@obtoai/agent-bridge 0.1.0-beta.20 → 0.1.0-beta.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@obtoai/agent-bridge",
-  "version": "0.1.0-beta.20",
+  "version": "0.1.0-beta.21",
   "description": "Local consumer for the OBTO Agent Bridge. Receives bridge events over SSE and drives a coding agent (Claude Code or OpenAI Codex) on your machine.",
   "license": "Apache-2.0",
   "author": "OBTO Inc.",

package/src/daemon.js

@@ -114,29 +114,52 @@ const handleEvent = async (sseEvent) => {
   // session is persisted to state.json and externalAdoption stops mattering.
   if (!session && payload.externalAdoption && payload.externalAdoption.sessionId) {
     const ea = payload.externalAdoption;
-    // Prefer projectName (already-decoded filesystem path) for cwd. Claude
-    // scanner emits both raw `-Users-foo` and decoded `/Users/foo`; the
-    // decoded form is what the SDK's cwd argument expects.
-    let resumeCwd = ea.projectName || ea.projectDir || cfg.projectDir;
+    // Prefer projectName (already-decoded absolute path) for the SDK's cwd.
+    // Code-review (2026-06-06): the prior fallback to cfg.projectDir was a
+    // silent foot-gun — if the external record carried no usable cwd (e.g.,
+    // a Codex session whose meta line didn't include `cwd`), we'd resume the
+    // session in the daemon's working dir, NOT the original project. The
+    // agent would find unrelated files and the conversation would lose its
+    // grounding. Now we validate the path looks absolute; if it doesn't, we
+    // log loudly and decline to fake a resume — the driver first-touches in
+    // cfg.projectDir, which is the only honest behavior when the original
+    // cwd is unknown.
+    let resumeCwd = ea.projectName || ea.projectDir || '';
     if (typeof resumeCwd === 'string' && resumeCwd.startsWith('//')) {
       resumeCwd = '/' + resumeCwd.replace(/^\/+/, '');
     }
-    session = {
-      sessionId: ea.sessionId,
-      projectDir: resumeCwd,
-      jsonlPath: null,
-      lastJsonlMtimeMs: null,
-      createdAt: new Date().toISOString(),
-      lastDriveAt: null,
-    };
-    wasAdoption = true;
-    log('info', 'adopting external session on first touch', {
-      threadId,
-      agent,
-      sessionId: ea.sessionId,
-      cwd: resumeCwd,
-      source: ea.source,
-    });
+    const looksAbsolute = typeof resumeCwd === 'string' && resumeCwd.startsWith('/');
+    if (!looksAbsolute) {
+      // The external adoption record didn't carry a real filesystem path —
+      // we will NOT synthesize a binding pointing at the daemon's working
+      // dir, since that would silently misroute the agent to unrelated
+      // files. Skip the synthetic binding; the driver will first-touch
+      // fresh, which is honest about losing the original context.
+      log('warn', 'external adoption skipped: no usable cwd in adoption record — first-touching fresh', {
+        threadId,
+        agent,
+        sessionId: ea.sessionId,
+        gotProjectName: ea.projectName,
+        gotProjectDir: ea.projectDir,
+      });
+    } else {
+      session = {
+        sessionId: ea.sessionId,
+        projectDir: resumeCwd,
+        jsonlPath: null,
+        lastJsonlMtimeMs: null,
+        createdAt: new Date().toISOString(),
+        lastDriveAt: null,
+      };
+      wasAdoption = true;
+      log('info', 'adopting external session on first touch', {
+        threadId,
+        agent,
+        sessionId: ea.sessionId,
+        cwd: resumeCwd,
+        source: ea.source,
+      });
+    }
   }
 
   log('event', 'reply received', {