@clawos-dev/clawd 0.2.255 → 0.2.257

package/dist/cli.cjs

@@ -6238,7 +6238,13 @@ var init_dispatch = __esm({
       // 合法值集与 claude adapter capabilities.models[].id 一致（见 daemon
       // tools/claude.ts CLAUDE_MODEL_IDS）；handler 层做二次校验，非法值 fail-fast。
       // protocol 层保持 string 便于未来跨 tool 扩展（届时 union 收合法字面量）。
-      model: external_exports.string().min(1).optional()
+      model: external_exports.string().min(1).optional(),
+      // 可选：给新 worker session 起 label（写入 SessionFile.label，sidebar 显示）。
+      // 仅在**新开 dispatch**（dispatchId 缺席）时生效；续派（dispatchId 非空）
+      // 时 daemon 层静默丢弃（避免半途改 label 造成 sidebar 抖动）。
+      // 上限 60 字符——sidebar 显示 tolerance，卡在 dispatch 入口即可。
+      // 协议层不硬拒 sessionLabel + dispatchId 同传，保留 forward-compat。
+      sessionLabel: external_exports.string().min(1).max(60).optional()
     }).refine((v2) => v2.targetPersona !== void 0 || v2.dispatchId !== void 0, {
       message: "either targetPersona (new dispatch) or dispatchId (follow-up) is required"
     }).refine((v2) => !(v2.dispatchId !== void 0 && v2.targetDeviceId !== void 0), {
@@ -40768,6 +40774,7 @@ init_protocol();
 var DEFAULT_PORT = 18790;
 var DEFAULT_HOST = "127.0.0.1";
 var DEFAULT_CLAWOS_API = "https://api.clawos.chat";
+var DEFAULT_OWNER_IDLE_KILL_DELAY_MS = 6 * 60 * 60 * 1e3;
 var DEFAULT_LOG_ENDPOINT = "https://clawd-prod.cn-hangzhou.log.aliyuncs.com/logstores/app-logs/track";
 function resolveLogShipping(raw, cliNoShipping) {
   if (cliNoShipping) {
@@ -40782,6 +40789,12 @@ function resolveLogShipping(raw, cliNoShipping) {
   const sampling = mode === "errors-only" ? { debug: 0, info: 0, warn: 1, error: 1 } : isPlainSamplingMap(raw?.sampling) ? raw.sampling : {};
   return { mode, endpoint, sampling };
 }
+function resolveIdleKillMs(raw) {
+  if (raw === void 0 || raw === null || raw === "") return null;
+  const n = typeof raw === "number" ? raw : Number(raw);
+  if (!Number.isFinite(n) || n < 0) return null;
+  return n;
+}
 function isPlainSamplingMap(v2) {
   if (!v2 || typeof v2 !== "object") return false;
   return Object.values(v2).every((n) => typeof n === "number");
@@ -40879,6 +40892,7 @@ function resolveConfig(opts) {
   const mode = DAEMON_MODE_VALUES.includes(rawMode ?? "") ? rawMode : "sdk";
   const filePreviewPorts = Array.isArray(fileCfg.previewPorts) ? fileCfg.previewPorts.map((n) => Number(n)).filter((n) => Number.isInteger(n) && n > 0) : null;
   const previewPorts = env.CLAWD_PREVIEW_PORTS ? env.CLAWD_PREVIEW_PORTS.split(",").map((s) => Number(s.trim())).filter((n) => Number.isInteger(n) && n > 0) : filePreviewPorts && filePreviewPorts.length > 0 ? filePreviewPorts : null;
+  const ownerIdleKillDelayMs = resolveIdleKillMs(env.CLAWD_OWNER_IDLE_KILL_DELAY_MS) ?? resolveIdleKillMs(fileCfg.ownerIdleKillDelayMs) ?? DEFAULT_OWNER_IDLE_KILL_DELAY_MS;
   const logShipping = resolveLogShipping(
     fileCfg.logShipping,
     args.noLogShipping ?? false
@@ -40896,7 +40910,8 @@ function resolveConfig(opts) {
     frpcBinary,
     mode,
     previewPorts,
-    logShipping
+    logShipping,
+    ownerIdleKillDelayMs
   };
 }
 var HELP_TEXT = `clawd [options]
@@ -40923,6 +40938,10 @@ Env (advanced):
   CLAWD_CC_MODE           CC \u5B50\u8FDB\u7A0B\u4EA4\u4E92\u6A21\u5F0F\uFF1A'sdk'\uFF08\u9ED8\u8BA4\uFF0C--print stream-json\uFF09/ 'tui'\uFF08pty \u4EA4\u4E92\u5F0F\uFF09\uFF1B
                           \u503C\u975E\u5408\u6CD5\u5B57\u9762\u91CF\u65F6\u9759\u9ED8\u56DE\u9000 'sdk'\u3002ready \u5E27 mode \u5B57\u6BB5\u900F\u4F20\u7ED9 UI\uFF1B
                           'tui' \u6A21\u5F0F\u989D\u5916\u63A8 session:control + session:pty \u4E24\u4E2A\u5E27\uFF08\u4E1A\u52A1\u5E27\u540D\u4E0D\u53D8\uFF09
+  CLAWD_OWNER_IDLE_KILL_DELAY_MS
+                          owner persona session \u95F2\u7F6E\u56DE\u6536\u515C\u5E95\u4E0A\u9650\uFF08ms\uFF0C\u9ED8\u8BA4 21600000 = 6h\uFF09\uFF1B
+                          \u8BBE 0 \u5173\u95ED\u56DE\u6536\u3002\u4E5F\u53EF\u5199 config.json \u7684 ownerIdleKillDelayMs\u3002
+                          guest session \u7684 10min \u662F\u72EC\u7ACB\u5EF6\u8FDF\uFF0C\u4E0D\u53D7\u6B64\u9879\u5F71\u54CD
 `;
 
 // src/index.ts
@@ -41406,12 +41425,14 @@ function scopeSubPath(scope) {
   if (scope.mode === "guest") return [scope.personaId, "guests", scope.capId];
   return [scope.personaId, scope.mode];
 }
-function metaFromScope(scope, personaRoot, usersRoot, ownerPrincipalId, callerDisplayName, callerFeishuUnionId) {
+var GUEST_IDLE_KILL_DELAY_MS = 6e5;
+function metaFromScope(scope, personaRoot, usersRoot, ownerPrincipalId, callerDisplayName, callerFeishuUnionId, opts) {
   if (scope.kind === "default") return void 0;
+  const ownerDelay = opts?.ownerIdleKillDelayMs !== void 0 && opts.ownerIdleKillDelayMs > 0 ? opts.ownerIdleKillDelayMs : void 0;
   if (scope.mode === "owner") {
     if (!ownerPrincipalId || !usersRoot) {
       return {
-        idleKillEnabled: false,
+        idleKillDelayMs: ownerDelay,
         personaMode: "owner",
         callerDisplayName,
         callerDeviceId: ownerPrincipalId,
@@ -41420,7 +41441,7 @@ function metaFromScope(scope, personaRoot, usersRoot, ownerPrincipalId, callerDi
     }
     const userWorkDir2 = deriveUserWorkDir(ownerPrincipalId, usersRoot);
     return {
-      idleKillEnabled: false,
+      idleKillDelayMs: ownerDelay,
       personaMode: "owner",
       userWorkDir: userWorkDir2,
       addDirs: [userWorkDir2],
@@ -41431,7 +41452,7 @@ function metaFromScope(scope, personaRoot, usersRoot, ownerPrincipalId, callerDi
   }
   const userWorkDir = deriveUserWorkDir(scope.capId, usersRoot);
   return {
-    idleKillEnabled: true,
+    idleKillDelayMs: GUEST_IDLE_KILL_DELAY_MS,
     personaMode: "guest",
     userWorkDir,
     addDirs: [userWorkDir],
@@ -41932,20 +41953,23 @@ var ATTACHMENT_SHARING_HINT = `## \u628A\u4EA7\u51FA\u6587\u4EF6\u5206\u4EAB\u7E
 - \u53EA\u80FD\u5206\u4EAB\u4F60\u81EA\u5DF1\u5DE5\u4F5C\u76EE\u5F55\u5185\u7684\u6587\u4EF6\uFF0C\u8D8A\u754C\u4F1A\u88AB\u62D2\u3002
 - \u88AB dispatch \u63A5\u5230\u4EFB\u52A1\u3001\u8981\u56DE\u4F20\u4EA7\u7269\u65F6\uFF1A\u628A\u7B7E\u540D URL \u5199\u8FDB \`personaDispatchComplete\` tool\uFF08\`clawd-dispatch\` MCP\uFF09\u7684 \`text\` \u91CC\uFF08\`filePaths\` \u53EA\u662F\u4F60\u672C\u673A\u7684\u7EDD\u5BF9\u8DEF\u5F84\uFF0C\u8DE8\u8BBE\u5907\u5BF9\u65B9\u6253\u4E0D\u5F00\uFF0CURL \u624D\u80FD\u6253\u5F00\uFF09\u3002`;
 
+// src/persona/no-ask-user-question-prompt.ts
+var NO_ASK_USER_QUESTION_HINT = `## \u9700\u8981\u8001\u677F\u62CD\u677F\u65F6\u600E\u4E48\u95EE
+
+\u8981\u8001\u677F\u9009\u62E9 / \u786E\u8BA4 / \u62CD\u677F\u65F6\uFF0C\u76F4\u63A5\u6B63\u6587\u5199\u95EE\u9898 + \u5217 A/B/C \u9009\u9879\u3002\u4E0D\u8981\u8C03 AskUserQuestion tool\u3002`;
+
 // src/dispatch/system-prompt.ts
 var DISPATCH_SYSTEM_PROMPT_HINT = `## \u59D4\u6D3E\u7ED9\u53E6\u4E00\u4E2A persona\uFF08dispatch\uFF09
 
-\u5F53\u7528\u6237\u6D88\u606F\u91CC\u542B \`@persona/<id>\`\uFF08\u5982 \`@persona/persona-app-builder\`\uFF09\u65F6\uFF0C**\u4F60\u5FC5\u987B**\u7ACB\u5373\u8C03 \`clawd-dispatch\` MCP server \u7684 \`personaDispatch\` tool \u59D4\u6D3E\uFF08\u5404 agent \u5BF9 MCP tool \u7684\u5C55\u793A\u540D\u4E0D\u540C\uFF0C\u5982 claude \u663E\u793A\u4E3A \`mcp__clawd-dispatch__personaDispatch\`\uFF1B\u6309\u4F60\u73AF\u5883\u91CC\u5B9E\u9645\u5217\u51FA\u7684\u540D\u5B57\u8C03\u7528\uFF09\uFF0C\u4E0D\u8981\u5C1D\u8BD5\u81EA\u5DF1\u6267\u884C\uFF1A
+\u5F53\u7528\u6237\u6D88\u606F\u91CC\u542B \`@persona/<id>\`\uFF08\u5982 \`@persona/persona-app-builder\`\uFF09\u65F6\uFF0C**\u4F60\u5FC5\u987B**\u7ACB\u5373\u8C03 \`clawd-dispatch\` MCP \u7684 \`personaDispatch\` tool \u59D4\u6D3E\uFF1A
 
 - \`targetPersona = <id>\`\uFF08@ token \u91CC\u7684 persona id\uFF09
 - \`prompt = \u53BB\u6389 @persona/<id> token \u7684\u7528\u6237\u539F\u6587\`
 
-tool \u4F1A**\u7ACB\u5373\u8FD4\u56DE** dispatchId\uFF08\u5F02\u6B65\u59D4\u6D3E\uFF09\uFF0C\u5BF9\u65B9\u4EBA\u683C\u5728\u540E\u53F0\u5E72\u6D3B\u3002\u4F60\u544A\u8BC9\u7528\u6237"\u4EFB\u52A1\u5DF2\u4EA4\u529E"\u5373\u53EF\u7ED3\u675F\u672C\u8F6E\u2014\u2014**\u4E0D\u8981\u7B49\u5F85\u3001\u4E0D\u8981\u8F6E\u8BE2**\u3002\u5BF9\u65B9\u5E72\u5B8C\u540E\uFF0C\u7ED3\u679C\u4F1A\u4F5C\u4E3A\u4E00\u6761\u65B0\u6D88\u606F\u81EA\u52A8\u6CE8\u5165\u56DE\u4F60\u7684 session\uFF0C\u4F60\u5C4A\u65F6\u518D\u7EFC\u5408\u8F6C\u8FBE\u7ED9\u7528\u6237\u3002\u60F3\u67E5\u8FDB\u5C55\u65F6\uFF08\u7528\u6237\u95EE\u8D77\uFF09\u8C03\u540C\u4E00 MCP \u7684 \`personaDispatchList\`\u3002
+\u544A\u8BC9\u7528\u6237"\u4EFB\u52A1\u5DF2\u4EA4\u529E"\u5373\u53EF\u7ED3\u675F\u672C\u8F6E\u3002\u7ED3\u679C\u4F1A\u4F5C\u4E3A\u4E00\u6761\u65B0\u6D88\u606F\u81EA\u52A8\u6CE8\u5165\u56DE\u4F60\u7684 session\uFF0C\u5C4A\u65F6\u518D\u7EFC\u5408\u8F6C\u8FBE\u7ED9\u7528\u6237\u3002\u60F3\u67E5\u8FDB\u5C55\u65F6\uFF08\u7528\u6237\u95EE\u8D77\uFF09\u8C03\u540C\u4E00 MCP \u7684 \`personaDispatchList\`\u3002
 
-- **\u4E0D\u8981**\u5C1D\u8BD5\u81EA\u5DF1\u6267\u884C\uFF08\u4F60\u4E0D\u662F\u90A3\u4E2A persona\uFF09
-- **\u4E0D\u8981** in-place \u6A21\u4EFF\u5BF9\u65B9\u4EBA\u683C \u2014\u2014 dispatch \u662F\u771F\u5207\u5230\u53E6\u4E00\u4E2A\u72EC\u7ACB session
+- **\u4E0D\u8981**\u5C1D\u8BD5\u81EA\u5DF1\u6267\u884C\uFF08\u4F60\u4E0D\u662F\u90A3\u4E2A persona\uFF09\uFF0C\u4E5F\u4E0D\u8981 in-place \u6A21\u4EFF\u5BF9\u65B9\u4EBA\u683C \u2014\u2014 dispatch \u662F\u771F\u5207\u5230\u53E6\u4E00\u4E2A\u72EC\u7ACB session
 - \u4E00\u53E5\u8BDD\u91CC\u591A\u4E2A \`@persona/<id>\` \u65F6\u9009\u7B2C\u4E00\u4E2A\uFF08tool \u4E00\u6B21\u53EA\u5904\u7406\u4E00\u4E2A target\uFF09
-- \u59D4\u6D3E\u5931\u8D25\uFF08tool_result.is_error=true\uFF09\u65F6\u5982\u5B9E\u544A\u8BC9\u7528\u6237\u539F\u56E0\uFF0C**\u4E0D\u8981\u91CD\u8BD5**
 
 ### \u7EED\u6D3E\uFF08\u540C\u4E00\u4EF6\u4E8B\u7684\u540E\u7EED\u6307\u4EE4\uFF09
 
@@ -41953,15 +41977,15 @@ tool \u4F1A**\u7ACB\u5373\u8FD4\u56DE** dispatchId\uFF08\u5F02\u6B65\u59D4\u6D3E
 
 ### \u8DE8\u8BBE\u5907\u59D4\u6D3E\uFF08remote persona\uFF09
 
-\u5F53 @ token \u5F62\u5982 \`@persona/<id>@<deviceId>\`\uFF08\u7B2C\u4E8C\u6BB5\u662F\u8054\u7CFB\u4EBA**\u8BBE\u5907\u7684 deviceId**\uFF0CUI \u9009\u8054\u7CFB\u4EBA\u65F6\u5DF2\u89E3\u6790\u597D\u586B\u5165\uFF09\u65F6\uFF0C\u662F\u628A\u4EFB\u52A1\u59D4\u6D3E\u7ED9\u90A3\u53F0\u8BBE\u5907\u4E0A\u7684 persona\u3002\u9664 targetPersona / prompt \u5916\u518D\u5E26\u4E00\u4E2A\u53C2\u6570\uFF1A
+\u5F53 @ token \u5F62\u5982 \`@persona/<id>@<deviceId>\`\uFF08\u7B2C\u4E8C\u6BB5\u662F\u8054\u7CFB\u4EBA**\u8BBE\u5907\u7684 deviceId**\uFF0CUI \u9009\u8054\u7CFB\u4EBA\u65F6\u5DF2\u89E3\u6790\u597D\u586B\u5165\uFF09\u65F6\uFF0C\u662F\u628A\u4EFB\u52A1\u59D4\u6D3E\u7ED9\u90A3\u53F0\u8BBE\u5907\u4E0A\u7684 persona\u3002\u9664 targetPersona / prompt \u5916\u518D\u5E26\uFF1A
 
 - \`targetDeviceId = <token \u7B2C\u4E8C\u6BB5\u7684 deviceId\uFF0C\u539F\u6837\u586B>\`
 
-deviceId \u76F4\u63A5\u53D6\u81EA token\uFF0C\u4E0D\u8981\u6539\u5199\u6216\u731C\u6D4B\u3002\u5BF9\u65B9\u4E0D\u53EF\u8FBE / \u76EE\u6807 persona \u672A\u516C\u5F00\u4F1A\u5728\u7ED3\u679C\u56DE\u6D41\u65F6\u62A5\u5931\u8D25\uFF0C\u7167\u5E38\u8F6C\u8FF0\u7ED9\u7528\u6237\u5373\u53EF\u3002\u5176\u4F59\u884C\u4E3A\uFF08\u79D2\u56DE dispatchId\u3001\u7ED3\u679C\u81EA\u52A8\u6CE8\u5165\u3001\u5931\u8D25\u4E0D\u91CD\u8BD5\uFF09\u4E0E\u672C\u5730\u59D4\u6D3E\u4E00\u81F4\u3002
+deviceId \u76F4\u63A5\u53D6\u81EA token\uFF0C\u4E0D\u8981\u6539\u5199\u6216\u731C\u6D4B\u3002
 
 ## \u88AB dispatch \u63A5\u5230\u4EFB\u52A1
 
-\u5982\u679C\u4F60\u7684 session \u7B2C\u4E00\u6761 user message \u662F\u4EE5 \`[Dispatched from owner \u2014 another persona session\u59D4\u6D3E\u7ED9\u4F60\u6267\u884C\u4EFB\u52A1]\` \u8D77\u5934\u7684 plain text \u4EFB\u52A1\u5305\uFF0C\u4F60\u662F\u88AB\u53E6\u4E00\u4E2A persona \u59D4\u6D3E\u6765\u5E72\u6D3B\u7684\uFF08\u4EFB\u52A1\u5305\u4E0D\u7528 \`<system-reminder>\` \u5305\u662F\u4E3A\u4E86 reducer dedup \u5DE5\u4F5C\u6B63\u5E38\uFF0C\u89C1 manager.ts buildDispatchTaskPack \u6CE8\u91CA\uFF09\uFF1A
+\u5982\u679C\u4F60\u7684 session \u7B2C\u4E00\u6761 user message \u662F\u4EE5 \`[Dispatched from owner \u2014 another persona session\u59D4\u6D3E\u7ED9\u4F60\u6267\u884C\u4EFB\u52A1]\` \u8D77\u5934\u7684 plain text \u4EFB\u52A1\u5305\uFF0C\u4F60\u662F\u88AB\u53E6\u4E00\u4E2A persona \u59D4\u6D3E\u6765\u5E72\u6D3B\u7684\uFF1A
 
 - \u4EFB\u52A1\u5728 \`Task:\` \u6BB5
 - \u539F\u4F1A\u8BDD\u7684\u5BF9\u8BDD\u5386\u53F2\u5728 \`Source conversation\` \u6BB5\u7ED9\u7684 jsonl \u8DEF\u5F84\u4E0B\uFF1B\u6309\u9700 Read \u5B83\u4E86\u89E3\u4E0A\u4E0B\u6587\uFF08\u4E0D\u5FC5\u8BFB\u5B8C\uFF09
@@ -42012,7 +42036,10 @@ function cloneState(s) {
     currentTurnSender: s.currentTurnSender
   };
 }
-var IDLE_KILL_DELAY_MS = 6e5;
+function idleKillDelayOf(state) {
+  const ms = state.subSessionMeta?.idleKillDelayMs;
+  return ms !== void 0 && ms > 0 ? ms : void 0;
+}
 function tryFlushPending(state, deps) {
   if (!state.readyForSend || state.pendingSend.length === 0) return [];
   const text = state.pendingSend.shift();
@@ -42126,6 +42153,9 @@ function buildSpawnContext(state, deps) {
   if (daemonUrl) {
     ctx.extraSystemPrompt = (ctx.extraSystemPrompt ? ctx.extraSystemPrompt + "\n\n" : "") + ATTACHMENT_SHARING_HINT;
   }
+  if (meta?.personaMode && (file.tool ?? "claude") === "claude") {
+    ctx.extraSystemPrompt = (ctx.extraSystemPrompt ? ctx.extraSystemPrompt + "\n\n" : "") + NO_ASK_USER_QUESTION_HINT;
+  }
   if (meta?.extraSettings) {
     ctx.extraSettings = meta.extraSettings;
   }
@@ -42284,11 +42314,12 @@ function pushEventToBuffer(state, event, deps) {
         status: "running-idle"
       }
     });
-    if (next.subSessionMeta?.idleKillEnabled) {
+    const idleKillMs = idleKillDelayOf(next);
+    if (idleKillMs !== void 0) {
       effects.push({
         kind: "schedule-idle-kill",
         sessionId: next.file.sessionId,
-        ms: IDLE_KILL_DELAY_MS
+        ms: idleKillMs
       });
     }
   }
@@ -42725,14 +42756,15 @@ function reduceSessionInner(state, input, deps) {
       if (state.status !== "running-idle") {
         return { state, effects: [] };
       }
-      if (input.subagentActive) {
+      const rescheduleMs = idleKillDelayOf(state);
+      if (input.subagentActive && rescheduleMs !== void 0) {
         return {
           state,
           effects: [
             {
               kind: "schedule-idle-kill",
               sessionId: state.file.sessionId,
-              ms: IDLE_KILL_DELAY_MS
+              ms: rescheduleMs
             }
           ]
         };
@@ -43652,8 +43684,8 @@ var SessionManager = class {
   // 经过 compressFrameForWire 后决定是 push collector 还是走 deps.broadcastFrame。
   // scope 决定两件事：SessionStore 路由 + SubSessionMeta 派生（metaFromScope）。
   //   - default → 复用 deps.store，无 subSessionMeta（普通 session）
-  //   - persona/owner → personas/<pid>/.clawd/sessions/owner/，meta={idleKillEnabled:false, personaMode:'owner'}
-  //   - persona/guest → personas/<pid>/.clawd/sessions/guests/<capId>/，meta={idleKillEnabled:true, personaMode:'guest', extraSettings:<sandbox>}
+  //   - persona/owner → personas/<pid>/.clawd/sessions/owner/，meta={idleKillDelayMs:<config 默认 6h>, personaMode:'owner'}
+  //   - persona/guest → personas/<pid>/.clawd/sessions/guests/<capId>/，meta={idleKillDelayMs:10min, personaMode:'guest', extraSettings:<sandbox>}
   newRunner(file, scope) {
     const adapter = this.deps.getAdapter(file.tool ?? "claude");
     const store = this.storeFor(scope);
@@ -43665,7 +43697,8 @@ var SessionManager = class {
       this.deps.usersRoot ?? "",
       this.deps.ownerPrincipalId,
       callerDisplayName,
-      callerFeishuUnionId
+      callerFeishuUnionId,
+      { ownerIdleKillDelayMs: this.deps.ownerIdleKillDelayMs }
     );
     if (subSessionMeta?.userWorkDir) {
       import_node_fs9.default.mkdirSync(subSessionMeta.userWorkDir, { recursive: true });
@@ -44503,8 +44536,8 @@ var SessionManager = class {
   //
   // 区别于 owner / default 单 sessionId 入口，这些 API 接 SessionScope 参数 ——
   // 调用方（PersonaManager / observer 等）明确传 scope，由 storeFor 路由到正确目录:
-  //   - {kind:'persona', personaId, mode:'guest', capId} → guests/<capId>/，meta={idleKill:true, sandbox}
-  //   - {kind:'persona', personaId, mode:'owner'}       → owner/，meta={idleKill:false}
+  //   - {kind:'persona', personaId, mode:'guest', capId} → guests/<capId>/，meta={idleKill:10min, sandbox}
+  //   - {kind:'persona', personaId, mode:'owner'}       → owner/，meta={idleKill:<config 默认 6h>}
   //
   // SubSessionMeta 由 scope → metaFromScope 派生，不进 SessionFile schema。
   /** 按 scope 读取 SessionFile；不存在返回 null */
@@ -44758,6 +44791,8 @@ var SessionManager = class {
       } : {},
       // T-20：dispatch model override 落盘（reducer spawn 路径读 SessionFile.model 生成 --model flag）
       ...args.model ? { model: args.model } : {},
+      // butler 顶部入口：dispatch 传下来的 label 落盘，sidebar 显示（否则兜底 cwd-basename）
+      ...args.label ? { label: args.label } : {},
       createdAt: now,
       updatedAt: now
     };
@@ -49415,7 +49450,10 @@ function buildPersonaDispatchHandlers(deps) {
         guestDisplayName: ctx.principal.displayName,
         // T-31: 把 A 的飞书 union_id 透传给 B（connectGuestContext 已把它挂在 principal.feishuUnionId）
         ...ctx.principal.feishuUnionId ? { guestFeishuUnionId: ctx.principal.feishuUnionId } : {},
-        ...args.model ? { model: args.model } : {}
+        ...args.model ? { model: args.model } : {},
+        // butler 顶部入口：peer daemon 若在 forwardToPeer 里传了 sessionLabel（当前
+        // 未接线，作 forward-compat 预留），这里也透给 spawnB
+        ...args.sessionLabel ? { label: args.sessionLabel } : {}
       }).then(() => logger?.info("dispatch.spawnB.ok", { dispatchId: dispatchId2 })).catch((err) => {
         const reason = err instanceof Error ? err.message : String(err);
         logger?.warn("dispatch.spawnB.failed", { dispatchId: dispatchId2, reason });
@@ -49450,7 +49488,9 @@ function buildPersonaDispatchHandlers(deps) {
       sourceSessionId,
       targetPersona,
       prompt: args.prompt,
-      ...args.model ? { model: args.model } : {}
+      ...args.model ? { model: args.model } : {},
+      // butler 顶部入口（spec 2026-07-27）：sessionLabel 落到 SessionFile.label 让 sidebar 显示
+      ...args.sessionLabel ? { label: args.sessionLabel } : {}
     }).then(() => {
       logger?.info("dispatch.spawnB.ok", { dispatchId });
     }).catch((err) => {
@@ -59292,6 +59332,9 @@ async function startDaemon(config) {
     ownerDisplayName,
     ownerPrincipalId,
     ownerFeishuUnionId,
+    // T-37 owner session 闲置回收兜底上限（默认 6h，config.json / env 可调，设 0 关闭）。
+    // guest 的 10min 不走这条——它是 session/scope.ts 的固定常量。
+    ownerIdleKillDelayMs: config.ownerIdleKillDelayMs,
     contactStore,
     mode: config.mode,
     // 单栏 refactor (spec 2026-06-02 §5.1)：cc 子进程 env CLAWD_DAEMON_URL 闭包来源。
@@ -59773,7 +59816,9 @@ async function startDaemon(config) {
         // T-31: 把 A 的飞书 union_id stamp 到 B SessionFile，供 cc prompt 身份卡 union_id 行
         guestFeishuUnionId: args.guestFeishuUnionId,
         // T-20: 可选 model override 透到 SessionFile.model
-        ...args.model ? { model: args.model } : {}
+        ...args.model ? { model: args.model } : {},
+        // butler 顶部入口（spec 2026-07-27）：可选 label 透到 SessionFile.label（sidebar 显示）
+        ...args.label ? { label: args.label } : {}
       });
     },
     // A 角色：从 ContactStore 取 peer 可达 URL + connect token，转发到对端 daemon /rpc。

package/dist/dispatch/mcp-server.cjs

@@ -22734,7 +22734,13 @@ var DispatchRunArgsSchema = external_exports.object({
   // 合法值集与 claude adapter capabilities.models[].id 一致（见 daemon
   // tools/claude.ts CLAUDE_MODEL_IDS）；handler 层做二次校验，非法值 fail-fast。
   // protocol 层保持 string 便于未来跨 tool 扩展（届时 union 收合法字面量）。
-  model: external_exports.string().min(1).optional()
+  model: external_exports.string().min(1).optional(),
+  // 可选：给新 worker session 起 label（写入 SessionFile.label，sidebar 显示）。
+  // 仅在**新开 dispatch**（dispatchId 缺席）时生效；续派（dispatchId 非空）
+  // 时 daemon 层静默丢弃（避免半途改 label 造成 sidebar 抖动）。
+  // 上限 60 字符——sidebar 显示 tolerance，卡在 dispatch 入口即可。
+  // 协议层不硬拒 sessionLabel + dispatchId 同传，保留 forward-compat。
+  sessionLabel: external_exports.string().min(1).max(60).optional()
 }).refine((v) => v.targetPersona !== void 0 || v.dispatchId !== void 0, {
   message: "either targetPersona (new dispatch) or dispatchId (follow-up) is required"
 }).refine((v) => !(v.dispatchId !== void 0 && v.targetDeviceId !== void 0), {
@@ -23557,7 +23563,10 @@ async function handlePersonaDispatchToolCall(input, ctx) {
         ...input.targetDeviceId ? { targetDeviceId: input.targetDeviceId } : {},
         // T-20: 可选 override B session 使用的 claude 模型；MCP tool 层已 enum 校验，
         // daemon handler 层还会再校验一次（fail-fast）。
-        ...input.model ? { model: input.model } : {}
+        ...input.model ? { model: input.model } : {},
+        // butler 顶部入口：可选 sessionLabel 落到新 worker SessionFile.label。
+        // 长度 1-60 由 protocol schema 强约束；续派场景（dispatchId 非空）daemon 层静默丢弃。
+        ...input.sessionLabel ? { sessionLabel: input.sessionLabel } : {}
       })
     });
   } catch (err) {
@@ -23738,6 +23747,13 @@ async function main() {
         // 精确校验（按 target persona tool 选表）在 daemon handler 层做（fail-fast）。
         model: external_exports.enum([...CLAUDE_MODEL_IDS, ...CODEX_MODEL_IDS]).optional().describe(
           "override the target persona's default model. Omit to use the persona default. Claude personas: " + CLAUDE_MODEL_IDS.join(" / ") + ". Codex personas: " + CODEX_MODEL_IDS.join(" / ") + "."
+        ),
+        // butler 顶部入口 (spec 2026-07-27)：butler 给新 worker session 起 label 用。
+        // Sidebar 直接显示这个 label（否则兜底 cwd-basename 都是 persona 目录名，同一
+        // persona 的 dispatched session 长得都一样）。仅新开 dispatch 生效；续派
+        // (dispatchId set) 时 daemon 静默丢弃，保 worker session 稳定命名。
+        sessionLabel: external_exports.string().optional().describe(
+          'short human-readable label for the new worker session (shown in sidebar, e.g. "\u4FEE sidebar \u9876\u90E8\u5165\u53E3" / "\u67E5\u6628\u665A SLS \u767B\u5F55\u5931\u8D25"). aim for 8-14 chars, verb-led. ignored when continuing an existing dispatch via dispatchId (worker session keeps its original label).'
         )
       }
     },