@clawos-dev/clawd 0.2.44-beta.65.0ec3371 → 0.2.45-beta.66.2111d29

package/dist/cli.cjs

@@ -10784,7 +10784,7 @@ function buildSpawnArgs(ctx) {
       args.push("--setting-sources", "project,local");
       break;
     case "owner":
-      args.push("--setting-sources", "user");
+      args.push("--setting-sources", "user,project,local");
       args.push("--permission-mode", "bypassPermissions");
       break;
     case void 0:
@@ -10795,6 +10795,7 @@ function buildSpawnArgs(ctx) {
       throw new Error(`unexpected personaMode: ${String(_exhaustive)}`);
     }
   }
+  if (ctx.extraSettings) args.push("--settings", ctx.extraSettings);
   if (ctx.effort) args.push("--effort", ctx.effort);
   if (ctx.toolSessionId) args.push("--resume", ctx.toolSessionId);
   return args;
@@ -15709,6 +15710,9 @@ function buildSpawnContext(state) {
   if (meta?.personaMode) {
     ctx.personaMode = meta.personaMode;
   }
+  if (meta?.extraSettings) {
+    ctx.extraSettings = meta.extraSettings;
+  }
   return ctx;
 }
 function sessionInfoFrame(file) {
@@ -17631,16 +17635,52 @@ var PersonaStore = class {
   claudeMdPath(personaId) {
     return path6.join(this.personaDir(personaId), "CLAUDE.md");
   }
-  settingsPath(personaId) {
+  /**
+   * Sandbox settings 落盘路径 —— 故意放在 `.clawd/` 而不是 `.claude/`，让 CC 的
+   * project source 自动发现机制扫不到。owner 模式 spawn 时不会被 `--setting-sources
+   * user,project,local` 顺手带进来；listener 模式靠 `--settings <这个路径>` 显式拉回。
+   * 把 sandbox 跟 persona CLAUDE.md（仍在 `<persona>/CLAUDE.md`）解耦后，两种模式都能
+   * 加载 persona 人格，只有 listener 多一层 OS sandbox。
+   */
+  sandboxSettingsPath(personaId) {
+    return path6.join(this.personaDir(personaId), ".clawd", "sandbox-settings.json");
+  }
+  /** 旧布局（< owner-personality-fix）的 sandbox 落点；只用于迁移 + 测试断言 */
+  legacySettingsPath(personaId) {
     return path6.join(this.personaDir(personaId), ".claude", "settings.json");
   }
   write(persona, personality) {
     const dir = this.personaDir(persona.personaId);
-    fs6.mkdirSync(path6.join(dir, ".claude"), { recursive: true });
     fs6.mkdirSync(path6.join(dir, ".clawd"), { recursive: true });
     this.atomicWrite(this.claudeMdPath(persona.personaId), personality);
-    this.atomicWrite(this.settingsPath(persona.personaId), JSON.stringify(DEFAULT_SETTINGS, null, 2));
+    this.atomicWrite(
+      this.sandboxSettingsPath(persona.personaId),
+      JSON.stringify(DEFAULT_SETTINGS, null, 2)
+    );
     this.atomicWrite(this.metaPath(persona.personaId), JSON.stringify(persona, null, 2));
+    this.removeLegacyLayout(persona.personaId);
+  }
+  /**
+   * 把旧布局（`<persona>/.claude/settings.json` 持有 sandbox）迁到新布局
+   * （`<persona>/.clawd/sandbox-settings.json`）。在 PersonaRegistry boot reload
+   * 时对每个已存在 persona 调一次；幂等，新布局已就位则直接 noop / 清残留。
+   * 返回 true 表示真做了迁移（写日志 / 测试断言用）。
+   */
+  migrateLegacyLayout(personaId) {
+    const legacy = this.legacySettingsPath(personaId);
+    const target = this.sandboxSettingsPath(personaId);
+    if (!fs6.existsSync(legacy)) return false;
+    if (fs6.existsSync(target)) {
+      fs6.unlinkSync(legacy);
+      return true;
+    }
+    fs6.mkdirSync(path6.dirname(target), { recursive: true });
+    fs6.renameSync(legacy, target);
+    return true;
+  }
+  removeLegacyLayout(personaId) {
+    const legacy = this.legacySettingsPath(personaId);
+    if (fs6.existsSync(legacy)) fs6.unlinkSync(legacy);
   }
   writePersonality(personaId, personality) {
     this.atomicWrite(this.claudeMdPath(personaId), personality);
@@ -17694,6 +17734,7 @@ var PersonaRegistry = class {
   reload() {
     this.cache.clear();
     for (const id of this.store.list()) {
+      this.store.migrateLegacyLayout(id);
       const p = this.store.read(id);
       if (p) this.cache.set(p.personaId, p);
     }
@@ -17840,7 +17881,14 @@ var PersonaManager = class {
       tool: "claude",
       label: subLabel,
       model: persona.model,
-      subSessionMeta: { idleKillEnabled: true, personaMode: "listener" }
+      // listener 走 OS sandbox：sandbox JSON 不在 project 自动发现路径上（PersonaStore 把它
+      // 落在 .clawd/sandbox-settings.json），靠 extraSettings 透传到 spawn 的 `--settings <file>`
+      // 显式拉回。owner 路径不传 extraSettings，天然无 sandbox。
+      subSessionMeta: {
+        idleKillEnabled: true,
+        personaMode: "listener",
+        extraSettings: this.deps.store.sandboxSettingsPath(personaId)
+      }
     });
     return { sessionFile, isNew: true };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawos-dev/clawd",
-  "version": "0.2.44-beta.65.0ec3371",
+  "version": "0.2.45-beta.66.2111d29",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",