@clawos-dev/clawd 0.2.613 → 0.2.614

package/dist/cli.cjs

@@ -8168,6 +8168,10 @@ var init_schemas = __esm({
       sessionId: external_exports.string().min(1),
       /** New gateway execution identity after session:new; defaults to sessionId for the first execution. */
       cloudExecutionId: external_exports.string().min(1).optional(),
+      /** First turn ID of the per-query SSE conversation. */
+      cloudConversationId: external_exports.string().min(1).optional(),
+      /** Accepted local turns whose terminal gateway status has not been observed. */
+      cloudPendingTurns: external_exports.array(external_exports.object({ id: external_exports.string().min(1), text: external_exports.string(), prepared: external_exports.boolean().optional() })).optional(),
       /** Owner gateway session observed in ready; proves the remote Pod was opened. */
       cloudGatewaySessionId: external_exports.string().min(1).optional(),
       /** Persisted before sending so daemon restart can retry the same gateway command ID. */
@@ -44805,7 +44809,7 @@ Env (advanced):
 var import_node_path85 = __toESM(require("path"), 1);
 var import_node_fs66 = __toESM(require("fs"), 1);
 var import_node_os31 = __toESM(require("os"), 1);
-var import_node_crypto28 = require("crypto");
+var import_node_crypto29 = require("crypto");
 var import_node_url6 = require("url");
 
 // src/logger.ts
@@ -46120,6 +46124,8 @@ function buildSpawnContext(state, deps) {
   const ctx = {
     cwd: file.cwd,
     cloudExecutionId: file.cloudExecutionId,
+    ...file.cloudConversationId ? { cloudConversationId: file.cloudConversationId } : {},
+    ...file.cloudPendingCommand && !file.cloudPendingTurns ? { cloudLegacyPendingCommand: true } : {},
     cloudGatewaySessionId: file.cloudGatewaySessionId,
     toolSessionId: file.toolSessionId,
     model: file.model,
@@ -46375,10 +46381,16 @@ function pushEventToBufferInPlace(next, event, deps) {
     }
   }
   if (isUserText || isTurnEnd) {
+    const cloudTurnId = isUserText ? withSeq.uuid ?? `${next.file.sessionId}-${seq}` : void 0;
+    const cloudPerTurn = isCloudTool(next.file.tool) && !next.file.cloudGatewaySessionId && (!next.file.cloudPendingCommand || !!next.file.cloudPendingTurns);
     next.file = {
       ...next.file,
       updatedAt: nowIso(deps),
-      ...isCloudTool(next.file.tool) && next.status !== "error" && !(withSeq.kind === "turn_end" && withSeq.reason === "interrupted") ? { cloudPendingCommand: withSeq.kind === "user_text" ? { id: withSeq.uuid ?? `${next.file.sessionId}-${seq}`, text: withSeq.text } : void 0 } : {}
+      ...cloudPerTurn && isUserText && next.status !== "error" ? {
+        cloudConversationId: next.file.cloudConversationId ?? next.file.cloudExecutionId ?? cloudTurnId,
+        cloudPendingTurns: [...next.file.cloudPendingTurns ?? [], { id: cloudTurnId, text: withSeq.text }]
+      } : {},
+      ...!cloudPerTurn && isCloudTool(next.file.tool) && next.status !== "error" && !(withSeq.kind === "turn_end" && withSeq.reason === "interrupted") ? { cloudPendingCommand: withSeq.kind === "user_text" ? { id: withSeq.uuid ?? `${next.file.sessionId}-${seq}`, text: withSeq.text } : void 0 } : {}
     };
     effects.push({ kind: "persist-file", file: next.file });
     effects.push(sessionInfoFrame(next.file));
@@ -46443,7 +46455,7 @@ function applyCommand(state, command, deps) {
   const sessionId = next.file.sessionId;
   switch (command.kind) {
     case "send": {
-      if (command.queueWhileRunning && (next.status === "running" || next.status === "spawning")) {
+      if (command.queueWhileRunning && !(isCloudTool(next.file.tool) && !next.file.cloudGatewaySessionId) && (next.status === "running" || next.status === "spawning")) {
         next.queuedSends = [
           ...next.queuedSends,
           {
@@ -46495,8 +46507,8 @@ function applyCommand(state, command, deps) {
       return { state: next, effects };
     }
     case "stop": {
-      if (isCloudTool(next.file.tool) && next.file.cloudPendingCommand) {
-        next.file = { ...next.file, cloudPendingCommand: void 0 };
+      if (isCloudTool(next.file.tool) && (next.file.cloudPendingCommand || next.file.cloudPendingTurns?.length)) {
+        next.file = { ...next.file, cloudPendingCommand: void 0, cloudPendingTurns: void 0 };
         effects.push({ kind: "persist-file", file: next.file }, sessionInfoFrame(next.file));
       }
       for (const toolUseId of Object.keys(state.pendingQuestions ?? {})) {
@@ -46634,6 +46646,9 @@ function applyCommand(state, command, deps) {
         toolSessionId: _drop,
         cloudPendingCommand: _cloudPendingCommand,
         cloudGatewaySessionId: _cloudGatewaySessionId,
+        cloudConversationId: _cloudConversationId,
+        cloudPendingTurns: _cloudPendingTurns,
+        cloudExecutionId: _cloudExecutionId,
         contextUsage: _ctx,
         contextWindowSize: _win,
         gitBranch: _branch,
@@ -46646,6 +46661,9 @@ function applyCommand(state, command, deps) {
       void _drop;
       void _cloudPendingCommand;
       void _cloudGatewaySessionId;
+      void _cloudConversationId;
+      void _cloudPendingTurns;
+      void _cloudExecutionId;
       void _ctx;
       void _win;
       void _branch;
@@ -46731,9 +46749,16 @@ function reduceSessionInner(state, input, deps) {
     }
     case "cloud-command-prepared": {
       const pending = state.file.cloudPendingCommand;
-      if (!pending || pending.id !== input.commandId) return { state, effects: [] };
+      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);
-      next.file = { ...next.file, cloudPendingCommand: { id: pending.id, text: input.text, prepared: true } };
+      next.file = { ...next.file, cloudPendingTurns: next.file.cloudPendingTurns?.filter((item) => item.id !== input.turnId) };
       return { state: next, effects: [{ kind: "persist-file", file: next.file }] };
     }
     case "proc-exit": {
@@ -47243,6 +47268,7 @@ 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);
     } finally {
       this.recoveringCloud = false;
     }
@@ -47440,7 +47466,7 @@ var SessionRunner = class {
         break;
       case "write-stdin":
         if (this.session) {
-          this.session.startTurn(effect.payload, this.state.file.cloudPendingCommand?.id);
+          this.session.startTurn(effect.payload, this.state.file.cloudPendingTurns?.at(-1)?.id ?? this.state.file.cloudPendingCommand?.id);
           break;
         }
         this.hooks.logger?.debug("[RG] write-stdin", {
@@ -47585,14 +47611,15 @@ var SessionRunner = class {
           this.input({ kind: "cloud-gateway-ready", gatewaySessionId });
         },
         onCommandPrepared: (commandId, text, prepared) => {
-          const pending = this.state.file.cloudPendingCommand;
+          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, cloudPendingCommand: { id: commandId, text, prepared: true } });
+            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 });
           }
           return true;
-        }
+        },
+        onCloudTurnTerminal: (turnId) => this.input({ kind: "cloud-turn-terminal", turnId })
       });
       return;
     }
@@ -48662,11 +48689,10 @@ var SessionManager = class {
     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.cloudGatewaySessionId) runner?.confirmCloudCancelled();
-      else if (file.cloudPendingCommand || runner?.getState().procAlive) {
+      if (file.cloudConversationId || file.cloudGatewaySessionId) {
         if (!this.cloudCancel) throw new Error("cloud canceller is not configured");
         await this.cloudCancel(file, runner);
-      }
+      } else runner?.confirmCloudCancelled();
     }
     return this.delete(args);
   }
@@ -48836,14 +48862,13 @@ var SessionManager = class {
     const file = this.findOwnedSession(args.sessionId);
     const runner = this.runners.get(args.sessionId);
     if (file && isCloudTool(file.tool)) {
-      if (!file.cloudGatewaySessionId) runner?.confirmCloudCancelled();
-      else if (file.cloudPendingCommand || runner?.getState().procAlive) {
+      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 (!runner) {
-      if (file && isCloudTool(file.tool) && file.cloudPendingCommand) this.writeOwned({ ...file, cloudPendingCommand: void 0 });
+      if (file && isCloudTool(file.tool) && (file.cloudPendingCommand || file.cloudPendingTurns?.length)) this.writeOwned({ ...file, cloudPendingCommand: void 0, cloudPendingTurns: void 0 });
       return { response: { ok: true }, broadcast: [] };
     }
     this.clearPendingTurnEnd(args.sessionId);
@@ -49009,6 +49034,9 @@ var SessionManager = class {
       toolSessionId: _drop,
       cloudPendingCommand: _cloudPendingCommand,
       cloudGatewaySessionId: _cloudGatewaySessionId,
+      cloudConversationId: _cloudConversationId,
+      cloudPendingTurns: _cloudPendingTurns,
+      cloudExecutionId: _cloudExecutionId,
       contextUsage: _ctx,
       contextWindowSize: _win,
       gitBranch: _branch,
@@ -49020,6 +49048,9 @@ var SessionManager = class {
     void _drop;
     void _cloudPendingCommand;
     void _cloudGatewaySessionId;
+    void _cloudConversationId;
+    void _cloudPendingTurns;
+    void _cloudExecutionId;
     void _ctx;
     void _win;
     void _branch;
@@ -49038,12 +49069,11 @@ var SessionManager = class {
     const file = this.getFile(args.sessionId);
     if (isCloudTool(file.tool)) {
       const runner = this.runners.get(args.sessionId) ?? null;
-      if (!file.cloudGatewaySessionId) runner?.confirmCloudCancelled();
-      else if (file.cloudPendingCommand || runner?.getState().procAlive) {
+      if (file.cloudConversationId || file.cloudGatewaySessionId) {
         if (!this.cloudCancel) throw new Error("cloud canceller is not configured");
         await this.cloudCancel(file, runner);
-      }
-      return this.newSession(args, (0, import_node_crypto3.randomUUID)());
+      } else runner?.confirmCloudCancelled();
+      return this.newSession(args, file.cloudGatewaySessionId ? (0, import_node_crypto3.randomUUID)() : void 0);
     }
     return this.newSession(args);
   }
@@ -49114,7 +49144,7 @@ var SessionManager = class {
   /** Reattach only to executions whose last turn lacks a durable end marker. */
   recoverCloudSessions() {
     for (const file of this.listAllOwned()) {
-      if (!isCloudTool(file.tool) || !file.cloudPendingCommand) continue;
+      if (!isCloudTool(file.tool) || !file.cloudPendingCommand && !file.cloudPendingTurns?.length) continue;
       const runner = this.ensureSession(file);
       runner.recoverCloud();
     }
@@ -64751,6 +64781,9 @@ var GATEWAY_ROUTES = {
   eventSession: (personaId2) => `/p/${encodeURIComponent(personaId2)}/session/events`,
   eventCancel: (personaId2) => `/p/${encodeURIComponent(personaId2)}/session/events:cancel`,
   eventSend: (personaId2, sessionId) => `/p/${encodeURIComponent(personaId2)}/session/events/${encodeURIComponent(sessionId)}`,
+  turn: (personaId2) => `/p/${encodeURIComponent(personaId2)}/v1/chat/completions`,
+  turnCommand: (personaId2, turnId) => `/p/${encodeURIComponent(personaId2)}/turns/${encodeURIComponent(turnId)}/commands`,
+  conversationCancel: (personaId2, conversationId) => `/p/${encodeURIComponent(personaId2)}/conversations/${encodeURIComponent(conversationId)}:cancel`,
   // 调用方自己那块盘的用量（design 2026-09-19-cloud-volume-usage §3.3）：同样按人、不挂 persona
   volume: () => "/me/volume",
   // 云 persona 运行看板的数据（design 2026-09-23-cloud-persona-metrics §3.6）：只给发布者与管理员（gateway 问中心，design 2026-09-24-cloud-persona-conversations §3.2）
@@ -64892,6 +64925,32 @@ var CloudGatewayClient = class {
       logger: this.deps.logger
     });
   }
+  async openTurn(personaId2, opts) {
+    const { apiKey, gatewayUrl } = await this.credentials();
+    const health = await this.fetchImpl(gatewayUrl + GATEWAY_ROUTES.healthz());
+    if (!health.ok || (await health.json()).turnProtocolVersion !== 1) {
+      throw new Error("\u4E91 gateway \u4E0D\u652F\u6301\u6309\u8F6E SSE\uFF0C\u8BF7\u5148\u5347\u7EA7 gateway");
+    }
+    return openHttpTurn({ ...opts, fetchImpl: this.fetchImpl, gatewayUrl, apiKey, personaId: personaId2, logger: this.deps.logger });
+  }
+  async commandTurn(personaId2, conversationId, turnId, command) {
+    const { apiKey, gatewayUrl } = await this.credentials();
+    const res = await this.fetchImpl(gatewayUrl + GATEWAY_ROUTES.turnCommand(personaId2, turnId), {
+      method: "POST",
+      headers: { authorization: `Bearer ${apiKey}`, "content-type": "application/json", "x-clawd-turn-protocol": "1" },
+      body: JSON.stringify({ conversationId, ...command })
+    });
+    if (!res.ok) throw new Error(`gateway turn command returned ${res.status}`);
+  }
+  async cancelConversation(personaId2, conversationId) {
+    const { apiKey, gatewayUrl } = await this.credentials();
+    const res = await this.fetchImpl(gatewayUrl + GATEWAY_ROUTES.conversationCancel(personaId2, conversationId), {
+      method: "POST",
+      headers: { authorization: `Bearer ${apiKey}`, "content-type": "application/json", "x-clawd-turn-protocol": "1" },
+      body: "{}"
+    });
+    if (!res.ok) throw new Error(`gateway conversation cancel returned ${res.status}`);
+  }
   async cancelEventSession(personaId2, clientSessionId, gatewaySessionId) {
     const { apiKey, gatewayUrl } = await this.credentials();
     const res = await this.fetchImpl(gatewayUrl + GATEWAY_ROUTES.eventCancel(personaId2), {
@@ -64964,6 +65023,152 @@ var CloudGatewayClient = class {
     return CloudVolumeUsageSchema.parse(body.volume);
   }
 };
+function openHttpTurn(opts) {
+  const { fetchImpl, gatewayUrl, apiKey, personaId: personaId2, conversationId, turnId, text, expectedEngine, engineSessionId, instructions, effort, personaMode, logger } = opts;
+  const body = JSON.stringify({
+    messages: [{ role: "user", content: text }],
+    stream: true,
+    clawd: {
+      eventMode: "parsed",
+      conversationId,
+      turnId,
+      expectedEngine,
+      ...engineSessionId ? { engineSessionId } : {},
+      ...instructions ? { instructions } : {},
+      ...effort ? { effort } : {},
+      ...personaMode ? { personaMode } : {}
+    }
+  });
+  const eventsCbs = [];
+  const stateCbs = [];
+  const gapCbs = [];
+  const closeCbs = [];
+  const earlyEvents = [];
+  const earlyStates = [];
+  let earlyGap = false;
+  let closed = false;
+  let lastSeq = 0;
+  let abort = new AbortController();
+  const finish = () => {
+    if (closed) return;
+    closed = true;
+    abort.abort();
+    for (const cb of closeCbs) cb();
+  };
+  const state = (value) => {
+    if (!stateCbs.length) earlyStates.push(value);
+    for (const cb of stateCbs) cb(value);
+    if (value.status === "completed" || value.status === "failed" || value.status === "cancelled") finish();
+  };
+  const gap = () => {
+    if (!gapCbs.length) earlyGap = true;
+    for (const cb of gapCbs) cb();
+  };
+  const retryWait = () => new Promise((resolve9) => {
+    const timer = setTimeout(resolve9, 250);
+    timer.unref?.();
+    abort.signal.addEventListener("abort", () => {
+      clearTimeout(timer);
+      resolve9();
+    }, { once: true });
+  });
+  void (async () => {
+    while (!closed) {
+      abort = new AbortController();
+      try {
+        const res = await fetchImpl(gatewayUrl + GATEWAY_ROUTES.turn(personaId2), {
+          method: "POST",
+          headers: {
+            authorization: `Bearer ${apiKey}`,
+            "content-type": "application/json",
+            "x-clawd-turn-protocol": "1",
+            ...lastSeq ? { "last-event-id": String(lastSeq) } : {}
+          },
+          body,
+          signal: abort.signal
+        });
+        if (!res.ok || !res.body) {
+          const raw = await res.text().catch(() => "");
+          let code = `HTTP_${res.status}`;
+          try {
+            const parsed = JSON.parse(raw);
+            code = parsed.error?.code ?? code;
+          } catch {
+          }
+          if ([400, 401, 403, 404, 409, 410, 426].includes(res.status)) {
+            state({ conversationId, turnId, status: "failed", errorCode: code });
+            return;
+          }
+          throw new Error(`gateway returned ${res.status}`);
+        }
+        const reader = res.body.getReader();
+        const decoder = new TextDecoder();
+        let pending = "";
+        for (; ; ) {
+          const { value, done } = await reader.read();
+          if (done || closed) break;
+          pending += decoder.decode(value, { stream: true });
+          let delimiter2;
+          while ((delimiter2 = /\r?\n\r?\n/.exec(pending)) !== null) {
+            const frame = pending.slice(0, delimiter2.index);
+            pending = pending.slice(delimiter2.index + delimiter2[0].length);
+            if (!frame || frame.startsWith(":")) continue;
+            const lines = frame.split(/\r?\n/);
+            const name = lines.find((line) => line.startsWith("event: "))?.slice(7);
+            const dataLine = lines.find((line) => line.startsWith("data: "));
+            if (!name || !dataLine) throw new Error("invalid Clawd SSE frame");
+            const id = lines.find((line) => line.startsWith("id: "))?.slice(4);
+            const seq = id === void 0 ? null : Number(id);
+            if (seq !== null && (!Number.isSafeInteger(seq) || seq < 0)) throw new Error("invalid Clawd SSE cursor");
+            if (seq !== null && seq <= lastSeq) continue;
+            if (seq !== null) lastSeq = seq;
+            const data = JSON.parse(dataLine.slice(6));
+            if (data.turnId !== void 0 && data.turnId !== turnId) throw new Error("Clawd SSE turn ID mismatch");
+            if (name === "events") {
+              const events = ParsedEventSchema.array().parse(data.events);
+              if (!eventsCbs.length) earlyEvents.push(events);
+              for (const cb of eventsCbs) cb(events);
+            } else if (name === "history-gap") gap();
+            else if (["inqueue", "running", "completed", "failed", "cancelled"].includes(name)) {
+              state({ ...data, conversationId, turnId, status: name });
+            } else throw new Error(`unknown Clawd SSE event ${name}`);
+            if (closed) return;
+          }
+        }
+      } catch (error) {
+        if (closed) return;
+        if (error instanceof SyntaxError || error.name === "ZodError" || error.message.startsWith("invalid Clawd SSE")) {
+          state({ conversationId, turnId, status: "failed", errorCode: "INVALID_TURN_STREAM" });
+          return;
+        }
+        logger?.warn("cloud turn SSE disconnected; reconnecting", { message: error.message, turnId });
+      }
+      if (!closed) await retryWait();
+    }
+  })();
+  return {
+    onEvents(cb) {
+      eventsCbs.push(cb);
+      for (const events of earlyEvents.splice(0)) cb(events);
+    },
+    onState(cb) {
+      stateCbs.push(cb);
+      for (const item of earlyStates.splice(0)) cb(item);
+    },
+    onHistoryGap(cb) {
+      gapCbs.push(cb);
+      if (earlyGap) {
+        earlyGap = false;
+        cb();
+      }
+    },
+    onClose(cb) {
+      closeCbs.push(cb);
+      if (closed) cb();
+    },
+    close: finish
+  };
+}
 function openHttpEventSession(opts) {
   const { fetchImpl, gatewayUrl, apiKey, personaId: personaId2, clientSessionId, gatewaySessionId, engineSessionId, instructions, purpose, effort, personaMode, attachOnly, expectedEngine, logger } = opts;
   const headers = { authorization: `Bearer ${apiKey}`, "content-type": "application/json" };
@@ -65482,7 +65687,7 @@ init_protocol();
 
 // src/tools/codex-cloud-session.ts
 var import_node_fs40 = __toESM(require("fs"), 1);
-var import_node_crypto13 = require("crypto");
+var import_node_crypto14 = require("crypto");
 
 // src/tools/cloud-portable-input.ts
 async function portableCloudInput(text, resolvers) {
@@ -65502,6 +65707,116 @@ async function portableCloudInput(text, resolvers) {
   return result;
 }
 
+// src/tools/cloud-turn-session.ts
+var import_node_crypto13 = require("crypto");
+function createCloudTurnSession(args) {
+  const { ctx, sink, client, personaId: personaId2, engine, instructions, engineSessionId, prepare } = args;
+  let conversationId = ctx.cloudConversationId ?? ctx.cloudExecutionId;
+  let closed = false;
+  let detached = false;
+  let exited = false;
+  let stopping = null;
+  const streams = /* @__PURE__ */ new Map();
+  const live = /* @__PURE__ */ new Set();
+  let submission = Promise.resolve();
+  const exit = () => {
+    if (!exited) {
+      exited = true;
+      sink.onExit(null);
+    }
+  };
+  const sendCommand = (turnId, command) => {
+    if (!conversationId || closed) return;
+    void client.commandTurn(personaId2, conversationId, turnId, command).catch((e) => sink.onError(`\u4E91\u4E0A\u547D\u4EE4\u5931\u8D25\uFF1A${e.message}`));
+  };
+  return {
+    startTurn(text, commandId = (0, import_node_crypto13.randomUUID)(), prepared = false) {
+      if (closed || live.has(commandId)) return;
+      conversationId ??= commandId;
+      live.add(commandId);
+      submission = submission.then(async () => {
+        try {
+          const portable = prepared ? text : await prepare(text);
+          if (closed || sink.onCommandPrepared?.(commandId, portable, prepared) === false) {
+            live.delete(commandId);
+            return;
+          }
+          const stream = await client.openTurn(personaId2, {
+            conversationId,
+            turnId: commandId,
+            text: portable,
+            expectedEngine: engine,
+            ...engine === "pi" ? { engineSessionId: engineSessionId ?? conversationId } : {},
+            ...instructions ? { instructions } : {},
+            ...ctx.effort ? { effort: ctx.effort } : {},
+            ...ctx.personaMode ? { personaMode: ctx.personaMode } : {}
+          });
+          if (closed) {
+            stream.close();
+            return;
+          }
+          streams.set(commandId, stream);
+          let resolveAccepted;
+          const accepted = new Promise((resolve9) => {
+            resolveAccepted = resolve9;
+          });
+          stream.onEvents((events) => sink.pushEvents(events));
+          stream.onHistoryGap(() => sink.onHistoryGap?.(false));
+          stream.onState((state) => {
+            resolveAccepted();
+            if (state.status === "inqueue") sink.pushEvents([{ kind: "meta-text", text: "\u5DF2\u6392\u961F\uFF0C\u4E0A\u4E00\u8F6E\u7ED3\u675F\u540E\u6267\u884C" }]);
+            if (state.status === "completed" || state.status === "failed" || state.status === "cancelled") {
+              live.delete(commandId);
+              streams.delete(commandId);
+              if (state.status === "completed" && state.threadId) sink.pushEvents([{ kind: "session_init", toolSessionId: state.threadId }]);
+              if (state.status === "failed") sink.pushEvents([{ kind: "error", message: `\u4E91\u4E0A\u6267\u884C\u5931\u8D25\uFF1A${state.errorCode ?? "TURN_FAILED"}` }]);
+              if (state.status === "failed" || state.status === "cancelled") sink.pushEvents([{ kind: "turn_end", reason: "interrupted" }]);
+              sink.onCloudTurnTerminal?.(commandId);
+            }
+          });
+          stream.onClose(() => {
+            resolveAccepted();
+            if (streams.get(commandId) === stream) streams.delete(commandId);
+          });
+          await accepted;
+        } catch (e) {
+          live.delete(commandId);
+          sink.onCloudTurnTerminal?.(commandId);
+          sink.onError(`\u8FDE\u4E0D\u4E0A\u4E91 gateway\uFF1A${e.message}`);
+        }
+      });
+    },
+    respondPermission(requestId, allow) {
+      const turnId = [...live][0];
+      if (turnId) sendCommand(turnId, { command: "permission", requestId, allow });
+    },
+    interrupt() {
+      const turnId = [...live][0];
+      if (turnId) sendCommand(turnId, { command: "interrupt" });
+    },
+    detach() {
+      detached = true;
+      closed = true;
+      for (const stream of streams.values()) stream.close();
+      streams.clear();
+    },
+    stop() {
+      if (stopping) return stopping;
+      closed = true;
+      for (const stream of streams.values()) stream.close();
+      streams.clear();
+      stopping = (async () => {
+        try {
+          if (!detached && conversationId) await client.cancelConversation(personaId2, conversationId);
+        } finally {
+          exit();
+        }
+      })();
+      return stopping;
+    }
+  };
+}
+
 // src/tools/codex-cloud-session.ts
 function cloudImageInput(deps) {
   return (url) => {
@@ -65521,7 +65836,18 @@ function cloudImageInput(deps) {
 }
 function createCloudCodexSession(ctx, sink, deps) {
   const personaId2 = personaIdFromCloudCwd(ctx.cwd);
-  const clientSessionId = ctx.titleOnly ? (0, import_node_crypto13.randomUUID)() : ctx.cloudExecutionId ?? ctx.env?.CLAWD_SESSION_ID;
+  if (personaId2 && !ctx.titleOnly && !ctx.cloudGatewaySessionId && !ctx.cloudLegacyPendingCommand && deps.client.openTurn && deps.client.commandTurn && deps.client.cancelConversation) {
+    return createCloudTurnSession({
+      ctx,
+      sink,
+      client: deps.client,
+      personaId: personaId2,
+      engine: "codex",
+      instructions: ctx.extraSystemPrompt,
+      prepare: (text) => portableCloudInput(text, { resolveCodexImage: cloudImageInput(deps) })
+    });
+  }
+  const clientSessionId = ctx.titleOnly ? (0, import_node_crypto14.randomUUID)() : ctx.cloudExecutionId ?? ctx.env?.CLAWD_SESSION_ID;
   let channel = null;
   let closed = false;
   let detached = false;
@@ -65595,7 +65921,7 @@ function createCloudCodexSession(ctx, sink, deps) {
     });
   };
   return {
-    startTurn(text, commandId = (0, import_node_crypto13.randomUUID)(), prepared = false) {
+    startTurn(text, commandId = (0, import_node_crypto14.randomUUID)(), prepared = false) {
       send2(async () => {
         const ch = await opened;
         if (closed) return;
@@ -65799,7 +66125,7 @@ var PiRpcClient = class {
 
 // src/tools/pi-session.ts
 var import_node_child_process11 = require("child_process");
-var import_node_crypto14 = require("crypto");
+var import_node_crypto15 = require("crypto");
 var import_node_fs41 = __toESM(require("fs"), 1);
 var import_node_path45 = __toESM(require("path"), 1);
 
@@ -66072,7 +66398,7 @@ ${dirs.map((d2) => `- ${d2}`).join("\n")}`;
 }
 function createPiSession(ctx, sink, deps = {}) {
   const cmd = process.env.PI_BIN ?? "pi";
-  const sessionId = ctx.toolSessionId ?? (0, import_node_crypto14.randomUUID)();
+  const sessionId = ctx.toolSessionId ?? (0, import_node_crypto15.randomUUID)();
   const skillsDir = import_node_path45.default.join(ctx.cwd, ".claude", "skills");
   const exists = deps.skillsDirExists ?? ((d2) => import_node_fs41.default.existsSync(d2));
   const args = buildPiArgs(ctx, {
@@ -66309,14 +66635,26 @@ var PiAdapter = class {
 };
 
 // src/tools/pi-cloud-session.ts
-var import_node_crypto15 = require("crypto");
+var import_node_crypto16 = require("crypto");
 function cloudPiInstructions(ctx) {
   return [ctx.extraSystemPrompt, workDirPrompt(CLOUD_WORKSPACE_SLOT, ctx.personaMode ?? "owner")].filter((x2) => Boolean(x2)).join("\n\n");
 }
 function createCloudPiSession(ctx, sink, deps) {
   const personaId2 = personaIdFromCloudCwd(ctx.cwd);
-  const clientSessionId = ctx.titleOnly ? (0, import_node_crypto15.randomUUID)() : ctx.cloudExecutionId ?? ctx.env?.CLAWD_SESSION_ID;
-  const sessionId = ctx.toolSessionId ?? (0, import_node_crypto15.randomUUID)();
+  if (personaId2 && !ctx.titleOnly && !ctx.cloudGatewaySessionId && !ctx.cloudLegacyPendingCommand && deps.client.openTurn && deps.client.commandTurn && deps.client.cancelConversation) {
+    return createCloudTurnSession({
+      ctx,
+      sink,
+      client: deps.client,
+      personaId: personaId2,
+      engine: "pi",
+      engineSessionId: ctx.toolSessionId,
+      instructions: cloudPiInstructions(ctx),
+      prepare: (text) => portableCloudInput(text, { fetchPiImage: deps.fetchImage ?? makeImageFetcher() })
+    });
+  }
+  const clientSessionId = ctx.titleOnly ? (0, import_node_crypto16.randomUUID)() : ctx.cloudExecutionId ?? ctx.env?.CLAWD_SESSION_ID;
+  const sessionId = ctx.toolSessionId ?? (0, import_node_crypto16.randomUUID)();
   let channel = null;
   let closed = false;
   let detached = false;
@@ -66380,7 +66718,7 @@ function createCloudPiSession(ctx, sink, deps) {
     });
   };
   return {
-    startTurn(text, commandId = (0, import_node_crypto15.randomUUID)(), prepared = false) {
+    startTurn(text, commandId = (0, import_node_crypto16.randomUUID)(), prepared = false) {
       send2(async () => {
         const ch = await opened;
         if (closed) return;
@@ -67499,7 +67837,7 @@ var wrapper_default = import_websocket.default;
 
 // src/transport/local-ws-server.ts
 var import_node_http = __toESM(require("http"), 1);
-var import_node_crypto16 = require("crypto");
+var import_node_crypto17 = require("crypto");
 var LocalWsServer = class {
   constructor(opts) {
     this.opts = opts;
@@ -67716,7 +68054,7 @@ var LocalWsServer = class {
     }
   }
   onConnection(socket, remoteAddress) {
-    const id = (0, import_node_crypto16.randomUUID)();
+    const id = (0, import_node_crypto17.randomUUID)();
     const subscribedSessions = /* @__PURE__ */ new Map();
     const handle = {
       id,
@@ -68681,7 +69019,7 @@ var import_node_path54 = __toESM(require("path"), 1);
 // src/attachment/upload.ts
 var import_node_fs48 = __toESM(require("fs"), 1);
 var import_node_path52 = __toESM(require("path"), 1);
-var import_node_crypto17 = __toESM(require("crypto"), 1);
+var import_node_crypto18 = __toESM(require("crypto"), 1);
 var import_promises8 = require("stream/promises");
 var UploadError = class extends Error {
   constructor(code, message) {
@@ -68705,11 +69043,11 @@ async function writeUploadedAttachment(args) {
   } catch (err) {
     throw new UploadError("STORAGE_ERROR", `mkdir failed: ${err.message}`);
   }
-  const hasher = import_node_crypto17.default.createHash("sha256");
+  const hasher = import_node_crypto18.default.createHash("sha256");
   let actualSize = 0;
   const tmpPath = import_node_path52.default.join(
     attachmentsRoot,
-    `.upload-${process.pid}-${Date.now()}-${import_node_crypto17.default.randomBytes(4).toString("hex")}`
+    `.upload-${process.pid}-${Date.now()}-${import_node_crypto18.default.randomBytes(4).toString("hex")}`
   );
   try {
     await (0, import_promises8.pipeline)(
@@ -69560,7 +69898,7 @@ function runAttachmentGc(args) {
 // src/attachment/group.ts
 var import_node_fs51 = __toESM(require("fs"), 1);
 var import_node_path56 = __toESM(require("path"), 1);
-var import_node_crypto18 = __toESM(require("crypto"), 1);
+var import_node_crypto19 = __toESM(require("crypto"), 1);
 init_protocol();
 var GroupFileStore = class {
   dataDir;
@@ -69649,7 +69987,7 @@ var GroupFileStore = class {
       entries[idx] = next;
     } else {
       next = {
-        id: `gf-${import_node_crypto18.default.randomBytes(6).toString("base64url")}`,
+        id: `gf-${import_node_crypto19.default.randomBytes(6).toString("base64url")}`,
         relPath: input.relPath,
         from: input.from,
         label: input.label,
@@ -69795,7 +70133,7 @@ function readSpawnedByDesktopFromEnv(env = process.env) {
 // src/tunnel/tunnel-manager.ts
 var import_node_fs56 = __toESM(require("fs"), 1);
 var import_node_path61 = __toESM(require("path"), 1);
-var import_node_crypto19 = __toESM(require("crypto"), 1);
+var import_node_crypto20 = __toESM(require("crypto"), 1);
 var import_node_child_process16 = require("child_process");
 
 // src/tunnel/tunnel-store.ts
@@ -70294,7 +70632,7 @@ var TunnelManager = class {
         override: this.deps.frpcBinaryOverride ?? void 0
       });
       const tomlPath = import_node_path61.default.join(this.deps.dataDir, "frpc.toml");
-      const proxyName = `clawd-${t2.subdomain}-${localPort}-${import_node_crypto19.default.randomBytes(3).toString("hex")}`;
+      const proxyName = `clawd-${t2.subdomain}-${localPort}-${import_node_crypto20.default.randomBytes(3).toString("hex")}`;
       const toml = buildFrpcToml({
         serverAddr: t2.frpsHost,
         serverPort: t2.frpsPort,
@@ -70395,7 +70733,7 @@ async function waitForFrpcReady(proc, timeoutMs) {
 // src/tunnel/device-key.ts
 var import_node_os22 = __toESM(require("os"), 1);
 var import_node_path62 = __toESM(require("path"), 1);
-var import_node_crypto20 = __toESM(require("crypto"), 1);
+var import_node_crypto21 = __toESM(require("crypto"), 1);
 var DERIVE_SALT = "clawd-tunnel-device-v1";
 function deriveStableDeviceKey(opts = {}) {
   const hostname = opts.hostname ?? import_node_os22.default.hostname();
@@ -70405,13 +70743,13 @@ function deriveStableDeviceKey(opts = {}) {
   const normalizedDataDir = opts.dataDir ? import_node_path62.default.resolve(opts.dataDir) : null;
   const isDefaultDir = normalizedDataDir == null || normalizedDataDir === defaultDataDir;
   const input = isDefaultDir ? `${hostname}::${uid}` : `${hostname}::${uid}::${normalizedDataDir}`;
-  return import_node_crypto20.default.createHmac("sha256", DERIVE_SALT).update(input).digest("hex").slice(0, 32);
+  return import_node_crypto21.default.createHmac("sha256", DERIVE_SALT).update(input).digest("hex").slice(0, 32);
 }
 
 // src/auth-store.ts
 var import_node_fs57 = __toESM(require("fs"), 1);
 var import_node_path63 = __toESM(require("path"), 1);
-var import_node_crypto21 = __toESM(require("crypto"), 1);
+var import_node_crypto22 = __toESM(require("crypto"), 1);
 var AUTH_FILE_NAME = "auth.json";
 function authFilePath(dataDir) {
   return import_node_path63.default.join(dataDir, AUTH_FILE_NAME);
@@ -70448,10 +70786,10 @@ function loadOrCreateTunnelDeviceKey(opts) {
   return tunnelDeviceKey;
 }
 function defaultGenerateToken() {
-  return import_node_crypto21.default.randomBytes(32).toString("base64url");
+  return import_node_crypto22.default.randomBytes(32).toString("base64url");
 }
 function defaultGenerateOwnerPrincipalId() {
-  return `owner-${import_node_crypto21.default.randomUUID()}`;
+  return `owner-${import_node_crypto22.default.randomUUID()}`;
 }
 function readAuthFile(file) {
   try {
@@ -70583,7 +70921,7 @@ var OwnerIdentityStore = class {
 };
 
 // src/feishu-auth/login-flow.ts
-var import_node_crypto22 = __toESM(require("crypto"), 1);
+var import_node_crypto23 = __toESM(require("crypto"), 1);
 var STATE_TTL_MS = 5 * 60 * 1e3;
 var LoginFlow = class {
   constructor(deps) {
@@ -70592,7 +70930,7 @@ var LoginFlow = class {
   deps;
   pendingStates = /* @__PURE__ */ new Map();
   start() {
-    const state = import_node_crypto22.default.randomBytes(16).toString("base64url");
+    const state = import_node_crypto23.default.randomBytes(16).toString("base64url");
     const now = (this.deps.now ?? Date.now)();
     this.pendingStates.set(state, now);
     this.gcExpired(now);
@@ -71123,7 +71461,7 @@ init_protocol();
 var import_node_fs60 = __toESM(require("fs"), 1);
 var import_node_os24 = __toESM(require("os"), 1);
 var import_node_path66 = __toESM(require("path"), 1);
-var import_node_crypto23 = require("crypto");
+var import_node_crypto24 = require("crypto");
 init_claude_history();
 function readJsonlEntries(file) {
   const raw = import_node_fs60.default.readFileSync(file, "utf8");
@@ -71160,7 +71498,7 @@ function forkSession(input) {
     throw new Error(`fork: messageUuid not found in transcript: ${input.messageUuid}`);
   }
   const sliced = mainEntries.slice(0, targetIdx + 1);
-  const forkedToolSessionId = (0, import_node_crypto23.randomUUID)();
+  const forkedToolSessionId = (0, import_node_crypto24.randomUUID)();
   let parentUuid = null;
   const forkedLines = [];
   for (const entry of sliced) {
@@ -73948,7 +74286,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.613".length > 0 ? "0.2.613" : "dev";
+var version = "0.2.614".length > 0 ? "0.2.614" : "dev";
 
 // src/cli-probe/probe.ts
 var fs84 = __toESM(require("fs"), 1);
@@ -74345,7 +74683,7 @@ init_protocol();
 // src/extension/bundle-zip.ts
 var import_promises12 = __toESM(require("fs/promises"), 1);
 var import_node_path74 = __toESM(require("path"), 1);
-var import_node_crypto24 = __toESM(require("crypto"), 1);
+var import_node_crypto25 = __toESM(require("crypto"), 1);
 var import_jszip2 = __toESM(require_lib3(), 1);
 async function bundleExtensionDir(dir) {
   const entries = await listFilesSorted(dir);
@@ -74360,7 +74698,7 @@ async function bundleExtensionDir(dir) {
     compression: "DEFLATE",
     compressionOptions: { level: 6 }
   });
-  const sha256 = import_node_crypto24.default.createHash("sha256").update(buffer).digest("hex");
+  const sha256 = import_node_crypto25.default.createHash("sha256").update(buffer).digest("hex");
   return { buffer, sha256 };
 }
 var FIXED_DATE = /* @__PURE__ */ new Date("2020-01-01T00:00:00.000Z");
@@ -74428,7 +74766,7 @@ function computePublishCheck(args) {
 var import_promises13 = __toESM(require("fs/promises"), 1);
 var import_node_path76 = __toESM(require("path"), 1);
 var import_node_os28 = __toESM(require("os"), 1);
-var import_node_crypto25 = __toESM(require("crypto"), 1);
+var import_node_crypto26 = __toESM(require("crypto"), 1);
 var import_jszip3 = __toESM(require_lib3(), 1);
 
 // src/extension/paths.ts
@@ -74457,7 +74795,7 @@ var InstallError = class extends Error {
 };
 async function installFromChannel(args, deps) {
   const { channelRef, snapshotHash, bundleZip } = args;
-  const computed = import_node_crypto25.default.createHash("sha256").update(bundleZip).digest("hex");
+  const computed = import_node_crypto26.default.createHash("sha256").update(bundleZip).digest("hex");
   if (computed !== snapshotHash) {
     throw new InstallError(
       "HASH_MISMATCH",
@@ -74549,7 +74887,7 @@ async function installFromChannel(args, deps) {
 var import_promises14 = __toESM(require("fs/promises"), 1);
 var import_node_path77 = __toESM(require("path"), 1);
 var import_node_os29 = __toESM(require("os"), 1);
-var import_node_crypto26 = __toESM(require("crypto"), 1);
+var import_node_crypto27 = __toESM(require("crypto"), 1);
 var import_jszip4 = __toESM(require_lib3(), 1);
 var UpdateError = class extends Error {
   constructor(code, message) {
@@ -74587,7 +74925,7 @@ async function updateFromChannel(args, deps) {
     if (e instanceof UpdateError) throw e;
     throw e;
   }
-  const computed = import_node_crypto26.default.createHash("sha256").update(bundleZip).digest("hex");
+  const computed = import_node_crypto27.default.createHash("sha256").update(bundleZip).digest("hex");
   if (computed !== snapshotHash) {
     throw new UpdateError(
       "HASH_MISMATCH",
@@ -75716,7 +76054,7 @@ async function uninstall(deps) {
 }
 
 // src/handlers/index.ts
-var import_node_crypto27 = require("crypto");
+var import_node_crypto28 = require("crypto");
 
 // src/handlers/peer-exec.ts
 init_protocol();
@@ -75873,7 +76211,7 @@ function buildMethodHandlers(deps) {
           const c2 = deps.contactStore.get(deviceId);
           return c2 ? { deviceId: c2.deviceId, remoteUrl: c2.remoteUrl, connectToken: c2.connectToken } : null;
         },
-        genId: () => (0, import_node_crypto27.randomUUID)(),
+        genId: () => (0, import_node_crypto28.randomUUID)(),
         now: () => Date.now(),
         forwardInboxPostToPeer,
         logger: deps.logger
@@ -76606,7 +76944,7 @@ async function startDaemon(config) {
   const channelStore = createChannelStore({
     filePath: import_node_path85.default.join(config.dataDir, "channels.json"),
     now: () => Date.now(),
-    genId: () => `ch-${(0, import_node_crypto28.randomUUID)().slice(0, 8)}`,
+    genId: () => `ch-${(0, import_node_crypto29.randomUUID)().slice(0, 8)}`,
     onFlushError: (err) => logger.error("channel store flush failed", {
       reason: err instanceof Error ? err.message : String(err)
     })
@@ -76615,7 +76953,7 @@ async function startDaemon(config) {
   const topicStore = createTopicStore({
     filePath: import_node_path85.default.join(config.dataDir, "topics.json"),
     now: () => Date.now(),
-    genId: () => `tp-${(0, import_node_crypto28.randomUUID)().slice(0, 8)}`,
+    genId: () => `tp-${(0, import_node_crypto29.randomUUID)().slice(0, 8)}`,
     onFlushError: (err) => logger.error("topic store flush failed", {
       reason: err instanceof Error ? err.message : String(err)
     })
@@ -76623,7 +76961,7 @@ async function startDaemon(config) {
   await topicStore.load();
   let deliverPendingRef;
   const personaDispatchManager = new PersonaDispatchManager({
-    genId: () => (0, import_node_crypto28.randomUUID)(),
+    genId: () => (0, import_node_crypto29.randomUUID)(),
     store: dispatchStore,
     now: () => Date.now(),
     onCompleted: (sid) => deliverPendingRef?.(sid),
@@ -77047,6 +77385,11 @@ async function startDaemon(config) {
   manager.setCloudCanceller(async (file, runner) => {
     const personaId2 = personaIdFromCloudCwd(file.cwd);
     if (!personaId2) throw new Error(`\u4E91\u4F1A\u8BDD ${file.sessionId} \u7F3A\u5C11 gateway persona ID`);
+    if (file.cloudConversationId) {
+      await cloudGateway.cancelConversation(personaId2, file.cloudConversationId);
+      runner?.confirmCloudCancelled();
+      return;
+    }
     const executionId = file.cloudExecutionId ?? file.sessionId;
     if (!file.cloudGatewaySessionId) throw new Error(`\u4E91\u4F1A\u8BDD ${file.sessionId} \u5C1A\u672A\u6536\u5230 gateway ready`);
     cloudCancelOutbox.record(executionId, personaId2, file.cloudGatewaySessionId);