Update files

packages/app/src/utils/new-agent-routing.test.ts

@@ -0,0 +1,37 @@
+import { describe, expect, it } from "vitest";
+
+import type { CheckoutStatusPayload } from "@/hooks/use-checkout-status-query";
+import {
+  buildNewAgentRoute,
+  resolveNewAgentWorkingDir,
+} from "./new-agent-routing";
+
+describe("buildNewAgentRoute", () => {
+  it("falls back to /agent when no working directory is provided", () => {
+    expect(buildNewAgentRoute(undefined)).toBe("/agent");
+    expect(buildNewAgentRoute("   ")).toBe("/agent");
+  });
+
+  it("encodes the working directory query parameter", () => {
+    expect(buildNewAgentRoute("/Users/me/dev/paseo")).toBe(
+      "/agent?workingDir=%2FUsers%2Fme%2Fdev%2Fpaseo"
+    );
+  });
+});
+
+describe("resolveNewAgentWorkingDir", () => {
+  it("returns the current cwd for regular checkouts", () => {
+    expect(resolveNewAgentWorkingDir("/repo/path", null)).toBe("/repo/path");
+  });
+
+  it("returns the main repo root for paseo-owned worktrees", () => {
+    const checkout = {
+      isPaseoOwnedWorktree: true,
+      mainRepoRoot: "/repo/main",
+    } as CheckoutStatusPayload;
+
+    expect(resolveNewAgentWorkingDir("/repo/.paseo/worktrees/feature", checkout)).toBe(
+      "/repo/main"
+    );
+  });
+});

packages/app/src/utils/new-agent-routing.ts

@@ -0,0 +1,16 @@
+import type { CheckoutStatusPayload } from "@/hooks/use-checkout-status-query";
+
+export function resolveNewAgentWorkingDir(
+  cwd: string,
+  checkout: CheckoutStatusPayload | null
+): string {
+  return (checkout?.isPaseoOwnedWorktree ? checkout.mainRepoRoot : null) ?? cwd;
+}
+
+export function buildNewAgentRoute(workingDir?: string | null): string {
+  const trimmedWorkingDir = workingDir?.trim();
+  if (!trimmedWorkingDir) {
+    return "/agent";
+  }
+  return `/agent?workingDir=${encodeURIComponent(trimmedWorkingDir)}`;
+}

packages/app/src/utils/tool-call-icon.ts

@@ -14,16 +14,19 @@ const TOOL_DETAIL_ICONS: Record<ToolCallDetail["type"], ToolCallIconComponent> =
 };
 
 export function resolveToolCallIcon(toolName: string, detail?: ToolCallDetail): ToolCallIconComponent {
+  const lowerName = toolName.trim().toLowerCase();
+
+  // Thoughts are rendered through ToolCall with unknown detail payloads.
+  if (lowerName === "thinking" && (!detail || detail.type === "unknown")) {
+    return Brain;
+  }
+
   if (detail) {
     return TOOL_DETAIL_ICONS[detail.type];
   }
 
-  const lowerName = toolName.trim().toLowerCase();
   if (lowerName === "task") {
     return Bot;
   }
-  if (lowerName === "thinking") {
-    return Brain;
-  }
   return Wrench;
 }