@hua-labs/tap 0.2.4 → 0.2.6

package/README.md

@@ -1,194 +1,194 @@
-# @hua-labs/tap
-
-Zero-dependency CLI for cross-model AI agent communication setup.
-
-One command to connect Claude, Codex, and Gemini agents through a shared file-based communication layer.
-
-## Quick Start
-
-> `bun` is required to run the managed tap MCP server. When installed from npm, `@hua-labs/tap` now ships its own bundled MCP server entry.
-
-```bash
-# 1. Initialize comms directory and state
-npx @hua-labs/tap init
-
-# 2. Add runtimes
-npx @hua-labs/tap add claude
-npx @hua-labs/tap add codex
-npx @hua-labs/tap add gemini
-
-# 3. Check status
-npx @hua-labs/tap status
-```
-
-Your agents can now communicate through the shared comms directory.
-
-## Commands
-
-### `init`
-
-Initialize the comms directory and `.tap-comms/` state.
-
-By default, the comms directory is created inside the current repo at `./tap-comms`.
-
-```bash
-npx @hua-labs/tap init
-npx @hua-labs/tap init --comms-dir /path/to/comms
-npx @hua-labs/tap init --permissions safe    # default: deny destructive ops
-npx @hua-labs/tap init --permissions full    # no restrictions (use with caution)
-npx @hua-labs/tap init --force               # re-initialize
-```
-
-### `add <runtime>`
-
-Add a runtime. Probes config, plans patches, applies, and verifies.
-
-```bash
-npx @hua-labs/tap add claude
-npx @hua-labs/tap add codex
-npx @hua-labs/tap add gemini
-npx @hua-labs/tap add claude --force   # re-install
-```
-
-### `remove <runtime>`
-
-Remove a runtime and rollback config changes.
-
-```bash
-npx @hua-labs/tap remove claude
-npx @hua-labs/tap remove codex
-```
-
-### `status`
-
-Show installed runtimes and their status.
-
-```bash
-npx @hua-labs/tap status
-```
-
-Output shows three status levels:
-
-- **installed** — config written but not verified
-- **configured** — config written and verified
-- **active** — runtime is running and connected
-
-### `serve`
-
-Start the tap-comms MCP server (stdio). Convenience command for running the MCP server locally.
-
-```bash
-npx @hua-labs/tap serve
-npx @hua-labs/tap serve --comms-dir /path/to/comms
-```
-
-Requires `bun`. Uses the bundled MCP server entry from `@hua-labs/tap`, with a repo-local fallback for monorepo checkouts.
-
-## Supported Runtimes
-
-| Runtime | Config                  | Bridge                 | Mode               |
-| ------- | ----------------------- | ---------------------- | ------------------ |
-| Claude  | `.mcp.json`             | native-push (fs.watch) | No daemon needed   |
-| Codex   | `~/.codex/config.toml`  | WebSocket bridge       | Daemon per session |
-| Gemini  | `.gemini/settings.json` | polling                | No daemon needed   |
-
-## `--json` Flag
-
-All commands support `--json` for machine-readable output. Returns a single JSON object to stdout with no human log noise.
-
-```bash
-npx @hua-labs/tap status --json
-```
-
-```json
-{
-  "ok": true,
-  "command": "status",
-  "code": "TAP_STATUS_OK",
-  "message": "2 runtime(s) installed",
-  "warnings": [],
-  "data": {
-    "version": "0.2.2",
-    "commsDir": "/path/to/comms",
-    "runtimes": {
-      "claude": { "status": "active", "bridgeMode": "native-push" },
-      "codex": { "status": "configured", "bridgeMode": "app-server" }
-    }
-  }
-}
-```
-
-Error codes use `TAP_*` prefix: `TAP_ADD_OK`, `TAP_NO_OP`, `TAP_PATCH_FAILED`, etc.
-
-Exit codes: `0` = ok, `1` = error.
-
-## Permissions
-
-`tap init` auto-configures runtime permissions.
-
-### Safe mode (default)
-
-**Claude**: Adds deny rules to `.claude/settings.local.json` blocking destructive operations (force push, hard reset, rm -rf, etc.).
-
-**Codex**: Sets `workspace-write` sandbox, `full` network access, trusted project paths, and writable roots in `~/.codex/config.toml`.
-
-### Full mode
-
-```bash
-npx @hua-labs/tap init --permissions full
-```
-
-**Claude**: Removes tap-managed deny rules. User-added rules preserved.
-
-**Codex**: Sets `danger-full-access` sandbox. Use on trusted local machines only.
-
-## How It Works
-
-Agents communicate through a shared directory (`comms/`) using markdown files:
-
-```
-comms/
-├── inbox/          # Agent-to-agent messages
-├── reviews/        # Code review results
-├── findings/       # Out-of-scope discoveries
-├── handoff/        # Session handoff documents
-├── retros/         # Retrospectives
-└── archive/        # Archived messages
-```
-
-Each runtime has an adapter that:
-
-1. **Probes** — finds config files, checks runtime installation
-2. **Plans** — determines what patches to apply
-3. **Applies** — backs up and patches config files
-4. **Verifies** — confirms the runtime can read the config
-
-The adapter contract (`RuntimeAdapter`) is the extension point for adding new runtimes.
-
-## Changelog (0.2.2)
-
-### Bridge
-
-- **Auth gateway** — Managed bridge now includes an auth proxy with timing-safe token validation (M99)
-- **`--no-auth` flag** — Skip auth gateway for localhost-only setups; app-server listens directly on public port (M102)
-- **TUI connect URL** — `bridge start` and `bridge status` output shows where to connect Codex TUI (M102)
-- **Identity routing** — Bridge matches inbox messages by both `agentId` and `agentName`; self echo-back filtered by both (M101)
-- **Display labels** — Bridge prompts, `tap_who`, and notifications use `name [id]` format (M101)
-
-### CLI
-
-- **`tap doctor`** — Diagnose comms, bridge, message, and MCP issues (M95)
-- **`tap doctor --fix`** — Auto-fix common issues with post-fix revalidation (M100)
-- **Error codes** — 24 CLI error codes with consistent `TAP_*` prefix (M91)
-- **Boot streamline** — Faster CLI startup with agent-name persistence (M92)
-
-### Infrastructure
-
-- **Auto-poll fallback** — Bridge falls back to polling when fs.watch is unavailable (M93)
-- **Watcher dedup** — Root-cause fix for duplicate message dispatch (M90)
-- **tap-plugin test infra** — In-memory test harness for MCP channel tests (M94)
-- **Blind test CI** — Cross-model communication verification framework (M98)
-
-## License
-
-MIT
+# @hua-labs/tap
+
+Zero-dependency CLI for cross-model AI agent communication setup.
+
+One command to connect Claude, Codex, and Gemini agents through a shared file-based communication layer.
+
+## Quick Start
+
+> `bun` is required to run the managed tap MCP server. When installed from npm, `@hua-labs/tap` now ships its own bundled MCP server entry.
+
+```bash
+# 1. Initialize comms directory and state
+npx @hua-labs/tap init
+
+# 2. Add runtimes
+npx @hua-labs/tap add claude
+npx @hua-labs/tap add codex
+npx @hua-labs/tap add gemini
+
+# 3. Check status
+npx @hua-labs/tap status
+```
+
+Your agents can now communicate through the shared comms directory.
+
+## Commands
+
+### `init`
+
+Initialize the comms directory and `.tap-comms/` state.
+
+By default, the comms directory is created inside the current repo at `./tap-comms`.
+
+```bash
+npx @hua-labs/tap init
+npx @hua-labs/tap init --comms-dir /path/to/comms
+npx @hua-labs/tap init --permissions safe    # default: deny destructive ops
+npx @hua-labs/tap init --permissions full    # no restrictions (use with caution)
+npx @hua-labs/tap init --force               # re-initialize
+```
+
+### `add <runtime>`
+
+Add a runtime. Probes config, plans patches, applies, and verifies.
+
+```bash
+npx @hua-labs/tap add claude
+npx @hua-labs/tap add codex
+npx @hua-labs/tap add gemini
+npx @hua-labs/tap add claude --force   # re-install
+```
+
+### `remove <runtime>`
+
+Remove a runtime and rollback config changes.
+
+```bash
+npx @hua-labs/tap remove claude
+npx @hua-labs/tap remove codex
+```
+
+### `status`
+
+Show installed runtimes and their status.
+
+```bash
+npx @hua-labs/tap status
+```
+
+Output shows three status levels:
+
+- **installed** — config written but not verified
+- **configured** — config written and verified
+- **active** — runtime is running and connected
+
+### `serve`
+
+Start the tap-comms MCP server (stdio). Convenience command for running the MCP server locally.
+
+```bash
+npx @hua-labs/tap serve
+npx @hua-labs/tap serve --comms-dir /path/to/comms
+```
+
+Requires `bun`. Uses the bundled MCP server entry from `@hua-labs/tap`, with a repo-local fallback for monorepo checkouts.
+
+## Supported Runtimes
+
+| Runtime | Config                  | Bridge                 | Mode               |
+| ------- | ----------------------- | ---------------------- | ------------------ |
+| Claude  | `.mcp.json`             | native-push (fs.watch) | No daemon needed   |
+| Codex   | `~/.codex/config.toml`  | WebSocket bridge       | Daemon per session |
+| Gemini  | `.gemini/settings.json` | polling                | No daemon needed   |
+
+## `--json` Flag
+
+All commands support `--json` for machine-readable output. Returns a single JSON object to stdout with no human log noise.
+
+```bash
+npx @hua-labs/tap status --json
+```
+
+```json
+{
+  "ok": true,
+  "command": "status",
+  "code": "TAP_STATUS_OK",
+  "message": "2 runtime(s) installed",
+  "warnings": [],
+  "data": {
+    "version": "0.2.2",
+    "commsDir": "/path/to/comms",
+    "runtimes": {
+      "claude": { "status": "active", "bridgeMode": "native-push" },
+      "codex": { "status": "configured", "bridgeMode": "app-server" }
+    }
+  }
+}
+```
+
+Error codes use `TAP_*` prefix: `TAP_ADD_OK`, `TAP_NO_OP`, `TAP_PATCH_FAILED`, etc.
+
+Exit codes: `0` = ok, `1` = error.
+
+## Permissions
+
+`tap init` auto-configures runtime permissions.
+
+### Safe mode (default)
+
+**Claude**: Adds deny rules to `.claude/settings.local.json` blocking destructive operations (force push, hard reset, rm -rf, etc.).
+
+**Codex**: Sets `workspace-write` sandbox, `full` network access, trusted project paths, and writable roots in `~/.codex/config.toml`.
+
+### Full mode
+
+```bash
+npx @hua-labs/tap init --permissions full
+```
+
+**Claude**: Removes tap-managed deny rules. User-added rules preserved.
+
+**Codex**: Sets `danger-full-access` sandbox. Use on trusted local machines only.
+
+## How It Works
+
+Agents communicate through a shared directory (`comms/`) using markdown files:
+
+```
+comms/
+├── inbox/          # Agent-to-agent messages
+├── reviews/        # Code review results
+├── findings/       # Out-of-scope discoveries
+├── handoff/        # Session handoff documents
+├── retros/         # Retrospectives
+└── archive/        # Archived messages
+```
+
+Each runtime has an adapter that:
+
+1. **Probes** — finds config files, checks runtime installation
+2. **Plans** — determines what patches to apply
+3. **Applies** — backs up and patches config files
+4. **Verifies** — confirms the runtime can read the config
+
+The adapter contract (`RuntimeAdapter`) is the extension point for adding new runtimes.
+
+## Changelog (0.2.2)
+
+### Bridge
+
+- **Auth gateway** — Managed bridge now includes an auth proxy with timing-safe token validation (M99)
+- **`--no-auth` flag** — Skip auth gateway for localhost-only setups; app-server listens directly on public port (M102)
+- **TUI connect URL** — `bridge start` and `bridge status` output shows where to connect Codex TUI (M102)
+- **Identity routing** — Bridge matches inbox messages by both `agentId` and `agentName`; self echo-back filtered by both (M101)
+- **Display labels** — Bridge prompts, `tap_who`, and notifications use `name [id]` format (M101)
+
+### CLI
+
+- **`tap doctor`** — Diagnose comms, bridge, message, and MCP issues (M95)
+- **`tap doctor --fix`** — Auto-fix common issues with post-fix revalidation (M100)
+- **Error codes** — 24 CLI error codes with consistent `TAP_*` prefix (M91)
+- **Boot streamline** — Faster CLI startup with agent-name persistence (M92)
+
+### Infrastructure
+
+- **Auto-poll fallback** — Bridge falls back to polling when fs.watch is unavailable (M93)
+- **Watcher dedup** — Root-cause fix for duplicate message dispatch (M90)
+- **tap-plugin test infra** — In-memory test harness for MCP channel tests (M94)
+- **Blind test CI** — Cross-model communication verification framework (M98)
+
+## License
+
+MIT

