Commit 807e3d18dec858c9694a595deaea4f9ac588db5f | the-knife

AGENTS.md+7

apps/desktop/turbo.jsonc+6-6

...	@@ -4,21 +4,21 @@	...	@@ -4,21 +4,21 @@
4	"tasks": {	4	"tasks": {
5	"build": {	5	"build": {
6	"dependsOn": ["^build"],	6	"dependsOn": ["^build"],
7	"outputs": ["dist-electron/**"]	7	"outputs": ["dist-electron/**"],
8	},	8	},
9	"dev": {	9	"dev": {
10	"dependsOn": ["t3#build"],	10	"dependsOn": ["t3#build"],
11	"persistent": true	11	"persistent": true,
12	},	12	},
13	"start": {	13	"start": {
14	"dependsOn": ["build", "@t3tools/web#build", "t3#build"],	14	"dependsOn": ["build", "@t3tools/web#build", "t3#build"],
15	"cache": false,	15	"cache": false,
16	"persistent": true	16	"persistent": true,
17	},	17	},
18	"smoke-test": {	18	"smoke-test": {
19	"dependsOn": ["build", "@t3tools/web#build", "t3#build"],	19	"dependsOn": ["build", "@t3tools/web#build", "t3#build"],
20	"cache": false,	20	"cache": false,
21	"outputs": []	21	"outputs": [],
22	}	22	},
23	}	23	},
24	}	24	}

