agent-companion 0.1.1 → 0.1.2

package/bridge/server.mjs

@@ -151,6 +151,11 @@ function normalizeState(value) {
   return allowed.includes(value) ? value : "RUNNING";
 }
 
+function isDirectSessionId(value) {
+  const id = safeTrimmedText(value, 160);
+  return id.startsWith("codex:") || id.startsWith("claude:");
+}
+
 function normalizeCategory(value) {
   const allowed = ["INFO", "ACTION", "INPUT", "ERROR"];
   return allowed.includes(value) ? value : "INFO";
@@ -627,6 +632,170 @@ function extractClaudeSessionIdFromRun(run) {
   return "";
 }
 
+function normalizeClaudeSessionId(value) {
+  const candidate = safeTrimmedText(value, 120).toLowerCase();
+  if (!candidate) return "";
+  if (/^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/.test(candidate)) {
+    return candidate;
+  }
+  return "";
+}
+
+function getLauncherRunUpdatedAt(run) {
+  return Math.max(
+    safeNumber(run?.endedAt, 0),
+    safeNumber(run?.startedAt, 0),
+    safeNumber(run?.createdAt, 0)
+  );
+}
+
+function resolveCanonicalSessionIdForDirectSession(sessionId) {
+  const directSessionId = safeTrimmedText(sessionId, 160);
+  if (!isDirectSessionId(directSessionId)) return directSessionId;
+
+  if (directSessionId.startsWith("codex:")) {
+    const threadId = directSessionId.slice("codex:".length).trim().toLowerCase();
+    if (!threadId) return directSessionId;
+
+    const mappedRun = [...launcherRuns.values()]
+      .slice()
+      .sort((a, b) => getLauncherRunUpdatedAt(b) - getLauncherRunUpdatedAt(a))
+      .find((run) => !isDirectSessionId(run?.sessionId) && extractCodexThreadIdFromRun(run) === threadId);
+    if (mappedRun?.sessionId) return mappedRun.sessionId;
+
+    const mappedThread = (Array.isArray(state.sessionThreads) ? state.sessionThreads : [])
+      .slice()
+      .sort((a, b) => safeNumber(b.updatedAt, 0) - safeNumber(a.updatedAt, 0))
+      .find(
+        (thread) =>
+          !isDirectSessionId(thread?.id) &&
+          safeTrimmedText(thread?.codexThreadId, 120).toLowerCase() === threadId
+      );
+    if (mappedThread?.id) return mappedThread.id;
+
+    return directSessionId;
+  }
+
+  const claudeSessionId = normalizeClaudeSessionId(directSessionId.slice("claude:".length));
+  if (!claudeSessionId) return directSessionId;
+
+  const mappedRun = [...launcherRuns.values()]
+    .slice()
+    .sort((a, b) => getLauncherRunUpdatedAt(b) - getLauncherRunUpdatedAt(a))
+    .find((run) => !isDirectSessionId(run?.sessionId) && extractClaudeSessionIdFromRun(run) === claudeSessionId);
+  if (mappedRun?.sessionId) return mappedRun.sessionId;
+
+  const mappedThread = (Array.isArray(state.sessionThreads) ? state.sessionThreads : [])
+    .slice()
+    .sort((a, b) => safeNumber(b.updatedAt, 0) - safeNumber(a.updatedAt, 0))
+    .find(
+      (thread) =>
+        !isDirectSessionId(thread?.id) &&
+        normalizeClaudeSessionId(thread?.claudeSessionId) === claudeSessionId
+    );
+  if (mappedThread?.id) return mappedThread.id;
+
+  return directSessionId;
+}
+
+function rewriteDirectScopedId(id, originalSessionId, canonicalSessionId) {
+  const text = safeTrimmedText(id, 240);
+  if (!text || !originalSessionId || !canonicalSessionId || originalSessionId === canonicalSessionId) {
+    return text || id;
+  }
+
+  if (text === `pending:${originalSessionId}`) {
+    return `pending:${canonicalSessionId}`;
+  }
+  if (text === `event:${originalSessionId}`) {
+    return `event:${canonicalSessionId}`;
+  }
+
+  const directPrefix = `direct:${originalSessionId}:`;
+  if (text.startsWith(directPrefix)) {
+    return `direct:${canonicalSessionId}:${text.slice(directPrefix.length)}`;
+  }
+
+  return text;
+}
+
+function canonicalizeDirectSnapshot(snapshot) {
+  if (!snapshot || typeof snapshot !== "object") return snapshot;
+
+  const sessionIdMap = new Map();
+  const sourceDirectSessionIds = new Set();
+
+  const remapSessionId = (value) => {
+    const sessionId = safeTrimmedText(value, 160);
+    if (!isDirectSessionId(sessionId)) return sessionId;
+    sourceDirectSessionIds.add(sessionId);
+
+    const existing = sessionIdMap.get(sessionId);
+    if (existing) return existing;
+
+    const canonical = resolveCanonicalSessionIdForDirectSession(sessionId) || sessionId;
+    sessionIdMap.set(sessionId, canonical);
+    return canonical;
+  };
+
+  const sessions = (Array.isArray(snapshot.sessions) ? snapshot.sessions : []).map((item) => {
+    const originalSessionId = safeTrimmedText(item?.id, 160);
+    const canonicalSessionId = remapSessionId(originalSessionId);
+    if (!originalSessionId || !canonicalSessionId || canonicalSessionId === originalSessionId) {
+      return item;
+    }
+    return { ...item, id: canonicalSessionId };
+  });
+
+  const pendingInputs = (Array.isArray(snapshot.pendingInputs) ? snapshot.pendingInputs : []).map((item) => {
+    const originalSessionId = safeTrimmedText(item?.sessionId, 160);
+    const canonicalSessionId = remapSessionId(originalSessionId);
+    if (!originalSessionId || !canonicalSessionId || canonicalSessionId === originalSessionId) {
+      return item;
+    }
+    return {
+      ...item,
+      id: rewriteDirectScopedId(item?.id, originalSessionId, canonicalSessionId),
+      sessionId: canonicalSessionId
+    };
+  });
+
+  const events = (Array.isArray(snapshot.events) ? snapshot.events : []).map((item) => {
+    const originalSessionId = safeTrimmedText(item?.sessionId, 160);
+    const canonicalSessionId = remapSessionId(originalSessionId);
+    if (!originalSessionId || !canonicalSessionId || canonicalSessionId === originalSessionId) {
+      return item;
+    }
+    return {
+      ...item,
+      id: rewriteDirectScopedId(item?.id, originalSessionId, canonicalSessionId),
+      sessionId: canonicalSessionId
+    };
+  });
+
+  const chatTurns = (Array.isArray(snapshot.chatTurns) ? snapshot.chatTurns : []).map((item) => {
+    const originalSessionId = safeTrimmedText(item?.sessionId, 160);
+    const canonicalSessionId = remapSessionId(originalSessionId);
+    if (!originalSessionId || !canonicalSessionId || canonicalSessionId === originalSessionId) {
+      return item;
+    }
+    return {
+      ...item,
+      id: rewriteDirectScopedId(item?.id, originalSessionId, canonicalSessionId),
+      sessionId: canonicalSessionId
+    };
+  });
+
+  return {
+    ...snapshot,
+    sessions,
+    pendingInputs,
+    events,
+    chatTurns,
+    directSourceSessionIds: [...sourceDirectSessionIds]
+  };
+}
+
 function buildContinueCommandFromThread(thread, prompt) {
   const safePrompt = safeTrimmedText(prompt, 1500);
   if (!safePrompt || !thread) return null;
@@ -1937,21 +2106,28 @@ function stopManagedService(service, signalInput) {
 function mergeDirectSnapshot(snapshot) {
   if (!snapshot || typeof snapshot !== "object") return;
 
+  snapshot = canonicalizeDirectSnapshot(snapshot);
+
   const incomingDirectSessionIds = new Set(
     (Array.isArray(snapshot.sessions) ? snapshot.sessions : [])
       .map((item) => item?.id)
-      .filter((id) => typeof id === "string")
+      .filter((id) => typeof id === "string" && isDirectSessionId(id))
+  );
+  const incomingDirectSourceSessionIds = new Set(
+    (Array.isArray(snapshot.directSourceSessionIds) ? snapshot.directSourceSessionIds : [])
+      .map((item) => safeTrimmedText(item, 160))
+      .filter(Boolean)
   );
 
-  if (incomingDirectSessionIds.size > 0) {
+  if (incomingDirectSessionIds.size > 0 || incomingDirectSourceSessionIds.size > 0) {
     state.sessions = state.sessions.filter((item) => {
       const id = String(item?.id || "");
-      if (!id.startsWith("codex:") && !id.startsWith("claude:")) return true;
+      if (!isDirectSessionId(id)) return true;
       return incomingDirectSessionIds.has(id);
     });
     state.sessionThreads = (Array.isArray(state.sessionThreads) ? state.sessionThreads : []).filter((item) => {
       const id = String(item?.id || "");
-      if (!id.startsWith("codex:") && !id.startsWith("claude:")) return true;
+      if (!isDirectSessionId(id)) return true;
       return incomingDirectSessionIds.has(id);
     });
   }
@@ -2802,11 +2978,14 @@ app.post("/api/import/snapshot", (req, res) => {
   return res.json({ ok: true });
 });
 
+function refreshDirectSnapshot() {
+  withPersist(() => {
+    const snapshot = collectDirectSnapshot();
+    mergeDirectSnapshot(snapshot);
+  });
+}
+
 app.listen(PORT, () => {
-  setInterval(() => {
-    withPersist(() => {
-      const snapshot = collectDirectSnapshot();
-      mergeDirectSnapshot(snapshot);
-    });
-  }, DIRECT_SNAPSHOT_POLL_INTERVAL_MS);
+  refreshDirectSnapshot();
+  setInterval(refreshDirectSnapshot, DIRECT_SNAPSHOT_POLL_INTERVAL_MS);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-companion",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "private": false,
   "type": "module",
   "description": "Phone-to-computer companion for Codex and Claude Code.",