@clawos-dev/clawd 0.2.632 → 0.2.636

package/dist/app-builder-plugin/mcp-server.cjs

@@ -32607,8 +32607,10 @@ var DashboardOpenUrlResultSchema = external_exports.object({
 }).strict();
 
 // ../protocol/src/persona-schemas.ts
-var PERSONA_SIZES = ["tiny", "small", "medium", "large"];
+var PERSONA_SIZES = ["tiny", "small", "medium", "large", "xlarge"];
 var PersonaSizeSchema = external_exports.enum(PERSONA_SIZES);
+var PERSONA_CPUS = [0.5, 1, 2];
+var PersonaCpuSchema = external_exports.number().refine((cpu) => PERSONA_CPUS.includes(cpu), "Unsupported CPU");
 var PersonaFileSchema = external_exports.object({
   personaId: external_exports.string(),
   label: external_exports.string(),
@@ -32625,6 +32627,7 @@ var PersonaFileSchema = external_exports.object({
   tool: external_exports.string().optional(),
   /** Cloud resource size is string-compatible in stored files and narrowed at update/deploy boundaries; local execution ignores it. */
   size: external_exports.string().optional(),
+  cpu: external_exports.number().finite().optional(),
   /** Cloud task-Pod concurrency, validated at release. Local execution ignores it; changes apply on the next publication. */
   taskConcurrency: external_exports.number().int().positive().optional(),
   createdAt: external_exports.number(),
@@ -32722,6 +32725,7 @@ var PersonaUpdateArgsSchema = external_exports.object({
     effort: external_exports.string().optional(),
     tool: external_exports.string().optional(),
     size: PersonaSizeSchema.optional(),
+    cpu: PersonaCpuSchema.optional(),
     taskConcurrency: PersonaFileSchema.shape.taskConcurrency,
     personality: external_exports.string().optional(),
     // 人格补充层正文（见 PersonaInfoResponseSchema.personalityLocal）。与 personality 各写
@@ -34468,6 +34472,7 @@ function renderDeployWorkflow(config2) {
     "            --model '${{ steps.plan.outputs.model }}' \\",
     "            --effort '${{ steps.plan.outputs.effort }}' \\",
     "            --size '${{ steps.plan.outputs.size }}' \\",
+    "            --cpu '${{ steps.plan.outputs.cpu }}' \\",
     "            --task-concurrency '${{ steps.plan.outputs.task_concurrency }}' \\",
     "            --engine '${{ steps.plan.outputs.engine }}' \\",
     "            --connectors '${{ steps.plan.outputs.connectors }}' \\",

package/dist/cli.cjs

@@ -7690,14 +7690,16 @@ var init_dashboard_schemas = __esm({
 });
 
 // ../protocol/src/persona-schemas.ts
-var PERSONA_SIZES, PersonaSizeSchema, PersonaFileSchema, PersonaSkillSummarySchema, PersonaPluginSummarySchema, CodexSandboxSettingsSchema, PersonaSandboxSettingsSchema, PersonaInfoResponseSchema, PersonaCreateArgsSchema, PersonaIdArgsSchema, PersonaUpdateArgsSchema;
+var PERSONA_SIZES, PersonaSizeSchema, PERSONA_CPUS, PersonaCpuSchema, PersonaFileSchema, PersonaSkillSummarySchema, PersonaPluginSummarySchema, CodexSandboxSettingsSchema, PersonaSandboxSettingsSchema, PersonaInfoResponseSchema, PersonaCreateArgsSchema, PersonaIdArgsSchema, PersonaUpdateArgsSchema;
 var init_persona_schemas = __esm({
   "../protocol/src/persona-schemas.ts"() {
     "use strict";
     init_zod();
     init_release_schemas();
-    PERSONA_SIZES = ["tiny", "small", "medium", "large"];
+    PERSONA_SIZES = ["tiny", "small", "medium", "large", "xlarge"];
     PersonaSizeSchema = external_exports.enum(PERSONA_SIZES);
+    PERSONA_CPUS = [0.5, 1, 2];
+    PersonaCpuSchema = external_exports.number().refine((cpu) => PERSONA_CPUS.includes(cpu), "Unsupported CPU");
     PersonaFileSchema = external_exports.object({
       personaId: external_exports.string(),
       label: external_exports.string(),
@@ -7714,6 +7716,7 @@ var init_persona_schemas = __esm({
       tool: external_exports.string().optional(),
       /** Cloud resource size is string-compatible in stored files and narrowed at update/deploy boundaries; local execution ignores it. */
       size: external_exports.string().optional(),
+      cpu: external_exports.number().finite().optional(),
       /** Cloud task-Pod concurrency, validated at release. Local execution ignores it; changes apply on the next publication. */
       taskConcurrency: external_exports.number().int().positive().optional(),
       createdAt: external_exports.number(),
@@ -7811,6 +7814,7 @@ var init_persona_schemas = __esm({
         effort: external_exports.string().optional(),
         tool: external_exports.string().optional(),
         size: PersonaSizeSchema.optional(),
+        cpu: PersonaCpuSchema.optional(),
         taskConcurrency: PersonaFileSchema.shape.taskConcurrency,
         personality: external_exports.string().optional(),
         // 人格补充层正文（见 PersonaInfoResponseSchema.personalityLocal）。与 personality 各写
@@ -45000,7 +45004,7 @@ var CodexHistoryReader = class {
   }
   async read(args) {
     const locate = createCodexRolloutLocator(this.deps.roots);
-    const segments = this.parseThreadSegments(locate, args.toolSessionId);
+    const segments = parseCodexThreadSegments(locate, args.toolSessionId);
     const messages = [];
     for (const segment of segments) {
       messages.push(...await withSubagentResults(
@@ -45020,7 +45024,7 @@ var CodexHistoryReader = class {
   }
   async readSubagent(args) {
     const locate = createCodexRolloutLocator(this.deps.roots);
-    const owner2 = this.parseThreadSegments(locate, args.toolSessionId).find((segment) => segment.parsed.subagents.some((sub) => sub.agentId === args.subagentId));
+    const owner2 = parseCodexThreadSegments(locate, args.toolSessionId).find((segment) => segment.parsed.subagents.some((sub) => sub.agentId === args.subagentId));
     const child = this.parseThread(locate, args.subagentId);
     if (!owner2 || child.meta?.threadId !== args.subagentId || child.meta.parentThreadId !== owner2.threadId) {
       throw new Error(
@@ -45036,7 +45040,7 @@ var CodexHistoryReader = class {
     return [];
   }
   parseThread(locate, threadId) {
-    const segments = this.parseThreadSegments(locate, threadId);
+    const segments = parseCodexThreadSegments(locate, threadId);
     const current = segments[segments.length - 1].parsed;
     return {
       ...current,
@@ -45045,30 +45049,30 @@ var CodexHistoryReader = class {
       turns: segments.flatMap((s2) => s2.parsed.turns)
     };
   }
-  parseThreadSegments(locate, threadId, endByteOffset, seen = /* @__PURE__ */ new Set()) {
-    const key = threadId.toLowerCase();
-    if (seen.has(key)) throw new Error(`Codex fork history cycle at thread ${threadId}`);
-    seen.add(key);
-    try {
-      const file = locate(threadId);
-      if (!file) throw new Error(`Codex rollout not found for thread ${threadId}`);
-      const bytes = import_node_fs3.default.readFileSync(file);
-      if (endByteOffset !== void 0 && endByteOffset > bytes.length) {
-        throw new Error(`Codex fork history_base exceeds source rollout ${threadId}`);
-      }
-      const text = (endByteOffset === void 0 ? bytes : bytes.subarray(0, endByteOffset)).toString("utf8");
-      const parsed = parseCodexRollout(text);
-      if (parsed.meta?.threadId.toLowerCase() !== key) {
-        throw new Error(`Codex rollout metadata does not match thread ${threadId}`);
-      }
-      const base = historyBase(text);
-      const inherited = base ? this.parseThreadSegments(locate, base.threadId, base.endByteOffset, seen) : [];
-      return [...inherited, { threadId, parsed }];
-    } finally {
-      seen.delete(key);
-    }
-  }
 };
+function parseCodexThreadSegments(locate, threadId, endByteOffset, seen = /* @__PURE__ */ new Set()) {
+  const key = threadId.toLowerCase();
+  if (seen.has(key)) throw new Error(`Codex fork history cycle at thread ${threadId}`);
+  seen.add(key);
+  try {
+    const file = locate(threadId);
+    if (!file) throw new Error(`Codex rollout not found for thread ${threadId}`);
+    const bytes = import_node_fs3.default.readFileSync(file);
+    if (endByteOffset !== void 0 && endByteOffset > bytes.length) {
+      throw new Error(`Codex fork history_base exceeds source rollout ${threadId}`);
+    }
+    const text = (endByteOffset === void 0 ? bytes : bytes.subarray(0, endByteOffset)).toString("utf8");
+    const parsed = parseCodexRollout(text);
+    if (parsed.meta?.threadId.toLowerCase() !== key) {
+      throw new Error(`Codex rollout metadata does not match thread ${threadId}`);
+    }
+    const base = historyBase(text);
+    const inherited = base ? parseCodexThreadSegments(locate, base.threadId, base.endByteOffset, seen) : [];
+    return [...inherited, { threadId, parsed }];
+  } finally {
+    seen.delete(key);
+  }
+}
 
 // src/tools/cloud-history-pages.ts
 var import_node_crypto = require("crypto");
@@ -45983,6 +45987,37 @@ var SessionStore = class {
   filePath(sessionId) {
     return import_node_path6.default.join(this.root, `${safeFileName(sessionId)}.json`);
   }
+  // Exact prepared cloud turn bodies (images inlined as base64) live beside the session file, never in it, so they are
+  // not persisted with every write or broadcast; restart recovery replays them byte-for-byte (the gateway rejects a
+  // changed body for the same turn ID). Each write prunes payloads of turns no longer in cloudPendingTurns.
+  cloudPayloadDir(sessionId) {
+    return import_node_path6.default.join(this.root, `${safeFileName(sessionId)}.cloud-payloads`);
+  }
+  writeCloudPayload(sessionId, turnId, text) {
+    const dir = this.cloudPayloadDir(sessionId);
+    import_node_fs7.default.mkdirSync(dir, { recursive: true });
+    const target = import_node_path6.default.join(dir, safeFileName(turnId));
+    const tmp = `${target}.tmp-${process.pid}-${Date.now()}`;
+    import_node_fs7.default.writeFileSync(tmp, text, { encoding: "utf8", mode: 384 });
+    import_node_fs7.default.renameSync(tmp, target);
+  }
+  readCloudPayload(sessionId, turnId) {
+    try {
+      return import_node_fs7.default.readFileSync(import_node_path6.default.join(this.cloudPayloadDir(sessionId), safeFileName(turnId)), "utf8");
+    } catch {
+      return null;
+    }
+  }
+  pruneCloudPayloads(file) {
+    const dir = this.cloudPayloadDir(file.sessionId);
+    if (!import_node_fs7.default.existsSync(dir)) return;
+    const keep = new Set((file.cloudPendingTurns ?? []).map((turn) => safeFileName(turn.id)));
+    if (keep.size === 0) {
+      import_node_fs7.default.rmSync(dir, { recursive: true, force: true });
+      return;
+    }
+    for (const name of import_node_fs7.default.readdirSync(dir)) if (!keep.has(name)) import_node_fs7.default.rmSync(import_node_path6.default.join(dir, name), { force: true });
+  }
   ensureDir() {
     import_node_fs7.default.mkdirSync(this.root, { recursive: true });
   }
@@ -46004,9 +46039,14 @@ var SessionStore = class {
     const tmp = `${target}.tmp-${process.pid}-${Date.now()}`;
     import_node_fs7.default.writeFileSync(tmp, JSON.stringify(validated, null, 2), { encoding: "utf8", mode: 384 });
     import_node_fs7.default.renameSync(tmp, target);
+    try {
+      this.pruneCloudPayloads(validated);
+    } catch {
+    }
     return validated;
   }
   delete(sessionId) {
+    import_node_fs7.default.rmSync(this.cloudPayloadDir(sessionId), { recursive: true, force: true });
     try {
       import_node_fs7.default.unlinkSync(this.filePath(sessionId));
       return true;
@@ -46614,6 +46654,7 @@ function cloneState(s2) {
     bufferStartSeq: s2.bufferStartSeq,
     turnOpen: s2.turnOpen,
     turnStartedAt: s2.turnStartedAt,
+    turnSelfWoke: s2.turnSelfWoke,
     pendingPermissions: s2.pendingPermissions,
     pendingQuestions: s2.pendingQuestions,
     freshSpawn: s2.freshSpawn,
@@ -47009,7 +47050,7 @@ function pushEventToBufferInPlace(next, event, deps) {
       next.pendingBgTasks = [...pending, bg.agentId];
     }
   }
-  if (isTurnEnd && next.turnOpen && isLateTurnEnd(withSeq, next.turnStartedAt, deps.now())) {
+  if (isTurnEnd && next.turnOpen && !next.turnSelfWoke && isLateTurnEnd(withSeq, next.turnStartedAt, deps.now())) {
     return [emitSessionEvent(next.file.sessionId, withSeq)];
   }
   if (isTurnEnd) {
@@ -47022,6 +47063,7 @@ function pushEventToBufferInPlace(next, event, deps) {
   } else if (!isBackgroundEvent && !(isSessionInit && next.status === "running-idle") && !next.turnOpen) {
     next.turnOpen = true;
     next.turnStartedAt = deps.now();
+    next.turnSelfWoke = next.status === "running-idle";
   }
   if (!next.turnOpen && next.buffer.length > deps.bufferCap) {
     const remove = next.buffer.length - deps.bufferCap;
@@ -47402,14 +47444,6 @@ function reduceSessionInner(state, input, deps) {
     case "inject-events": {
       return applyEventBatch(state, input.events, deps);
     }
-    case "cloud-command-prepared": {
-      const pending = state.file.cloudPendingCommand;
-      const turn = state.file.cloudPendingTurns?.find((item) => item.id === input.commandId);
-      if ((!pending || pending.id !== input.commandId) && !turn) return { state, effects: [] };
-      const next = cloneState(state);
-      next.file = turn ? { ...next.file, cloudPendingTurns: next.file.cloudPendingTurns?.map((item) => item.id === input.commandId ? { ...item, text: input.text, prepared: true } : item) } : { ...next.file, cloudPendingCommand: { id: pending.id, text: input.text, prepared: true } };
-      return { state: next, effects: [{ kind: "persist-file", file: next.file }] };
-    }
     case "cloud-turn-terminal": {
       if (!state.file.cloudPendingTurns?.some((item) => item.id === input.turnId)) return { state, effects: [] };
       const next = cloneState(state);
@@ -47419,9 +47453,13 @@ function reduceSessionInner(state, input, deps) {
     case "proc-exit": {
       const next = cloneState(state);
       next.procAlive = false;
+      if (isCloudTool(next.file.tool) && next.file.cloudPendingCommand && !next.file.cloudPendingTurns) {
+        next.file = { ...next.file, cloudPendingCommand: void 0 };
+      }
       if (isCloudTool(next.file.tool) && !next.file.cloudPendingCommand && next.file.cloudGatewaySessionId) {
         next.file = { ...next.file, cloudGatewaySessionId: void 0 };
       }
+      const cloudFileChanged = next.file !== state.file;
       next.status = "stopped";
       next.stdinClosed = false;
       next.pendingBgTasks = [];
@@ -47444,7 +47482,7 @@ function reduceSessionInner(state, input, deps) {
       return {
         state: next,
         effects: [
-          ...isCloudTool(state.file.tool) && state.file.cloudGatewaySessionId && !next.file.cloudGatewaySessionId ? [{ kind: "persist-file", file: next.file }] : [],
+          ...cloudFileChanged ? [{ kind: "persist-file", file: next.file }] : [],
           ...interruptEffects,
           {
             kind: "emit-frame",
@@ -47901,7 +47939,10 @@ var SessionRunner = class {
       this.input({ kind: "command", command: { kind: "spawn-if-needed" } });
       const pending = this.state.file.cloudPendingCommand;
       if (pending) this.session?.startTurn(pending.text, pending.id, pending.prepared === true);
-      for (const turn of this.state.file.cloudPendingTurns ?? []) this.session?.startTurn(turn.text, turn.id, turn.prepared === true);
+      for (const turn of this.state.file.cloudPendingTurns ?? []) {
+        const payload = turn.prepared ? null : this.hooks.store.readCloudPayload(this.state.file.sessionId, turn.id);
+        this.session?.startTurn(payload ?? turn.text, turn.id, payload !== null || turn.prepared === true);
+      }
     } finally {
       this.recoveringCloud = false;
     }
@@ -48224,10 +48265,9 @@ var SessionRunner = class {
         }, "broadcast"),
         onCommandPrepared: (commandId, text, prepared) => {
           const pending = this.state.file.cloudPendingTurns?.find((turn) => turn.id === commandId) ?? this.state.file.cloudPendingCommand;
-          if (!pending || pending.id !== commandId || prepared && pending.text !== text) return false;
-          if (!prepared) {
-            this.hooks.store.write(this.state.file.cloudPendingTurns?.some((turn) => turn.id === commandId) ? { ...this.state.file, cloudPendingTurns: this.state.file.cloudPendingTurns.map((turn) => turn.id === commandId ? { ...turn, text, prepared: true } : turn) } : { ...this.state.file, cloudPendingCommand: { id: commandId, text, prepared: true } });
-            this.input({ kind: "cloud-command-prepared", commandId, text });
+          if (!pending || pending.id !== commandId) return false;
+          if (!prepared && pending !== this.state.file.cloudPendingCommand) {
+            this.hooks.store.writeCloudPayload(this.state.file.sessionId, commandId, text);
           }
           return true;
         },
@@ -48420,6 +48460,24 @@ var SessionManager = class {
   setCloudCanceller(cancel) {
     this.cloudCancel = cancel;
   }
+  /**
+   * Cancel only an in-flight cloud turn before a local stop / delete / reset. Idle conversations need no gateway
+   * call, and a failed cancel must not block the local action (offline / logged out / gateway errors).
+   */
+  async cancelCloudTurns(file, runner) {
+    const inFlight = (file.cloudConversationId || file.cloudGatewaySessionId) && (file.cloudPendingCommand || file.cloudPendingTurns?.length);
+    if (!inFlight) {
+      runner?.confirmCloudCancelled();
+      return;
+    }
+    if (!this.cloudCancel) throw new Error("cloud canceller is not configured");
+    try {
+      await this.cloudCancel(file, runner);
+    } catch (err) {
+      this.deps.logger?.warn("cloud cancel failed; continuing locally", { sessionId: file.sessionId, message: err.message });
+      runner?.confirmCloudCancelled();
+    }
+  }
   // sessionId → SessionRunner；在 send / ensureSession 时按需创建
   runners = /* @__PURE__ */ new Map();
   // 标题生成 in-flight 防重（进程内）；跨重启防重靠 SessionFile.aiLabelGeneratedAt
@@ -49178,12 +49236,7 @@ var SessionManager = class {
     const file = this.findOwnedSession(args.sessionId);
     if (!file) throw new ClawdError(ERROR_CODES.SESSION_NOT_FOUND, args.sessionId);
     const runner = this.runners.get(args.sessionId) ?? null;
-    if (isCloudTool(file.tool)) {
-      if (file.cloudConversationId || file.cloudGatewaySessionId) {
-        if (!this.cloudCancel) throw new Error("cloud canceller is not configured");
-        await this.cloudCancel(file, runner);
-      } else runner?.confirmCloudCancelled();
-    }
+    if (isCloudTool(file.tool)) await this.cancelCloudTurns(file, runner);
     return this.delete(args);
   }
   send(args, senderPrincipal) {
@@ -49327,12 +49380,7 @@ var SessionManager = class {
   async stop(args) {
     const file = this.findOwnedSession(args.sessionId);
     const runner = this.runners.get(args.sessionId);
-    if (file && isCloudTool(file.tool)) {
-      if (file.cloudConversationId || file.cloudGatewaySessionId) {
-        if (!this.cloudCancel) throw new Error("cloud canceller is not configured");
-        await this.cloudCancel(file, runner ?? null);
-      } else runner?.confirmCloudCancelled();
-    }
+    if (file && isCloudTool(file.tool)) await this.cancelCloudTurns(file, runner ?? null);
     if (!runner) {
       if (file && isCloudTool(file.tool) && (file.cloudPendingCommand || file.cloudPendingTurns?.length)) this.writeOwned({ ...file, cloudPendingCommand: void 0, cloudPendingTurns: void 0 });
       return { response: { ok: true }, broadcast: [] };
@@ -49528,11 +49576,7 @@ var SessionManager = class {
   async newSessionWithCloudCancel(args) {
     const file = this.getFile(args.sessionId);
     if (isCloudTool(file.tool)) {
-      const runner = this.runners.get(args.sessionId) ?? null;
-      if (file.cloudConversationId || file.cloudGatewaySessionId) {
-        if (!this.cloudCancel) throw new Error("cloud canceller is not configured");
-        await this.cloudCancel(file, runner);
-      } else runner?.confirmCloudCancelled();
+      await this.cancelCloudTurns(file, this.runners.get(args.sessionId) ?? null);
       return this.newSession(args);
     }
     return this.newSession(args);
@@ -56771,6 +56815,9 @@ var CloudGatewayClient = class {
     return CloudVolumeUsageSchema.parse(body.volume);
   }
 };
+var TURN_RETRY_BASE_MS = 250;
+var TURN_RETRY_MAX_MS = 3e4;
+var TURN_RETRY_MAX_FAILURES = 12;
 function openHttpTurn(opts) {
   const { fetchImpl, gatewayUrl, apiKey, personaId: personaId2, conversationId, turnId, text, expectedEngine, engineSessionId, instructions, effort, personaMode, purpose, logger } = opts;
   const body = JSON.stringify({
@@ -56814,8 +56861,9 @@ function openHttpTurn(opts) {
     if (!gapCbs.length) earlyGap = true;
     for (const cb of gapCbs) cb();
   };
-  const retryWait = () => new Promise((resolve9) => {
-    const timer = setTimeout(resolve9, 250);
+  let failures = 0;
+  const retryWait = (ms) => new Promise((resolve9) => {
+    const timer = setTimeout(resolve9, ms);
     timer.unref?.();
     abort.signal.addEventListener("abort", () => {
       clearTimeout(timer);
@@ -56857,6 +56905,7 @@ function openHttpTurn(opts) {
         for (; ; ) {
           const { value, done } = await reader.read();
           if (done || closed) break;
+          if (value.byteLength) failures = 0;
           pending += decoder.decode(value, { stream: true });
           let delimiter2;
           while ((delimiter2 = /\r?\n\r?\n/.exec(pending)) !== null) {
@@ -56893,7 +56942,12 @@ function openHttpTurn(opts) {
         }
         logger?.warn("cloud turn SSE disconnected; reconnecting", { message: error.message, turnId });
       }
-      if (!closed) await retryWait();
+      if (closed) return;
+      if (++failures > TURN_RETRY_MAX_FAILURES) {
+        state({ conversationId, turnId, status: "failed", errorCode: "GATEWAY_UNREACHABLE" });
+        return;
+      }
+      await retryWait(Math.min(TURN_RETRY_BASE_MS * 2 ** (failures - 1), TURN_RETRY_MAX_MS));
     }
   })();
   return {
@@ -61158,6 +61212,7 @@ function renderDeployWorkflow(config) {
     "            --model '${{ steps.plan.outputs.model }}' \\",
     "            --effort '${{ steps.plan.outputs.effort }}' \\",
     "            --size '${{ steps.plan.outputs.size }}' \\",
+    "            --cpu '${{ steps.plan.outputs.cpu }}' \\",
     "            --task-concurrency '${{ steps.plan.outputs.task_concurrency }}' \\",
     "            --engine '${{ steps.plan.outputs.engine }}' \\",
     "            --connectors '${{ steps.plan.outputs.connectors }}' \\",
@@ -70967,10 +71022,15 @@ async function forkCodexThread(input, deps = {}) {
   if (rollout.meta?.threadId.toLowerCase() !== input.sourceThreadId.toLowerCase()) {
     throw new Error(`codex fork: source thread metadata does not match ${input.sourceThreadId}`);
   }
-  if (!rollout.turns.some((turn) => turn.turnId === input.turnId && turn.status === "completed")) {
-    throw new Error(`codex fork: completed turn not found: ${input.turnId}`);
+  const completed = (turns) => turns.some((turn) => turn.turnId === input.turnId && turn.status === "completed");
+  let owner2 = { threadId: input.sourceThreadId, home: source.home };
+  if (!completed(rollout.turns)) {
+    const segment = parseCodexThreadSegments(createCodexRolloutLocator(input.roots), input.sourceThreadId).find((item) => completed(item.parsed.turns));
+    const home = segment && locateCodexThread(input.roots, segment.threadId)?.home;
+    if (!segment || !home) throw new Error(`codex fork: completed turn not found: ${input.turnId}`);
+    owner2 = { threadId: segment.threadId, home };
   }
-  const connection = (deps.open ?? openCodexAppServer)(source.home, input.targetCwd);
+  const connection = (deps.open ?? openCodexAppServer)(owner2.home, input.targetCwd);
   const timeoutMs = deps.timeoutMs ?? DEFAULT_CODEX_QUERY_TIMEOUT_MS;
   let timer;
   const timeout = new Promise((_3, reject) => {
@@ -70985,7 +71045,7 @@ async function forkCodexThread(input, deps = {}) {
       });
       client.notify("initialized", {});
       const result = await client.request("thread/fork", {
-        threadId: input.sourceThreadId,
+        threadId: owner2.threadId,
         lastTurnId: input.turnId,
         cwd: input.targetCwd
       });
@@ -70993,7 +71053,7 @@ async function forkCodexThread(input, deps = {}) {
       if (typeof forkedToolSessionId !== "string" || !forkedToolSessionId) {
         throw new Error("codex fork: app-server returned no thread id");
       }
-      const forked = locateCodexThread([import_node_path66.default.join(source.home, "sessions")], forkedToolSessionId);
+      const forked = locateCodexThread([import_node_path66.default.join(owner2.home, "sessions")], forkedToolSessionId);
       if (!forked) throw new Error(`codex fork: rollout not found for forked thread ${forkedToolSessionId}`);
       return { forkedToolSessionId, forkedFilePath: forked.file };
     })()]);
@@ -73672,7 +73732,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.632".length > 0 ? "0.2.632" : "dev";
+var version = "0.2.636".length > 0 ? "0.2.636" : "dev";
 
 // src/cli-probe/probe.ts
 var fs84 = __toESM(require("fs"), 1);