flowviant 0.44.1 → 0.47.0

package/bin/lib/runtimes.mjs

@@ -123,9 +123,11 @@ function humanizeCodexItem(item = {}, cwd = '') {
 }
 
 /**
- * Codex `--json` emits JSONL of ThreadEvents. Returns `{ activity, text }` —
- * `text` accumulates the agent's own words, because the turn loop reads its
- * sentinels (NOTHING / BLOCKED:<id> / DONE) out of exactly that.
+ * Codex `--json` emits JSONL of ThreadEvents. Returns `{ activity, text,
+ * threadId }` — `text` accumulates the agent's own words, because the turn
+ * loop reads its sentinels (NOTHING / BLOCKED:<id> / DONE) out of exactly
+ * that; `threadId` surfaces once, off the lifecycle event, for callers that
+ * need to resume THIS conversation later (runTurn's onThreadId).
  */
 function parseCodexLine(line, cwd) {
   let ev;
@@ -135,6 +137,14 @@ function parseCodexLine(line, cwd) {
     return null; // not every line is JSON (warnings go to stderr, but be safe)
   }
   switch (ev.type) {
+    // The conversation's own id, announced before any item (`ThreadStarted` on
+    // the shipped 0.147 binary, like the measured events below). Surfaced so a
+    // SESSION turn can resume this exact thread next time: `resume --last` is
+    // a machine-global guess, and on a box running two tabs — or a tab plus a
+    // dispatch — it resumes someone else's conversation. No activity and no
+    // text: nothing here is the model speaking.
+    case 'thread.started':
+      return { activity: null, text: '', threadId: String(ev.thread_id ?? '') || null };
     case 'item.completed': {
       const item = ev.item ?? {};
       const activity = humanizeCodexItem(item, cwd);
@@ -165,7 +175,7 @@ function parseCodexLine(line, cwd) {
         text: `${ev.message ?? ''}\n`,
       };
     default:
-      return null; // thread.started / turn.started / item.started / item.updated
+      return null; // turn.started / item.started / item.updated
   }
 }
 
@@ -310,9 +320,18 @@ export const RUNTIMES = {
      * strongest form of it available anywhere: `--append-system-prompt` sits
      * above the conversation rather than inside it.
      */
-    args({ prompt, system, model, effort, resume, streamJson, perm, mcp = [], resultSchemaArgs = [] }) {
+    args({ prompt, system, model, effort, resume, streamJson, perm, mcp = [], resultSchemaArgs = [], adoptResumeId }) {
       const a = [];
-      if (resume) a.push('--continue');
+      // ADOPTION — the first turn of a tab born from a terminal session.
+      // `--resume <id> --fork-session` finds the session globally (any cwd),
+      // carries its full context, and writes the FORK natively into THIS cwd's
+      // own store, leaving the original transcript untouched (measured on
+      // 2.1.234). From turn 2 on the plain `--continue` below resumes the fork
+      // where it now lives, so nothing downstream knows the tab was adopted.
+      // INSTEAD of --continue, never alongside it: they are the same decision
+      // ("what conversation is this?") answered two different ways.
+      if (adoptResumeId) a.push('--resume', adoptResumeId, '--fork-session');
+      else if (resume) a.push('--continue');
       a.push('-p', prompt, '--append-system-prompt', system);
       a.push(...mcp, ...resultSchemaArgs);
       a.push('--model', model || MODEL);
@@ -371,9 +390,22 @@ export const RUNTIMES = {
      * placed before it. Appending them after the positional is the kind of argv
      * that parses today and stops parsing on some future clap upgrade.
      */
-    args({ prompt, system, model, effort, resume, profile = 'build', vaultDir, mcp = [], resultSchemaArgs = [] }) {
+    args({ prompt, system, model, effort, resume, resumeThreadId, profile = 'build', vaultDir, mcp = [], resultSchemaArgs = [], adoptResumeId }) {
+      // Adoption resumes a conversation in ITS OWN CLI's store (claude forks,
+      // agy moves) — codex has no adoptable store wired yet. Reaching here
+      // with an adopt id is a wiring mistake upstream, and it fails loudly on
+      // purpose: quietly dropping the flag would answer that session's held
+      // context with a different brain.
+      if (adoptResumeId) throw new Error("codex has no adoptable terminal store — an adopt id can't reach this builder");
       const a = ['exec'];
-      if (resume) a.push('resume', '--last');
+      // BY ID when the caller knows WHICH conversation this is — a Workbench
+      // tab's held context, captured off thread.started and stored with its
+      // worktree. `--last` resumes the machine's most recent codex conversation,
+      // which is only safe on the dispatch path (one lane, one turn at a time,
+      // in its own worktree); for a session it is a machine-global guess that
+      // two tabs — or a tab plus a dispatch — would cross-resume.
+      if (resumeThreadId) a.push('resume', resumeThreadId);
+      else if (resume) a.push('resume', '--last');
       a.push('--json');
       if (model) a.push('--model', model);
       // Effort is a config value on Codex rather than a flag.
@@ -610,9 +642,18 @@ export const RUNTIMES = {
      */
     profiles: ['build', 'wiki', 'consult'],
     mcp: null,
-    args({ prompt, system, model, effort, resume, profile = 'build', vaultDir, resultSchemaArgs = [] }) {
+    args({ prompt, system, model, effort, resume, resumeConversationId, profile = 'build', vaultDir, resultSchemaArgs = [], adoptResumeId }) {
       const a = [];
-      if (resume) a.push('--continue');
+      // WHICH CONVERSATION IS THIS — one decision, answered one way (the same
+      // rule as Claude's --resume/--continue). By id when the caller knows:
+      // `--conversation <id>` resumes globally, any cwd (measured on 1.1.12).
+      // Adoption is the SAME argv because agy has no fork — the id in the db
+      // is the identity (a renamed copy fails "trajectory not found",
+      // measured), so adopting MOVES the conversation: the tab continues the
+      // terminal session itself, appending to its one store. `--continue` is
+      // the cwd-keyed fallback for a session whose id was never learned.
+      if (adoptResumeId || resumeConversationId) a.push('--conversation', adoptResumeId || resumeConversationId);
+      else if (resume) a.push('--continue');
       // No system-prompt flag, same weakening as Codex: the contract rides in
       // the prompt, fenced and first.
       a.push('-p', `${system}\n\n---\n\n${prompt}`);