@clawos-dev/clawd 0.2.736 → 0.2.738

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

@@ -33107,8 +33107,6 @@ var SessionFileSchema = external_exports.object({
   cloudExpectedImage: ImageDigestSchema.optional(),
   testReleaseId: external_exports.string().optional(),
   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(),
   cloudWorkspace: WorkspaceBindingSchema.optional(),
@@ -33116,10 +33114,6 @@ var SessionFileSchema = external_exports.object({
   cloudPendingTurns: external_exports.array(external_exports.object({ id: external_exports.string().min(1), text: external_exports.string(), prepared: external_exports.boolean().optional() })).optional(),
   /** 用户在前端选的、尚未由 agent 执行的分支；下一条 query 发出时作为上下文注入，被网关接受后清除。 */
   cloudBranchIntent: WorkspaceBranchSchema.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. */
-  cloudPendingCommand: external_exports.object({ id: external_exports.string().min(1), text: external_exports.string(), prepared: external_exports.boolean().optional() }).optional(),
   cwd: external_exports.string().min(1),
   tool: external_exports.literal("claude").or(external_exports.string().min(1)).default("claude"),
   toolSessionId: external_exports.string().optional(),

package/dist/cli.cjs

@@ -8334,8 +8334,6 @@ var init_schemas = __esm({
       cloudExpectedImage: ImageDigestSchema.optional(),
       testReleaseId: external_exports.string().optional(),
       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(),
       cloudWorkspace: WorkspaceBindingSchema.optional(),
@@ -8343,10 +8341,6 @@ var init_schemas = __esm({
       cloudPendingTurns: external_exports.array(external_exports.object({ id: external_exports.string().min(1), text: external_exports.string(), prepared: external_exports.boolean().optional() })).optional(),
       /** 用户在前端选的、尚未由 agent 执行的分支；下一条 query 发出时作为上下文注入，被网关接受后清除。 */
       cloudBranchIntent: WorkspaceBranchSchema.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. */
-      cloudPendingCommand: external_exports.object({ id: external_exports.string().min(1), text: external_exports.string(), prepared: external_exports.boolean().optional() }).optional(),
       cwd: external_exports.string().min(1),
       tool: external_exports.literal("claude").or(external_exports.string().min(1)).default("claude"),
       toolSessionId: external_exports.string().optional(),
@@ -48094,7 +48088,7 @@ function clearQueuedSends(next, effects) {
 function ensureDeliverable(next, deps) {
   const effects = [];
   const sessionId = next.file.sessionId;
-  if (next.status === "running-idle" || next.status === "error" && next.procAlive && isCloudTool(next.file.tool) && !next.file.cloudGatewaySessionId && !next.file.cloudPendingCommand) {
+  if (next.status === "running-idle" || next.status === "error" && next.procAlive && isCloudTool(next.file.tool)) {
     effects.push({ kind: "cancel-idle-kill", sessionId });
     next.status = next.procAlive ? "running" : "idle";
     if (next.procAlive) {
@@ -48146,7 +48140,8 @@ function deliverUserText(next, args, deps) {
   } else {
     effects.push({
       kind: "write-stdin",
-      payload: deps.encodeStdin(args.text, { sessionId: next.file.sessionId })
+      payload: deps.encodeStdin(args.text, { sessionId: next.file.sessionId }),
+      ...userEvent.uuid ? { userMessageId: userEvent.uuid } : {}
     });
   }
   return effects;
@@ -48201,14 +48196,11 @@ function buildSpawnContext(state, deps) {
   const mcpConfigs = deps.getMcpConfigs?.() ?? [];
   const ctx = {
     cwd: file.cwd,
-    cloudExecutionId: file.cloudExecutionId,
     ...file.cloudWorkspace ? { cloudWorkspace: file.cloudWorkspace } : {},
     ...file.cloudEnvironment ? { cloudEnvironment: file.cloudEnvironment } : {},
     ...file.cloudExpectedImage ? { cloudExpectedImage: file.cloudExpectedImage } : {},
     ...file.testReleaseId ? { testReleaseId: file.testReleaseId } : {},
     ...file.cloudConversationId ? { cloudConversationId: file.cloudConversationId } : {},
-    ...file.cloudPendingCommand && !file.cloudPendingTurns ? { cloudLegacyPendingCommand: true } : {},
-    cloudGatewaySessionId: file.cloudGatewaySessionId,
     toolSessionId: file.toolSessionId,
     model: file.model,
     permissionMode: file.permissionMode,
@@ -48459,17 +48451,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);
+    const cloudPerTurn = isCloudTool(next.file.tool);
     next.file = {
       ...next.file,
       updatedAt: nowIso(deps),
       // Only a local send carries `sender`. A user_text echoed by the engine stream (skill hint, interrupt marker) has no
       // turn stream of its own, so recording it would leave a pending turn that startup recovery replays to the Pod.
       ...cloudPerTurn && isUserText && withSeq.sender && next.status !== "error" ? {
-        cloudConversationId: next.file.cloudConversationId ?? next.file.cloudExecutionId ?? cloudTurnId,
+        cloudConversationId: next.file.cloudConversationId ?? 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));
@@ -48534,7 +48525,7 @@ function applyCommand(state, command, deps) {
   const sessionId = next.file.sessionId;
   switch (command.kind) {
     case "send": {
-      if (command.queueWhileRunning && !(isCloudTool(next.file.tool) && !next.file.cloudGatewaySessionId) && (next.status === "running" || next.status === "spawning")) {
+      if (command.queueWhileRunning && !isCloudTool(next.file.tool) && (next.status === "running" || next.status === "spawning")) {
         next.queuedSends = [
           ...next.queuedSends,
           {
@@ -48585,8 +48576,8 @@ function applyCommand(state, command, deps) {
       return { state: next, effects };
     }
     case "stop": {
-      if (isCloudTool(next.file.tool) && (next.file.cloudPendingCommand || next.file.cloudPendingTurns?.length)) {
-        next.file = { ...next.file, cloudPendingCommand: void 0, cloudPendingTurns: void 0 };
+      if (isCloudTool(next.file.tool) && next.file.cloudPendingTurns?.length) {
+        next.file = { ...next.file, cloudPendingTurns: void 0 };
         effects.push({ kind: "persist-file", file: next.file }, sessionInfoFrame(next.file));
       }
       for (const toolUseId of Object.keys(state.pendingQuestions ?? {})) {
@@ -48722,11 +48713,10 @@ function applyCommand(state, command, deps) {
     case "new": {
       const {
         toolSessionId: _drop,
-        cloudPendingCommand: _cloudPendingCommand,
-        cloudGatewaySessionId: _cloudGatewaySessionId,
         cloudConversationId: _cloudConversationId,
         cloudPendingTurns: _cloudPendingTurns,
-        cloudExecutionId: _cloudExecutionId,
+        cloudWorkspace: _cloudWorkspace,
+        cloudBranchIntent: _cloudBranchIntent,
         contextUsage: _ctx,
         contextWindowSize: _win,
         gitBranch: _branch,
@@ -48737,11 +48727,10 @@ function applyCommand(state, command, deps) {
         ...rest
       } = next.file;
       void _drop;
-      void _cloudPendingCommand;
-      void _cloudGatewaySessionId;
       void _cloudConversationId;
       void _cloudPendingTurns;
-      void _cloudExecutionId;
+      void _cloudWorkspace;
+      void _cloudBranchIntent;
       void _ctx;
       void _win;
       void _branch;
@@ -48751,6 +48740,7 @@ function applyCommand(state, command, deps) {
       const nextFile = {
         ...rest,
         ...command.nextToolSessionId ? { toolSessionId: command.nextToolSessionId } : {},
+        ...command.nextCloudConversationId ? { cloudConversationId: command.nextCloudConversationId } : {},
         updatedAt: nowIso(deps)
       };
       next.file = nextFile;
@@ -48821,12 +48811,6 @@ 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;
@@ -49382,8 +49366,6 @@ var SessionRunner = class {
     this.recoveringCloud = true;
     try {
       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 ?? []) {
         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);
@@ -49614,7 +49596,7 @@ var SessionRunner = class {
       }
       case "write-stdin":
         if (this.session) {
-          this.session.startTurn(effect.payload, this.state.file.cloudPendingTurns?.at(-1)?.id ?? this.state.file.cloudPendingCommand?.id);
+          this.session.startTurn(effect.payload, this.state.file.cloudPendingTurns?.at(-1)?.id, void 0, effect.userMessageId);
           break;
         }
         this.hooks.logger?.debug("[RG] write-stdin", {
@@ -49773,11 +49755,9 @@ var SessionRunner = class {
         },
         onCommandPrepared: (commandId, text, prepared) => {
           if (!isCurrent()) return false;
-          const pending = this.state.file.cloudPendingTurns?.find((turn) => turn.id === commandId) ?? this.state.file.cloudPendingCommand;
+          const pending = this.state.file.cloudPendingTurns?.find((turn) => turn.id === commandId);
           if (!pending || pending.id !== commandId) return false;
-          if (!prepared && pending !== this.state.file.cloudPendingCommand) {
-            this.hooks.store.writeCloudPayload(this.state.file.sessionId, commandId, text);
-          }
+          if (!prepared) this.hooks.store.writeCloudPayload(this.state.file.sessionId, commandId, text);
           return true;
         },
         onCloudTurnTerminal: (turnId) => {
@@ -49984,7 +49964,7 @@ var SessionManager = class {
    * 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);
+    const inFlight = file.cloudConversationId && file.cloudPendingTurns?.length;
     if (!inFlight) {
       runner?.confirmCloudCancelled();
       return;
@@ -50991,7 +50971,7 @@ var SessionManager = class {
     const runner = this.runners.get(args.sessionId);
     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 });
+      if (file && isCloudTool(file.tool) && file.cloudPendingTurns?.length) this.writeOwned({ ...file, cloudPendingTurns: void 0 });
       return { response: { ok: true }, broadcast: [] };
     }
     this.clearPendingTurnEnd(args.sessionId);
@@ -51132,11 +51112,7 @@ var SessionManager = class {
   }
   newSession(args) {
     const existingFile = this.getFile(args.sessionId);
-    if (existingFile.cloudWorkspace)
-      throw new ClawdError(
-        ERROR_CODES.VALIDATION_ERROR,
-        "\u6B64\u4F1A\u8BDD\u5DF2\u7ED1\u5B9A\u5DE5\u4F5C\u533A\uFF0C\u8BF7\u65B0\u5EFA\u4F1A\u8BDD\u4EE5\u5F00\u59CB\u72EC\u7ACB\u73B0\u573A"
-      );
+    const nextCloudConversationId = isCloudTool(existingFile.tool) ? (0, import_node_crypto6.randomUUID)() : void 0;
     this.titleGenPending.get(args.sessionId)?.abort();
     this.titleGenPending.delete(args.sessionId);
     const nextToolSessionId = this.deps.mode === "tui" && (existingFile.tool ?? "claude") === "claude" ? (0, import_node_crypto6.randomUUID)() : void 0;
@@ -51146,7 +51122,11 @@ var SessionManager = class {
       const { value, broadcast } = this.withCollector(() => {
         runner.input({
           kind: "command",
-          command: { kind: "new", ...nextToolSessionId ? { nextToolSessionId } : {} }
+          command: {
+            kind: "new",
+            ...nextToolSessionId ? { nextToolSessionId } : {},
+            ...nextCloudConversationId ? { nextCloudConversationId } : {}
+          }
         });
         return runner.getState().file;
       });
@@ -51155,11 +51135,10 @@ var SessionManager = class {
     const existing = this.findOwnedSession(args.sessionId);
     const {
       toolSessionId: _drop,
-      cloudPendingCommand: _cloudPendingCommand,
-      cloudGatewaySessionId: _cloudGatewaySessionId,
       cloudConversationId: _cloudConversationId,
       cloudPendingTurns: _cloudPendingTurns,
-      cloudExecutionId: _cloudExecutionId,
+      cloudWorkspace: _cloudWorkspace,
+      cloudBranchIntent: _cloudBranchIntent,
       contextUsage: _ctx,
       contextWindowSize: _win,
       gitBranch: _branch,
@@ -51169,11 +51148,10 @@ var SessionManager = class {
       ...rest
     } = existing;
     void _drop;
-    void _cloudPendingCommand;
-    void _cloudGatewaySessionId;
     void _cloudConversationId;
     void _cloudPendingTurns;
-    void _cloudExecutionId;
+    void _cloudWorkspace;
+    void _cloudBranchIntent;
     void _ctx;
     void _win;
     void _branch;
@@ -51183,17 +51161,13 @@ var SessionManager = class {
     const updated = {
       ...rest,
       ...nextToolSessionId ? { toolSessionId: nextToolSessionId } : {},
+      ...nextCloudConversationId ? { cloudConversationId: nextCloudConversationId } : {},
       updatedAt: nowIso2(this.deps)
     };
     return { response: this.writeOwned(updated), broadcast: [] };
   }
   async newSessionWithCloudCancel(args) {
     const file = this.getFile(args.sessionId);
-    if (file.cloudWorkspace)
-      throw new ClawdError(
-        ERROR_CODES.VALIDATION_ERROR,
-        "\u6B64\u4F1A\u8BDD\u5DF2\u7ED1\u5B9A\u5DE5\u4F5C\u533A\uFF0C\u8BF7\u65B0\u5EFA\u4F1A\u8BDD\u4EE5\u5F00\u59CB\u72EC\u7ACB\u73B0\u573A"
-      );
     if (isCloudTool(file.tool)) {
       await this.cancelCloudTurns(file, this.runners.get(args.sessionId) ?? null);
       return this.newSession(args);
@@ -51272,7 +51246,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 && !file.cloudPendingTurns?.length) continue;
+      if (!isCloudTool(file.tool) || !file.cloudPendingTurns?.length) continue;
       const runner = this.ensureSession(file);
       runner.recoverCloud();
     }
@@ -54991,7 +54965,7 @@ function driveCodexThread(opts) {
     }
   })().catch((e) => sink.onError(`codex app-server init failed: ${e.message}`));
   const session = {
-    startTurn(text) {
+    startTurn(text, _commandId, _prepared, userMessageId) {
       const trace = opts.onTurnTrace?.();
       trace?.("native.ready.waiting");
       const model = opts.turnModel?.();
@@ -55009,6 +54983,7 @@ function driveCodexThread(opts) {
           void client.request("turn/start", {
             threadId,
             input: turnStartInput(text, opts.imageInput),
+            ...userMessageId ? { clientUserMessageId: userMessageId } : {},
             // Wire field is effort (v2 already used it before 0.138); unknown reasoningEffort is silently ignored.
             ...effort ? { effort } : {},
             ...model ? { model } : {}
@@ -67532,7 +67507,7 @@ function withBranchIntent(text, branch) {
 }
 function createCloudTurnSession(args) {
   const { ctx, sink, client, personaId: personaId2, engine, instructions, engineSessionId, prepare } = args;
-  let conversationId = ctx.cloudConversationId ?? ctx.cloudExecutionId;
+  let conversationId = ctx.cloudConversationId;
   let closed = false;
   let detached = false;
   let exited = false;
@@ -67678,9 +67653,9 @@ function cloudImageInput(deps) {
 }
 function createCloudCodexSession(ctx, sink, deps) {
   const personaId2 = personaIdFromCloudCwd(ctx.cwd);
-  if (!personaId2 || ctx.cloudGatewaySessionId || ctx.cloudLegacyPendingCommand) {
+  if (!personaId2) {
     queueMicrotask(() => {
-      sink.onError(personaId2 ? "\u65E7\u4E91\u4F1A\u8BDD\u534F\u8BAE\u5DF2\u505C\u7528\uFF0C\u8BF7\u5347\u7EA7\u5BA2\u6237\u7AEF\u5E76\u65B0\u5F00\u4F1A\u8BDD" : "cloud session is missing persona id");
+      sink.onError("cloud session is missing persona id");
       sink.onExit(null);
     });
     return { startTurn() {
@@ -68421,9 +68396,9 @@ var PiAdapter = class {
 // src/tools/pi-cloud-session.ts
 function createCloudPiSession(ctx, sink, deps) {
   const personaId2 = personaIdFromCloudCwd(ctx.cwd);
-  if (!personaId2 || ctx.cloudGatewaySessionId || ctx.cloudLegacyPendingCommand) {
+  if (!personaId2) {
     queueMicrotask(() => {
-      sink.onError(personaId2 ? "\u65E7\u4E91\u4F1A\u8BDD\u534F\u8BAE\u5DF2\u505C\u7528\uFF0C\u8BF7\u5347\u7EA7\u5BA2\u6237\u7AEF\u5E76\u65B0\u5F00\u4F1A\u8BDD" : "cloud session is missing persona id");
+      sink.onError("cloud session is missing persona id");
       sink.onExit(null);
     });
     return { startTurn() {
@@ -68514,9 +68489,9 @@ init_protocol();
 // src/tools/claude-cloud-session.ts
 function createCloudClaudeSession(ctx, sink, deps) {
   const personaId2 = personaIdFromCloudCwd(ctx.cwd);
-  if (!personaId2 || ctx.cloudGatewaySessionId || ctx.cloudLegacyPendingCommand) {
+  if (!personaId2) {
     queueMicrotask(() => {
-      sink.onError(personaId2 ? "\u65E7\u4E91\u4F1A\u8BDD\u534F\u8BAE\u5DF2\u505C\u7528\uFF0C\u8BF7\u5347\u7EA7\u5BA2\u6237\u7AEF\u5E76\u65B0\u5F00\u4F1A\u8BDD" : "cloud session is missing persona id");
+      sink.onError("cloud session is missing persona id");
       sink.onExit(null);
     });
     return { startTurn() {
@@ -73733,7 +73708,7 @@ function buildSessionHandlers(deps) {
     if (engine === "claude" ? !("messageUuid" in forkAt) : !("turnId" in forkAt)) {
       throw new ClawdError(ERROR_CODES.VALIDATION_ERROR, `fork: ${source.tool} needs ${engine === "claude" ? "messageUuid" : "turnId"}`);
     }
-    const sourceConversationId = source.cloudConversationId ?? source.cloudExecutionId;
+    const sourceConversationId = source.cloudConversationId;
     if (!source.toolSessionId || !sourceConversationId) throw new ClawdError(ERROR_CODES.VALIDATION_ERROR, "fork: \u6E90\u4F1A\u8BDD\u8FD8\u6CA1\u6709\u4E91\u7AEF\u5386\u53F2");
     if (source.cloudPendingTurns?.length) throw new ClawdError(ERROR_CODES.VALIDATION_ERROR, "fork: \u8BF7\u7B49\u5F85\u6E90\u4F1A\u8BDD\u5F53\u524D\u4EFB\u52A1\u5B8C\u6210");
     const sessionId = newSessionId();
@@ -75901,7 +75876,7 @@ function buildCloudWorkspaceHandlers(deps) {
         deps.status(file.sessionId)
       ) || file.cloudPendingTurns?.length))
         throw new ClawdError(ERROR_CODES.VALIDATION_ERROR, "\u8BF7\u7B49\u5F85\u5F53\u524D\u4EFB\u52A1\u5B8C\u6210");
-      const conversationId = file.cloudConversationId ?? file.cloudExecutionId ?? file.sessionId;
+      const conversationId = file.cloudConversationId ?? file.sessionId;
       const traceId = typeof frame.requestId === "string" && /^[A-Za-z0-9:_-]{1,128}$/.test(frame.requestId) ? frame.requestId : (0, import_node_crypto29.randomUUID)();
       const started = performance.now();
       const meta = { traceId, sessionId: args.sessionId, action: args.action };
@@ -75918,7 +75893,7 @@ function buildCloudWorkspaceHandlers(deps) {
           await deps.command(file, {
             ...args,
             traceId,
-            workspaceId: file.cloudWorkspace?.workspaceId ?? file.sessionId,
+            workspaceId: file.cloudWorkspace?.workspaceId ?? conversationId,
             conversationId,
             ...file.toolSessionId ? { threadId: file.toolSessionId } : {}
           })
@@ -76262,7 +76237,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.736".length > 0 ? "0.2.736" : "dev";
+var version = "0.2.738".length > 0 ? "0.2.738" : "dev";
 
 // src/cli-probe/probe.ts
 var fs87 = __toESM(require("fs"), 1);