@obtoai/agent-bridge 0.1.0-beta.10 → 0.1.0-beta.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@obtoai/agent-bridge",
-  "version": "0.1.0-beta.10",
+  "version": "0.1.0-beta.11",
   "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

@@ -102,7 +102,43 @@ const handleEvent = async (sseEvent) => {
 
   // v1.1 — which agent this thread is bound to (server-set, on the event).
   const agent = agentFor(payload);
-  const session = getAgentSession(state, threadId, agent);
+  let session = getAgentSession(state, threadId, agent);
+  let wasAdoption = false;
+
+  // Phase 6.2 — adopt external session on first turn. The bridge attaches
+  // `externalAdoption: {sessionId, projectDir, projectName, source}` to the
+  // reply payload for adopted threads. With no prior session for this
+  // (thread, agent), synthesize a binding pointing at the original engine
+  // session so the driver resumes it instead of first-touching fresh —
+  // context preserved end-to-end. After the first successful drive, the
+  // 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;
+    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,
+    });
+  }
+
   log('event', 'reply received', {
     threadId,
     agent,
@@ -135,7 +171,7 @@ const handleEvent = async (sseEvent) => {
     if (
       result &&
       result.sessionId &&
-      (!session || session.sessionId !== result.sessionId)
+      (!session || session.sessionId !== result.sessionId || wasAdoption)
     ) {
       setAgentSession(
         state,