@clawos-dev/clawd 0.2.256 → 0.2.257

package/dist/cli.cjs

@@ -40774,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) {
@@ -40788,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");
@@ -40885,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
@@ -40902,7 +40910,8 @@ function resolveConfig(opts) {
     frpcBinary,
     mode,
     previewPorts,
-    logShipping
+    logShipping,
+    ownerIdleKillDelayMs
   };
 }
 var HELP_TEXT = `clawd [options]
@@ -40929,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
@@ -41412,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,
@@ -41426,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],
@@ -41437,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],
@@ -42021,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();
@@ -42296,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
       });
     }
   }
@@ -42737,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
             }
           ]
         };
@@ -43664,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);
@@ -43677,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 });
@@ -44515,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 */
@@ -59311,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 闭包来源。