package/dist/bridges/codex-app-server-bridge.d.mts

@@ -36,12 +36,21 @@ interface HeadlessWarmupClient {
     startTurn(inputText: string): Promise<string | null>;
     refreshCurrentThreadState(): Promise<void>;
 }
+interface LoadedThreadCandidate {
+    id: string;
+    cwd: string;
+    updatedAt: number;
+    statusType: string | null;
+    thread: any;
+}
 interface HeartbeatStoreRecord {
     id?: string;
     agent?: string;
 }
 type HeartbeatStore = Record<string, HeartbeatStoreRecord>;
 declare const HEADLESS_WARMUP_PROMPT: string;
+declare function threadCwdMatches(expectedCwd: string, actualCwd: string | null | undefined): boolean;
+declare function chooseLoadedThreadForCwd(cwd: string, threads: LoadedThreadCandidate[]): LoadedThreadCandidate | null;
 declare function resolveAgentId(preferredAgentName?: string | null): string;
 declare function recipientMatchesAgent(recipient: string, agentId: string, agentName: string): boolean;
 declare function isOwnMessageSender(sender: string, agentId: string, agentName: string): boolean;
@@ -53,4 +62,4 @@ declare function maybeBootstrapHeadlessTurn(options: Options, cutoff: Date, clie
 declare function buildOptions(argv: string[]): Options;
 declare function main(): Promise<void>;
 
-export { HEADLESS_WARMUP_PROMPT, type HeadlessWarmupClient, buildOptions, buildUserInput, isOwnMessageSender, main, maybeBootstrapHeadlessTurn, recipientMatchesAgent, resolveAddressLabel, resolveAgentId, resolveCurrentAgentName, waitForTurnCompletion };
+export { HEADLESS_WARMUP_PROMPT, type HeadlessWarmupClient, type LoadedThreadCandidate, buildOptions, buildUserInput, chooseLoadedThreadForCwd, isOwnMessageSender, main, maybeBootstrapHeadlessTurn, recipientMatchesAgent, resolveAddressLabel, resolveAgentId, resolveCurrentAgentName, threadCwdMatches, waitForTurnCompletion };

package/dist/bridges/codex-app-server-bridge.mjs

@@ -31,6 +31,30 @@ var HEADLESS_WARMUP_PROMPT = [
 var HEADLESS_WARMUP_TIMEOUT_MS = 3e4;
 var TURN_COMPLETION_POLL_MS = 250;
 var TURN_COMPLETION_REFRESH_MS = 1e3;
+function normalizeThreadCwd(cwd) {
+  return resolve(cwd).replace(/\\/g, "/").toLowerCase();
+}
+function threadCwdMatches(expectedCwd, actualCwd) {
+  if (!actualCwd) {
+    return false;
+  }
+  return normalizeThreadCwd(expectedCwd) === normalizeThreadCwd(actualCwd);
+}
+function chooseLoadedThreadForCwd(cwd, threads) {
+  const matching = threads.filter((thread) => threadCwdMatches(cwd, thread.cwd));
+  if (matching.length === 0) {
+    return null;
+  }
+  matching.sort((left, right) => {
+    const leftActive = left.statusType === "active" ? 1 : 0;
+    const rightActive = right.statusType === "active" ? 1 : 0;
+    if (leftActive !== rightActive) {
+      return rightActive - leftActive;
+    }
+    return right.updatedAt - left.updatedAt;
+  });
+  return matching[0] ?? null;
+}
 function printHelp() {
   console.log(`Codex App Server bridge
 
@@ -344,12 +368,13 @@ function readThreadState(stateDir) {
   }
   return null;
 }
-function persistThreadState(stateDir, threadId, appServerUrl, ephemeral) {
+function persistThreadState(stateDir, threadId, appServerUrl, ephemeral, cwd) {
   const payload = {
     threadId,
     updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
     appServerUrl,
-    ephemeral
+    ephemeral,
+    cwd
   };
   writeFileSync(
     join(stateDir, "thread.json"),
@@ -646,7 +671,7 @@ async function waitForTurnCompletion(client, turnId, timeoutMs) {
   throw new Error(`Timed out waiting for turn ${turnId} to complete`);
 }
 async function maybeBootstrapHeadlessTurn(options, cutoff, client) {
-  if (process.env.TAP_HEADLESS !== "true") {
+  if (process.env.TAP_HEADLESS !== "true" && process.env.TAP_COLD_START_WARMUP !== "true") {
     return false;
   }
   const { candidates } = getPendingCandidates(options, cutoff);
@@ -714,6 +739,7 @@ var AppServerClient = class {
   connected = false;
   initialized = false;
   threadId = null;
+  currentThreadCwd = null;
   activeTurnId = null;
   lastTurnStatus = null;
   lastNotificationMethod = null;
@@ -797,7 +823,7 @@ var AppServerClient = class {
     this.initialized = false;
     this.socket = null;
   }
-  async ensureThread(explicitThreadId, resumeThreadId, cwd, ephemeral) {
+  async ensureThread(explicitThreadId, savedThread, cwd, ephemeral) {
     if (explicitThreadId) {
       try {
         const resumeResponse = await this.request("thread/resume", {
@@ -820,22 +846,38 @@ var AppServerClient = class {
     if (loadedThreadId) {
       return loadedThreadId;
     }
-    if (resumeThreadId) {
-      try {
-        const resumeResponse = await this.request("thread/resume", {
-          threadId: resumeThreadId,
-          persistExtendedHistory: false
-        });
-        const resumedThreadId = resumeResponse?.thread?.id ?? resumeThreadId;
-        await this.refreshThreadState(resumedThreadId);
-        this.logger(
-          `resumed saved thread ${resumedThreadId}${this.activeTurnId ? ` (active turn ${this.activeTurnId})` : ""}`
-        );
-        return resumedThreadId;
-      } catch (error) {
+    if (savedThread?.threadId) {
+      if (savedThread.cwd && !threadCwdMatches(cwd, savedThread.cwd)) {
         this.logger(
-          `saved thread resume failed for ${resumeThreadId}; starting a fresh thread (${String(error)})`
+          `saved thread ${savedThread.threadId} cwd ${savedThread.cwd} does not match ${cwd}; skipping saved thread`
         );
+      } else {
+        try {
+          const resumeResponse = await this.request("thread/resume", {
+            threadId: savedThread.threadId,
+            persistExtendedHistory: false
+          });
+          const resumedThreadId = resumeResponse?.thread?.id ?? savedThread.threadId;
+          await this.refreshThreadState(resumedThreadId);
+          if (!threadCwdMatches(cwd, this.currentThreadCwd)) {
+            this.logger(
+              `saved thread ${resumedThreadId} cwd ${this.currentThreadCwd ?? "unknown"} does not match ${cwd}; starting a fresh thread`
+            );
+            this.threadId = null;
+            this.currentThreadCwd = null;
+            this.activeTurnId = null;
+            this.lastTurnStatus = null;
+          } else {
+            this.logger(
+              `resumed saved thread ${resumedThreadId}${this.activeTurnId ? ` (active turn ${this.activeTurnId})` : ""}`
+            );
+            return resumedThreadId;
+          }
+        } catch (error) {
+          this.logger(
+            `saved thread resume failed for ${savedThread.threadId}; starting a fresh thread (${String(error)})`
+          );
+        }
       }
     }
     const startResponse = await this.request("thread/start", {
@@ -848,7 +890,9 @@ var AppServerClient = class {
     if (!startedThreadId) {
       throw new Error("thread/start did not return a thread id");
     }
+    this.syncThreadStateFromThread(startResponse?.thread);
     this.threadId = startedThreadId;
+    this.currentThreadCwd = this.currentThreadCwd ?? cwd;
     this.activeTurnId = null;
     this.lastTurnStatus = null;
     this.logger(`started thread ${startedThreadId}`);
@@ -886,20 +930,13 @@ var AppServerClient = class {
         continue;
       }
     }
-    const matching = threads.filter((thread) => thread.cwd === cwd);
-    const candidates = matching.length > 0 ? matching : threads;
-    if (candidates.length === 0) {
+    const chosen = chooseLoadedThreadForCwd(cwd, threads);
+    if (!chosen) {
+      if (threads.length > 0) {
+        this.logger(`loaded threads exist but none match cwd ${cwd}`);
+      }
       return null;
     }
-    candidates.sort((left, right) => {
-      const leftActive = left.statusType === "active" ? 1 : 0;
-      const rightActive = right.statusType === "active" ? 1 : 0;
-      if (leftActive !== rightActive) {
-        return rightActive - leftActive;
-      }
-      return right.updatedAt - left.updatedAt;
-    });
-    const chosen = candidates[0];
     this.syncThreadStateFromThread(chosen.thread);
     this.logger(
       `attached to loaded thread ${chosen.id}${this.activeTurnId ? ` (active turn ${this.activeTurnId})` : ""}`
@@ -972,6 +1009,7 @@ var AppServerClient = class {
     if (typeof thread?.id === "string") {
       this.threadId = thread.id;
     }
+    this.currentThreadCwd = typeof thread?.cwd === "string" ? thread.cwd : null;
     let activeTurnId = null;
     let lastTurnStatus = null;
     const turns = Array.isArray(thread?.turns) ? thread.turns : [];
@@ -1020,6 +1058,9 @@ var AppServerClient = class {
         if (params?.thread?.id) {
           this.threadId = params.thread.id;
         }
+        if (typeof params?.thread?.cwd === "string") {
+          this.currentThreadCwd = params.thread.cwd;
+        }
         this.logger(`thread started ${params?.thread?.id ?? ""}`.trim());
         break;
       case "thread/status/changed":
@@ -1075,6 +1116,16 @@ var AppServerClient = class {
   }
 };
 function writeHeartbeat(options, client, health) {
+  if (client?.threadId) {
+    const savedThread = readThreadState(options.stateDir);
+    persistThreadState(
+      options.stateDir,
+      client.threadId,
+      options.appServerUrl,
+      options.ephemeral,
+      client.currentThreadCwd ?? savedThread?.cwd ?? null
+    );
+  }
   const payload = {
     pid: process.pid,
     agent: options.agentName,
@@ -1084,6 +1135,7 @@ function writeHeartbeat(options, client, health) {
     connected: client?.connected ?? false,
     initialized: client?.initialized ?? false,
     threadId: client?.threadId ?? null,
+    threadCwd: client?.currentThreadCwd ?? null,
     activeTurnId: client?.activeTurnId ?? null,
     lastTurnStatus: client?.lastTurnStatus ?? null,
     lastNotificationMethod: client?.lastNotificationMethod ?? null,
@@ -1235,7 +1287,7 @@ async function main() {
     options.messageLookbackMinutes,
     options.processExistingMessages
   );
-  const savedThread = readThreadState(options.stateDir);
+  const initialSavedThread = readThreadState(options.stateDir);
   logStatus("codex app-server bridge ready");
   console.log(`  repo:       ${options.repoRoot}`);
   console.log(`  comms:      ${options.commsDir}`);
@@ -1251,14 +1303,15 @@ async function main() {
   console.log(
     `  lookback:   ${options.processExistingMessages ? "existing messages" : `${options.messageLookbackMinutes} minute(s)`}`
   );
-  if (options.threadId || savedThread?.threadId) {
-    console.log(`  thread:     ${options.threadId ?? savedThread?.threadId}`);
+  if (options.threadId || initialSavedThread?.threadId) {
+    console.log(
+      `  thread:     ${options.threadId ?? initialSavedThread?.threadId}`
+    );
   }
   if (options.dryRun) {
     logStatus("dry-run mode enabled");
   }
   let client = null;
-  let savedThreadId = savedThread?.threadId ?? null;
   const health = {
     consecutiveFailureCount: 0
   };
@@ -1272,9 +1325,10 @@ async function main() {
             options.gatewayToken
           );
           await client.connect();
+          const savedThread = readThreadState(options.stateDir);
           const threadId = await client.ensureThread(
             options.threadId,
-            savedThreadId,
+            savedThread,
             options.repoRoot,
             options.ephemeral
           );
@@ -1282,9 +1336,9 @@ async function main() {
             options.stateDir,
             threadId,
             options.appServerUrl,
-            options.ephemeral
+            options.ephemeral,
+            client.currentThreadCwd ?? options.repoRoot
           );
-          savedThreadId = threadId;
           writeHeartbeat(options, client, health);
           const bootstrapped = await maybeBootstrapHeadlessTurn(
             options,
@@ -1356,6 +1410,7 @@ export {
   HEADLESS_WARMUP_PROMPT,
   buildOptions,
   buildUserInput,
+  chooseLoadedThreadForCwd,
   isOwnMessageSender,
   main,
   maybeBootstrapHeadlessTurn,
@@ -1363,6 +1418,7 @@ export {
   resolveAddressLabel,
   resolveAgentId,
   resolveCurrentAgentName,
+  threadCwdMatches,
   waitForTurnCompletion
 };
 //# sourceMappingURL=codex-app-server-bridge.mjs.map