@clawos-dev/clawd 0.2.682 → 0.2.684

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

@@ -31064,12 +31064,6 @@ var WorkspaceRepoSchema = external_exports.object({
   private: external_exports.boolean(),
   description: external_exports.string().nullable()
 });
-var WorkspacePrSchema = external_exports.object({
-  number: external_exports.number().int().positive(),
-  url: external_exports.string().url().refine((u) => new URL(u).origin === "https://github.com"),
-  base: external_exports.string(),
-  head: external_exports.string()
-});
 var WorkspaceStatusSchema = WorkspaceBindingSchema.extend({
   initialCommit: external_exports.string(),
   head: external_exports.string(),
@@ -31094,10 +31088,7 @@ var WorkspaceStatusSchema = WorkspaceBindingSchema.extend({
   dirty: external_exports.boolean(),
   conflicted: external_exports.boolean(),
   version: external_exports.string(),
-  measuredAt: external_exports.number(),
-  pendingPublication: external_exports.object({ operationId: Id, expectedVersion: external_exports.string(), stage: external_exports.string() }).optional(),
-  pr: WorkspacePrSchema.nullable().optional(),
-  savedAt: external_exports.number().nullable().optional()
+  measuredAt: external_exports.number()
 });
 var Session = external_exports.object({ sessionId: Id });
 var CloudWorkspaceArgsSchema = external_exports.discriminatedUnion("action", [
@@ -31117,17 +31108,12 @@ var CloudWorkspaceArgsSchema = external_exports.discriminatedUnion("action", [
     branch: WorkspaceBranchSchema
   }).strict(),
   Session.extend({ action: external_exports.literal("status") }).strict(),
+  // 只记「待切换分支」意图，不碰网关；branch 缺省 = 清除意图
   Session.extend({
-    action: external_exports.literal("switch"),
-    branch: WorkspaceBranchSchema,
-    create: external_exports.boolean().optional()
+    action: external_exports.literal("intend"),
+    branch: WorkspaceBranchSchema.optional()
   }).strict(),
-  Session.extend({ action: external_exports.literal("diff"), filePath: FilePath }).strict(),
-  Session.extend({
-    action: external_exports.literal("publish"),
-    operationId: Id,
-    expectedVersion: external_exports.string().min(1).max(128)
-  }).strict()
+  Session.extend({ action: external_exports.literal("diff"), filePath: FilePath }).strict()
 ]);
 var CloudWorkspaceResultSchema = external_exports.object({
   binding: WorkspaceBindingSchema.nullable().optional(),
@@ -31135,14 +31121,13 @@ var CloudWorkspaceResultSchema = external_exports.object({
   repositories: external_exports.array(WorkspaceRepoSchema).optional(),
   branches: external_exports.array(external_exports.string()).optional(),
   hasMore: external_exports.boolean().optional(),
-  cache: external_exports.enum(["warm", "cold"]).optional(),
   diff: external_exports.object({
     path: FilePath,
     patch: external_exports.string(),
     binary: external_exports.boolean(),
-    truncated: external_exports.boolean()
-  }).optional(),
-  pr: WorkspacePrSchema.optional()
+    truncated: external_exports.boolean(),
+    notStored: external_exports.boolean().optional()
+  }).optional()
 });
 
 // ../protocol/src/subscription-channel.ts
@@ -33094,6 +33079,8 @@ var SessionFileSchema = external_exports.object({
   cloudWorkspace: WorkspaceBindingSchema.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(),
+  /** 用户在前端选的、尚未由 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. */

package/dist/cli.cjs

@@ -4150,7 +4150,7 @@ var init_zod = __esm({
 });
 
 // ../protocol/src/cloud-workspace-schemas.ts
-var WORKSPACE_COMPARISON_VALUES, Id, RepoId, Part, WorkspaceBranchSchema, FilePath, WorkspaceBindingSchema, WorkspaceRepoSchema, WorkspacePrSchema, WorkspaceStatusSchema, Session, CloudWorkspaceArgsSchema, CloudWorkspaceResultSchema;
+var WORKSPACE_COMPARISON_VALUES, Id, RepoId, Part, WorkspaceBranchSchema, FilePath, WorkspaceBindingSchema, WorkspaceRepoSchema, WorkspaceStatusSchema, Session, CloudWorkspaceArgsSchema, CloudWorkspaceResultSchema;
 var init_cloud_workspace_schemas = __esm({
   "../protocol/src/cloud-workspace-schemas.ts"() {
     "use strict";
@@ -4182,12 +4182,6 @@ var init_cloud_workspace_schemas = __esm({
       private: external_exports.boolean(),
       description: external_exports.string().nullable()
     });
-    WorkspacePrSchema = external_exports.object({
-      number: external_exports.number().int().positive(),
-      url: external_exports.string().url().refine((u2) => new URL(u2).origin === "https://github.com"),
-      base: external_exports.string(),
-      head: external_exports.string()
-    });
     WorkspaceStatusSchema = WorkspaceBindingSchema.extend({
       initialCommit: external_exports.string(),
       head: external_exports.string(),
@@ -4212,10 +4206,7 @@ var init_cloud_workspace_schemas = __esm({
       dirty: external_exports.boolean(),
       conflicted: external_exports.boolean(),
       version: external_exports.string(),
-      measuredAt: external_exports.number(),
-      pendingPublication: external_exports.object({ operationId: Id, expectedVersion: external_exports.string(), stage: external_exports.string() }).optional(),
-      pr: WorkspacePrSchema.nullable().optional(),
-      savedAt: external_exports.number().nullable().optional()
+      measuredAt: external_exports.number()
     });
     Session = external_exports.object({ sessionId: Id });
     CloudWorkspaceArgsSchema = external_exports.discriminatedUnion("action", [
@@ -4235,17 +4226,12 @@ var init_cloud_workspace_schemas = __esm({
         branch: WorkspaceBranchSchema
       }).strict(),
       Session.extend({ action: external_exports.literal("status") }).strict(),
+      // 只记「待切换分支」意图，不碰网关；branch 缺省 = 清除意图
       Session.extend({
-        action: external_exports.literal("switch"),
-        branch: WorkspaceBranchSchema,
-        create: external_exports.boolean().optional()
+        action: external_exports.literal("intend"),
+        branch: WorkspaceBranchSchema.optional()
       }).strict(),
-      Session.extend({ action: external_exports.literal("diff"), filePath: FilePath }).strict(),
-      Session.extend({
-        action: external_exports.literal("publish"),
-        operationId: Id,
-        expectedVersion: external_exports.string().min(1).max(128)
-      }).strict()
+      Session.extend({ action: external_exports.literal("diff"), filePath: FilePath }).strict()
     ]);
     CloudWorkspaceResultSchema = external_exports.object({
       binding: WorkspaceBindingSchema.nullable().optional(),
@@ -4253,14 +4239,13 @@ var init_cloud_workspace_schemas = __esm({
       repositories: external_exports.array(WorkspaceRepoSchema).optional(),
       branches: external_exports.array(external_exports.string()).optional(),
       hasMore: external_exports.boolean().optional(),
-      cache: external_exports.enum(["warm", "cold"]).optional(),
       diff: external_exports.object({
         path: FilePath,
         patch: external_exports.string(),
         binary: external_exports.boolean(),
-        truncated: external_exports.boolean()
-      }).optional(),
-      pr: WorkspacePrSchema.optional()
+        truncated: external_exports.boolean(),
+        notStored: external_exports.boolean().optional()
+      }).optional()
     });
   }
 });
@@ -8303,6 +8288,8 @@ var init_schemas = __esm({
       cloudWorkspace: WorkspaceBindingSchema.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(),
+      /** 用户在前端选的、尚未由 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. */
@@ -48439,7 +48426,7 @@ var RUNTIME_PATCH_KEYS = [
   "effort",
   "cwd"
 ];
-var MARKER_PATCH_KEYS = ["pinnedAt", "pinSortOrder", "unreadAt", "archivedAt"];
+var MARKER_PATCH_KEYS = ["pinnedAt", "pinSortOrder", "unreadAt", "archivedAt", "cloudBranchIntent"];
 function isMarkerOnlyPatch(patch) {
   const keys = Object.keys(patch).filter(
     (k3) => patch[k3] !== void 0
@@ -49158,6 +49145,14 @@ function encodeAllowWithInputControlResponse(requestId, updatedInput) {
 }
 var DEFAULT_WAIT_STOP_TIMEOUT_MS = 3e3;
 var SUBAGENT_ACTIVE_WINDOW_MS = 3e5;
+function latestTurnId(state) {
+  for (let index = state.buffer.length - 1; index >= 0; index--) {
+    const event = state.buffer[index].event;
+    if (event.turnId) return event.turnId;
+    if (event.kind === "user_text") return void 0;
+  }
+  return void 0;
+}
 var SessionRunner = class {
   constructor(initial, hooks) {
     this.hooks = hooks;
@@ -49410,20 +49405,11 @@ var SessionRunner = class {
   }
   lifecycleMetadata() {
     const state = this.state;
-    let turnId;
-    for (let index = state.buffer.length - 1; index >= 0; index--) {
-      const event = state.buffer[index].event;
-      if (event.turnId) {
-        turnId = event.turnId;
-        break;
-      }
-      if (event.kind === "user_text") break;
-    }
     return {
       sessionId: state.file.sessionId,
       tool: state.file.tool,
       toolSessionId: state.file.toolSessionId,
-      turnId,
+      turnId: latestTurnId(state),
       status: state.status,
       turnOpen: state.turnOpen,
       procAlive: state.procAlive
@@ -49621,6 +49607,11 @@ var SessionRunner = class {
         },
         onCloudTurnTerminal: (turnId) => {
           if (isCurrent()) this.input({ kind: "cloud-turn-terminal", turnId });
+        },
+        pendingBranchIntent: () => this.state.file.cloudBranchIntent,
+        onBranchIntentDelivered: (branch) => {
+          if (isCurrent() && this.state.file.cloudBranchIntent === branch)
+            this.input({ kind: "command", command: { kind: "update", patch: { cloudBranchIntent: void 0 } } });
         }
       });
       if (isCurrent()) this.session = session;
@@ -50513,7 +50504,7 @@ var SessionManager = class {
       });
       return { response: value, broadcast };
     }
-    const updated = { ...existing, ...args.patch, updatedAt: nowIso2(this.deps) };
+    const updated = isMarkerOnlyPatch(args.patch) ? { ...existing, ...args.patch } : { ...existing, ...args.patch, updatedAt: nowIso2(this.deps) };
     if (args.patch.model !== void 0) {
       delete updated.resolvedModel;
       delete updated.resolvedEffort;
@@ -50760,6 +50751,11 @@ var SessionManager = class {
     const runner = this.runners.get(sessionId);
     return runner?.getState() ?? null;
   }
+  /** Native id of the turn this daemon is running right now; null when no foreground turn is open. */
+  openTurnId(sessionId) {
+    const state = this.runners.get(sessionId)?.getState();
+    return state?.turnOpen ? latestTurnId(state) ?? null : null;
+  }
   // 等真实 proc-exit 再 ack，避免调用方开始删除 worktree 时进程仍持文件锁；超时向上报错。
   async stop(args) {
     const file = this.findOwnedSession(args.sessionId);
@@ -66809,6 +66805,11 @@ async function portableCloudInput(text, resolvers) {
 
 // src/tools/cloud-turn-session.ts
 var import_node_crypto16 = require("crypto");
+function withBranchIntent(text, branch) {
+  return `${text}
+
+<system-reminder>\u7528\u6237\u5728\u754C\u9762\u4E0A\u9009\u62E9\u4E86\u5206\u652F ${branch}\uFF0C\u5E0C\u671B\u672C\u4F1A\u8BDD\u5DE5\u4F5C\u5728\u8BE5\u5206\u652F\u4E0A\u3002\u5F00\u59CB\u5904\u7406\u672C\u6761\u6D88\u606F\u524D\uFF0C\u8BF7\u5148\u5207\u6362\u5230 ${branch}\uFF08\u672C\u5730\u6CA1\u6709\u5C31\u4ECE origin \u53D6\uFF09\uFF1B\u5982\u679C\u5DE5\u4F5C\u533A\u6709\u672A\u63D0\u4EA4\u7684\u6539\u52A8\uFF0C\u5148\u544A\u8BC9\u7528\u6237\u518D\u5904\u7406\u3002</system-reminder>`;
+}
 function createCloudTurnSession(args) {
   const { ctx, sink, client, personaId: personaId2, engine, instructions, engineSessionId, prepare } = args;
   let conversationId = ctx.cloudConversationId ?? ctx.cloudExecutionId;
@@ -66836,7 +66837,9 @@ function createCloudTurnSession(args) {
       live.add(commandId);
       submission = submission.then(async () => {
         try {
-          const portable = prepared ? text : await prepare(text);
+          const intent = prepared ? void 0 : sink.pendingBranchIntent?.();
+          const prepared0 = prepared ? text : await prepare(text);
+          const portable = intent ? withBranchIntent(prepared0, intent) : prepared0;
           if (closed || sink.onCommandPrepared?.(commandId, portable, prepared) === false) {
             live.delete(commandId);
             return;
@@ -66856,6 +66859,7 @@ function createCloudTurnSession(args) {
             ...ctx.personaMode ? { personaMode: ctx.personaMode } : {},
             ...ctx.titleOnly ? { purpose: "title" } : {}
           });
+          if (intent) sink.onBranchIntentDelivered?.(intent);
           if (closed) {
             stream.close();
             return;
@@ -73495,6 +73499,13 @@ function slimHistoryMessages(messages) {
     return out;
   });
 }
+function markOpenTurnInProgress(page, openTurnId) {
+  if (page.view !== "turns" || !openTurnId) return page;
+  return {
+    ...page,
+    data: page.data.map((turn) => turn.id === openTurnId && turn.status === "interrupted" ? { ...turn, status: "inProgress" } : turn)
+  };
+}
 function assertGuestPath(ctx, absPath, personaRoot, method, usersRoot) {
   if (!ctx || ctx.principal.kind !== "guest" || !personaRoot) return;
   const userWorkDir = usersRoot ? deriveUserWorkDir(ctx.principal.id, usersRoot) : void 0;
@@ -73563,6 +73574,7 @@ function buildHistoryHandlers(deps) {
     if (args.view) {
       const reader = getHistoryReader(f2.tool ?? "claude", f2.cloudEnvironment);
       if (!reader.readPage) throw new Error("This engine does not support turn history paging");
+      const openTurnId = manager.openTurnId(args.sessionId);
       const page = await reader.readPage({
         cwd: f2.cwd,
         toolSessionId: f2.toolSessionId,
@@ -73572,7 +73584,7 @@ function buildHistoryHandlers(deps) {
         turnId: args.turnId,
         snapshotId: args.snapshotId
       });
-      return { response: { type: "history:read", ...page } };
+      return { response: { type: "history:read", ...markOpenTurnInProgress(page, openTurnId) } };
     }
     let res;
     try {
@@ -74993,7 +75005,13 @@ function buildCloudWorkspaceHandlers(deps) {
           ERROR_CODES.VALIDATION_ERROR,
           "Workspace operations require a cloud session"
         );
-      if (["bind", "switch", "publish"].includes(args.action) && (!["idle", "running-idle", "stopped", "error"].includes(
+      if (args.action === "intend") {
+        if (!file.cloudWorkspace)
+          throw new ClawdError(ERROR_CODES.VALIDATION_ERROR, "\u8BF7\u5148\u9009\u62E9\u4ED3\u5E93");
+        const { broadcast } = deps.setBranchIntent(file.sessionId, args.branch);
+        return { response: { type: "cloud:workspace:ok" }, broadcast };
+      }
+      if (args.action === "bind" && (!["idle", "running-idle", "stopped", "error"].includes(
         deps.status(file.sessionId)
       ) || file.cloudPendingTurns?.length))
         throw new ClawdError(ERROR_CODES.VALIDATION_ERROR, "\u8BF7\u7B49\u5F85\u5F53\u524D\u4EFB\u52A1\u5B8C\u6210");
@@ -75338,7 +75356,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.682".length > 0 ? "0.2.682" : "dev";
+var version = "0.2.684".length > 0 ? "0.2.684" : "dev";
 
 // src/cli-probe/probe.ts
 var fs86 = __toESM(require("fs"), 1);
@@ -78859,6 +78877,7 @@ async function startDaemon(config) {
         getFile: (id) => manager.get({ sessionId: id }).response,
         status: (id) => manager.getCurrentStatus(id),
         bind: (id, binding, conversationId) => manager.bindCloudWorkspace(id, binding, conversationId),
+        setBranchIntent: (id, branch) => manager.update({ sessionId: id, patch: { cloudBranchIntent: branch } }),
         command: (file, input) => {
           const personaId2 = personaIdFromCloudCwd(file.cwd);
           if (!personaId2)