@clawos-dev/clawd 0.2.135-beta.280.568890f → 0.2.135-beta.282.8ee36dc

package/dist/cli.cjs

@@ -4495,7 +4495,7 @@ var init_attachment_schemas = __esm({
 });
 
 // ../protocol/src/persona-schemas.ts
-var PersonaFileSchema, PersonaSkillSummarySchema, PersonaPluginSummarySchema, PersonaSandboxSettingsSchema, PersonaInfoResponseSchema, PersonaCreateArgsSchema, PersonaIdArgsSchema, PersonaUpdateArgsSchema;
+var PersonaFileSchema, PersonaSkillSummarySchema, PersonaPluginSummarySchema, PersonaSandboxSettingsSchema, PersonaInfoResponseSchema, PersonaCreateArgsSchema, PersonaIdArgsSchema, PersonaUpdateArgsSchema, CodexSandboxSettingsSchema;
 var init_persona_schemas = __esm({
   "../protocol/src/persona-schemas.ts"() {
     "use strict";
@@ -4580,6 +4580,14 @@ var init_persona_schemas = __esm({
         iconKey: external_exports.string().nullable().optional()
       }).strict()
     }).strict();
+    CodexSandboxSettingsSchema = external_exports.object({
+      // 额外可写的绝对路径或 ~ 路径（pnpm 工具链等）；workspace(cwd) 和 userWorkDir 由 daemon 自动加，不用列。
+      writableRoots: external_exports.array(external_exports.string()).optional(),
+      // 禁读 glob（相对 workspace root 或绝对），如 ".secrets/**"、"**/*.env"。
+      denyRead: external_exports.array(external_exports.string()).optional(),
+      // true → 网络全放(*)；缺省/false → 断网。
+      network: external_exports.boolean().optional()
+    }).strict();
   }
 });
 