apps/server/src/codexAppServerManager.test.ts+2-6

 @@ -57,17 +57,13 @@ describe("normalizeCodexModelSlug", () => {
 describe("isRecoverableThreadResumeError", () => {
   it("matches not-found resume errors", () => {
     expect(
-      isRecoverableThreadResumeError(
+      isRecoverableThreadResumeError(new Error("thread/resume failed: thread not found")),
-        new Error("thread/resume failed: thread not found"),
-      ),
     ).toBe(true);
   });
   it("ignores non-resume errors", () => {
     expect(
-      isRecoverableThreadResumeError(
+      isRecoverableThreadResumeError(new Error("thread/start failed: permission denied")),
-        new Error("thread/start failed: permission denied"),
-      ),
     ).toBe(false);
   });

apps/server/src/codexAppServerManager.ts+11-33

 @@ -26,9 +26,7 @@ interface PendingRequest {
 interface PendingApprovalRequest {
   requestId: string;
   jsonRpcId: string | number;
-  method:
+  method: "item/commandExecution/requestApproval" | "item/fileChange/requestApproval";
-    | "item/commandExecution/requestApproval"
-    | "item/fileChange/requestApproval";
   requestKind: ProviderRequestKind;
   threadId?: string;
   turnId?: string;
 @@ -122,16 +120,12 @@ export function classifyCodexStderrLine(rawLine: string): { message: string } |
 }
 export function isRecoverableThreadResumeError(error: unknown): boolean {
-  const message = (
+  const message = (error instanceof Error ? error.message : String(error)).toLowerCase();
-    error instanceof Error ? error.message : String(error)
-  ).toLowerCase();
   if (!message.includes("thread/resume")) {
     return false;
   }
-  return RECOVERABLE_THREAD_RESUME_ERROR_SNIPPETS.some((snippet) =>
+  return RECOVERABLE_THREAD_RESUME_ERROR_SNIPPETS.some((snippet) => message.includes(snippet));
-    message.includes(snippet),
-  );
 }
 export interface CodexAppServerManagerEvents {
 @@ -209,14 +203,10 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
       if (input.resumeThreadId) {
         try {
           threadOpenMethod = "thread/resume";
-          threadOpenResponse = await this.sendRequest(
+          threadOpenResponse = await this.sendRequest(context, "thread/resume", {
-            context,
+            ...sessionOverrides,
-            "thread/resume",
+            threadId: input.resumeThreadId,
-            {
+          });
-              ...sessionOverrides,
-              threadId: input.resumeThreadId,
-            },
-          );
         } catch (error) {
           if (!isRecoverableThreadResumeError(error)) {
             throw error;
 @@ -228,19 +218,11 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
             "session/threadResumeFallback",
             `Could not resume thread ${input.resumeThreadId}; started a new thread instead.`,
           );
-          threadOpenResponse = await this.sendRequest(
+          threadOpenResponse = await this.sendRequest(context, "thread/start", threadStartParams);
-            context,
-            "thread/start",
-            threadStartParams,
-          );
         }
       } else {
         threadOpenMethod = "thread/start";
-        threadOpenResponse = await this.sendRequest(
+        threadOpenResponse = await this.sendRequest(context, "thread/start", threadStartParams);
-          context,
-          "thread/start",
-          threadStartParams,
-        );
       }
       const threadOpenRecord = this.readObject(threadOpenResponse);
 @@ -248,9 +230,7 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
         this.readString(this.readObject(threadOpenRecord, "thread"), "id") ??
         this.readString(threadOpenRecord, "threadId");
       if (!threadId) {
-        throw new Error(
+        throw new Error(`${threadOpenMethod} response did not include a thread id.`);
-          `${threadOpenMethod} response did not include a thread id.`,
-        );
       }
       this.updateSession(context, {
 @@ -732,9 +712,7 @@ export class CodexAppServerManager extends EventEmitter<CodexAppServerManagerEve
     };
   }
-  private requestKindForMethod(
+  private requestKindForMethod(method: string): ProviderRequestKind | undefined {
-    method: string,
-  ): ProviderRequestKind | undefined {
     if (method === "item/commandExecution/requestApproval") {
       return "command";
     }

apps/server/src/git.ts+2-10

 @@ -16,11 +16,7 @@ import type {
 } from "@t3tools/contracts";
 /** Spawn git directly with an argv array — no shell, no quoting needed. */
-function runGit(
+function runGit(args: string[], cwd: string, timeoutMs = 30_000): Promise<TerminalCommandResult> {
-  args: string[],
-  cwd: string,
-  timeoutMs = 30_000,
-): Promise<TerminalCommandResult> {
   return new Promise((resolve, reject) => {
     const child = spawn("git", args, {
       cwd,
 @@ -127,11 +123,7 @@ export async function listGitBranches(input: GitListBranchesInput): Promise<GitL
   }
   // Resolve the real default branch from the remote
-  const defaultRef = await runGit(
+  const defaultRef = await runGit(["symbolic-ref", "refs/remotes/origin/HEAD"], input.cwd, 5_000);
-    ["symbolic-ref", "refs/remotes/origin/HEAD"],
-    input.cwd,
-    5_000,
-  );
   const defaultBranch =
     defaultRef.code === 0 ? defaultRef.stdout.trim().replace(/^refs\/remotes\/origin\//, "") : null;

apps/server/src/providerManager.test.ts+1-4

 @@ -16,10 +16,7 @@ describe("ProviderManager", () => {
         method: string;
         threadId: string;
       }) => void;
-      threadLogStreams: Map<
+      threadLogStreams: Map<string, { writableEnded: boolean; destroyed: boolean }>;
-        string,
-        { writableEnded: boolean; destroyed: boolean }
-      >;
     };
     internals.onCodexEvent({
       id: "evt-1",

apps/server/src/providerManager.ts+2-9

 @@ -87,11 +87,7 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
       throw new Error(`Unknown provider session: ${input.sessionId}`);
     }
-    await this.codex.respondToRequest(
+    await this.codex.respondToRequest(input.sessionId, input.requestId, input.decision);
-      input.sessionId,
-      input.requestId,
-      input.decision,
-    );
   }
   stopSession(raw: ProviderStopSessionInput): void {
 @@ -151,10 +147,7 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
   private resolveThreadId(event: ProviderEvent): string | undefined {
     const fromPayload = this.readThreadIdFromPayload(event.payload);
-    const threadId =
+    const threadId = event.threadId ?? fromPayload ?? this.sessionThreadIds.get(event.sessionId);
-      event.threadId ??
-      fromPayload ??
-      this.sessionThreadIds.get(event.sessionId);
     if (threadId) {
       this.sessionThreadIds.set(event.sessionId, threadId);

apps/server/src/wsServer.ts+4-1

 @@ -369,7 +369,10 @@ export function createServer(options: ServerOptions) {
     const isServerNotRunningError = (error: unknown): boolean => {
       if (!(error instanceof Error)) return false;
       const maybeCode = (error as NodeJS.ErrnoException).code;
-      return maybeCode === "ERR_SERVER_NOT_RUNNING" || error.message.toLowerCase().includes("not running");
+      return (
+        maybeCode === "ERR_SERVER_NOT_RUNNING" ||
+        error.message.toLowerCase().includes("not running")
+      );
     };
     const closeWebSocketServer = new Promise<void>((resolve, reject) => {

apps/server/turbo.jsonc+3-3

...	@@ -5,7 +5,7 @@	...	@@ -5,7 +5,7 @@
5	"start": {	5	"start": {
6	"dependsOn": ["build"],	6	"dependsOn": ["build"],
7	"cache": false,	7	"cache": false,
8	"persistent": true	8	"persistent": true,
9	}	9	},
10	}	10	},
11	}	11	}

apps/web/index.html+4-1

 @@ -5,7 +5,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
-    <link href="https://fonts.googleapis.com/css2?family=DM+Sans:ital,opsz,wght@0,9..40,300..800;1,9..40,300..800&display=swap" rel="stylesheet" />
+    <link
+      href="https://fonts.googleapis.com/css2?family=DM+Sans:ital,opsz,wght@0,9..40,300..800;1,9..40,300..800&display=swap"
+      rel="stylesheet"
+    />
     <title>T3 Code</title>
   </head>
   <body>

apps/web/package.json+1

...	@@ -12,6 +12,7 @@	...	@@ -12,6 +12,7 @@
12	},	12	},
13	"dependencies": {	13	"dependencies": {
14	"@t3tools/contracts": "workspace:*",	14	"@t3tools/contracts": "workspace:*",
		15	"@tanstack/react-query": "^5.90.0",
15	"highlight.js": "^11.11.1",	16	"highlight.js": "^11.11.1",
16	"lucide-react": "^0.563.0",	17	"lucide-react": "^0.563.0",
17	"react": "^19.0.0",	18	"react": "^19.0.0",

apps/web/src/App.tsx+8-3

 @@ -1,3 +1,4 @@
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { useEffect, useMemo, useRef } from "react";
 import ChatView from "./components/ChatView";
 @@ -168,10 +169,14 @@ function Layout() {
   );
 }
+const queryClient = new QueryClient();
 export default function App() {
   return (
-    <StoreProvider>
+    <QueryClientProvider client={queryClient}>
-      <Layout />
+      <StoreProvider>
-    </StoreProvider>
+        <Layout />
+      </StoreProvider>
+    </QueryClientProvider>
   );
 }

apps/web/src/components/BranchToolbar.tsx+89-108

 @@ -1,5 +1,6 @@
 import type { GitBranch } from "@t3tools/contracts";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useEffect, useMemo, useRef, useState } from "react";
 import { readNativeApi } from "../session-logic";
 import { useStore } from "../store";
 @@ -10,76 +11,85 @@ interface BranchToolbarProps {
   envLocked: boolean;
 }
-export default function BranchToolbar({
+export default function BranchToolbar({ envMode, onEnvModeChange, envLocked }: BranchToolbarProps) {
-  envMode,
-  onEnvModeChange,
-  envLocked,
-}: BranchToolbarProps) {
   const { state, dispatch } = useStore();
   const api = useMemo(() => readNativeApi(), []);
+  const queryClient = useQueryClient();
-  const [branches, setBranches] = useState<GitBranch[]>([]);
-  const [isRepo, setIsRepo] = useState(false);
-  const [isLoadingBranches, setIsLoadingBranches] = useState(false);
   const [isBranchMenuOpen, setIsBranchMenuOpen] = useState(false);
   const [isCreatingBranch, setIsCreatingBranch] = useState(false);
   const [newBranchName, setNewBranchName] = useState("");
-  const [isInitializingRepo, setIsInitializingRepo] = useState(false);
   const branchMenuRef = useRef<HTMLDivElement>(null);
   const activeThread = state.threads.find((thread) => thread.id === state.activeThreadId);
   const activeProject = state.projects.find((project) => project.id === activeThread?.projectId);
-  const branchCwd = activeThread?.worktreePath ?? activeProject?.cwd;
+  const activeThreadId = activeThread?.id;
+  const activeThreadBranch = activeThread?.branch ?? null;
+  const activeWorktreePath = activeThread?.worktreePath ?? null;
+  const branchCwd = activeWorktreePath ?? activeProject?.cwd;
-  const loadBranches = useCallback(async () => {
+  // ── Queries ───────────────────────────────────────────────────────────
-    if (!api || !branchCwd) return;
-    setIsLoadingBranches(true);
-    try {
-      const result = await api.git.listBranches({ cwd: branchCwd });
-      setIsRepo(result.isRepo);
-      setBranches(result.branches);
-    } catch (error) {
-      setIsRepo(false);
-      setBranches([]);
-      if (activeThread) {
-        dispatch({
-          type: "SET_ERROR",
-          threadId: activeThread.id,
-          error:
-            error instanceof Error ? error.message : "Failed to load git branches.",
-        });
-      }
-    } finally {
-      setIsLoadingBranches(false);
-    }
-  }, [activeThread, api, branchCwd, dispatch]);
-  useEffect(() => {
+  const branchesQuery = useQuery({
-    void loadBranches();
+    queryKey: ["git", "branches", branchCwd],
-  }, [loadBranches]);
+    queryFn: () => api!.git.listBranches({ cwd: branchCwd! }),
+    enabled: !!api && !!branchCwd,
+  });
+  const branches = branchesQuery.data?.branches ?? [];
+  const isRepo = branchesQuery.data?.isRepo ?? false;
+  // ── Mutations ─────────────────────────────────────────────────────────
+  const checkoutMutation = useMutation({
+    mutationFn: (branch: string) => api!.git.checkout({ cwd: branchCwd!, branch }),
+    onSuccess: () => queryClient.invalidateQueries({ queryKey: ["git", "branches", branchCwd] }),
+    onError: (error) =>
+      setThreadError(error instanceof Error ? error.message : "Failed to checkout branch."),
+  });
+  const createBranchMutation = useMutation({
+    mutationFn: (branch: string) =>
+      api!.git
+        .createBranch({ cwd: branchCwd!, branch })
+        .then(() => api!.git.checkout({ cwd: branchCwd!, branch })),
+    onSuccess: () => queryClient.invalidateQueries({ queryKey: ["git", "branches", branchCwd] }),
+    onError: (error) =>
+      setThreadError(error instanceof Error ? error.message : "Failed to create branch."),
+  });
+  const initMutation = useMutation({
+    mutationFn: () => api!.git.init({ cwd: branchCwd! }),
+    onSuccess: () => {
+      setThreadError(null);
+      queryClient.invalidateQueries({ queryKey: ["git", "branches", branchCwd] });
+    },
+    onError: (error) =>
+      setThreadError(error instanceof Error ? error.message : "Failed to initialize git repo."),
+  });
+  // ── Effects ───────────────────────────────────────────────────────────
   // Keep thread branch synced to git current branch for local threads.
+  const queryBranches = branchesQuery.data?.branches;
   useEffect(() => {
-    if (!activeThread || activeThread.worktreePath) return;
+    if (!activeThreadId || activeWorktreePath) return;
-    const current = branches.find((branch) => branch.current);
+    const current = queryBranches?.find((branch) => branch.current);
     if (!current) return;
-    if (current.name === activeThread.branch) return;
+    if (current.name === activeThreadBranch) return;
     dispatch({
       type: "SET_THREAD_BRANCH",
-      threadId: activeThread.id,
+      threadId: activeThreadId,
       branch: current.name,
       worktreePath: null,
     });
-  }, [activeThread, branches, dispatch]);
+  }, [activeThreadId, activeWorktreePath, activeThreadBranch, queryBranches, dispatch]);
   useEffect(() => {
     if (!isBranchMenuOpen) return;
     const handleClickOutside = (event: MouseEvent) => {
       if (!branchMenuRef.current) return;
-      if (
+      if (event.target instanceof Node && !branchMenuRef.current.contains(event.target)) {
-        event.target instanceof Node &&
-        !branchMenuRef.current.contains(event.target)
-      ) {
         setIsBranchMenuOpen(false);
       }
     };
 @@ -89,79 +99,50 @@ export default function BranchToolbar({
     };
   }, [isBranchMenuOpen]);
+  // ── Helpers ───────────────────────────────────────────────────────────
   const setThreadError = (error: string | null) => {
-    if (!activeThread) return;
+    if (!activeThreadId) return;
-    dispatch({
+    dispatch({ type: "SET_ERROR", threadId: activeThreadId, error });
-      type: "SET_ERROR",
-      threadId: activeThread.id,
-      error,
-    });
   };
   const setThreadBranch = (branch: string | null, worktreePath: string | null) => {
-    if (!activeThread) return;
+    if (!activeThreadId) return;
-    dispatch({
+    dispatch({ type: "SET_THREAD_BRANCH", threadId: activeThreadId, branch, worktreePath });
-      type: "SET_THREAD_BRANCH",
-      threadId: activeThread.id,
-      branch,
-      worktreePath,
-    });
-  };
-  const initializeRepo = async () => {
-    if (!api || !branchCwd || !activeThread || isInitializingRepo) return;
-    setIsInitializingRepo(true);
-    try {
-      await api.git.init({ cwd: branchCwd });
-      setThreadError(null);
-      await loadBranches();
-    } catch (error) {
-      setThreadError(error instanceof Error ? error.message : "Failed to initialize git repo.");
-    } finally {
-      setIsInitializingRepo(false);
-    }
   };
-  const selectBranch = async (branch: GitBranch) => {
+  const selectBranch = (branch: GitBranch) => {
-    if (!api || !activeThread || !branchCwd) return;
+    if (!api || !activeThreadId || !branchCwd) return;
     // For new worktree mode, selecting a branch picks the base branch.
-    if (envMode === "worktree" && !envLocked && !activeThread.worktreePath) {
+    if (envMode === "worktree" && !envLocked && !activeWorktreePath) {
       setThreadError(null);
       setThreadBranch(branch.name, null);
       setIsBranchMenuOpen(false);
       return;
     }
-    try {
+    checkoutMutation.mutate(branch.name, {
-      await api.git.checkout({
+      onSuccess: () => {
-        cwd: branchCwd,
+        setThreadError(null);
-        branch: branch.name,
+        setThreadBranch(branch.name, activeWorktreePath);
-      });
+        setIsBranchMenuOpen(false);
-      setThreadError(null);
+      },
-      setThreadBranch(branch.name, activeThread.worktreePath);
+    });
-      setIsBranchMenuOpen(false);
-      await loadBranches();
-    } catch (error) {
-      setThreadError(error instanceof Error ? error.message : "Failed to checkout branch.");
-    }
   };
-  const createBranch = async () => {
+  const createBranch = () => {
     const name = newBranchName.trim();
-    if (!api || !activeThread || !branchCwd || !name) return;
+    if (!api || !activeThreadId || !branchCwd || !name) return;
-    try {
+    createBranchMutation.mutate(name, {
-      await api.git.createBranch({ cwd: branchCwd, branch: name });
+      onSuccess: () => {
-      await api.git.checkout({ cwd: branchCwd, branch: name });
+        setThreadError(null);
-      setThreadError(null);
+        setThreadBranch(name, activeWorktreePath);
-      setThreadBranch(name, activeThread.worktreePath);
+        setNewBranchName("");
-      setNewBranchName("");
+        setIsCreatingBranch(false);
-      setIsCreatingBranch(false);
+        setIsBranchMenuOpen(false);
-      setIsBranchMenuOpen(false);
+      },
-      await loadBranches();
+    });
-    } catch (error) {
-      setThreadError(error instanceof Error ? error.message : "Failed to create branch.");
-    }
   };
   if (!activeThread || !activeProject) return null;
 @@ -192,10 +173,10 @@ export default function BranchToolbar({
         <button
           type="button"
           className="inline-flex items-center gap-1.5 rounded-lg border border-border px-2 py-1 text-[12px] text-muted-foreground/70 transition-colors duration-150 hover:bg-accent hover:text-foreground/80 disabled:cursor-not-allowed disabled:opacity-50"
-          disabled={!branchCwd || isInitializingRepo}
+          disabled={!branchCwd || initMutation.isPending}
-          onClick={() => void initializeRepo()}
+          onClick={() => initMutation.mutate()}
         >
-          {isInitializingRepo ? "Initializing…" : "Initialize git"}
+          {initMutation.isPending ? "Initializing\u2026" : "Initialize git"}
         </button>
       ) : (
         <div className="relative" ref={branchMenuRef}>
 @@ -203,7 +184,7 @@ export default function BranchToolbar({
             type="button"
             className="inline-flex items-center gap-1.5 rounded-lg px-2 py-1 text-[12px] text-muted-foreground/60 transition-colors duration-150 hover:bg-accent/50 hover:text-muted-foreground/80"
             onClick={() => setIsBranchMenuOpen((open) => !open)}
-            disabled={isLoadingBranches}
+            disabled={branchesQuery.isLoading}
           >
             <span className="max-w-[240px] truncate font-mono">
               {activeThread.branch
 @@ -246,7 +227,7 @@ export default function BranchToolbar({
                           ? "bg-accent text-foreground"
                           : "text-foreground/90 hover:bg-accent/50"
                       }`}
-                      onClick={() => void selectBranch(branch)}
+                      onClick={() => selectBranch(branch)}
                     >
                       <span className="truncate">{branch.name}</span>
                       {(branch.current || branch.isDefault) && (
 @@ -266,7 +247,7 @@ export default function BranchToolbar({
                       className="flex items-center gap-1 px-1"
                       onSubmit={(event) => {
                         event.preventDefault();
-                        void createBranch();
+                        createBranch();
                       }}
                     >
                       <input
 @@ -286,7 +267,7 @@ export default function BranchToolbar({
                       />
                       <button
                         type="submit"
-                        disabled={!newBranchName.trim()}
+                        disabled={!newBranchName.trim() || createBranchMutation.isPending}
                         className="rounded-lg px-2 py-1.5 text-xs text-muted-foreground/70 transition-colors hover:bg-accent hover:text-foreground/80 disabled:opacity-30"
                       >
                         Create

apps/web/src/components/ChatView.tsx+49-139

 @@ -92,23 +92,17 @@ function approvalDetail(event: ProviderEvent): string | undefined {
   return asString(payload?.reason);
 }
-function derivePendingApprovals(
+function derivePendingApprovals(events: ProviderEvent[]): PendingApprovalCard[] {
-  events: ProviderEvent[],
-): PendingApprovalCard[] {
   const pending = new Map<string, PendingApprovalCard>();
   const ordered = [...events].toReversed();
   for (const event of ordered) {
-    if (
+    if (event.method === "session/closed" || event.method === "session/exited") {
-      event.method === "session/closed" ||
-      event.method === "session/exited"
-    ) {
       pending.clear();
       continue;
     }
-    const requestId =
+    const requestId = event.requestId ?? asString(asRecord(event.payload)?.requestId);
-      event.requestId ?? asString(asRecord(event.payload)?.requestId);
     if (!requestId) continue;
     if (
 @@ -143,20 +137,13 @@ export default function ChatView() {
   const [isEditorMenuOpen, setIsEditorMenuOpen] = useState(false);
   const [lastEditor, setLastEditor] = useState<EditorId>(() => {
     const stored = localStorage.getItem(LAST_EDITOR_KEY);
-    return EDITORS.some((e) => e.id === stored)
+    return EDITORS.some((e) => e.id === stored) ? (stored as EditorId) : EDITORS[0].id;
-      ? (stored as EditorId)
-      : EDITORS[0].id;
   });
-  const [selectedEffort, setSelectedEffort] =
+  const [selectedEffort, setSelectedEffort] = useState<string>(DEFAULT_REASONING);
-    useState<string>(DEFAULT_REASONING);
   const [envMode, setEnvMode] = useState<"local" | "worktree">("local");
   const [isSwitchingRuntimeMode, setIsSwitchingRuntimeMode] = useState(false);
-  const [respondingRequestIds, setRespondingRequestIds] = useState<string[]>(
+  const [respondingRequestIds, setRespondingRequestIds] = useState<string[]>([]);
-    [],
+  const [expandedWorkGroups, setExpandedWorkGroups] = useState<Record<string, boolean>>({});
-  );
-  const [expandedWorkGroups, setExpandedWorkGroups] = useState<
-    Record<string, boolean>
-  >({});
   const [nowTick, setNowTick] = useState(() => Date.now());
   const messagesEndRef = useRef<HTMLDivElement>(null);
   const textareaRef = useRef<HTMLTextAreaElement>(null);
 @@ -177,11 +164,7 @@ export default function ChatView() {
     [activeThread?.events],
   );
   const latestTurnWorkEntries = useMemo(
-    () =>
+    () => deriveWorkLogEntries(activeThread?.events ?? [], activeThread?.latestTurnId),
-      deriveWorkLogEntries(
-        activeThread?.events ?? [],
-        activeThread?.latestTurnId,
-      ),
     [activeThread?.events, activeThread?.latestTurnId],
   );
   const pendingApprovals = useMemo(
 @@ -269,22 +252,18 @@ export default function ChatView() {
         } as const);
   const envLocked = Boolean(
     activeThread &&
-      (activeThread.messages.length > 0 ||
+    (activeThread.messages.length > 0 ||
-        (activeThread.session !== null && activeThread.session.status !== "closed")),
+      (activeThread.session !== null && activeThread.session.status !== "closed")),
   );
-  const handleRuntimeModeChange = async (
+  const handleRuntimeModeChange = async (mode: "approval-required" | "full-access") => {
-    mode: "approval-required" | "full-access",
-  ) => {
     if (mode === state.runtimeMode) return;
     dispatch({ type: "SET_RUNTIME_MODE", mode });
     if (!api) return;
     const sessionIds = state.threads
       .map((t) => t.session)
-      .filter(
+      .filter((s): s is NonNullable<typeof s> => s !== null && s.status !== "closed")
-        (s): s is NonNullable<typeof s> => s !== null && s.status !== "closed",
-      )
       .map((s) => s.sessionId);
     if (sessionIds.length === 0) return;
 @@ -292,9 +271,7 @@ export default function ChatView() {
     setIsSwitchingRuntimeMode(true);
     try {
       await Promise.all(
-        sessionIds.map((id) =>
+        sessionIds.map((id) => api.providers.stopSession({ sessionId: id }).catch(() => undefined)),
-          api.providers.stopSession({ sessionId: id }).catch(() => undefined),
-        ),
       );
     } finally {
       setIsSwitchingRuntimeMode(false);
 @@ -316,10 +293,11 @@ export default function ChatView() {
     setExpandedWorkGroups({});
   }, [activeThread?.id]);
+  const activeWorktreePath = activeThread?.worktreePath;
   useEffect(() => {
-    if (!activeThread) return;
+    if (!activeThread?.id) return;
-    setEnvMode(activeThread.worktreePath ? "worktree" : "local");
+    setEnvMode(activeWorktreePath ? "worktree" : "local");
-  }, [activeThread?.id, activeThread?.worktreePath]);
+  }, [activeThread?.id, activeWorktreePath]);
   // Auto-resize textarea
   useEffect(() => {
 @@ -360,10 +338,7 @@ export default function ChatView() {
     const handleClickOutside = (event: MouseEvent) => {
       if (!editorMenuRef.current) return;
-      if (
+      if (event.target instanceof Node && !editorMenuRef.current.contains(event.target)) {
-        event.target instanceof Node &&
-        !editorMenuRef.current.contains(event.target)
-      ) {
         setIsEditorMenuOpen(false);
       }
     };
 @@ -398,9 +373,7 @@ export default function ChatView() {
     setIsEditorMenuOpen(false);
   };
-  const ensureSession = async (
+  const ensureSession = async (cwdOverride?: string): Promise<EnsuredSessionInfo | null> => {
-    cwdOverride?: string,
-  ): Promise<EnsuredSessionInfo | null> => {
     if (!api || !activeThread || !activeProject) return null;
     if (activeThread.session && activeThread.session.status !== "closed") {
       const sessionThreadId = activeThread.session.threadId ?? null;
 @@ -527,14 +500,9 @@ export default function ChatView() {
     try {
       const shouldBootstrap =
         previousMessages.length > 0 &&
-        (sessionInfo.continuityState === "new" ||
+        (sessionInfo.continuityState === "new" || sessionInfo.continuityState === "fallback_new");
-          sessionInfo.continuityState === "fallback_new");
       const input = shouldBootstrap
-        ? buildBootstrapInput(
+        ? buildBootstrapInput(previousMessages, trimmed, PROVIDER_SEND_TURN_MAX_INPUT_CHARS).text
-            previousMessages,
-            trimmed,
-            PROVIDER_SEND_TURN_MAX_INPUT_CHARS,
-          ).text
         : trimmed;
       await api.providers.sendTurn({
         sessionId: sessionInfo.sessionId,
 @@ -561,10 +529,7 @@ export default function ChatView() {
     });
   };
-  const onRespondToApproval = async (
+  const onRespondToApproval = async (requestId: string, decision: ProviderApprovalDecision) => {
-    requestId: string,
-    decision: ProviderApprovalDecision,
-  ) => {
     if (!api || !activeThread?.session) return;
     setRespondingRequestIds((existing) =>
 @@ -580,15 +545,10 @@ export default function ChatView() {
       dispatch({
         type: "SET_ERROR",
         threadId: activeThread.id,
-        error:
+        error: err instanceof Error ? err.message : "Failed to submit approval decision.",
-          err instanceof Error
-            ? err.message
-            : "Failed to submit approval decision.",
       });
     } finally {
-      setRespondingRequestIds((existing) =>
+      setRespondingRequestIds((existing) => existing.filter((id) => id !== requestId));
-        existing.filter((id) => id !== requestId),
-      );
     }
   };
 @@ -626,11 +586,11 @@ export default function ChatView() {
   return (
     <div className="flex flex-1 flex-col bg-background">
       {/* Top bar */}
-      <header className={`flex items-center justify-between border-b border-border px-5 pb-3 ${isElectron ? "drag-region pt-[28px]" : "pt-3"}`}>
+      <header
+        className={`flex items-center justify-between border-b border-border px-5 pb-3 ${isElectron ? "drag-region pt-[28px]" : "pt-3"}`}
+      >
         <div className="flex items-center gap-3">
-          <h2 className="text-sm font-medium text-foreground">
+          <h2 className="text-sm font-medium text-foreground">{activeThread.title}</h2>
-            {activeThread.title}
-          </h2>
           {activeProject && (
             <span className="rounded-full bg-accent px-2 py-0.5 text-[10px] text-muted-foreground/50">
               {activeProject.name}
 @@ -666,9 +626,7 @@ export default function ChatView() {
                       {editorLabel(editor)}
                       {editor.id === lastEditor && (
                         <kbd className="ml-auto text-[9px] text-muted-foreground/40">
-                          {navigator.platform.includes("Mac")
+                          {navigator.platform.includes("Mac") ? "\u2318O" : "Ctrl+O"}
-                            ? "\u2318O"
-                            : "Ctrl+O"}
                         </kbd>
                       )}
                     </button>
 @@ -702,9 +660,7 @@ export default function ChatView() {
       {pendingApprovals.length > 0 && (
         <div className="mx-4 mt-3 space-y-2">
           {pendingApprovals.map((approval) => {
-            const isResponding = respondingRequestIds.includes(
+            const isResponding = respondingRequestIds.includes(approval.requestId);
-              approval.requestId,
-            );
             return (
               <div
                 key={approval.requestId}
 @@ -728,9 +684,7 @@ export default function ChatView() {
                     type="button"
                     className="rounded-md border border-border bg-accent px-2 py-1 text-[11px] text-foreground transition-colors duration-150 hover:bg-accent/80 disabled:cursor-not-allowed disabled:opacity-50"
                     disabled={isResponding}
-                    onClick={() =>
+                    onClick={() => void onRespondToApproval(approval.requestId, "accept")}
-                      void onRespondToApproval(approval.requestId, "accept")
-                    }
                   >
                     Approve once
                   </button>
 @@ -738,12 +692,7 @@ export default function ChatView() {
                     type="button"
                     className="rounded-md border border-sky-300/30 bg-sky-500/[0.15] px-2 py-1 text-[11px] text-sky-100 transition-colors duration-150 hover:bg-sky-500/[0.22] disabled:cursor-not-allowed disabled:opacity-50"
                     disabled={isResponding}
-                    onClick={() =>
+                    onClick={() => void onRespondToApproval(approval.requestId, "acceptForSession")}
-                      void onRespondToApproval(
-                        approval.requestId,
-                        "acceptForSession",
-                      )
-                    }
                   >
                     Always allow this session
                   </button>
 @@ -751,9 +700,7 @@ export default function ChatView() {
                     type="button"
                     className="rounded-md border border-border px-2 py-1 text-[11px] text-foreground/90 transition-colors duration-150 hover:bg-accent disabled:cursor-not-allowed disabled:opacity-50"
                     disabled={isResponding}
-                    onClick={() =>
+                    onClick={() => void onRespondToApproval(approval.requestId, "decline")}
-                      void onRespondToApproval(approval.requestId, "decline")
-                    }
                   >
                     Decline
                   </button>
 @@ -761,9 +708,7 @@ export default function ChatView() {
                     type="button"
                     className="rounded-md border border-rose-300/30 bg-rose-500/[0.12] px-2 py-1 text-[11px] text-rose-100 transition-colors duration-150 hover:bg-rose-500/[0.2] disabled:cursor-not-allowed disabled:opacity-50"
                     disabled={isResponding}
-                    onClick={() =>
+                    onClick={() => void onRespondToApproval(approval.requestId, "cancel")}
-                      void onRespondToApproval(approval.requestId, "cancel")
-                    }
                   >
                     Cancel turn
                   </button>
 @@ -778,15 +723,14 @@ export default function ChatView() {
       <div className="flex-1 overflow-y-auto px-5 py-4">
         {activeThread.messages.length === 0 && !isWorking ? (
           <div className="flex h-full items-center justify-center">
-            <p className="text-sm text-muted-foreground/30">Send a message to start the conversation.</p>
+            <p className="text-sm text-muted-foreground/30">
+              Send a message to start the conversation.
+            </p>
           </div>
         ) : (
           <div className="mx-auto max-w-3xl space-y-4">
             {timelineEntries.map((timelineEntry, index) => {
-              if (
+              if (timelineEntry.kind === "work" && timelineEntries[index - 1]?.kind === "work") {
-                timelineEntry.kind === "work" &&
-                timelineEntries[index - 1]?.kind === "work"
-              ) {
                 return null;
               }
 @@ -807,16 +751,13 @@ export default function ChatView() {
                 const groupId = timelineEntry.id;
                 const isExpanded = expandedWorkGroups[groupId] ?? false;
-                const hasOverflow =
+                const hasOverflow = groupedEntries.length > MAX_VISIBLE_WORK_LOG_ENTRIES;
-                  groupedEntries.length > MAX_VISIBLE_WORK_LOG_ENTRIES;
                 const visibleEntries =
                   hasOverflow && !isExpanded
                     ? groupedEntries.slice(-MAX_VISIBLE_WORK_LOG_ENTRIES)
                     : groupedEntries;
                 const hiddenCount = groupedEntries.length - visibleEntries.length;
-                const onlyToolEntries = groupedEntries.every(
+                const onlyToolEntries = groupedEntries.every((entry) => entry.tone === "tool");
-                  (entry) => entry.tone === "tool",
-                );
                 const groupLabel = onlyToolEntries
                   ? groupedEntries.length === 1
                     ? "Tool call"
 @@ -902,9 +843,7 @@ export default function ChatView() {
                     <div className="my-3 flex items-center gap-3">
                       <span className="h-px flex-1 bg-border" />
                       <span className="rounded-full border border-border bg-background px-2.5 py-1 text-[10px] uppercase tracking-[0.14em] text-muted-foreground/80">
-                        {completionSummary
+                        {completionSummary ? `Response • ${completionSummary}` : "Response"}
-                          ? `Response • ${completionSummary}`
-                          : "Response"}
                       </span>
                       <span className="h-px flex-1 bg-border" />
                     </div>
 @@ -913,24 +852,17 @@ export default function ChatView() {
                     <ChatMarkdown
                       text={
                         timelineEntry.message.text ||
-                        (timelineEntry.message.streaming
+                        (timelineEntry.message.streaming ? "" : "(empty response)")
-                          ? ""
-                          : "(empty response)")
                       }
                     />
                     <p className="mt-1.5 text-[10px] text-muted-foreground/30">
                       {formatMessageMeta(
                         timelineEntry.message.createdAt,
                         timelineEntry.message.streaming
-                          ? formatElapsed(
+                          ? formatElapsed(timelineEntry.message.createdAt, nowIso)
-                              timelineEntry.message.createdAt,
-                              nowIso,
-                            )
                           : formatElapsed(
                               timelineEntry.message.createdAt,
-                              assistantCompletionByItemId.get(
+                              assistantCompletionByItemId.get(timelineEntry.message.id),
-                                timelineEntry.message.id,
-                              ),
                             ),
                       )}
                     </p>
 @@ -1086,9 +1018,7 @@ export default function ChatView() {
                   disabled={isSwitchingRuntimeMode}
                   onClick={() =>
                     void handleRuntimeModeChange(
-                      state.runtimeMode === "full-access"
+                      state.runtimeMode === "full-access" ? "approval-required" : "full-access",
-                        ? "approval-required"
-                        : "full-access",
                     )
                   }
                   title={
 @@ -1098,13 +1028,7 @@ export default function ChatView() {
                   }
                 >
                   {state.runtimeMode === "full-access" ? (
-                    <svg
+                    <svg width="14" height="14" viewBox="0 0 14 14" fill="none" aria-hidden="true">
-                      width="14"
-                      height="14"
-                      viewBox="0 0 14 14"
-                      fill="none"
-                      aria-hidden="true"
-                    >
                       <rect
                         x="2"
                         y="5.5"
 @@ -1122,13 +1046,7 @@ export default function ChatView() {
                       />
                     </svg>
                   ) : (
-                    <svg
+                    <svg width="14" height="14" viewBox="0 0 14 14" fill="none" aria-hidden="true">
-                      width="14"
-                      height="14"
-                      viewBox="0 0 14 14"
-                      fill="none"
-                      aria-hidden="true"
-                    >
                       <rect
                         x="2"
                         y="5.5"
 @@ -1146,11 +1064,7 @@ export default function ChatView() {
                       />
                     </svg>
                   )}
-                  <span>
+                  <span>{state.runtimeMode === "full-access" ? "Full access" : "Supervised"}</span>
-                    {state.runtimeMode === "full-access"
-                      ? "Full access"
-                      : "Supervised"}
-                  </span>
                 </button>
               </div>
 @@ -1226,11 +1140,7 @@ export default function ChatView() {
         </form>
       </div>
-      <BranchToolbar
+      <BranchToolbar envMode={envMode} onEnvModeChange={setEnvMode} envLocked={envLocked} />
-        envMode={envMode}
-        onEnvModeChange={setEnvMode}
-        envLocked={envLocked}
-      />
     </div>
   );
 }

apps/web/src/components/DiffPanel.tsx+3-1

 @@ -7,7 +7,9 @@ export default function DiffPanel() {
   return (
     <aside className="flex h-full w-[400px] shrink-0 flex-col border-l border-border bg-card">
       {/* Header */}
-      <div className={`flex items-center justify-between border-b border-border px-4 pb-3 ${isElectron ? "drag-region pt-[28px]" : "pt-3"}`}>
+      <div
+        className={`flex items-center justify-between border-b border-border px-4 pb-3 ${isElectron ? "drag-region pt-[28px]" : "pt-3"}`}
+      >
         <h3 className="text-xs font-medium text-foreground">Uncommitted changes</h3>
         <button
           type="button"

apps/web/src/historyBootstrap.ts+4-11

 @@ -36,13 +36,8 @@ export function buildBootstrapInput(
   latestPrompt: string,
   maxChars: number,
 ): BootstrapInputResult {
-  const budget = Number.isFinite(maxChars)
+  const budget = Number.isFinite(maxChars) ? Math.max(1, Math.floor(maxChars)) : 1;
-    ? Math.max(1, Math.floor(maxChars))
+  const promptOnly = latestPrompt.length <= budget ? latestPrompt : latestPrompt.slice(0, budget);
-    : 1;
-  const promptOnly =
-    latestPrompt.length <= budget
-      ? latestPrompt
-      : latestPrompt.slice(0, budget);
   if (previousMessages.length === 0) {
     return {
 @@ -87,8 +82,7 @@ export function buildBootstrapInput(
   let includedChronological = [...includedNewestFirst].reverse();
   while (true) {
-    const omittedCount =
+    const omittedCount = newestFirstBlocks.length - includedChronological.length;
-      newestFirstBlocks.length - includedChronological.length;
     const transcriptBody =
       omittedCount > 0
         ? includedChronological.length > 0
 @@ -101,8 +95,7 @@ export function buildBootstrapInput(
         text: finalized,
         includedCount: includedChronological.length,
         omittedCount,
-        truncated:
+        truncated: omittedCount > 0 || latestPrompt.length !== promptOnly.length,
-          omittedCount > 0 || latestPrompt.length !== promptOnly.length,
       };
     }

apps/web/src/index.css+11-26

 @@ -88,11 +88,7 @@
   --secondary: --alpha(var(--color-black) / 4%);
   --secondary-foreground: var(--color-neutral-800);
   --muted: --alpha(var(--color-black) / 4%);
-  --muted-foreground: color-mix(
+  --muted-foreground: color-mix(in srgb, var(--color-neutral-500) 90%, var(--color-black));
-    in srgb,
-    var(--color-neutral-500) 90%,
-    var(--color-black)
-  );
   --accent: --alpha(var(--color-black) / 5%);
   --accent-foreground: var(--color-neutral-800);
   --destructive: var(--color-red-500);
 @@ -122,11 +118,7 @@
   @variant dark {
     color-scheme: dark;
-    --background: color-mix(
+    --background: color-mix(in srgb, var(--color-neutral-950) 95%, var(--color-white));
-      in srgb,
-      var(--color-neutral-950) 95%,
-      var(--color-white)
-    );
     --foreground: var(--color-neutral-100);
     --card: color-mix(in srgb, var(--background) 98%, var(--color-white));
     --card-foreground: var(--color-neutral-100);
 @@ -137,18 +129,10 @@
     --secondary: --alpha(var(--color-white) / 4%);
     --secondary-foreground: var(--color-neutral-100);
     --muted: --alpha(var(--color-white) / 4%);
-    --muted-foreground: color-mix(
+    --muted-foreground: color-mix(in srgb, var(--color-neutral-500) 90%, var(--color-white));
-      in srgb,
-      var(--color-neutral-500) 90%,
-      var(--color-white)
-    );
     --accent: --alpha(var(--color-white) / 4%);
     --accent-foreground: var(--color-neutral-100);
-    --destructive: color-mix(
+    --destructive: color-mix(in srgb, var(--color-red-500) 90%, var(--color-white));
-      in srgb,
-      var(--color-red-500) 90%,
-      var(--color-white)
-    );
     --border: --alpha(var(--color-white) / 6%);
     --input: --alpha(var(--color-white) / 8%);
     --ring: oklch(0.588 0.217 264);
 @@ -177,7 +161,12 @@
 body {
   font-family:
-    "DM Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", system-ui, sans-serif;
+    "DM Sans",
+    -apple-system,
+    BlinkMacSystemFont,
+    "Segoe UI",
+    system-ui,
+    sans-serif;
   margin: 0;
   padding: 0;
   min-height: 100vh;
 @@ -287,11 +276,7 @@ label:has(> select#reasoning-effort) select {
 .chat-markdown a {
   color: var(--info-foreground);
   text-decoration: underline;
-  text-decoration-color: color-mix(
+  text-decoration-color: color-mix(in srgb, var(--info-foreground) 40%, transparent);
-    in srgb,
-    var(--info-foreground) 40%,
-    transparent
-  );
 }
 .chat-markdown a:hover {

apps/web/src/persistenceSchema.ts+3-12

 @@ -1,12 +1,7 @@
 import { z } from "zod";
 import { DEFAULT_MODEL, resolveModelSlug } from "./model-logic";
-import {
+import { DEFAULT_RUNTIME_MODE, type Project, type RuntimeMode, type Thread } from "./types";
-  DEFAULT_RUNTIME_MODE,
-  type Project,
-  type RuntimeMode,
-  type Thread,
-} from "./types";
 const LEGACY_DEFAULT_MODEL = "gpt-5.2-codex";
 @@ -150,13 +145,9 @@ export function hydratePersistedState(
   return {
     projects,
     threads,
-    activeThreadId: hasActiveThread
+    activeThreadId: hasActiveThread ? parsedState.data.activeThreadId : (threads[0]?.id ?? null),
-      ? parsedState.data.activeThreadId
-      : (threads[0]?.id ?? null),
     runtimeMode:
-      "runtimeMode" in parsedState.data
+      "runtimeMode" in parsedState.data ? parsedState.data.runtimeMode : DEFAULT_RUNTIME_MODE,
-        ? parsedState.data.runtimeMode
-        : DEFAULT_RUNTIME_MODE,
   };
 }

apps/web/src/session-logic.ts+5-20

 @@ -109,11 +109,7 @@ function normalizeItemType(raw: string | undefined): string {
 }
 function shouldDropItemType(type: string): boolean {
-  if (
+  if (type.includes("preamble") || type.includes("reasoning") || type.includes("thought")) {
-    type.includes("preamble") ||
-    type.includes("reasoning") ||
-    type.includes("thought")
-  ) {
     return true;
   }
 @@ -121,11 +117,7 @@ function shouldDropItemType(type: string): boolean {
 }
 function shouldShowItemLifecycle(type: string): boolean {
-  return (
+  return type.includes("tool") || type.includes("command") || type.includes("file change");
-    type.includes("tool") ||
-    type.includes("command") ||
-    type.includes("file change")
-  );
 }
 function shouldDropMethod(method: string): boolean {
 @@ -182,9 +174,7 @@ function extractDetail(
   return undefined;
 }
-function lifecycleCandidateFromItemEvent(
+function lifecycleCandidateFromItemEvent(event: ProviderEvent): ItemLifecycleCandidate | null {
-  event: ProviderEvent,
-): ItemLifecycleCandidate | null {
   const payload = asObject(event.payload);
   const item = asObject(payload?.item);
   const normalizedType = normalizeItemType(asString(item?.type));
 @@ -360,10 +350,7 @@ export function deriveWorkLogEntries(
       ) {
         continue;
       }
-      if (
+      if (lifecycleCandidate.label === "Tool call" && !lifecycleCandidate.detail) {
-        lifecycleCandidate.label === "Tool call" &&
-        !lifecycleCandidate.detail
-      ) {
         continue;
       }
 @@ -371,9 +358,7 @@ export function deriveWorkLogEntries(
         id: lifecycleCandidate.id,
         createdAt: lifecycleCandidate.createdAt,
         label: lifecycleCandidate.label,
-        ...(lifecycleCandidate.detail
+        ...(lifecycleCandidate.detail ? { detail: lifecycleCandidate.detail } : {}),
-          ? { detail: lifecycleCandidate.detail }
-          : {}),
         tone: lifecycleCandidate.tone,
       });
       continue;

apps/web/src/store.ts+1-3

 @@ -395,9 +395,7 @@ export function reducer(state: AppState, action: Action): AppState {
     case "DELETE_THREAD": {
       const threads = state.threads.filter((t) => t.id !== action.threadId);
       const activeThreadId =
-        state.activeThreadId === action.threadId
+        state.activeThreadId === action.threadId ? (threads[0]?.id ?? null) : state.activeThreadId;
-          ? (threads[0]?.id ?? null)
-          : state.activeThreadId;
       return { ...state, threads, activeThreadId };
     }

apps/web/src/wsNativeApi.ts+2-4

 @@ -98,10 +98,8 @@ export function createWsNativeApi(): NativeApi {
     },
     git: {
       listBranches: (input) => transport.request(WS_METHODS.gitListBranches, input),
-      createWorktree: (input) =>
+      createWorktree: (input) => transport.request(WS_METHODS.gitCreateWorktree, input),
-        transport.request(WS_METHODS.gitCreateWorktree, input),
+      removeWorktree: (input) => transport.request(WS_METHODS.gitRemoveWorktree, input),
-      removeWorktree: (input) =>
-        transport.request(WS_METHODS.gitRemoveWorktree, input),
       createBranch: (input) => transport.request(WS_METHODS.gitCreateBranch, input),
       checkout: (input) => transport.request(WS_METHODS.gitCheckout, input),
       init: (input) => transport.request(WS_METHODS.gitInit, input),

apps/web/turbo.jsonc+3-3

...	@@ -3,7 +3,7 @@	...	@@ -3,7 +3,7 @@
3	"extends": ["//"],	3	"extends": ["//"],
4	"tasks": {	4	"tasks": {
5	"dev": {	5	"dev": {
6	"persistent": true	6	"persistent": true,
7	}	7	},
8	}	8	},
9	}	9	}

apps/web/vite.config.ts+1-3

 @@ -13,9 +13,7 @@ export default defineConfig({
   ],
   define: {
     // In dev mode, tell the web app where the WebSocket server lives
-    "import.meta.env.VITE_WS_URL": JSON.stringify(
+    "import.meta.env.VITE_WS_URL": JSON.stringify(process.env.VITE_WS_URL ?? ""),
-      process.env.VITE_WS_URL ?? "",
-    ),
   },
   server: {
     port: Number(process.env.PORT ?? 5173),

bun.lock+5

...	@@ -51,6 +51,7 @@	...	@@ -51,6 +51,7 @@
51	"version": "0.0.0",	51	"version": "0.0.0",
52	"dependencies": {	52	"dependencies": {
53	"@t3tools/contracts": "workspace:*",	53	"@t3tools/contracts": "workspace:*",
		54	"@tanstack/react-query": "^5.90.0",
54	"highlight.js": "^11.11.1",	55	"highlight.js": "^11.11.1",
55	"lucide-react": "^0.563.0",	56	"lucide-react": "^0.563.0",
56	"react": "^19.0.0",	57	"react": "^19.0.0",
...	@@ -364,6 +365,10 @@	...	@@ -364,6 +365,10 @@
364		365
365	"@tailwindcss/vite": ["@tailwindcss/vite@4.1.18", "", { "dependencies": { "@tailwindcss/node": "4.1.18", "@tailwindcss/oxide": "4.1.18", "tailwindcss": "4.1.18" }, "peerDependencies": { "vite": "^5.2.0 \|\| ^6 \|\| ^7" } }, "sha512-jVA+/UpKL1vRLg6Hkao5jldawNmRo7mQYrZtNHMIVpLfLhDml5nMRUo/8MwoX2vNXvnaXNNMedrMfMugAVX1nA=="],	366	"@tailwindcss/vite": ["@tailwindcss/vite@4.1.18", "", { "dependencies": { "@tailwindcss/node": "4.1.18", "@tailwindcss/oxide": "4.1.18", "tailwindcss": "4.1.18" }, "peerDependencies": { "vite": "^5.2.0 \|\| ^6 \|\| ^7" } }, "sha512-jVA+/UpKL1vRLg6Hkao5jldawNmRo7mQYrZtNHMIVpLfLhDml5nMRUo/8MwoX2vNXvnaXNNMedrMfMugAVX1nA=="],
366		367
		368	"@tanstack/query-core": ["@tanstack/query-core@5.90.20", "", {}, "sha512-OMD2HLpNouXEfZJWcKeVKUgQ5n+n3A2JFmBaScpNDUqSrQSjiveC7dKMe53uJUg1nDG16ttFPz2xfilz6i2uVg=="],
		369
		370	"@tanstack/react-query": ["@tanstack/react-query@5.90.21", "", { "dependencies": { "@tanstack/query-core": "5.90.20" }, "peerDependencies": { "react": "^18 \|\| ^19" } }, "sha512-0Lu6y5t+tvlTJMTO7oh5NSpJfpg/5D41LlThfepTixPYkJ0sE2Jj0m0f6yYqujBwIXlId87e234+MxG3D3g7kg=="],
		371
367	"@tybys/wasm-util": ["@tybys/wasm-util@0.10.1", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg=="],	372	"@tybys/wasm-util": ["@tybys/wasm-util@0.10.1", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg=="],
368		373
369	"@types/babel__core": ["@types/babel__core@7.20.5", "", { "dependencies": { "@babel/parser": "^7.20.7", "@babel/types": "^7.20.7", "@types/babel__generator": "", "@types/babel__template": "", "@types/babel__traverse": "*" } }, "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA=="],	374	"@types/babel__core": ["@types/babel__core@7.20.5", "", { "dependencies": { "@babel/parser": "^7.20.7", "@babel/types": "^7.20.7", "@types/babel__generator": "", "@types/babel__template": "", "@types/babel__traverse": "*" } }, "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA=="],

packages/contracts/src/git.ts+2-6

 @@ -51,13 +51,9 @@ export const gitWorktreeSchema = z.object({
 export type GitListBranchesInput = z.infer<typeof gitListBranchesInputSchema>;
 export type GitBranch = z.infer<typeof gitBranchSchema>;
-export type GitCreateWorktreeInput = z.infer<
+export type GitCreateWorktreeInput = z.infer<typeof gitCreateWorktreeInputSchema>;
-  typeof gitCreateWorktreeInputSchema
->;
 export type GitWorktree = z.infer<typeof gitWorktreeSchema>;
-export type GitRemoveWorktreeInput = z.infer<
+export type GitRemoveWorktreeInput = z.infer<typeof gitRemoveWorktreeInputSchema>;
-  typeof gitRemoveWorktreeInputSchema
->;
 export type GitCreateBranchInput = z.infer<typeof gitCreateBranchInputSchema>;
 export type GitCheckoutInput = z.infer<typeof gitCheckoutInputSchema>;
 export type GitInitInput = z.infer<typeof gitInitInputSchema>;

packages/contracts/src/provider.ts+6-21

 @@ -83,12 +83,7 @@ export const providerRespondToRequestInputSchema = z.object({
   decision: providerApprovalDecisionSchema,
 });
-export const providerEventKindSchema = z.enum([
+export const providerEventKindSchema = z.enum(["session", "notification", "request", "error"]);
-  "session",
-  "notification",
-  "request",
-  "error",
-]);
 export const providerEventSchema = z.object({
   id: z.string().min(1),
 @@ -111,24 +106,14 @@ export type ProviderKind = z.infer<typeof providerKindSchema>;
 export type ProviderApprovalPolicy = z.infer<typeof providerApprovalPolicySchema>;
 export type ProviderSandboxMode = z.infer<typeof providerSandboxModeSchema>;
 export type ProviderRequestKind = z.infer<typeof providerRequestKindSchema>;
-export type ProviderApprovalDecision = z.infer<
+export type ProviderApprovalDecision = z.infer<typeof providerApprovalDecisionSchema>;
-  typeof providerApprovalDecisionSchema
->;
 export type ProviderSessionStatus = z.infer<typeof providerSessionStatusSchema>;
 export type ProviderSession = z.infer<typeof providerSessionSchema>;
 export type ProviderSessionStartInput = z.input<typeof providerSessionStartInputSchema>;
 export type ProviderSendTurnInput = z.input<typeof providerSendTurnInputSchema>;
-export type ProviderTurnStartResult = z.infer<
+export type ProviderTurnStartResult = z.infer<typeof providerTurnStartResultSchema>;
-  typeof providerTurnStartResultSchema
+export type ProviderInterruptTurnInput = z.input<typeof providerInterruptTurnInputSchema>;
->;
+export type ProviderStopSessionInput = z.input<typeof providerStopSessionInputSchema>;
-export type ProviderInterruptTurnInput = z.input<
+export type ProviderRespondToRequestInput = z.input<typeof providerRespondToRequestInputSchema>;
-  typeof providerInterruptTurnInputSchema
->;
-export type ProviderStopSessionInput = z.input<
-  typeof providerStopSessionInputSchema
->;
-export type ProviderRespondToRequestInput = z.input<
-  typeof providerRespondToRequestInputSchema
->;
 export type ProviderEventKind = z.infer<typeof providerEventKindSchema>;
 export type ProviderEvent = z.infer<typeof providerEventSchema>;

author	Julius Marminge <julius0216@outlook.com> 2026-02-11 14:26:24-08:00
committer	Julius Marminge <julius0216@outlook.com> 2026-02-11 14:26:24-08:00
log	807e3d18dec858c9694a595deaea4f9ac588db5f
tree	c926654e81418cae6b15529bbce4d882ce031d01
parent	198cc58377fd87ff39b8a37464dd8cb1a77beb0b

...	@@ -1,11 +1,13 @@	...	@@ -1,11 +1,13 @@
1	# CLAUDE.md	1	# CLAUDE.md
2		2
3	## Project Snapshot	3	## Project Snapshot
		4
4	T3 Code is a minimal web GUI for using code agents like Codex and Claude Code (coming soon).	5	T3 Code is a minimal web GUI for using code agents like Codex and Claude Code (coming soon).
5		6
6	This repository is a VERY EARLY WIP. Proposing sweeping changes that improve long-term maintainability is encouraged.	7	This repository is a VERY EARLY WIP. Proposing sweeping changes that improve long-term maintainability is encouraged.
7		8
8	## Core Priorities	9	## Core Priorities
		10
9	1. Performance first.	11	1. Performance first.
10	2. Reliability first.	12	2. Reliability first.
11	3. Keep behavior predictable under load and during failures (session restarts, reconnects, partial streams).	13	3. Keep behavior predictable under load and during failures (session restarts, reconnects, partial streams).
...	@@ -13,23 +15,28 @@ This repository is a VERY EARLY WIP. Proposing sweeping changes that improve lon	...	@@ -13,23 +15,28 @@ This repository is a VERY EARLY WIP. Proposing sweeping changes that improve lon
13	If a tradeoff is required, choose correctness and robustness over short-term convenience.	15	If a tradeoff is required, choose correctness and robustness over short-term convenience.
14		16
15	## Package Roles	17	## Package Roles
		18
16	- `apps/server`: Node.js WebSocket server. Wraps Codex app-server (JSON-RPC over stdio), serves the React web app, and manages provider sessions.	19	- `apps/server`: Node.js WebSocket server. Wraps Codex app-server (JSON-RPC over stdio), serves the React web app, and manages provider sessions.
17	- `apps/web`: React/Vite UI. Owns session UX, conversation/event rendering, and client-side state. Connects to the server via WebSocket.	20	- `apps/web`: React/Vite UI. Owns session UX, conversation/event rendering, and client-side state. Connects to the server via WebSocket.
18	- `packages/contracts`: Shared Zod schemas and TypeScript contracts for provider events, WebSocket protocol, and model/session types.	21	- `packages/contracts`: Shared Zod schemas and TypeScript contracts for provider events, WebSocket protocol, and model/session types.
19		22
20	## Codex App Server (Important)	23	## Codex App Server (Important)
		24
21	T3 Code is currently Codex-first. The server starts `codex app-server` (JSON-RPC over stdio) per provider session, then streams structured events to the browser through WebSocket push messages.	25	T3 Code is currently Codex-first. The server starts `codex app-server` (JSON-RPC over stdio) per provider session, then streams structured events to the browser through WebSocket push messages.
22		26
23	How we use it in this codebase:	27	How we use it in this codebase:
		28
24	- Session startup/resume and turn lifecycle are brokered in `apps/server/src/codexAppServerManager.ts`.	29	- Session startup/resume and turn lifecycle are brokered in `apps/server/src/codexAppServerManager.ts`.
25	- Provider dispatch and thread event logging are coordinated in `apps/server/src/providerManager.ts`.	30	- Provider dispatch and thread event logging are coordinated in `apps/server/src/providerManager.ts`.
26	- WebSocket server routes NativeApi methods in `apps/server/src/wsServer.ts`.	31	- WebSocket server routes NativeApi methods in `apps/server/src/wsServer.ts`.
27	- Web app consumes provider event streams via WebSocket push on channel `providers.event`.	32	- Web app consumes provider event streams via WebSocket push on channel `providers.event`.
28		33
29	Docs:	34	Docs:
		35
30	- Codex App Server docs: https://developers.openai.com/codex/sdk/#app-server	36	- Codex App Server docs: https://developers.openai.com/codex/sdk/#app-server
31		37
32	## Reference Repos	38	## Reference Repos
		39
33	- Open-source Codex repo: https://github.com/openai/codex	40	- Open-source Codex repo: https://github.com/openai/codex
34	- Codex-Monitor (Tauri, feature-complete, strong reference implementation): https://github.com/Dimillian/CodexMonitor	41	- Codex-Monitor (Tauri, feature-complete, strong reference implementation): https://github.com/Dimillian/CodexMonitor
35		42

Add react-query, refactor BranchToolbar async state, and fix stale deps