Merge branch 'main' into t3code/git-usage-audit

Author: mrinc

apps/web/src/components/ChatView.browser.tsx

@@ -2818,6 +2818,55 @@ describe("ChatView timeline estimator parity (full app)", () => {
     }
   });
 
+  it("uses the active worktree path when saving a proposed plan to the workspace", async () => {
+    const snapshot = createSnapshotWithLongProposedPlan();
+    const threads = snapshot.threads.slice();
+    const targetThreadIndex = threads.findIndex((thread) => thread.id === THREAD_ID);
+    const targetThread = targetThreadIndex >= 0 ? threads[targetThreadIndex] : undefined;
+    if (targetThread) {
+      threads[targetThreadIndex] = {
+        ...targetThread,
+        worktreePath: "/repo/worktrees/plan-thread",
+      };
+    }
+
+    const mounted = await mountChatView({
+      viewport: DEFAULT_VIEWPORT,
+      snapshot: {
+        ...snapshot,
+        threads,
+      },
+    });
+
+    try {
+      const planActionsButton = await waitForElement(
+        () => document.querySelector<HTMLButtonElement>('button[aria-label="Plan actions"]'),
+        "Unable to find proposed plan actions button.",
+      );
+      planActionsButton.click();
+
+      const saveToWorkspaceItem = await waitForElement(
+        () =>
+          (Array.from(document.querySelectorAll('[data-slot="menu-item"]')).find(
+            (item) => item.textContent?.trim() === "Save to workspace",
+          ) ?? null) as HTMLElement | null,
+        'Unable to find "Save to workspace" menu item.',
+      );
+      saveToWorkspaceItem.click();
+
+      await vi.waitFor(
+        () => {
+          expect(document.body.textContent).toContain(
+            "Enter a path relative to /repo/worktrees/plan-thread.",
+          );
+        },
+        { timeout: 8_000, interval: 16 },
+      );
+    } finally {
+      await mounted.cleanup();
+    }
+  });
+
   it("keeps pending-question footer actions inside the composer after a real resize", async () => {
     const mounted = await mountChatView({
       viewport: WIDE_FOOTER_VIEWPORT,

apps/web/src/components/ChatView.tsx

@@ -1529,6 +1529,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
   );
   const activeProjectCwd = activeProject?.cwd ?? null;
   const activeThreadWorktreePath = activeThread?.worktreePath ?? null;
+  const activeWorkspaceRoot = activeThreadWorktreePath ?? activeProjectCwd ?? undefined;
   const activeTerminalLaunchContext =
     terminalLaunchContext?.threadId === activeThreadId
       ? terminalLaunchContext
@@ -4007,7 +4008,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
                 markdownCwd={gitCwd ?? undefined}
                 resolvedTheme={resolvedTheme}
                 timestampFormat={timestampFormat}
-                workspaceRoot={activeProject?.cwd ?? undefined}
+                workspaceRoot={activeWorkspaceRoot}
               />
             </div>
 
@@ -4441,7 +4442,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
             activePlan={activePlan}
             activeProposedPlan={sidebarProposedPlan}
             markdownCwd={gitCwd ?? undefined}
-            workspaceRoot={activeProject?.cwd ?? undefined}
+            workspaceRoot={activeWorkspaceRoot}
             timestampFormat={timestampFormat}
             onClose={() => {
               setPlanSidebarOpen(false);

apps/web/src/rpc/requestLatencyState.ts

@@ -3,8 +3,9 @@ import { Atom } from "effect/unstable/reactivity";
 
 import { appAtomRegistry } from "./atomRegistry";
 
-export const SLOW_RPC_ACK_THRESHOLD_MS = 2_500;
+export const SLOW_RPC_ACK_THRESHOLD_MS = 15_000;
 export const MAX_TRACKED_RPC_ACK_REQUESTS = 256;
+let slowRpcAckThresholdMs = SLOW_RPC_ACK_THRESHOLD_MS;
 
 export interface SlowRpcAckRequest {
   readonly requestId: string;
@@ -56,12 +57,12 @@ export function trackRpcRequestSent(requestId: string, tag: string): void {
     startedAt: new Date(startedAtMs).toISOString(),
     startedAtMs,
     tag,
-    thresholdMs: SLOW_RPC_ACK_THRESHOLD_MS,
+    thresholdMs: slowRpcAckThresholdMs,
   };
   const timeoutId = setTimeout(() => {
     pendingRpcAckRequests.delete(requestId);
     appendSlowRpcAckRequest(request);
-  }, SLOW_RPC_ACK_THRESHOLD_MS);
+  }, slowRpcAckThresholdMs);
 
   pendingRpcAckRequests.set(requestId, {
     request,
@@ -119,9 +120,14 @@ function evictOldestPendingRpcRequestIfNeeded(): void {
 }
 
 export function resetRequestLatencyStateForTests(): void {
+  slowRpcAckThresholdMs = SLOW_RPC_ACK_THRESHOLD_MS;
   clearAllTrackedRpcRequests();
 }
 
+export function setSlowRpcAckThresholdMsForTests(thresholdMs: number): void {
+  slowRpcAckThresholdMs = thresholdMs;
+}
+
 export function useSlowRpcAckRequests(): ReadonlyArray<SlowRpcAckRequest> {
   return useAtomValue(slowRpcAckRequestsAtom);
 }

apps/web/src/wsTransport.test.ts

@@ -5,7 +5,11 @@ import {
   __resetClientTracingForTests,
   configureClientTracing,
 } from "./observability/clientTracing";
-import { getSlowRpcAckRequests, resetRequestLatencyStateForTests } from "./rpc/requestLatencyState";
+import {
+  getSlowRpcAckRequests,
+  resetRequestLatencyStateForTests,
+  setSlowRpcAckThresholdMsForTests,
+} from "./rpc/requestLatencyState";
 import {
   getWsConnectionStatus,
   getWsConnectionUiState,
@@ -292,6 +296,8 @@ describe("WsTransport", () => {
   });
 
   it("marks unary requests as slow until the first server ack arrives", async () => {
+    const slowAckThresholdMs = 25;
+    setSlowRpcAckThresholdMsForTests(slowAckThresholdMs);
     const transport = new WsTransport("ws://localhost:3020");
 
     const requestPromise = transport.request((client) =>
@@ -320,7 +326,7 @@ describe("WsTransport", () => {
           tag: WS_METHODS.serverUpsertKeybinding,
         },
       ]);
-    }, 5_000);
+    }, 1_000);
 
     socket.serverMessage(
       JSON.stringify({
@@ -343,7 +349,7 @@ describe("WsTransport", () => {
     expect(getSlowRpcAckRequests()).toEqual([]);
 
     await transport.dispose();
-  }, 10_000);
+  }, 5_000);
 
   it("sends unary RPC requests and resolves successful exits", async () => {
     const transport = new WsTransport("ws://localhost:3020");