@clawos-dev/clawd 0.2.277 → 0.2.278

package/dist/cli.cjs

@@ -6779,7 +6779,7 @@ var init_principal = __esm({
 });
 
 // ../protocol/src/schemas.ts
-var SessionStatusSchema, UsageSchema, ContextUsageSchema, sessionMetaShape, SessionMetaSchema, ModelInfoSchema, ModeInfoSchema, ConfigFieldSchemaSchema, CapabilitiesGetArgs, ToolFeaturesSchema, CapabilitiesResponseSchema, AllowRuleSchema, SessionFileSchema, ParsedEventBase, HistoryUserMetaSchema, SubagentToolStatsSchema, StructuredPatchHunkSchema, ToolResultExtraSchema, MemoryEntrySchema, AskQuestionOptionSchema, AskQuestionItemSchema, ParsedEventSchema, SessionCreateArgs, SessionListArgs, SessionIdArgs, SessionUpdateArgs, SessionSendArgs, SessionInterruptArgs, SessionRewindArgs, SessionRewindResponseSchema, SessionRewindDiffArgs, RewindDiffHunkSchema, RewindDiffFileSchema, SessionRewindDiffResponseSchema, SessionRewindableMessageIdsArgs, SessionRewindableMessageIdsResponseSchema, SessionResumeArgs, SessionForkArgs, SessionForkResponseSchema, SessionObserveArgs, SessionEventsArgs, PermissionRespondArgs, HistoryListArgs, HistoryReadArgs, HistorySubagentsArgs, HistorySubagentReadArgs, WorkspaceListArgs, WorkspaceReadArgs, SkillsListArgs, SkillEntrySchema, AgentEntrySchema, AgentsListArgs, AgentsListResponseSchema, SessionCurrentTurnSenderArgs, SessionSubscribeArgs, SessionPinArgs, PeerSessionUpsertArgs, PeerSessionUpsertResponseSchema, PeerSessionRemoveArgs, PeerSessionRemoveResponseSchema, SessionReorderPinsArgs, GitRootArgs, GitRootResponseSchema, GitBranchArgs, GitBranchResponseSchema, GitBranchesArgs, GitBranchesResponseSchema, HistoryRecentDirsArgs, RecentDirEntrySchema, HistoryRecentDirsResponseSchema, SessionQuestionFrameSchema, SessionQuestionClearedFrameSchema, AnswerQuestionArgs, AnswerQuestionResponseSchema, CancelQuestionArgs, CancelQuestionResponseSchema, ClientInfoSchema, AuthRequestFrameSchema, AuthOkFrameSchema, DeviceConnectionEntrySchema, DeviceConnectionsResponseSchema, TunnelReadyEventSchema, TunnelExitedEventSchema, TunnelUnavailableEventSchema, InfoRunningSessionSchema, InfoResponseSchema, PROJECT_PORT_MIN, PROJECT_PORT_MAX, projectNameRegex, DEFAULT_DEV_COMMAND, ProjectMetadataSchema, PROJECT_STAGE_VALUES, ProjectStageSchema, ProjectWithStatusSchema, ListProjectsArgsSchema, ListProjectsResultSchema, GetProjectArgsSchema, GetProjectResultSchema, CreateProjectArgsSchema, CreateProjectResultSchema, DeleteProjectArgsSchema, DeleteProjectResultSchema, UpdateProjectPortArgsSchema, UpdateProjectPortResultSchema, SetProdUrlArgsSchema, SetProdUrlResultSchema, StartDevServerArgsSchema, StartDevServerResultSchema, ASSISTANT_REPORTABLE_STAGES, ReportStageArgsSchema, ReportStageResultSchema, StopDevServerArgsSchema, StopDevServerResultSchema, AppBuilderProjectUpdatedEventSchema, PublishArgsSchema, PublishResultSchema, DismissPublishJobArgsSchema, DismissPublishJobResultSchema, AppBuilderPublishProgressEventSchema, AppBuilderPublishFailedEventSchema;
+var SessionStatusSchema, UsageSchema, ContextUsageSchema, sessionMetaShape, SessionMetaSchema, ModelInfoSchema, ModeInfoSchema, ConfigFieldSchemaSchema, CapabilitiesGetArgs, ToolFeaturesSchema, CapabilitiesResponseSchema, AllowRuleSchema, SessionFileSchema, ParsedEventBase, HistoryUserMetaSchema, SubagentToolStatsSchema, StructuredPatchHunkSchema, ToolResultExtraSchema, MemoryEntrySchema, AskQuestionOptionSchema, AskQuestionItemSchema, ParsedEventSchema, SessionCreateArgs, SessionImportExternalArgs, SessionListArgs, SessionIdArgs, SessionUpdateArgs, SessionSendArgs, SessionInterruptArgs, SessionRewindArgs, SessionRewindResponseSchema, SessionRewindDiffArgs, RewindDiffHunkSchema, RewindDiffFileSchema, SessionRewindDiffResponseSchema, SessionRewindableMessageIdsArgs, SessionRewindableMessageIdsResponseSchema, SessionResumeArgs, SessionForkArgs, SessionForkResponseSchema, SessionObserveArgs, SessionEventsArgs, PermissionRespondArgs, HistoryListArgs, HistoryReadArgs, HistorySubagentsArgs, HistorySubagentReadArgs, WorkspaceListArgs, WorkspaceReadArgs, SkillsListArgs, SkillEntrySchema, AgentEntrySchema, AgentsListArgs, AgentsListResponseSchema, SessionCurrentTurnSenderArgs, SessionSubscribeArgs, SessionPinArgs, PeerSessionUpsertArgs, PeerSessionUpsertResponseSchema, PeerSessionRemoveArgs, PeerSessionRemoveResponseSchema, SessionReorderPinsArgs, GitRootArgs, GitRootResponseSchema, GitBranchArgs, GitBranchResponseSchema, GitBranchesArgs, GitBranchesResponseSchema, HistoryRecentDirsArgs, RecentDirEntrySchema, HistoryRecentDirsResponseSchema, SessionQuestionFrameSchema, SessionQuestionClearedFrameSchema, AnswerQuestionArgs, AnswerQuestionResponseSchema, CancelQuestionArgs, CancelQuestionResponseSchema, ClientInfoSchema, AuthRequestFrameSchema, AuthOkFrameSchema, DeviceConnectionEntrySchema, DeviceConnectionsResponseSchema, TunnelReadyEventSchema, TunnelExitedEventSchema, TunnelUnavailableEventSchema, InfoRunningSessionSchema, InfoResponseSchema, PROJECT_PORT_MIN, PROJECT_PORT_MAX, projectNameRegex, DEFAULT_DEV_COMMAND, ProjectMetadataSchema, PROJECT_STAGE_VALUES, ProjectStageSchema, ProjectWithStatusSchema, ListProjectsArgsSchema, ListProjectsResultSchema, GetProjectArgsSchema, GetProjectResultSchema, CreateProjectArgsSchema, CreateProjectResultSchema, DeleteProjectArgsSchema, DeleteProjectResultSchema, UpdateProjectPortArgsSchema, UpdateProjectPortResultSchema, SetProdUrlArgsSchema, SetProdUrlResultSchema, StartDevServerArgsSchema, StartDevServerResultSchema, ASSISTANT_REPORTABLE_STAGES, ReportStageArgsSchema, ReportStageResultSchema, StopDevServerArgsSchema, StopDevServerResultSchema, AppBuilderProjectUpdatedEventSchema, PublishArgsSchema, PublishResultSchema, DismissPublishJobArgsSchema, DismissPublishJobResultSchema, AppBuilderPublishProgressEventSchema, AppBuilderPublishFailedEventSchema;
 var init_schemas = __esm({
   "../protocol/src/schemas.ts"() {
     "use strict";
@@ -7225,6 +7225,16 @@ var init_schemas = __esm({
     }).refine((args) => args.cwd != null || args.ownerPersonaId != null, {
       message: "cwd \u4E0E ownerPersonaId \u81F3\u5C11\u4F20\u4E00\u4E2A"
     });
+    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()
+    });
     SessionListArgs = external_exports.object({
       /** true = 只返回 mirror（originOwnerPrincipalId 非空，即「我在朋友 daemon 上创建」的本机存证）。 */
       originOnly: external_exports.boolean().optional(),
@@ -7801,6 +7811,10 @@ var init_methods = __esm({
           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
@@ -45963,6 +45977,41 @@ var SessionManager = class {
     const written = this.storeFor(scope).write(file);
     return { response: written, broadcast: [] };
   }
+  importExternal(args, creatorPrincipalId, creatorDisplayName, creatorFeishuUnionId) {
+    const existing = this.listAllOwned().find((file2) => file2.toolSessionId === args.toolSessionId);
+    if (existing) {
+      return {
+        response: { ...existing, alreadyLinked: true },
+        broadcast: []
+      };
+    }
+    try {
+      const stat = import_node_fs9.default.statSync(args.cwd);
+      if (!stat.isDirectory()) throw new Error("not dir");
+    } catch {
+      throw new ClawdError(ERROR_CODES.INVALID_CWD, `cwd not a directory: ${args.cwd}`);
+    }
+    this.deps.getAdapter(args.tool);
+    const file = {
+      sessionId: newSessionId(),
+      cwd: args.cwd,
+      tool: args.tool,
+      toolSessionId: args.toolSessionId,
+      label: args.label,
+      iconKey: args.iconKey,
+      ownerPersonaId: args.ownerPersonaId,
+      creatorPrincipalId,
+      creatorDisplayName,
+      ...creatorFeishuUnionId ? { creatorFeishuUnionId } : {},
+      createdAt: args.createdAt,
+      updatedAt: args.updatedAt
+    };
+    const written = this.writeOwned(file);
+    return {
+      response: written,
+      broadcast: [{ frame: { type: "session:info", ...written }, target: "all" }]
+    };
+  }
   pin(args) {
     const existing = this.getFile(args.sessionId);
     const pinnedAt = args.pinned ? (this.deps.now ?? Date.now)() : null;
@@ -56332,6 +56381,31 @@ function buildSessionHandlers(deps) {
     );
     return { response: { type: "session:info", ...response }, broadcast };
   };
+  const importExternal = async (frame, _client, ctx) => {
+    if (ctx && ctx.principal.kind !== "owner") {
+      throw new ClawdError(
+        ERROR_CODES.UNAUTHORIZED,
+        `principal ${ctx.principal.kind}:${ctx.principal.id} cannot session:importExternal`
+      );
+    }
+    const args = SessionImportExternalArgs.parse(frame);
+    if (args.ownerPersonaId) {
+      const persona = deps.personaRegistry.get(args.ownerPersonaId);
+      if (!persona) {
+        throw new Error(`persona not found: ${args.ownerPersonaId}`);
+      }
+    }
+    const creatorPrincipalId = ctx?.principal.id ?? ownerPrincipalId;
+    const creatorDisplayName = ctx?.principal.displayName ?? "Owner";
+    const creatorFeishuUnionId = ctx?.principal.feishuUnionId;
+    const { response, broadcast } = manager.importExternal(
+      args,
+      creatorPrincipalId,
+      creatorDisplayName,
+      creatorFeishuUnionId
+    );
+    return { response: { type: "session:info", ...response }, broadcast };
+  };
   const list = async (frame, _client, ctx) => {
     const args = SessionListArgs.parse(frame ?? {});
     const narrow = (sessions) => {
@@ -56650,6 +56724,7 @@ function buildSessionHandlers(deps) {
   };
   return {
     "session:create": create,
+    "session:importExternal": importExternal,
     "session:list": list,
     "session:get": get,
     "session:update": update,
@@ -57738,6 +57813,7 @@ var METHOD_GRANT_MAP = {
   // dispatcher 不验资源，handler 内按 ctx + frame.args 反查 ownerPersonaId 调 assertGrant。
   // owner 自动通过（ctx 自带 '*':'admin' grant 一切 match）；guest 在被授权 persona 内可调。
   "session:create": CAPABILITY_SCOPED,
+  "session:importExternal": CAPABILITY_SCOPED,
   "session:list": CAPABILITY_SCOPED,
   "session:get": CAPABILITY_SCOPED,
   "session:update": CAPABILITY_SCOPED,
@@ -57929,7 +58005,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.277".length > 0 ? "0.2.277" : "dev";
+var version = "0.2.278".length > 0 ? "0.2.278" : "dev";
 
 // src/cli-probe/probe.ts
 var fs54 = __toESM(require("fs"), 1);

package/dist/dispatch/mcp-server.cjs

@@ -22376,6 +22376,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 +22925,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

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}`
       }