@hua-labs/tap 0.4.2 → 0.5.1

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

@@ -1,8 +1,8 @@
 // src/bridges/codex-app-server-bridge.ts
-import { pathToFileURL as pathToFileURL3 } from "url";
-import { resolve as resolve6 } from "path";
+import { pathToFileURL as pathToFileURL2 } from "url";
+import { resolve as resolve5 } from "path";
 
-// ../../scripts/bridge/bridge-types.ts
+// scripts/bridge/bridge-types.ts
 var DEFAULT_AGENT = String.fromCharCode(50728);
 var DEFAULT_APP_SERVER_URL = "ws://127.0.0.1:4501";
 var AUTH_SUBPROTOCOL_PREFIX = "tap-auth-";
@@ -30,11 +30,11 @@ var COMMS_HEARTBEAT_LOCK_TIMEOUT_MS = 2e3;
 var COMMS_LOCK_STALE_AGE_MS = 1e4;
 var STALE_TURN_MS = 5 * 60 * 1e3;
 
-// ../../scripts/bridge/bridge-routing.ts
+// scripts/bridge/bridge-routing.ts
 import { existsSync, readFileSync, writeFileSync } from "fs";
 import { join, resolve } from "path";
 
-// ../tap-plugin/channels/tap-identity.ts
+// packages/tap-plugin/channels/tap-identity.ts
 var BROADCAST_RECIPIENTS = /* @__PURE__ */ new Set(["\uC804\uCCB4", "all"]);
 function trimAddress(value) {
   return value?.trim() ?? "";
@@ -71,7 +71,7 @@ function isOwnMessageAddress(sender, agentId, agentName) {
   return sameRoutingAddress(normalizedSender, agentId) || normalizedSender === trimAddress(agentName);
 }
 
-// ../../scripts/bridge/bridge-routing.ts
+// scripts/bridge/bridge-routing.ts
 function canonicalize(id) {
   return canonicalizeAgentId(id);
 }
@@ -85,9 +85,12 @@ function threadCwdMatches(expectedCwd, actualCwd) {
   return normalizeThreadCwd(expectedCwd) === normalizeThreadCwd(actualCwd);
 }
 function chooseLoadedThreadForCwd(cwd, threads) {
-  const matching = threads.filter(
-    (thread) => threadCwdMatches(cwd, thread.cwd)
-  );
+  const matching = threads.filter((thread) => {
+    if (!threadCwdMatches(cwd, thread.cwd)) {
+      return false;
+    }
+    return thread.statusType !== "notLoaded";
+  });
   if (matching.length === 0) {
     return null;
   }
@@ -237,7 +240,7 @@ function getInboxRouteFromFilename(fileName) {
   };
 }
 
-// ../../scripts/bridge/bridge-config.ts
+// scripts/bridge/bridge-config.ts
 import { existsSync as existsSync3, mkdirSync, readFileSync as readFileSync3 } from "fs";
 import { isAbsolute as isAbsolute2, join as join3, resolve as resolve3 } from "path";
 
@@ -258,7 +261,7 @@ function normalizeTapPath(input) {
   return trimmed;
 }
 
-// ../../scripts/bridge/bridge-config.ts
+// scripts/bridge/bridge-config.ts
 function ensureDir(target) {
   if (!existsSync3(target)) {
     mkdirSync(target, { recursive: true });
@@ -562,12 +565,12 @@ function buildOptions(argv) {
   };
 }
 
-// ../../scripts/bridge/bridge-candidates.ts
+// scripts/bridge/bridge-candidates.ts
 import { createHash } from "crypto";
 import { existsSync as existsSync4, readFileSync as readFileSync4, readdirSync, statSync } from "fs";
 import { join as join4 } from "path";
 
-// ../../scripts/bridge/bridge-logging.ts
+// scripts/bridge/bridge-logging.ts
 var LOG_LEVEL_PRIORITY = {
   debug: 10,
   info: 20,
@@ -639,7 +642,7 @@ function createBridgeLogger(scope) {
   };
 }
 
-// ../../scripts/bridge/bridge-candidates.ts
+// scripts/bridge/bridge-candidates.ts
 var routingLogger = createBridgeLogger("routing");
 function buildMarkerId(filePath, mtimeMs) {
   return createHash("sha1").update(`${filePath}|${mtimeMs}`).digest("hex");
@@ -748,7 +751,7 @@ function getPendingCandidates(options, cutoff) {
   return { heartbeats, candidates };
 }
 
-// ../../scripts/bridge/bridge-format.ts
+// scripts/bridge/bridge-format.ts
 import { writeFileSync as writeFileSync3 } from "fs";
 import { join as join5 } from "path";
 function buildUserInput(candidate, agentName, heartbeats) {
@@ -817,7 +820,7 @@ function writeLastDispatch(stateDir, candidate, dispatchMode, threadId, turnId)
   );
 }
 
-// ../../scripts/bridge/bridge-dispatch.ts
+// scripts/bridge/bridge-dispatch.ts
 import {
   existsSync as existsSync5,
   readFileSync as readFileSync5,
@@ -916,13 +919,18 @@ function updateCommsHeartbeat(options, status) {
     }
     const key = options.agentId;
     const existing = store[key];
+    const now = (/* @__PURE__ */ new Date()).toISOString();
     store[key] = {
       id: options.agentId,
       agent: options.agentName,
-      timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-      lastActivity: (/* @__PURE__ */ new Date()).toISOString(),
-      joinedAt: existing?.joinedAt ?? (/* @__PURE__ */ new Date()).toISOString(),
-      status
+      timestamp: now,
+      lastActivity: now,
+      joinedAt: existing?.joinedAt ?? now,
+      status,
+      source: "bridge-dispatch",
+      instanceId: options.agentId,
+      bridgePid: process.pid,
+      connectHash: `instance:${options.agentId}`
     };
     const tmpPath = heartbeatsPath + ".tmp." + process.pid;
     writeFileSync4(tmpPath, JSON.stringify(store, null, 2), "utf-8");
@@ -933,7 +941,54 @@ function updateCommsHeartbeat(options, status) {
   }
 }
 var heartbeatCount = 0;
+function readPreviousHeartbeat(stateDir) {
+  const heartbeatPath = join6(stateDir, "heartbeat.json");
+  if (!existsSync5(heartbeatPath)) {
+    return null;
+  }
+  try {
+    return JSON.parse(
+      readFileSync5(heartbeatPath, "utf8")
+    );
+  } catch {
+    return null;
+  }
+}
+function readLastDispatchAt(stateDir) {
+  const dispatchPath = join6(stateDir, "last-dispatch.json");
+  if (!existsSync5(dispatchPath)) {
+    return null;
+  }
+  try {
+    const parsed = JSON.parse(
+      readFileSync5(dispatchPath, "utf8")
+    );
+    return typeof parsed.dispatchedAt === "string" ? parsed.dispatchedAt : null;
+  } catch {
+    return null;
+  }
+}
+function isWaitingApprovalStatus(status) {
+  if (!status) return false;
+  return /approval|input-required|confirm|consent/i.test(status);
+}
+function resolveTurnState(client) {
+  if (!client) return null;
+  if (client.activeTurnId) return "active";
+  if (client.connected === false) return "disconnected";
+  if (isWaitingApprovalStatus(client.lastTurnStatus)) {
+    return "waiting-approval";
+  }
+  if (client.connected) return "idle";
+  return null;
+}
 function writeHeartbeat(options, client, health) {
+  const nowIso = (/* @__PURE__ */ new Date()).toISOString();
+  const previousHeartbeat = readPreviousHeartbeat(options.stateDir);
+  const lastDispatchAt = readLastDispatchAt(options.stateDir);
+  const turnState = resolveTurnState(client);
+  const lastTurnAt = previousHeartbeat?.activeTurnId && !client?.activeTurnId ? nowIso : previousHeartbeat?.lastTurnAt ?? null;
+  const idleSince = turnState === "idle" || turnState === "waiting-approval" ? previousHeartbeat?.turnState === turnState && previousHeartbeat.idleSince ? previousHeartbeat.idleSince : lastTurnAt ?? lastDispatchAt ?? nowIso : null;
   if (client?.threadId) {
     const savedThread = readThreadState(options.stateDir);
     persistThreadState(
@@ -947,7 +1002,7 @@ function writeHeartbeat(options, client, health) {
   const payload = {
     pid: process.pid,
     agent: options.agentName,
-    updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+    updatedAt: nowIso,
     pollSeconds: options.pollSeconds,
     appServerUrl: options.appServerUrl,
     authenticated: Boolean(options.gatewayToken),
@@ -958,6 +1013,10 @@ function writeHeartbeat(options, client, health) {
     activeTurnId: client?.activeTurnId ?? null,
     turnStartedAt: client?.turnStartedAt ?? null,
     lastTurnStatus: client?.lastTurnStatus ?? null,
+    lastTurnAt,
+    lastDispatchAt,
+    idleSince,
+    turnState: turnState ?? void 0,
     lastNotificationMethod: client?.lastNotificationMethod ?? null,
     lastNotificationAt: client?.lastNotificationAt ?? null,
     lastError: sanitizeErrorForPersistence(client?.lastError ?? null),
@@ -981,7 +1040,7 @@ function writeHeartbeat(options, client, health) {
       consecutiveFailureCount: payload.consecutiveFailureCount
     });
   }
-  const status = client?.connected ? "active" : "idle";
+  const status = turnState === "active" ? "active" : "idle";
   updateCommsHeartbeat(options, status);
 }
 async function dispatchCandidate(client, options, candidate, heartbeats) {
@@ -1181,7 +1240,7 @@ async function maybeBootstrapHeadlessTurn(options, cutoff, client) {
   }
 }
 
-// ../../scripts/bridge/bridge-ws-client.ts
+// scripts/bridge/bridge-ws-client.ts
 async function readSocketData(data) {
   if (typeof data === "string") {
     return data;
@@ -1729,7 +1788,7 @@ var AppServerClient = class {
   }
 };
 
-// ../../scripts/bridge/bridge-main.ts
+// scripts/bridge/bridge-main.ts
 import { existsSync as existsSync6, readFileSync as readFileSync6, writeFileSync as writeFileSync5 } from "fs";
 import { isAbsolute as isAbsolute3, join as join7, resolve as resolve4 } from "path";
 import { pathToFileURL } from "url";
@@ -1948,29 +2007,13 @@ function isDirectExecution() {
   return import.meta.url === pathToFileURL(resolve4(entry)).href;
 }
 
-// ../../scripts/codex-app-server-bridge.ts
-import { resolve as resolve5 } from "path";
-import { pathToFileURL as pathToFileURL2 } from "url";
+// src/bridges/codex-app-server-bridge.ts
 function isDirectExecution2() {
   const entry = process.argv[1];
   if (!entry) return false;
   return import.meta.url === pathToFileURL2(resolve5(entry)).href;
 }
 if (isDirectExecution2()) {
-  main().catch((error) => {
-    const raw = error instanceof Error ? error.stack ?? error.message : String(error);
-    console.error(sanitizeErrorForPersistence(raw));
-    process.exitCode = 1;
-  });
-}
-
-// src/bridges/codex-app-server-bridge.ts
-function isDirectExecution3() {
-  const entry = process.argv[1];
-  if (!entry) return false;
-  return import.meta.url === pathToFileURL3(resolve6(entry)).href;
-}
-if (isDirectExecution3()) {
   main().catch((error) => {
     console.error(
       error instanceof Error ? error.stack ?? error.message : String(error)