@clawos-dev/clawd 0.2.135-beta.279.732f6db → 0.2.135-beta.281.fb1ead2

package/dist/cli.cjs

@@ -4508,6 +4508,9 @@ var init_persona_schemas = __esm({
       // 8-key set defined UI-side in `lib/session-icons.ts`; protocol stays plain string
       // for forward compatibility, consumer fallbacks to default when key not found.
       iconKey: external_exports.string().optional(),
+      // 绑定的 agent tool（'claude' / 'codex'）；缺省消费侧按 'claude' 兜底。
+      // 与 model 平行：persona 新建 session 的默认 tool，可平滑切换。
+      tool: external_exports.string().optional(),
       createdAt: external_exports.number(),
       updatedAt: external_exports.number()
     }).strict();
@@ -4558,6 +4561,7 @@ var init_persona_schemas = __esm({
       label: external_exports.string().min(1),
       personality: external_exports.string(),
       model: external_exports.string().optional(),
+      tool: external_exports.string().optional(),
       public: external_exports.boolean().optional(),
       iconKey: external_exports.string().optional()
     }).strict();
@@ -4569,6 +4573,7 @@ var init_persona_schemas = __esm({
       patch: external_exports.object({
         label: external_exports.string().min(1).optional(),
         model: external_exports.string().optional(),
+        tool: external_exports.string().optional(),
         personality: external_exports.string().optional(),
         public: external_exports.boolean().optional(),
         // pass `null` to clear; daemon strips the field from PersonaFile on null
@@ -31762,6 +31767,9 @@ function buildSpawnContext(state, deps) {
   if (meta?.addDirs && meta.addDirs.length > 0) {
     ctx.addDirs = meta.addDirs;
   }
+  if (meta?.networkAccess !== void 0) {
+    ctx.networkAccess = meta.networkAccess;
+  }
   return ctx;
 }
 function sessionInfoFrame(file) {
@@ -33258,6 +33266,8 @@ 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 attachmentGroup = this.deps.attachmentGroup;
     const runner = new SessionRunner(makeInitialState(file, subSessionMeta), {
@@ -34472,6 +34482,11 @@ var PersonaStore = class {
   claudeMdPath(personaId) {
     return path9.join(this.personaDir(personaId), "CLAUDE.md");
   }
+  // codex 原生读 cwd 的 AGENTS.md。人格双写镜像：claude 读 CLAUDE.md、codex 读 AGENTS.md，
+  // 两份内容恒一致，persona 切 tool 零迁移。
+  agentsMdPath(personaId) {
+    return path9.join(this.personaDir(personaId), "AGENTS.md");
+  }
   /**
    * persona 级 sandbox 模板落盘路径 —— 故意放 `.clawd/` 而非 `.claude/`，让 CC 的 project
    * source 自动发现扫不到（owner `--setting-sources user,project,local` 不会顺手带进来）。
@@ -34485,6 +34500,7 @@ var PersonaStore = class {
     const dir = this.personaDir(persona.personaId);
     fs7.mkdirSync(path9.join(dir, ".clawd"), { recursive: true });
     this.atomicWrite(this.claudeMdPath(persona.personaId), personality);
+    this.atomicWrite(this.agentsMdPath(persona.personaId), personality);
     this.atomicWrite(
       this.sandboxSettingsPath(persona.personaId),
       JSON.stringify(buildGuestSettingsV1(), null, 2)
@@ -34493,6 +34509,21 @@ var PersonaStore = class {
   }
   writePersonality(personaId, personality) {
     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 之后可手编）。
@@ -34522,9 +34553,11 @@ var PersonaStore = class {
     return fs7.existsSync(this.metaPath(personaId));
   }
   readPersonality(personaId) {
-    const p2 = this.claudeMdPath(personaId);
-    if (!fs7.existsSync(p2)) return null;
-    return fs7.readFileSync(p2, "utf8");
+    const claudeMd = this.claudeMdPath(personaId);
+    if (fs7.existsSync(claudeMd)) return fs7.readFileSync(claudeMd, "utf8");
+    const agentsMd = this.agentsMdPath(personaId);
+    if (fs7.existsSync(agentsMd)) return fs7.readFileSync(agentsMd, "utf8");
+    return null;
   }
   /**
    * 读 sandbox-settings.json 当前内容；文件不存在 / JSON 解析失败均返回 null。
@@ -34926,6 +34959,7 @@ var PersonaManager = class {
       personaId,
       label: args.label,
       model: args.model,
+      tool: args.tool,
       public: args.public ?? false,
       iconKey: args.iconKey,
       createdAt: now,
@@ -35205,6 +35239,23 @@ 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 });
+}
 
 // src/index.ts
 init_claude();
@@ -35392,24 +35443,29 @@ function num(v2) {
 
 // src/tools/codex-app-server-params.ts
 function resolveSandbox(ctx) {
-  if (ctx.personaMode === "guest") throw new Error("codex \u6682\u4E0D\u652F\u6301 guest persona session\uFF1B\u8BF7\u7528 claude \u6216 owner");
+  if (ctx.personaMode === "guest") return "workspace-write";
   return "danger-full-access";
 }
 function resolveApprovalPolicy(ctx) {
+  if (ctx.personaMode === "owner" || ctx.personaMode === "guest") return "never";
   const m2 = ctx.permissionMode ?? "";
   if (m2 === "untrusted" || m2 === "on-failure" || m2 === "on-request" || m2 === "never") return m2;
   return "on-request";
 }
 function threadStartParams(ctx) {
-  return {
+  const params = {
     cwd: ctx.cwd,
     sandbox: resolveSandbox(ctx),
-    // persona 侧
     approvalPolicy: resolveApprovalPolicy(ctx),
-    // 会话设置侧
     approvalsReviewer: "user",
     ...ctx.model ? { model: ctx.model } : {}
   };
+  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;
 var SKILL_RE = /\[skill:(.+?):(\/[^\]]+)\]/g;
@@ -35598,6 +35654,10 @@ var CODEX_CAPABILITIES = {
     }
   ]
 };
+function sanitizeCodexModel(model) {
+  if (model === void 0) return void 0;
+  return CODEX_MODELS.some((m2) => m2.id === model) ? model : void 0;
+}
 async function probeCodex(env = process.env) {
   if (env.CODEX_BIN && import_node_fs10.default.existsSync(env.CODEX_BIN)) return { available: true, path: env.CODEX_BIN };
   try {
@@ -35631,7 +35691,7 @@ var CodexAdapter = class {
     return (CODEX_MODELS.find((m2) => m2.id === (modelId ?? "")) ?? CODEX_MODELS[0]).contextWindowSize;
   }
   createSession(ctx, sink) {
-    return createCodexSession(ctx, sink, { logger: this.logger });
+    return createCodexSession({ ...ctx, model: sanitizeCodexModel(ctx.model) }, sink, { logger: this.logger });
   }
   spawn(_ctx) {
     throw new Error("CodexAdapter uses createSession, not spawn");
@@ -41051,15 +41111,17 @@ function buildSessionHandlers(deps) {
   };
   const create = async (frame, _client, ctx) => {
     const args = SessionCreateArgs.parse(frame);
+    let tool = args.tool;
     if (args.ownerPersonaId) {
       const persona = deps.personaRegistry.get(args.ownerPersonaId);
       if (!persona) {
         throw new Error(`persona not found: ${args.ownerPersonaId}`);
       }
+      tool = persona.tool ?? args.tool;
     }
     ensurePersonaAccess(ctx, args.ownerPersonaId, "send");
     const creatorPrincipalId = ctx?.principal.id ?? ownerPrincipalId;
-    const { response, broadcast } = manager.create(args, creatorPrincipalId);
+    const { response, broadcast } = manager.create({ ...args, tool }, creatorPrincipalId);
     return { response: { type: "session:info", ...response }, broadcast };
   };
   const list = async (_frame, _client, ctx) => {
@@ -45221,6 +45283,7 @@ async function startDaemon(config) {
   } else {
     logger.warn("persona.seed.skip", { reason: "defaults-root-not-found" });
   }
+  migrateAgentsMirror({ store: personaStore, logger });
   const groupFileStore = new GroupFileStore({ dataDir: config.dataDir, logger });
   const manager = new SessionManager({
     store,

package/package.json

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