@clawos-dev/clawd 0.2.277 → 0.2.279

package/dist/dispatch/mcp-server.cjs

@@ -3227,8 +3227,8 @@ var require_utils = __commonJS({
       }
       return ind;
     }
-    function removeDotSegments(path4) {
-      let input = path4;
+    function removeDotSegments(path2) {
+      let input = path2;
       const output = [];
       let nextSlash = -1;
       let len = 0;
@@ -3480,8 +3480,8 @@ var require_schemes = __commonJS({
         wsComponent.secure = void 0;
       }
       if (wsComponent.resourceName) {
-        const [path4, query] = wsComponent.resourceName.split("?");
-        wsComponent.path = path4 && path4 !== "/" ? path4 : void 0;
+        const [path2, query] = wsComponent.resourceName.split("?");
+        wsComponent.path = path2 && path2 !== "/" ? path2 : void 0;
         wsComponent.query = query;
         wsComponent.resourceName = void 0;
       }
@@ -6874,12 +6874,12 @@ var require_dist = __commonJS({
         throw new Error(`Unknown format "${name}"`);
       return f;
     };
-    function addFormats(ajv, list, fs6, exportName) {
+    function addFormats(ajv, list, fs4, exportName) {
       var _a;
       var _b;
       (_a = (_b = ajv.opts.code).formats) !== null && _a !== void 0 ? _a : _b.formats = (0, codegen_1._)`require("ajv-formats/dist/formats").${exportName}`;
       for (const f of list)
-        ajv.addFormat(f, fs6[f]);
+        ajv.addFormat(f, fs4[f]);
     }
     module2.exports = exports2 = formatsPlugin;
     Object.defineProperty(exports2, "__esModule", { value: true });
@@ -6895,7 +6895,7 @@ __export(mcp_server_exports, {
   handlePersonaDispatchToolCall: () => handlePersonaDispatchToolCall
 });
 module.exports = __toCommonJS(mcp_server_exports);
-var import_node_fs5 = __toESM(require("fs"), 1);
+var import_node_fs3 = __toESM(require("fs"), 1);
 
 // ../node_modules/.pnpm/zod@3.25.76/node_modules/zod/v3/external.js
 var external_exports = {};
@@ -7375,8 +7375,8 @@ function getErrorMap() {
 
 // ../node_modules/.pnpm/zod@3.25.76/node_modules/zod/v3/helpers/parseUtil.js
 var makeIssue = (params) => {
-  const { data, path: path4, errorMaps, issueData } = params;
-  const fullPath = [...path4, ...issueData.path || []];
+  const { data, path: path2, errorMaps, issueData } = params;
+  const fullPath = [...path2, ...issueData.path || []];
   const fullIssue = {
     ...issueData,
     path: fullPath
@@ -7492,11 +7492,11 @@ var errorUtil;
 
 // ../node_modules/.pnpm/zod@3.25.76/node_modules/zod/v3/types.js
 var ParseInputLazyPath = class {
-  constructor(parent, value, path4, key) {
+  constructor(parent, value, path2, key) {
     this._cachedPath = [];
     this.parent = parent;
     this.data = value;
-    this._path = path4;
+    this._path = path2;
     this._key = key;
   }
   get path() {
@@ -11133,10 +11133,10 @@ function assignProp(target, prop, value) {
     configurable: true
   });
 }
-function getElementAtPath(obj, path4) {
-  if (!path4)
+function getElementAtPath(obj, path2) {
+  if (!path2)
     return obj;
-  return path4.reduce((acc, key) => acc?.[key], obj);
+  return path2.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -11456,11 +11456,11 @@ function aborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path4, issues) {
+function prefixIssues(path2, issues) {
   return issues.map((iss) => {
     var _a;
     (_a = iss).path ?? (_a.path = []);
-    iss.path.unshift(path4);
+    iss.path.unshift(path2);
     return iss;
   });
 }
@@ -21959,12 +21959,22 @@ var sessionMetaShape = {
   contextWindowSize: external_exports.number().int().positive().optional()
 };
 var SessionMetaSchema = external_exports.object(sessionMetaShape);
+var SelectOptionSchema = external_exports.object({
+  value: external_exports.string(),
+  label: external_exports.string(),
+  description: external_exports.string().optional()
+});
 var ModelInfoSchema = external_exports.object({
   id: external_exports.string().min(1),
   label: external_exports.string().min(1),
   description: external_exports.string().optional(),
   contextWindowSize: external_exports.number().int().positive(),
-  default: external_exports.boolean().optional()
+  default: external_exports.boolean().optional(),
+  // 该模型支持的 reasoning effort 档位（codex：per-model，gpt-5.6 系有 max/ultra、5.5 只有四档）。
+  // 缺省 = 该 tool 的 effort 与模型无关（claude 即此情形），消费方回落到 configSchema 里
+  // name==='effort' 那条字段的 options。
+  efforts: external_exports.array(SelectOptionSchema).optional(),
+  defaultEffort: external_exports.string().optional()
 });
 var ModeInfoSchema = external_exports.object({
   id: external_exports.string().min(1),
@@ -21976,13 +21986,7 @@ var ConfigFieldSchemaSchema = external_exports.object({
   type: external_exports.enum(["string", "select", "toggle"]),
   label: external_exports.string().min(1),
   description: external_exports.string().optional(),
-  options: external_exports.array(
-    external_exports.object({
-      value: external_exports.string(),
-      label: external_exports.string(),
-      description: external_exports.string().optional()
-    })
-  ).optional(),
+  options: external_exports.array(SelectOptionSchema).optional(),
   default: external_exports.unknown().optional(),
   scope: external_exports.enum(["core", "tool-specific"])
 });
@@ -22376,6 +22380,16 @@ var SessionCreateArgs = external_exports.object({
 }).refine((args) => args.cwd != null || args.ownerPersonaId != null, {
   message: "cwd \u4E0E ownerPersonaId \u81F3\u5C11\u4F20\u4E00\u4E2A"
 });
+var SessionImportExternalArgs = external_exports.object({
+  cwd: external_exports.string().min(1),
+  tool: external_exports.string().min(1),
+  toolSessionId: external_exports.string().min(1),
+  label: external_exports.string().optional(),
+  iconKey: external_exports.string().optional(),
+  createdAt: external_exports.string().datetime(),
+  updatedAt: external_exports.string().datetime(),
+  ownerPersonaId: external_exports.string().min(1).optional()
+});
 var SessionListArgs = external_exports.object({
   /** true = 只返回 mirror（originOwnerPrincipalId 非空，即「我在朋友 daemon 上创建」的本机存证）。 */
   originOnly: external_exports.boolean().optional(),
@@ -22915,6 +22929,10 @@ var METHOD_DOCS = {
       anyOf: [{ required: ["cwd"] }, { required: ["ownerPersonaId"] }]
     }
   },
+  "session:importExternal": {
+    summary: "\u628A Claude Code / Codex \u65E2\u6709\u5386\u53F2\u4F1A\u8BDD\u5BFC\u5165\u4E3A clawd \u5F15\u7528\uFF1A\u53EA\u5199 SessionFile\uFF0C\u4E0D\u62C9\u8D77 runner\uFF0C\u4E0D\u6539\u539F\u59CB transcript\uFF1B\u6309 toolSessionId \u8DE8 owned scope \u53BB\u91CD\uFF0C\u65B0\u5BFC\u5165\u4F1A\u5E7F\u64AD session:info",
+    args: SessionImportExternalArgs
+  },
   "session:list": {
     summary: "\u5217\u51FA\u5F53\u524D\u8EAB\u4EFD\u53EF\u89C1\u7684\u4F1A\u8BDD\uFF08owner \u5168\u91CF\uFF1Bguest \u9650\u88AB\u6388\u6743 persona\uFF09",
     args: SessionListArgs
@@ -23514,11 +23532,11 @@ Diff.prototype = {
       }
     }
   },
-  addToPath: function addToPath(path4, added, removed, oldPosInc, options) {
-    var last = path4.lastComponent;
+  addToPath: function addToPath(path2, added, removed, oldPosInc, options) {
+    var last = path2.lastComponent;
     if (last && !options.oneChangePerToken && last.added === added && last.removed === removed) {
       return {
-        oldPos: path4.oldPos + oldPosInc,
+        oldPos: path2.oldPos + oldPosInc,
         lastComponent: {
           count: last.count + 1,
           added,
@@ -23528,7 +23546,7 @@ Diff.prototype = {
       };
     } else {
       return {
-        oldPos: path4.oldPos + oldPosInc,
+        oldPos: path2.oldPos + oldPosInc,
         lastComponent: {
           count: 1,
           added,
@@ -24023,80 +24041,6 @@ var CLAUDE_CAPABILITIES = {
   ]
 };
 
-// src/tools/codex.ts
-var import_node_child_process5 = require("child_process");
-var import_node_fs4 = __toESM(require("fs"), 1);
-
-// src/tools/codex-session.ts
-var import_node_child_process4 = require("child_process");
-var import_node_path3 = __toESM(require("path"), 1);
-
-// src/tools/codex-app-server-client.ts
-var import_node_readline = require("readline");
-
-// src/tools/codex-mcp-config.ts
-var import_node_fs3 = __toESM(require("fs"), 1);
-var import_node_path2 = __toESM(require("path"), 1);
-
-// src/tools/codex-features.ts
-var import_node_child_process3 = require("child_process");
-
-// src/tools/codex.ts
-var CODEX_MODEL_IDS = ["gpt-5.5", "gpt-5.4", "gpt-5.4-mini"];
-var CODEX_MODELS = [
-  { id: "", label: "Default", description: "codex config.toml \u9ED8\u8BA4", contextWindowSize: 258400, default: true },
-  { id: "gpt-5.5", label: "GPT-5.5", description: "Frontier model for complex coding", contextWindowSize: 258400 },
-  { id: "gpt-5.4", label: "GPT-5.4", contextWindowSize: 258400 },
-  { id: "gpt-5.4-mini", label: "GPT-5.4-Mini", contextWindowSize: 258400 }
-];
-var CODEX_EFFORTS = [
-  { value: "low", label: "Low", description: "Fast responses with lighter reasoning" },
-  { value: "medium", label: "Medium", description: "Balances speed and reasoning depth for everyday tasks" },
-  { value: "high", label: "High", description: "Greater reasoning depth for complex problems" },
-  { value: "xhigh", label: "Extra high", description: "Extra high reasoning depth for complex problems" }
-];
-var CODEX_APPROVAL_PRESETS = [
-  { id: "untrusted", label: "Ask for approval", description: "\u51E0\u4E4E\u6BCF\u6761\u547D\u4EE4\u90FD\u95EE\u4F60\uFF08\u6700\u8C28\u614E\uFF09" },
-  { id: "on-request", label: "Approve for me", description: "\u6A21\u578B\u81EA\u5DF1\u5224\u65AD\uFF0C\u53EA\u5BF9\u9AD8\u98CE\u9669\u64CD\u4F5C\u95EE\u4F60\uFF08\u9ED8\u8BA4\uFF09" },
-  { id: "never", label: "Full Access", description: "\u4ECE\u4E0D\u8BE2\u95EE\uFF0C\u81EA\u4E3B\u6267\u884C" }
-];
-var CODEX_CAPABILITIES = {
-  tool: "codex",
-  toolSessionIdLabel: "Codex Thread ID",
-  models: CODEX_MODELS,
-  permissionModes: CODEX_APPROVAL_PRESETS,
-  // codex 不支持这些 clawd 功能(rewind 无 file-snapshot / 无子 agent / 无 TUI pty /
-  // 无 observe 推送 / 无文件分享 / fork 是 claude jsonl 专用)；UI 据此 gate 入口。
-  features: { rewind: false, subagents: false, tui: false, observe: false, fileSharing: false, fork: false },
-  configSchema: [
-    {
-      name: "model",
-      type: "select",
-      label: "Model",
-      scope: "core",
-      options: CODEX_MODELS.map((m) => ({ value: m.id, label: m.label, description: m.description })),
-      default: ""
-    },
-    {
-      name: "permissionMode",
-      type: "select",
-      label: "Approval",
-      scope: "core",
-      options: CODEX_APPROVAL_PRESETS.map((m) => ({ value: m.id, label: m.label, description: m.description })),
-      default: "on-request"
-    },
-    {
-      name: "effort",
-      type: "select",
-      label: "Reasoning effort",
-      scope: "tool-specific",
-      // 渲染在 Advanced 区（与 claude effort 一致）
-      options: CODEX_EFFORTS,
-      default: "medium"
-    }
-  ]
-};
-
 // src/dispatch/mcp-server.ts
 var DISPATCH_LOG = process.env.CLAWD_DISPATCH_LOG;
 function log(msg, info) {
@@ -24104,7 +24048,7 @@ function log(msg, info) {
 `;
   if (DISPATCH_LOG) {
     try {
-      import_node_fs5.default.appendFileSync(DISPATCH_LOG, line);
+      import_node_fs3.default.appendFileSync(DISPATCH_LOG, line);
       return;
     } catch {
     }
@@ -24341,11 +24285,13 @@ async function main() {
         targetDeviceId: external_exports.string().optional().describe(
           "contact deviceId of the remote device when delegating cross-device (omit for a local persona)"
         ),
-        // T-20: dispatch model override. Enum 走 MCP tool JSON schema 硬约束，
-        // caller LLM 只能从可选值挑，避免瞎填历史模型名。claude / codex 两表 union——
-        // 精确校验（按 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(" / ") + "."
+        // T-20: dispatch model override。
+        // 2026-08-03 起不再用 enum 硬约束：codex 的模型表已运行时化（随安装的 codex 版本变），
+        // 没有编译期常量可枚举——硬 enum 的前提正是一张静态表，而静态表会过期并拒掉 UI 里
+        // 明明能选到的新模型。精确校验下沉到 daemon handler（按 target persona tool 查运行时
+        // capabilities，fail-fast 且错误消息列出 allowed 值，caller 据此自我纠正）。
+        model: external_exports.string().optional().describe(
+          "override the target persona's default model. Omit to use the persona default. Claude personas: " + CLAUDE_MODEL_IDS.join(" / ") + ". Codex personas: model ids vary by installed codex version \u2014 omit unless you know the exact id (invalid values are rejected with the allowed list)."
         ),
         // butler 顶部入口 (spec 2026-07-27)：butler 给新 worker session 起 label 用。
         // Sidebar 直接显示这个 label（否则兜底 cwd-basename 都是 persona 目录名，同一

package/dist/persona-defaults/persona-clawd-butler/.claude/skills/clawd-session-import/SKILL.md

@@ -39,6 +39,7 @@ node .claude/skills/clawd-session-import/scripts/link-sessions.mjs --days 7 --ap
 | `--min-turns N` | 少于 N 轮用户发言的会话跳过，默认 2（滤掉「hello」这种试水会话） |
 | `--include-clawd` | 连 `~/.clawd` 目录下的会话也关联。默认跳过——那些本来就是 clawd 自己开的 |
 | `--icon KEY` | 侧边栏图标：`research/code/loop/qa/reading/debug/idea/doc/assist`，默认 `reading` |
+| `--owner-persona-id ID` | 显式挂到某个 persona。默认不传，导入普通 session，进入 Recent |
 | `--json` | 输出 JSON，含被跳过的条目和原因，便于你自己筛 |
 
 撤销（删掉本工具建过的全部引用，原会话文件不受影响）：
@@ -48,19 +49,27 @@ node .claude/skills/clawd-session-import/scripts/link-sessions.mjs --undo
 node .claude/skills/clawd-session-import/scripts/link-sessions.mjs --undo --apply  # 真删
 ```
 
-## 原理（已对 clawd 源码核实）
+## 原理
 
 一条 clawd 会话的元数据里有 `cwd` + `toolSessionId` 两个字段，指向底层工具那条真实
-对话。关联就是把这两个字段填对：
+对话。关联就是调用 daemon 的 `session:importExternal` RPC 建一条引用：
 
-1. `session:create` —— 只写一份元数据文件，**不拉起任何进程**，所以批量关联很便宜
-2. `session:resume` —— 该会话还没进程时，只是把 `toolSessionId` 写进元数据
-3. 脚本再把元数据里的创建/更新时间改回原会话的真实时间，侧边栏才按真实先后排序
-   （clawd 每次列会话都重读磁盘，改完立刻生效，不用重启）
+- daemon 只创建 clawd 引用，**不拉起任何进程**
+- daemon 不复制、不移动、不修改 Claude Code / Codex 的原始 transcript
+- daemon 按 `toolSessionId` 跨 default/persona scope 去重，已导入过就返回既有 session
+- daemon 用原会话 `createdAt` / `updatedAt` 写入 metadata，并广播 `session:info`，已打开的
+  desktop/mobile sidepanel 会收到通知刷新列表
 
 用户点开时，clawd 按 `(cwd, toolSessionId)` 去读原始 transcript 渲染；发消息才真正
 把 Claude Code / Codex 进程拉起来 resume 那条对话。
 
+归属规则：
+
+- 默认不传 `ownerPersonaId`：导入普通 session，不挂任何 persona，出现在 Recent
+- 显式传 `--owner-persona-id <personaId>`：导入该 persona 的 owner session，出现在对应
+  People/persona 分组
+- 外部 cwd（例如 `~/Desktop` 项目）不会因为执行导入的是 butler 就自动挂到 butler
+
 两边的会话数据在哪：
 
 - Claude Code：`~/.claude/projects/<编码后的 cwd>/<会话 id>.jsonl`，文件名就是会话 id
@@ -99,7 +108,7 @@ node .claude/skills/clawd-session-import/scripts/link-sessions.mjs --undo --appl
 ## 注意
 
 - clawd 桌面端得在跑，否则脚本连不上（会明确报错）
-- 关联完让用户刷新一下 clawd 界面才看得到
+- 如果脚本提示 daemon 没有 `session:importExternal`，说明当前 clawd 还没升级/重启到支持后台导入的版本；脚本不会退回旧的直接改 JSON 路径
 - Codex 会话在 clawd 里不支持回滚 / fork / 实时接管（这是 codex 侧的能力边界，
   不是关联的问题）；能看能续聊
 - 会话很多时一次全灌会把侧边栏冲爆，建议配 `--limit` 分批，或先用 `--days 3` 试水

package/dist/persona-defaults/persona-clawd-butler/.claude/skills/clawd-session-import/scripts/link-sessions.mjs

@@ -1,10 +1,9 @@
 #!/usr/bin/env node
 // 把本机 Claude Code / Codex 的历史会话关联成 clawd session。
 //
-// 原理（对 clawd 源码核实过，非猜测）：
-//   - session:create 只写一份 SessionFile 元数据，不拉起任何进程 → 批量关联很便宜
-//   - session:resume 在该 session 尚无 runner 时，只是把 toolSessionId 写进元数据
-//   - SessionStore.list() 每次都从磁盘重读 → 事后回填 createdAt/updatedAt 即时生效
+// 原理：
+//   - session:importExternal 只写一份 clawd SessionFile 引用，不拉起任何进程
+//   - daemon 负责去重、写入正确 scope，并广播 session:info 通知已打开的侧边栏刷新
 // 关联完，会话出现在 clawd sidebar；点开时由 history reader 按 (cwd, toolSessionId)
 // 渲染原始 transcript；用户发消息才真正 resume 起 CC / codex 进程接着聊。
 //
@@ -427,62 +426,33 @@ function isDir(p) {
   }
 }
 
-// SessionFile 只落这两处：<clawd>/sessions/** 和 <clawd>/personas/<id>/.clawd/sessions/**。
-// 别退化成扫整个 <clawd>/personas——那底下有用户的 projects/ 和 node_modules，而本函数
-// 每关联一条会话调一次，--limit 50 就是 50 次全树遍历。
-function sessionRoots() {
-  const roots = [path.join(CLAWD_DIR, 'sessions')]
-  let personas = []
+async function link(cand, icon, ownerPersonaId = '') {
+  let imported
   try {
-    personas = fs.readdirSync(path.join(CLAWD_DIR, 'personas'), { withFileTypes: true })
-  } catch {
-    /* 没有 personas 目录 */
-  }
-  for (const d of personas) {
-    if (d.isDirectory()) roots.push(path.join(CLAWD_DIR, 'personas', d.name, '.clawd', 'sessions'))
-  }
-  return roots
-}
-
-function findSessionFile(sessionId) {
-  const want = `${sessionId}.json`
-  for (const root of sessionRoots()) {
-    const hit = listFiles(root).find((f) => path.basename(f) === want)
-    if (hit) return hit
-  }
-  return null
-}
-
-// 把 SessionFile 的时间戳改回原始会话的，sidebar 才按真实先后排
-function backfillTimestamps(sessionId, cand) {
-  const file = findSessionFile(sessionId)
-  if (!file) return '会话文件没找到，时间戳未回填'
-  try {
-    const data = JSON.parse(fs.readFileSync(file, 'utf8'))
-    data.createdAt = isoOf(cand.createdMs)
-    data.updatedAt = isoOf(cand.updatedMs)
-    const tmp = `${file}.tmp-import`
-    fs.writeFileSync(tmp, JSON.stringify(data, null, 2), { encoding: 'utf8', mode: 0o600 })
-    fs.renameSync(tmp, file)
-    return ''
+    imported = await rpc('session:importExternal', {
+      cwd: cand.cwd,
+      tool: cand.tool,
+      toolSessionId: cand.toolSessionId,
+      label: cand.label || `${cand.tool} 会话`,
+      iconKey: icon,
+      createdAt: isoOf(cand.createdMs),
+      updatedAt: isoOf(cand.updatedMs),
+      ...(ownerPersonaId ? { ownerPersonaId } : {}),
+    })
   } catch (err) {
-    return `时间戳回填失败：${err.message}`
+    if (err instanceof RpcError && /session:importExternal|METHOD_NOT_ALLOWED|METHOD_NOT_IMPLEMENTED|unknown method|not implemented/.test(err.message)) {
+      throw new RpcError(
+        '当前 clawd daemon 还没有 session:importExternal RPC。请升级/重启 clawd 后再导入；脚本不会退回旧的直接改 JSON 路径。',
+      )
+    }
+    throw err
   }
-}
-
-async function link(cand, icon) {
-  const created = await rpc('session:create', {
-    cwd: cand.cwd,
-    tool: cand.tool,
-    label: cand.label || `${cand.tool} 会话`,
-    iconKey: icon,
-  })
-  const sessionId = created.sessionId
-  if (!sessionId) throw new RpcError(`session:create 没返回 sessionId：${clip(JSON.stringify(created), 150)}`)
-  await rpc('session:resume', { sessionId, toolSessionId: cand.toolSessionId })
-  const warn = backfillTimestamps(sessionId, cand)
-  cand.result = sessionId + (warn ? `（${warn}）` : '')
-  return sessionId
+  const sessionId = imported.sessionId
+  if (!sessionId) {
+    throw new RpcError(`session:importExternal 没返回 sessionId：${clip(JSON.stringify(imported), 150)}`)
+  }
+  cand.result = sessionId + (imported.alreadyLinked ? '（已存在）' : '')
+  return { sessionId, linked: !imported.alreadyLinked }
 }
 
 // ---------------------------------------------------------------- 台账 / 撤销
@@ -542,7 +512,7 @@ const ICON_KEYS = ['research', 'code', 'loop', 'qa', 'reading', 'debug', 'idea',
 function parseArgs(argv) {
   const a = {
     days: 7, tool: 'both', apply: false, limit: 0, minTurns: 2,
-    includeClawd: false, icon: 'reading', undo: false, json: false,
+    includeClawd: false, icon: 'reading', ownerPersonaId: '', undo: false, json: false,
   }
   for (let i = 0; i < argv.length; i++) {
     const k = argv[i]
@@ -557,6 +527,7 @@ function parseArgs(argv) {
       case '--limit': a.limit = Number(next()); break
       case '--min-turns': a.minTurns = Number(next()); break
       case '--icon': a.icon = next(); break
+      case '--owner-persona-id': a.ownerPersonaId = next(); break
       case '--apply': a.apply = true; break
       case '--include-clawd': a.includeClawd = true; break
       case '--undo': a.undo = true; break
@@ -585,6 +556,8 @@ const HELP = `把本机 Claude Code / Codex 历史会话关联进 clawd
   --min-turns N     少于这么多轮用户发言的会话跳过（默认 2）
   --include-clawd   连 ~/.clawd 目录下的会话也关联（默认跳过）
   --icon KEY        research/code/loop/qa/reading/debug/idea/doc/assist（默认 reading）
+  --owner-persona-id ID
+                   显式挂到某个 persona；不传则导入为普通 session，进入 Recent
   --undo            撤销本工具关联过的会话（配 --apply 才真删）
   --json            输出 JSON（含被跳过的和原因）`
 
@@ -615,13 +588,21 @@ async function main() {
   if (args.apply) {
     for (const c of todo) {
       try {
-        const sid = await link(c, args.icon)
+        const linked = await link(c, args.icon, args.ownerPersonaId)
         // 每成功一条就落台账：攒到循环结束再写的话，中途崩了 --undo 就清不掉已建的会话
-        ledgerWrite(
-          ledgerRead().concat([
-            { sessionId: sid, tool: c.tool, label: c.label, toolSessionId: c.toolSessionId },
-          ]),
-        )
+        if (linked.linked) {
+          ledgerWrite(
+            ledgerRead().concat([
+              {
+                sessionId: linked.sessionId,
+                tool: c.tool,
+                label: c.label,
+                toolSessionId: c.toolSessionId,
+                ...(args.ownerPersonaId ? { ownerPersonaId: args.ownerPersonaId } : {}),
+              },
+            ]),
+          )
+        }
       } catch (err) {
         c.result = `失败：${err.message}`
       }