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

package/package.json

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

package/src/external-scanner.js

@@ -27,7 +27,9 @@ const CLAUDE_DIR = path.join(os.homedir(), '.claude', 'projects');
 const CODEX_DIR = path.join(os.homedir(), '.codex', 'sessions');
 
 const PREVIEW_MAX_CHARS = 200;
+const TITLE_MAX_CHARS = 80;
 const TAIL_READ_BYTES = 8192; // read the last 8KB of each JSONL for the last message
+const HEAD_READ_BYTES = 4096; // read the first 4KB for the first-user-message title
 
 // Read the tail of a (potentially large) JSONL file without slurping the
 // whole thing into memory. Returns a string (UTF-8) or '' on any failure.
@@ -50,6 +52,58 @@ const readTail = (filePath, maxBytes = TAIL_READ_BYTES) => {
   }
 };
 
+// Read the head of a JSONL file (first ~4KB). Used to extract the first user
+// message for a meaningful session title — "fix the auth bug" beats "OBTO".
+const readHead = (filePath, maxBytes = HEAD_READ_BYTES) => {
+  let fd = null;
+  try {
+    const stat = fs.statSync(filePath);
+    const len = Math.min(stat.size, maxBytes);
+    if (len <= 0) return '';
+    fd = fs.openSync(filePath, 'r');
+    const buf = Buffer.alloc(len);
+    fs.readSync(fd, buf, 0, len, 0);
+    return buf.toString('utf8');
+  } catch (_) {
+    return '';
+  } finally {
+    if (fd !== null) { try { fs.closeSync(fd); } catch (_) {} }
+  }
+};
+
+// Walk JSONL lines forward to find the first user message. Same tolerance
+// for the two SDKs' shapes as extractLastMessage. Returns a short title
+// suitable for a thread name, or '' if no user message landed in the head.
+const extractTitle = (jsonlHead) => {
+  if (!jsonlHead) return '';
+  const lines = jsonlHead.split(/\r?\n/).filter((l) => l.trim().length > 0);
+  for (let i = 0; i < lines.length; i++) {
+    let obj;
+    try { obj = JSON.parse(lines[i]); } catch (_) { continue; }
+    let role = null;
+    let raw = null;
+    if (obj && obj.message && (obj.message.role || obj.type)) {
+      role = obj.message.role || (obj.type === 'user' ? 'user' : 'assistant');
+      raw = obj.message.content;
+    } else if (obj && obj.role && (obj.content || obj.text)) {
+      role = obj.role;
+      raw = obj.content != null ? obj.content : obj.text;
+    }
+    if (role !== 'user' || raw == null) continue;
+    let text = '';
+    if (typeof raw === 'string') text = raw;
+    else if (Array.isArray(raw)) {
+      text = raw
+        .filter((p) => p && (p.type === 'text' || typeof p.text === 'string'))
+        .map((p) => String(p.text || ''))
+        .join(' ');
+    }
+    text = text.trim().replace(/\s+/g, ' ');
+    if (text) return text.slice(0, TITLE_MAX_CHARS);
+  }
+  return '';
+};
+
 // Walk a JSONL tail backwards, parse each non-empty line as JSON, return the
 // first one we can extract a message from. Tolerant of multiple shapes —
 // Claude and Codex write slightly different envelopes and the formats have
@@ -142,12 +196,15 @@ const scanClaude = () => {
       let stat;
       try { stat = fs.statSync(filePath); } catch (_) { continue; }
       const tail = readTail(filePath);
+      const head = readHead(filePath);
       const lastMsg = extractLastMessage(tail);
+      const title = extractTitle(head);
       out.push({
         source: 'claude',
         sessionId,
         projectDir: entry,                         // raw encoded form
         projectName: decodeClaudeProjectDir(entry), // best-effort decoded
+        title: title,                              // first-user-message slice
         lastActivityAt: stat.mtimeMs,
         lastMessagePreview: lastMsg ? lastMsg.preview : '',
         lastMessageAuthor: lastMsg ? lastMsg.author : null,
@@ -214,12 +271,15 @@ const scanCodex = () => {
           }
 
           const tail = readTail(filePath);
+          const head = readHead(filePath);
           const lastMsg = extractLastMessage(tail);
+          const title = extractTitle(head);
           out.push({
             source: 'codex',
             sessionId,
             projectDir: projectDir || `${y}/${m}/${d}`,
             projectName: projectDir || null,
+            title: title,
             lastActivityAt: stat.mtimeMs,
             lastMessagePreview: lastMsg ? lastMsg.preview : '',
             lastMessageAuthor: lastMsg ? lastMsg.author : null,