fix: remove redundant targetProjectCwd reassignment and replace fragile setup terminal ID heuristic

- Remove dead reassignment of targetProjectCwd in bootstrap worktree
  preparation (ws.ts:278) — the value was already set at initialization.

- Extract SETUP_TERMINAL_ID_PREFIX constant into @t3tools/contracts so
  the setup terminal naming convention is shared between server and
  client instead of duplicated as magic strings.

- Remove the fragile effectiveWorktreePath fallback in
  PersistentThreadTerminalDrawer that inferred worktree path from
  launchContext.cwd when the active terminal started with 'setup-'.
  The fallback could return the wrong path when the launch context
  originated from a different terminal. The thread-level worktreePath
  is the correct fallback and was already in place.

Author: cursoragent

apps/server/src/project/Layers/ProjectSetupScriptRunner.ts

@@ -1,3 +1,4 @@
+import { SETUP_TERMINAL_ID_PREFIX } from "@t3tools/contracts";
 import { projectScriptRuntimeEnv, setupProjectScript } from "@t3tools/shared/projectScripts";
 import { Effect, Layer } from "effect";
 
@@ -35,7 +36,7 @@ const makeProjectSetupScriptRunner = Effect.gen(function* () {
         } as const;
       }
 
-      const terminalId = input.preferredTerminalId ?? `setup-${script.id}`;
+      const terminalId = input.preferredTerminalId ?? `${SETUP_TERMINAL_ID_PREFIX}${script.id}`;
       const cwd = input.worktreePath;
       const env = projectScriptRuntimeEnv({
         project: { cwd: project.workspaceRoot },

apps/server/src/ws.ts

@@ -275,7 +275,6 @@ const WsRpcLayer = WsRpcGroup.toLayer(
               newBranch: bootstrap.prepareWorktree.branch,
               path: null,
             });
-            targetProjectCwd = bootstrap.prepareWorktree.projectCwd;
             targetWorktreePath = worktree.worktree.path;
             yield* orchestrationEngine.dispatch({
               type: "thread.meta.update",

apps/web/src/components/ChatView.tsx

@@ -446,11 +446,8 @@ function PersistentThreadTerminalDrawer({
     if (launchContext?.worktreePath) {
       return launchContext.worktreePath;
     }
-    if (launchContext && terminalState.activeTerminalId.startsWith("setup-")) {
-      return launchContext.cwd;
-    }
     return worktreePath;
-  }, [launchContext, terminalState.activeTerminalId, worktreePath]);
+  }, [launchContext, worktreePath]);
   const cwd = useMemo(
     () =>
       launchContext?.cwd ??

apps/web/src/terminalStateStore.ts

@@ -5,7 +5,7 @@
  * API constrained to store actions/selectors.
  */
 
-import { ThreadId, type TerminalEvent } from "@t3tools/contracts";
+import { SETUP_TERMINAL_ID_PREFIX, ThreadId, type TerminalEvent } from "@t3tools/contracts";
 import { create } from "zustand";
 import { createJSONStorage, persist } from "zustand/middleware";
 import { resolveStorage } from "./lib/storage";
@@ -281,7 +281,7 @@ function launchContextFromStartEvent(
 ): ThreadTerminalLaunchContext {
   return {
     cwd: event.snapshot.cwd,
-    worktreePath: event.terminalId.startsWith("setup-") ? event.snapshot.cwd : null,
+    worktreePath: event.terminalId.startsWith(SETUP_TERMINAL_ID_PREFIX) ? event.snapshot.cwd : null,
   };
 }
 

packages/contracts/src/terminal.ts

@@ -2,6 +2,7 @@ import { Schema } from "effect";
 import { TrimmedNonEmptyString } from "./baseSchemas";
 
 export const DEFAULT_TERMINAL_ID = "default";
+export const SETUP_TERMINAL_ID_PREFIX = "setup-";
 
 const TrimmedNonEmptyStringSchema = TrimmedNonEmptyString;
 const TerminalColsSchema = Schema.Int.check(Schema.isGreaterThanOrEqualTo(20)).check(