@@ -10047,7 +10055,7 @@ var require_multistream = __commonJS({
 var require_pino = __commonJS({
   "../node_modules/.pnpm/pino@9.14.0/node_modules/pino/pino.js"(exports2, module2) {
     "use strict";
-    var os21 = require("os");
+    var os22 = require("os");
     var stdSerializers = require_pino_std_serializers();
     var caller = require_caller();
     var redaction = require_redaction();
@@ -10094,7 +10102,7 @@ var require_pino = __commonJS({
     } = symbols;
     var { epochTime, nullTime } = time;
     var { pid } = process;
-    var hostname = os21.hostname();
+    var hostname = os22.hostname();
     var defaultErrorSerializer = stdSerializers.err;
     var defaultOptions = {
       level: "info",
@@ -11333,12 +11341,12 @@ function readCurrentContent(filePath) {
     return null;
   }
 }
-var import_node_fs8, import_node_os3, import_node_path8, TASK_NOTIFICATION_RE, TASK_ID_RE, TOOL_USE_ID_RE, SLASH_COMMAND_RE, LOCAL_COMMAND_RE, SYSTEM_REMINDER_RE, OPENSPEC_BLOCK_RE, SKILL_HINT_RE, ATTACHMENT_SILENT_SUBTYPES, ClaudeHistoryReader;
+var import_node_fs8, import_node_os4, import_node_path8, TASK_NOTIFICATION_RE, TASK_ID_RE, TOOL_USE_ID_RE, SLASH_COMMAND_RE, LOCAL_COMMAND_RE, SYSTEM_REMINDER_RE, OPENSPEC_BLOCK_RE, SKILL_HINT_RE, ATTACHMENT_SILENT_SUBTYPES, ClaudeHistoryReader;
 var init_claude_history = __esm({
   "src/tools/claude-history.ts"() {
     "use strict";
     import_node_fs8 = __toESM(require("fs"), 1);
-    import_node_os3 = __toESM(require("os"), 1);
+    import_node_os4 = __toESM(require("os"), 1);
     import_node_path8 = __toESM(require("path"), 1);
     init_lib();
     init_tool_result_extra();
@@ -11363,7 +11371,7 @@ var init_claude_history = __esm({
       // 每次 user 提交前 trackEdit 拷一份，作为 rewind 回退目标
       fileHistoryRoot;
       constructor(opts = {}) {
-        const base = opts.baseDir ?? import_node_path8.default.join(import_node_os3.default.homedir(), ".claude");
+        const base = opts.baseDir ?? import_node_path8.default.join(import_node_os4.default.homedir(), ".claude");
         this.projectsRoot = import_node_path8.default.join(base, "projects");
         this.fileHistoryRoot = import_node_path8.default.join(base, "file-history");
       }
@@ -11760,7 +11768,7 @@ function probeViaWhich() {
   }
   return null;
 }
-async function probeClaude(env = process.env, home = import_node_os4.default.homedir()) {
+async function probeClaude(env = process.env, home = import_node_os5.default.homedir()) {
   if (env.CLAUDE_BIN && import_node_fs9.default.existsSync(env.CLAUDE_BIN)) {
     return { available: true, path: env.CLAUDE_BIN };
   }
@@ -12200,14 +12208,14 @@ function encodeClaudeStdin(text) {
   };
   return JSON.stringify(frame) + "\n";
 }
-var import_node_child_process, import_node_child_process2, import_node_fs9, import_node_os4, import_node_path9, ATTACHMENT_SILENT_SUBTYPES2, unknownTypeHandler, ATTACHMENT_RE, IMAGE_EXT_MIME, CLAUDE_MODELS, CLAUDE_PERMISSION_MODES, CLAUDE_CAPABILITIES, ClaudeAdapter;
+var import_node_child_process, import_node_child_process2, import_node_fs9, import_node_os5, import_node_path9, ATTACHMENT_SILENT_SUBTYPES2, unknownTypeHandler, ATTACHMENT_RE, IMAGE_EXT_MIME, CLAUDE_MODELS, CLAUDE_PERMISSION_MODES, CLAUDE_CAPABILITIES, ClaudeAdapter;
 var init_claude = __esm({
   "src/tools/claude.ts"() {
     "use strict";
     import_node_child_process = require("child_process");
     import_node_child_process2 = require("child_process");
     import_node_fs9 = __toESM(require("fs"), 1);
-    import_node_os4 = __toESM(require("os"), 1);
+    import_node_os5 = __toESM(require("os"), 1);
     import_node_path9 = __toESM(require("path"), 1);
     init_protocol();
     init_claude_history();
@@ -30840,7 +30848,7 @@ var init_wire = __esm({
 // src/run-case/controller.ts
 async function runController(opts) {
   const now = opts.now ?? Date.now;
-  const cwd = opts.cwd ?? (0, import_node_fs35.mkdtempSync)(import_node_path48.default.join(import_node_os19.default.tmpdir(), "clawd-runcase-"));
+  const cwd = opts.cwd ?? (0, import_node_fs35.mkdtempSync)(import_node_path48.default.join(import_node_os20.default.tmpdir(), "clawd-runcase-"));
   const ownsCwd = opts.cwd === void 0;
   const recorder = startRunCaseRecorder({ recordPath: opts.record, now });
   const spawnCtx = { cwd };
@@ -31007,12 +31015,12 @@ async function runController(opts) {
   }
   return exitCode ?? 0;
 }
-var import_node_fs35, import_node_os19, import_node_path48;
+var import_node_fs35, import_node_os20, import_node_path48;
 var init_controller = __esm({
   "src/run-case/controller.ts"() {
     "use strict";
     import_node_fs35 = require("fs");
-    import_node_os19 = __toESM(require("os"), 1);
+    import_node_os20 = __toESM(require("os"), 1);
     import_node_path48 = __toESM(require("path"), 1);
     init_claude();
     init_stdout_splitter();
@@ -31490,6 +31498,7 @@ var SessionStoreFactory = class {
 // src/session/manager.ts
 var import_node_fs6 = __toESM(require("fs"), 1);
 var import_node_path6 = __toESM(require("path"), 1);
+var import_node_os2 = __toESM(require("os"), 1);
 
 // ../node_modules/.pnpm/uuid@10.0.0/node_modules/uuid/dist/esm-node/stringify.js
 var byteToHex = [];
@@ -31767,8 +31776,8 @@ function buildSpawnContext(state, deps) {
   if (meta?.addDirs && meta.addDirs.length > 0) {
     ctx.addDirs = meta.addDirs;
   }
-  if (meta?.networkAccess !== void 0) {
-    ctx.networkAccess = meta.networkAccess;
+  if (meta?.codexSandbox) {
+    ctx.codexSandbox = meta.codexSandbox;
   }
   return ctx;
 }
@@ -33266,8 +33275,14 @@ var SessionManager = class {
       const base = this.deps.personaStore?.readSandboxSettings(scope.personaId) ?? null;
       const settings = composeGuestSandbox(base, subSessionMeta.userWorkDir, file.cwd);
       subSessionMeta.extraSettings = JSON.stringify(settings);
-      const domains = settings.sandbox?.network?.allowedDomains;
-      subSessionMeta.networkAccess = Array.isArray(domains) && domains.length > 0;
+      const home = import_node_os2.default.homedir();
+      const expand = (p2) => p2 === "~" ? home : p2.startsWith("~/") ? import_node_path6.default.join(home, p2.slice(2)) : p2;
+      const codexCfg = this.deps.personaStore?.readCodexSandboxSettings(scope.personaId) ?? null;
+      subSessionMeta.codexSandbox = {
+        writableRoots: [subSessionMeta.userWorkDir, ...(codexCfg?.writableRoots ?? []).map(expand)],
+        denyRead: codexCfg?.denyRead ?? [],
+        network: codexCfg?.network ?? false
+      };
     }
     const attachmentGroup = this.deps.attachmentGroup;
     const runner = new SessionRunner(makeInitialState(file, subSessionMeta), {
@@ -34511,6 +34526,20 @@ var PersonaStore = class {
     this.atomicWrite(this.claudeMdPath(personaId), personality);
     this.atomicWrite(this.agentsMdPath(personaId), personality);
   }
+  /**
+   * 历史 persona 补 AGENTS.md：人格双写镜像是 codex 适配后才加的，更早落盘的 persona 只有
+   * CLAUDE.md。codex 原生读 cwd 的 AGENTS.md，缺失则切到 codex 后人格丢失。daemon 启动跑一次
+   * migrate（见 seed.migrateAgentsMirror）。幂等：已有 AGENTS.md（含用户手改的）不覆盖；
+   * 无 CLAUDE.md 不凭空造。返回是否实际补写。
+   */
+  ensureAgentsMirror(personaId) {
+    const claudeMd = this.claudeMdPath(personaId);
+    const agentsMd = this.agentsMdPath(personaId);
+    if (!fs7.existsSync(claudeMd)) return false;
+    if (fs7.existsSync(agentsMd)) return false;
+    this.atomicWrite(agentsMd, fs7.readFileSync(claudeMd, "utf8"));
+    return true;
+  }
   /**
    * 覆盖式写 persona 级 sandbox 配置（seed 给有 profile 的 persona 写 base⊕profile；owner 之后可手编）。
    * 这份是 guest 沙箱的 **base 真源**：manager spawn 时 composeGuestSandbox 读它 + 叠强制底座
@@ -34522,6 +34551,25 @@ var PersonaStore = class {
       JSON.stringify(settings, null, 2)
     );
   }
+  codexSandboxSettingsPath(personaId) {
+    return path9.join(this.personaDir(personaId), ".clawd", "codex-sandbox.json");
+  }
+  /** 读 codex-sandbox.json；不存在/损坏 → null。 */
+  readCodexSandboxSettings(personaId) {
+    const p2 = this.codexSandboxSettingsPath(personaId);
+    if (!fs7.existsSync(p2)) return null;
+    try {
+      return CodexSandboxSettingsSchema.parse(JSON.parse(fs7.readFileSync(p2, "utf8")));
+    } catch {
+      return null;
+    }
+  }
+  /** 覆盖写 codex-sandbox.json（seed/migrate 用）。 */
+  writeCodexSandboxSettings(personaId, settings) {
+    const dir = path9.join(this.personaDir(personaId), ".clawd");
+    fs7.mkdirSync(dir, { recursive: true });
+    this.atomicWrite(this.codexSandboxSettingsPath(personaId), JSON.stringify(settings, null, 2));
+  }
   writeMeta(persona) {
     this.atomicWrite(this.metaPath(persona.personaId), JSON.stringify(persona, null, 2));
   }
@@ -34661,7 +34709,7 @@ var import_node_crypto3 = __toESM(require("crypto"), 1);
 
 // src/skills/scanner.ts
 var import_node_fs7 = __toESM(require("fs"), 1);
-var import_node_os2 = __toESM(require("os"), 1);
+var import_node_os3 = __toESM(require("os"), 1);
 var import_node_path7 = __toESM(require("path"), 1);
 
 // src/skills/frontmatter.ts
@@ -34895,7 +34943,7 @@ var SkillsScanner = class {
   home;
   extraPluginRoots;
   constructor(opts = {}) {
-    this.home = opts.home ?? import_node_os2.default.homedir();
+    this.home = opts.home ?? import_node_os3.default.homedir();
     this.extraPluginRoots = opts.extraPluginRoots ?? [];
   }
   /**
@@ -35102,6 +35150,11 @@ var DEFAULT_PERSONAS = [
           allowLocalBinding: true
         }
       }
+    },
+    codexSandbox: {
+      writableRoots: ["~/Library/pnpm", "~/.local/share/pnpm", "~/.local/state/pnpm", "~/.npm", "~/.pnpm-store"],
+      denyRead: [".secrets/**"],
+      network: true
     }
   },
   {
@@ -35181,6 +35234,10 @@ function seedDefaultPersonas(args) {
       args.store.writeSandboxSettings(entry.personaId, settings);
       args.logger.info("persona.seed.sandbox-profile", { personaId: entry.personaId });
     }
+    if (entry.codexSandbox) {
+      args.store.writeCodexSandboxSettings(entry.personaId, entry.codexSandbox);
+      args.logger.info("persona.seed.codex-sandbox", { personaId: entry.personaId });
+    }
     copyBundleExtras(bundleDir, args.store.personaDirPath(entry.personaId));
     args.logger.info("persona.seed.created", { personaId: entry.personaId });
   }
@@ -35225,6 +35282,39 @@ function refreshDaemonManagedDirs(args) {
     }
   }
 }
+function migrateAgentsMirror(args) {
+  let mirrored = 0;
+  for (const personaId of args.store.list()) {
+    try {
+      if (args.store.ensureAgentsMirror(personaId)) {
+        mirrored++;
+        args.logger.info("persona.agents-mirror.synced", { personaId });
+      }
+    } catch (err) {
+      args.logger.warn("persona.agents-mirror.failed", {
+        personaId,
+        error: err instanceof Error ? err.message : String(err)
+      });
+    }
+  }
+  if (mirrored > 0) args.logger.info("persona.agents-mirror.done", { mirrored });
+}
+function migrateCodexSandbox(args) {
+  const entries = args.entries ?? DEFAULT_PERSONAS;
+  let n = 0;
+  for (const personaId of args.store.list()) {
+    if (args.store.readCodexSandboxSettings(personaId)) continue;
+    try {
+      const def = entries.find((e) => e.personaId === personaId)?.codexSandbox ?? { writableRoots: [], denyRead: [], network: false };
+      args.store.writeCodexSandboxSettings(personaId, def);
+      n++;
+      args.logger.info("persona.codex-sandbox.synced", { personaId });
+    } catch (err) {
+      args.logger.warn("persona.codex-sandbox.failed", { personaId, error: err instanceof Error ? err.message : String(err) });
+    }
+  }
+  if (n > 0) args.logger.info("persona.codex-sandbox.done", { migrated: n });
+}
 
 // src/index.ts
 init_claude();
@@ -35421,19 +35511,58 @@ function resolveApprovalPolicy(ctx) {
   if (m2 === "untrusted" || m2 === "on-failure" || m2 === "on-request" || m2 === "never") return m2;
   return "on-request";
 }
+function buildCodexGuestConfig(cs) {
+  const filesystem = {};
+  for (const w2 of cs.writableRoots ?? []) filesystem[w2] = "write";
+  const deny = cs.denyRead ?? [];
+  if (deny.length > 0) {
+    const wsScoped = {};
+    for (const d of deny) wsScoped[d] = "deny";
+    filesystem[":workspace_roots"] = wsScoped;
+  }
+  return {
+    default_permissions: "clawos_guest",
+    permissions: {
+      clawos_guest: {
+        extends: ":workspace",
+        filesystem,
+        network: cs.network ? { enabled: true, domains: { "*": "allow" } } : { enabled: false }
+      }
+    }
+  };
+}
+function tomlValue(v2) {
+  if (typeof v2 === "string") return JSON.stringify(v2);
+  if (typeof v2 === "boolean" || typeof v2 === "number") return String(v2);
+  if (Array.isArray(v2)) return "[" + v2.map(tomlValue).join(",") + "]";
+  if (v2 && typeof v2 === "object") {
+    return "{" + Object.entries(v2).map(([k2, val]) => `${/^[A-Za-z0-9_-]+$/.test(k2) ? k2 : JSON.stringify(k2)}=${tomlValue(val)}`).join(",") + "}";
+  }
+  return JSON.stringify(v2);
+}
+function codexGuestCliArgs(cs) {
+  const cfg = buildCodexGuestConfig(cs);
+  const profile = cfg.permissions.clawos_guest;
+  return [
+    "-c",
+    `default_permissions=${tomlValue("clawos_guest")}`,
+    "-c",
+    `permissions.clawos_guest=${tomlValue(profile)}`
+  ];
+}
 function threadStartParams(ctx) {
   const params = {
     cwd: ctx.cwd,
-    sandbox: resolveSandbox(ctx),
     approvalPolicy: resolveApprovalPolicy(ctx),
     approvalsReviewer: "user",
-    ...ctx.model ? { model: ctx.model } : {}
+    ...ctx.model ? { model: ctx.model } : {},
+    // guest 沙箱由 app-server 启动 -c 注入的 permission profile（codexGuestCliArgs）控制——profile 是
+    // 进程启动解析的。故 guest **不发 sandbox 字段**（避免 sandbox mode 覆盖 profile）；owner/普通按 sandbox mode。
+    ...ctx.personaMode === "guest" ? {} : { sandbox: resolveSandbox(ctx) },
+    // 连接 intro（owner/guest 人称差异化）走 developerInstructions（developer 级、不进消息流、不显示在 UI），
+    // 取代旧的"折进首条 turn 文本"（那个被当用户消息显示）。thread/start + thread/resume 都带，幂等。
+    ...ctx.extraSystemPrompt ? { developerInstructions: ctx.extraSystemPrompt } : {}
   };
-  if (ctx.personaMode === "guest") {
-    params.config = {
-      sandbox_workspace_write: { writable_roots: ctx.addDirs ?? [], network_access: ctx.networkAccess ?? false }
-    };
-  }
   return params;
 }
 var ATTACHMENT_RE2 = /\[attachment:(image|file):([^\]]+)\]/g;
@@ -35462,12 +35591,14 @@ function turnStartInput(text) {
 function createCodexSession(ctx, sink, deps = {}) {
   const cmd = process.env.CODEX_BIN ?? "codex";
   const args = ["app-server", "--listen", "stdio://"];
+  if (ctx.personaMode === "guest" && ctx.codexSandbox) {
+    args.push(...codexGuestCliArgs(ctx.codexSandbox));
+  }
   const env = { ...process.env, ...ctx.env };
   const proc = deps.spawnOverride ? deps.spawnOverride(cmd, args, ctx.cwd, env) : (0, import_node_child_process3.spawn)(cmd, args, { cwd: ctx.cwd, env, stdio: ["pipe", "pipe", "pipe"] });
   let threadId = ctx.toolSessionId;
   let turnId;
   const approvalIds = /* @__PURE__ */ new Map();
-  let pendingSystemPrompt = ctx.toolSessionId ? void 0 : ctx.extraSystemPrompt;
   const effort = ctx.effort;
   let exited = false;
   const finish = (code) => {
@@ -35530,15 +35661,11 @@ function createCodexSession(ctx, sink, deps = {}) {
   })().catch((e) => sink.onError(`codex app-server init failed: ${e.message}`));
   return {
     startTurn(text) {
-      const body = pendingSystemPrompt ? `${pendingSystemPrompt}
-
-${text}` : text;
-      pendingSystemPrompt = void 0;
       void ready.then(() => {
         if (threadId)
           void client.request("turn/start", {
             threadId,
-            input: turnStartInput(body),
+            input: turnStartInput(text),
             // TurnStartParams 字段是 `effort`（不是 `reasoningEffort`，0.138 改名）——传错名字
             // codex 静默忽略, reasoning effort 改了不生效。"override for this turn and subsequent turns"。
             ...effort ? { effort } : {}
@@ -35677,7 +35804,7 @@ var CodexAdapter = class {
 
 // src/tools/claude-tui.ts
 var import_node_fs11 = __toESM(require("fs"), 1);
-var import_node_os5 = __toESM(require("os"), 1);
+var import_node_os6 = __toESM(require("os"), 1);
 var import_node_path10 = __toESM(require("path"), 1);
 var import_headless = __toESM(require_xterm_headless(), 1);
 
@@ -36657,7 +36784,7 @@ function buildTuiSpawnArgs(ctx, isResume = false) {
 }
 function jsonlExistsForCtx(ctx) {
   if (!ctx.toolSessionId) return false;
-  const home = import_node_os5.default.homedir();
+  const home = import_node_os6.default.homedir();
   const file = import_node_path10.default.join(home, ".claude", "projects", cwdToHashDir(ctx.cwd), `${ctx.toolSessionId}.jsonl`);
   try {
     return import_node_fs11.default.statSync(file).isFile();
@@ -36901,7 +37028,7 @@ async function listCodexSkills(cwd, deps = {}) {
 
 // src/workspace/browser.ts
 var import_node_fs12 = __toESM(require("fs"), 1);
-var import_node_os6 = __toESM(require("os"), 1);
+var import_node_os7 = __toESM(require("os"), 1);
 var import_node_path11 = __toESM(require("path"), 1);
 init_protocol();
 var MAX_FILE_BYTES = 2 * 1024 * 1024;
@@ -36927,7 +37054,7 @@ function ensureCwd(cwd) {
 }
 var WorkspaceBrowser = class {
   list(args) {
-    const cwd = args.cwd && args.cwd.length > 0 ? args.cwd : import_node_os6.default.homedir();
+    const cwd = args.cwd && args.cwd.length > 0 ? args.cwd : import_node_os7.default.homedir();
     ensureCwd(cwd);
     const full = resolveInsideCwd(cwd, args.path);
     const dirents = import_node_fs12.default.readdirSync(full, { withFileTypes: true });
@@ -36986,7 +37113,7 @@ var WorkspaceBrowser = class {
 
 // src/skills/agents-scanner.ts
 var import_node_fs13 = __toESM(require("fs"), 1);
-var import_node_os7 = __toESM(require("os"), 1);
+var import_node_os8 = __toESM(require("os"), 1);
 var import_node_path12 = __toESM(require("path"), 1);
 var DEFAULT_POLICY_DIR_DARWIN = "/Library/Application Support/ClaudeCode/.claude/agents";
 function isDirLikeSync2(p2) {
@@ -37129,7 +37256,7 @@ var AgentsScanner = class {
   extraPluginRoots;
   policyDir;
   constructor(opts = {}) {
-    this.home = opts.home ?? process.env.CLAUDE_CONFIG_DIR ?? import_node_os7.default.homedir();
+    this.home = opts.home ?? process.env.CLAUDE_CONFIG_DIR ?? import_node_os8.default.homedir();
     this.extraPluginRoots = opts.extraPluginRoots ?? [];
     if (opts.policyDir !== void 0) {
       this.policyDir = opts.policyDir;
@@ -37177,20 +37304,20 @@ var AgentsScanner = class {
 
 // src/observer/session-observer.ts
 var import_node_fs15 = __toESM(require("fs"), 1);
-var import_node_os9 = __toESM(require("os"), 1);
+var import_node_os10 = __toESM(require("os"), 1);
 var import_node_path14 = __toESM(require("path"), 1);
 init_claude_history();
 
 // src/observer/subagent-meta-observer.ts
 var import_node_fs14 = __toESM(require("fs"), 1);
-var import_node_os8 = __toESM(require("os"), 1);
+var import_node_os9 = __toESM(require("os"), 1);
 var import_node_path13 = __toESM(require("path"), 1);
 init_claude_history();
 var META_RE = /^agent-([A-Za-z0-9_-]+)\.meta\.json$/;
 var SubagentMetaObserver = class {
   constructor(opts) {
     this.opts = opts;
-    this.home = opts.home ?? import_node_os8.default.homedir();
+    this.home = opts.home ?? import_node_os9.default.homedir();
   }
   opts;
   home;
@@ -37301,7 +37428,7 @@ var SubagentMetaObserver = class {
 var SessionObserver = class {
   constructor(opts) {
     this.opts = opts;
-    this.home = opts.home ?? import_node_os9.default.homedir();
+    this.home = opts.home ?? import_node_os10.default.homedir();
     this.metaObserver = opts.enableSubagentMetaObserver ? new SubagentMetaObserver({ home: this.home, onEvent: opts.onEvent }) : null;
   }
   opts;
@@ -38619,20 +38746,35 @@ async function connectRemote(args) {
         return;
       }
       if (f.type === "auth:ok") {
-        ws.off("message", onMessage);
+        finish();
         resolve6();
         return;
       }
       if (f.type === "auth:error" || f.code === 4401) {
-        ws.off("message", onMessage);
+        finish();
         reject(new Error(`auth failed: ${f.message ?? f.type ?? "unknown"}`));
       }
     };
-    ws.on("message", onMessage);
-    setTimeout(() => {
-      ws.off("message", onMessage);
+    const onClose = (code, reason) => {
+      finish();
+      const detail = reason.toString() || (code === 4401 ? "BAD_TOKEN" : `code ${code}`);
+      reject(
+        new Error(
+          code === 4401 ? `auth rejected: ${detail}` : `connection closed before auth (code ${code})`
+        )
+      );
+    };
+    const timer = setTimeout(() => {
+      finish();
       reject(new Error("auth handshake timeout"));
     }, HANDSHAKE_TIMEOUT_MS);
+    function finish() {
+      ws.off("message", onMessage);
+      ws.off("close", onClose);
+      clearTimeout(timer);
+    }
+    ws.on("message", onMessage);
+    ws.once("close", onClose);
   });
   function call(method, payload) {
     const requestId = crypto5.randomUUID();
@@ -39093,7 +39235,7 @@ async function writeUploadedAttachment(args) {
 // src/extension/import.ts
 var import_promises2 = __toESM(require("fs/promises"), 1);
 var import_node_path17 = __toESM(require("path"), 1);
-var import_node_os10 = __toESM(require("os"), 1);
+var import_node_os11 = __toESM(require("os"), 1);
 var import_jszip = __toESM(require_lib3(), 1);
 var ImportError = class extends Error {
   constructor(code, message) {
@@ -39153,7 +39295,7 @@ async function importZip(buf, root) {
   if (destExists) {
     throw new ImportError("ALREADY_EXISTS", `extension ${manifest.id} already installed`);
   }
-  const stage = await import_promises2.default.mkdtemp(import_node_path17.default.join(import_node_os10.default.tmpdir(), `clawd-ext-stage-${manifest.id}-`));
+  const stage = await import_promises2.default.mkdtemp(import_node_path17.default.join(import_node_os11.default.tmpdir(), `clawd-ext-stage-${manifest.id}-`));
   try {
     for (const [name, entry] of Object.entries(zip.files)) {
       const dest = import_node_path17.default.join(stage, name);
@@ -40032,7 +40174,7 @@ function escape(v2) {
 
 // src/tunnel/frpc-binary.ts
 var import_node_fs22 = __toESM(require("fs"), 1);
-var import_node_os11 = __toESM(require("os"), 1);
+var import_node_os12 = __toESM(require("os"), 1);
 var import_node_path23 = __toESM(require("path"), 1);
 var import_node_child_process7 = require("child_process");
 var import_node_stream2 = require("stream");
@@ -40493,14 +40635,14 @@ async function waitForFrpcReady(proc, timeoutMs) {
 }
 
 // src/tunnel/device-key.ts
-var import_node_os12 = __toESM(require("os"), 1);
+var import_node_os13 = __toESM(require("os"), 1);
 var import_node_path26 = __toESM(require("path"), 1);
 var import_node_crypto8 = __toESM(require("crypto"), 1);
 var DERIVE_SALT = "clawd-tunnel-device-v1";
 function deriveStableDeviceKey(opts = {}) {
-  const hostname = opts.hostname ?? import_node_os12.default.hostname();
-  const uid = opts.uid ?? (typeof import_node_os12.default.userInfo === "function" ? import_node_os12.default.userInfo().uid : 0);
-  const home = opts.home ?? import_node_os12.default.homedir();
+  const hostname = opts.hostname ?? import_node_os13.default.hostname();
+  const uid = opts.uid ?? (typeof import_node_os13.default.userInfo === "function" ? import_node_os13.default.userInfo().uid : 0);
+  const home = opts.home ?? import_node_os13.default.homedir();
   const defaultDataDir = import_node_path26.default.resolve(import_node_path26.default.join(home, ".clawd"));
   const normalizedDataDir = opts.dataDir ? import_node_path26.default.resolve(opts.dataDir) : null;
   const isDefaultDir = normalizedDataDir == null || normalizedDataDir === defaultDataDir;
@@ -40577,11 +40719,11 @@ function writeAuthFile(file, content) {
 
 // src/owner-profile.ts
 var import_node_fs26 = __toESM(require("fs"), 1);
-var import_node_os13 = __toESM(require("os"), 1);
+var import_node_os14 = __toESM(require("os"), 1);
 var import_node_path28 = __toESM(require("path"), 1);
 var PROFILE_FILENAME = "profile.json";
 function loadOwnerDisplayName(dataDir) {
-  const fallback = import_node_os13.default.userInfo().username;
+  const fallback = import_node_os14.default.userInfo().username;
   const profilePath = import_node_path28.default.join(dataDir, PROFILE_FILENAME);
   let raw;
   try {
@@ -40966,7 +41108,7 @@ init_protocol();
 
 // src/session/fork.ts
 var import_node_fs28 = __toESM(require("fs"), 1);
-var import_node_os14 = __toESM(require("os"), 1);
+var import_node_os15 = __toESM(require("os"), 1);
 var import_node_path30 = __toESM(require("path"), 1);
 init_claude_history();
 function readJsonlEntries(file) {
@@ -40983,7 +41125,7 @@ function readJsonlEntries(file) {
   return out;
 }
 function forkSession(input) {
-  const baseDir = input.baseDir ?? import_node_path30.default.join(import_node_os14.default.homedir(), ".claude");
+  const baseDir = input.baseDir ?? import_node_path30.default.join(import_node_os15.default.homedir(), ".claude");
   const projectDir = import_node_path30.default.join(baseDir, "projects", cwdToHashDir(input.cwd));
   const sourceFile = import_node_path30.default.join(projectDir, `${input.toolSessionId}.jsonl`);
   if (!import_node_fs28.default.existsSync(sourceFile)) {
@@ -41553,7 +41695,7 @@ function buildHistoryHandlers(deps) {
 
 // src/handlers/workspace.ts
 var path42 = __toESM(require("path"), 1);
-var os15 = __toESM(require("os"), 1);
+var os16 = __toESM(require("os"), 1);
 init_protocol();
 init_protocol();
 function buildEnabledPluginNames(personaManager, personaId) {
@@ -41593,7 +41735,7 @@ function buildWorkspaceHandlers(deps) {
   const list = async (frame, _client, ctx) => {
     const args = WorkspaceListArgs.parse(frame);
     const isGuest = ctx?.principal.kind === "guest";
-    const fallbackCwd = isGuest && personaRoot ? personaRoot : os15.homedir();
+    const fallbackCwd = isGuest && personaRoot ? personaRoot : os16.homedir();
     const resolvedCwd = path42.resolve(args.cwd ?? fallbackCwd);
     const target = args.path ? path42.resolve(resolvedCwd, args.path) : resolvedCwd;
     assertGuestPath2(ctx, target, personaRoot, "workspace:list", usersRoot);
@@ -42020,6 +42162,7 @@ function buildFeishuAuthHandlers(deps) {
   };
   const logout = async () => {
     deps.ownerIdentityStore.clear();
+    deps.serverKeyStore.clear();
     return {
       response: { type: "auth:logout:ok" }
     };
@@ -42117,7 +42260,7 @@ function buildDeviceHandlers(deps) {
 }
 
 // src/handlers/meta.ts
-var import_node_os15 = __toESM(require("os"), 1);
+var import_node_os16 = __toESM(require("os"), 1);
 init_protocol();
 
 // src/version.ts
@@ -42148,7 +42291,7 @@ function buildReadyFrame(deps, client) {
   return {
     version,
     protocolVersion: PROTOCOL_VERSION,
-    hostname: import_node_os15.default.hostname(),
+    hostname: import_node_os16.default.hostname(),
     os: process.platform,
     tools,
     runningSessions: info.runningSessions,
@@ -42487,15 +42630,15 @@ function computePublishCheck(args) {
 // src/extension/install-flow.ts
 var import_promises5 = __toESM(require("fs/promises"), 1);
 var import_node_path35 = __toESM(require("path"), 1);
-var import_node_os17 = __toESM(require("os"), 1);
+var import_node_os18 = __toESM(require("os"), 1);
 var import_node_crypto12 = __toESM(require("crypto"), 1);
 var import_jszip3 = __toESM(require_lib3(), 1);
 
 // src/extension/paths.ts
-var import_node_os16 = __toESM(require("os"), 1);
+var import_node_os17 = __toESM(require("os"), 1);
 var import_node_path34 = __toESM(require("path"), 1);
 function clawdHomeRoot(override) {
-  return override ?? process.env.CLAWD_HOME ?? import_node_path34.default.join(import_node_os16.default.homedir(), ".clawd");
+  return override ?? process.env.CLAWD_HOME ?? import_node_path34.default.join(import_node_os17.default.homedir(), ".clawd");
 }
 function extensionsRoot(override) {
   return import_node_path34.default.join(clawdHomeRoot(override), "extensions");
@@ -42577,7 +42720,7 @@ async function installFromChannel(args, deps) {
     );
   }
   const stage = await import_promises5.default.mkdtemp(
-    import_node_path35.default.join(import_node_os17.default.tmpdir(), `clawd-ext-install-${localExtId}-`)
+    import_node_path35.default.join(import_node_os18.default.tmpdir(), `clawd-ext-install-${localExtId}-`)
   );
   try {
     for (const [name, entry] of Object.entries(zip.files)) {
@@ -42608,7 +42751,7 @@ async function installFromChannel(args, deps) {
 // src/extension/update-flow.ts
 var import_promises6 = __toESM(require("fs/promises"), 1);
 var import_node_path36 = __toESM(require("path"), 1);
-var import_node_os18 = __toESM(require("os"), 1);
+var import_node_os19 = __toESM(require("os"), 1);
 var import_node_crypto13 = __toESM(require("crypto"), 1);
 var import_jszip4 = __toESM(require_lib3(), 1);
 var UpdateError = class extends Error {
@@ -42696,7 +42839,7 @@ async function updateFromChannel(args, deps) {
   await import_promises6.default.rm(prevDir, { recursive: true, force: true });
   await import_promises6.default.rename(liveDir, prevDir);
   const stage = await import_promises6.default.mkdtemp(
-    import_node_path36.default.join(import_node_os18.default.tmpdir(), `clawd-ext-update-${localExtId}-`)
+    import_node_path36.default.join(import_node_os19.default.tmpdir(), `clawd-ext-update-${localExtId}-`)
   );
   try {
     for (const [name, entry] of Object.entries(zip.files)) {
@@ -45252,6 +45395,8 @@ async function startDaemon(config) {
   } else {
     logger.warn("persona.seed.skip", { reason: "defaults-root-not-found" });
   }
+  migrateAgentsMirror({ store: personaStore, logger });
+  migrateCodexSandbox({ store: personaStore, logger });
   const groupFileStore = new GroupFileStore({ dataDir: config.dataDir, logger });
   const manager = new SessionManager({
     store,
@@ -45402,15 +45547,14 @@ async function startDaemon(config) {
   };
   const fetchServerKey = async () => {
     if (!feishuActive) return;
-    if (serverKeyStore.read()) return;
     try {
       const { publicKeyPem } = await centralGetPublicKey({
         api: config.clawosApi ?? DEFAULT_CLAWOS_API
       });
       serverKeyStore.write(publicKeyPem);
-      logger.info("server signing key cached");
+      logger.info("server signing key refreshed");
     } catch (err) {
-      logger.warn("server signing key fetch failed (guest \u5165\u7AD9\u5C06\u88AB\u62D2\u7EDD)", {
+      logger.warn("server signing key fetch failed (\u4FDD\u7559\u65E7\u7F13\u5B58)", {
         err: err.message
       });
     }
@@ -45516,7 +45660,7 @@ async function startDaemon(config) {
     bundleCache,
     // 飞书统一身份 Phase 1：登录 RPC handlers（auth:login:start / getIdentity / logout）
     // deviceId（决策 #15）：getIdentity 返回给 UI 拼"我的设备标识"
-    feishuAuth: { loginFlow, ownerIdentityStore, deviceId: authFile.deviceId },
+    feishuAuth: { loginFlow, ownerIdentityStore, deviceId: authFile.deviceId, serverKeyStore },
     // 设备目录 + 连接（决策 #15：daemon 代理中心 server）。
     // exchange/listDevices 包掉 owner ttcJwt（每次现读 store——热切换后立即用新身份）；
     // dispatcher 的 FEISHU_GATED_METHODS gate 已保证未登录时这些 RPC 到不了 handler，

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawos-dev/clawd",
-  "version": "0.2.135-beta.280.568890f",
+  "version": "0.2.135-beta.282.8ee36dc",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",