@hua-labs/tap 0.2.3 → 0.2.5

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

@@ -16,7 +16,7 @@ import { isAbsolute, join, resolve } from "path";
 import { pathToFileURL } from "url";
 var DEFAULT_AGENT = String.fromCharCode(50728);
 var DEFAULT_APP_SERVER_URL = "ws://127.0.0.1:4501";
-var APP_SERVER_AUTH_QUERY_PARAM = "tap_token";
+var AUTH_SUBPROTOCOL_PREFIX = "tap-auth-";
 var PLACEHOLDER_AGENT_VALUES = /* @__PURE__ */ new Set([
   "unknown",
   "unnamed",
@@ -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
 
@@ -316,11 +340,6 @@ function persistAgentName(stateDir, agentName) {
   writeFileSync(join(stateDir, "agent-name.txt"), `${agentName}
 `, "utf8");
 }
-function buildProtectedAppServerUrl(appServerUrl, token) {
-  const url = new URL(appServerUrl);
-  url.searchParams.set(APP_SERVER_AUTH_QUERY_PARAM, token);
-  return url.toString().replace(/\/(?=\?|$)/, "");
-}
 function readGatewayTokenFile(tokenFile) {
   const token = readFileSync(tokenFile, "utf8").trim();
   if (!token) {
@@ -349,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"),
@@ -651,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);
@@ -712,12 +732,14 @@ async function readSocketData(data) {
 var AppServerClient = class {
   socket = null;
   url;
+  gatewayToken;
   logger;
   nextId = 1;
   pending = /* @__PURE__ */ new Map();
   connected = false;
   initialized = false;
   threadId = null;
+  currentThreadCwd = null;
   activeTurnId = null;
   lastTurnStatus = null;
   lastNotificationMethod = null;
@@ -725,15 +747,20 @@ var AppServerClient = class {
   lastError = null;
   lastSuccessfulAppServerAt = null;
   lastSuccessfulAppServerMethod = null;
-  constructor(url, logger) {
+  constructor(url, logger, gatewayToken) {
     this.url = url;
     this.logger = logger;
+    this.gatewayToken = gatewayToken ?? null;
   }
   async connect() {
     if (this.connected && this.socket?.readyState === WebSocket.OPEN) {
       return;
     }
-    this.socket = new WebSocket(this.url);
+    const wsOptions = {};
+    if (this.gatewayToken) {
+      wsOptions.protocols = [`${AUTH_SUBPROTOCOL_PREFIX}${this.gatewayToken}`];
+    }
+    this.socket = new WebSocket(this.url, wsOptions);
     await new Promise((resolvePromise, rejectPromise) => {
       let settled = false;
       const resolveOnce = () => {
@@ -796,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", {
@@ -819,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);
+    if (savedThread?.threadId) {
+      if (savedThread.cwd && !threadCwdMatches(cwd, savedThread.cwd)) {
         this.logger(
-          `resumed saved thread ${resumedThreadId}${this.activeTurnId ? ` (active turn ${this.activeTurnId})` : ""}`
-        );
-        return resumedThreadId;
-      } catch (error) {
-        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", {
@@ -847,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}`);
@@ -885,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})` : ""}`
@@ -971,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 : [];
@@ -1019,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":
@@ -1074,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,
@@ -1083,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,
@@ -1219,10 +1272,8 @@ function buildOptions(argv) {
     runOnce: parsed.runOnce,
     waitAfterDispatchSeconds: parsed.waitAfterDispatchSeconds ?? 0,
     appServerUrl,
-    connectAppServerUrl: gatewayTokenFile ? buildProtectedAppServerUrl(
-      appServerUrl,
-      readGatewayTokenFile(gatewayTokenFile)
-    ) : appServerUrl,
+    connectAppServerUrl: appServerUrl,
+    gatewayToken: gatewayTokenFile ? readGatewayTokenFile(gatewayTokenFile) : null,
     gatewayTokenFile,
     busyMode: parsed.busyMode ?? "steer",
     threadId: parsed.threadId?.trim() || null,
@@ -1236,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}`);
@@ -1252,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
   };
@@ -1267,11 +1319,16 @@ async function main() {
     try {
       if (!options.dryRun) {
         if (!client || !client.connected) {
-          client = new AppServerClient(options.connectAppServerUrl, logStatus);
+          client = new AppServerClient(
+            options.connectAppServerUrl,
+            logStatus,
+            options.gatewayToken
+          );
           await client.connect();
+          const savedThread = readThreadState(options.stateDir);
           const threadId = await client.ensureThread(
             options.threadId,
-            savedThreadId,
+            savedThread,
             options.repoRoot,
             options.ephemeral
           );
@@ -1279,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,
@@ -1353,6 +1410,7 @@ export {
   HEADLESS_WARMUP_PROMPT,
   buildOptions,
   buildUserInput,
+  chooseLoadedThreadForCwd,
   isOwnMessageSender,
   main,
   maybeBootstrapHeadlessTurn,
@@ -1360,6 +1418,7 @@ export {
   resolveAddressLabel,
   resolveAgentId,
   resolveCurrentAgentName,
+  threadCwdMatches,
   waitForTurnCompletion
 };
 //# sourceMappingURL=codex-app-server-bridge.mjs.map