@clawos-dev/clawd 0.2.277 → 0.2.279

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, SelectOptionSchema, 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";
@@ -6808,12 +6808,22 @@ var init_schemas = __esm({
       contextWindowSize: external_exports.number().int().positive().optional()
     };
     SessionMetaSchema = external_exports.object(sessionMetaShape);
+    SelectOptionSchema = external_exports.object({
+      value: external_exports.string(),
+      label: external_exports.string(),
+      description: external_exports.string().optional()
+    });
     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()
     });
     ModeInfoSchema = external_exports.object({
       id: external_exports.string().min(1),
@@ -6825,13 +6835,7 @@ var init_schemas = __esm({
       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"])
     });
@@ -7225,6 +7229,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 +7815,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 +45981,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;
@@ -48657,7 +48710,7 @@ function createVisitorStore(opts) {
 init_claude();
 
 // src/tools/codex.ts
-var import_node_child_process5 = require("child_process");
+var import_node_child_process6 = require("child_process");
 var import_node_fs18 = __toESM(require("fs"), 1);
 
 // src/tools/codex-session.ts
@@ -49158,29 +49211,110 @@ function createCodexSession(ctx, sink, deps = {}) {
   };
 }
 
+// src/tools/codex-app-server-query.ts
+var import_node_child_process5 = require("child_process");
+var DEFAULT_CODEX_QUERY_TIMEOUT_MS = 8e3;
+async function queryCodexAppServer(cwd, method, params, deps = {}) {
+  const cmd = process.env.CODEX_BIN ?? "codex";
+  const args = ["app-server", "--listen", "stdio://"];
+  const proc = deps.spawnOverride ? deps.spawnOverride(cmd, args, cwd) : (0, import_node_child_process5.spawn)(cmd, args, { cwd, env: process.env, stdio: ["pipe", "pipe", "pipe"] });
+  const client = new CodexAppServerClient(proc, {});
+  const timeoutMs = deps.timeoutMs ?? DEFAULT_CODEX_QUERY_TIMEOUT_MS;
+  let timer;
+  const timeout = new Promise((_2, reject) => {
+    timer = setTimeout(
+      () => reject(new Error(`codex app-server ${method} timed out after ${timeoutMs}ms`)),
+      timeoutMs
+    );
+    proc.on(
+      "error",
+      (err) => reject(new Error(`codex app-server spawn failed: ${err.message}`))
+    );
+  });
+  try {
+    await Promise.race([
+      (async () => {
+        await client.request("initialize", {
+          clientInfo: { name: "clawd", title: "clawd", version: "0" },
+          capabilities: null
+        });
+        client.notify("initialized", {});
+      })(),
+      timeout
+    ]);
+    deps.beforeRequest?.(client);
+    return await Promise.race([client.request(method, params), timeout]);
+  } finally {
+    if (timer) clearTimeout(timer);
+    if (proc.exitCode === null && proc.signalCode === null) proc.kill("SIGTERM");
+  }
+}
+
+// src/tools/codex-model-list.ts
+var CODEX_CONTEXT_WINDOW = 258400;
+var EFFORT_LABELS = {
+  low: "Low",
+  medium: "Medium",
+  high: "High",
+  xhigh: "Extra high",
+  max: "Max",
+  ultra: "Ultra"
+};
+var CODEX_DEFAULT_MODEL_ENTRY = {
+  id: "",
+  label: "Default",
+  description: "codex config.toml \u9ED8\u8BA4",
+  contextWindowSize: CODEX_CONTEXT_WINDOW,
+  default: true
+};
+function mapModelList(raw) {
+  if (!raw || typeof raw !== "object") throw new Error("model/list: response is not an object");
+  const data = raw.data;
+  if (!Array.isArray(data)) throw new Error("model/list: `data` is not an array");
+  const models = [CODEX_DEFAULT_MODEL_ENTRY];
+  for (const item of data) {
+    if (!item || typeof item !== "object") throw new Error("model/list: entry is not an object");
+    const e = item;
+    if (typeof e.id !== "string" || e.id === "") throw new Error("model/list: entry missing `id`");
+    if (e.hidden === true) continue;
+    const efforts = Array.isArray(e.supportedReasoningEfforts) ? e.supportedReasoningEfforts.filter((x) => x && typeof x.reasoningEffort === "string").map((x) => {
+      const value = x.reasoningEffort;
+      return {
+        value,
+        label: EFFORT_LABELS[value] ?? value,
+        ...typeof x.description === "string" ? { description: x.description } : {}
+      };
+    }) : void 0;
+    models.push({
+      id: e.id,
+      label: typeof e.displayName === "string" && e.displayName ? e.displayName : e.id,
+      ...typeof e.description === "string" ? { description: e.description } : {},
+      contextWindowSize: CODEX_CONTEXT_WINDOW,
+      ...efforts && efforts.length > 0 ? { efforts } : {},
+      ...typeof e.defaultReasoningEffort === "string" ? { defaultEffort: e.defaultReasoningEffort } : {}
+    });
+  }
+  return models;
+}
+
 // 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 }
-];
+init_claude();
 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" }
+  { value: "xhigh", label: "Extra high", description: "Extra high reasoning depth for complex problems" },
+  { value: "max", label: "Max", description: "Maximum reasoning depth for the hardest problems" },
+  { value: "ultra", label: "Ultra", description: "Maximum reasoning with automatic task delegation" }
 ];
 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 = {
+var CODEX_CAPABILITIES_BASE = {
   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 入口。
@@ -49191,7 +49325,8 @@ var CODEX_CAPABILITIES = {
       type: "select",
       label: "Model",
       scope: "core",
-      options: CODEX_MODELS.map((m2) => ({ value: m2.id, label: m2.label, description: m2.description })),
+      options: [],
+      // 运行时填充，见 buildCapabilities
       default: ""
     },
     {
@@ -49213,14 +49348,25 @@ var CODEX_CAPABILITIES = {
     }
   ]
 };
+function buildCapabilities(models) {
+  return {
+    ...CODEX_CAPABILITIES_BASE,
+    models,
+    configSchema: CODEX_CAPABILITIES_BASE.configSchema.map(
+      (f) => f.name === "model" ? { ...f, options: models.map((m2) => ({ value: m2.id, label: m2.label, description: m2.description })) } : f
+    )
+  };
+}
 function sanitizeCodexModel(model) {
   if (model === void 0) return void 0;
-  return CODEX_MODELS.some((m2) => m2.id === model) ? model : void 0;
+  if (CLAUDE_MODEL_IDS.includes(model)) return void 0;
+  if (model.startsWith("claude-")) return void 0;
+  return model;
 }
 async function probeCodex(env = process.env) {
   if (env.CODEX_BIN && import_node_fs18.default.existsSync(env.CODEX_BIN)) return { available: true, path: env.CODEX_BIN };
   try {
-    const out = (0, import_node_child_process5.execFileSync)("which", ["codex"], { encoding: "utf8" }).trim();
+    const out = (0, import_node_child_process6.execFileSync)("which", ["codex"], { encoding: "utf8" }).trim();
     if (out && import_node_fs18.default.existsSync(out)) return { available: true, path: out };
   } catch {
   }
@@ -49233,10 +49379,16 @@ var CodexAdapter = class {
   probeCache = null;
   logger;
   probeOverride;
+  queryOverride;
+  // capabilities 的进程级 memo。**回落结果同样被缓存**——否则 codex 没装时每次开弹窗都
+  // spawn 一次必然失败的子进程。代价是装好 codex 后要重启 daemon 才恢复，与「codex 升级后
+  // 要重启才更新模型表」是同一条语义。
+  capsPromise;
   constructor(opts = {}) {
     this.logger = opts.logger;
     this.probeOverride = opts.probeOverride;
     this.historyReader = opts.historyReader;
+    this.queryOverride = opts.queryOverride;
   }
   async probe() {
     if (this.probeCache) return this.probeCache;
@@ -49244,10 +49396,25 @@ var CodexAdapter = class {
     return this.probeCache;
   }
   async capabilities() {
-    return CODEX_CAPABILITIES;
+    if (!this.capsPromise) this.capsPromise = this.loadCapabilities();
+    return this.capsPromise;
   }
-  resolveContextWindow(modelId) {
-    return (CODEX_MODELS.find((m2) => m2.id === (modelId ?? "")) ?? CODEX_MODELS[0]).contextWindowSize;
+  async loadCapabilities() {
+    try {
+      const raw = this.queryOverride ? await this.queryOverride() : await queryCodexAppServer(process.cwd(), "model/list", {});
+      return buildCapabilities(mapModelList(raw));
+    } catch (err) {
+      this.logger?.warn?.(
+        `codex model/list failed, falling back to config.toml default only: ${err.message}`
+      );
+      return buildCapabilities([CODEX_DEFAULT_MODEL_ENTRY]);
+    }
+  }
+  // 纯函数、无 IO。所有 codex 模型共用同一静态窗口值（model/list 不给 contextWindow），
+  // 真实窗口由运行时 modelContextWindow 事件覆盖（doc/knowledge/codex-integration.md §6），
+  // 所以这里不需要模型表。
+  resolveContextWindow(_modelId) {
+    return CODEX_CONTEXT_WINDOW;
   }
   createSession(ctx, sink) {
     return createCodexSession({ ...ctx, model: sanitizeCodexModel(ctx.model) }, sink, { logger: this.logger });
@@ -51381,7 +51548,7 @@ function buildPersonaDispatchHandlers(deps) {
     if (args.model !== void 0) {
       const targetPersona2 = args.targetPersona ?? (args.dispatchId ? deps.store.get(args.dispatchId)?.targetPersonaId : void 0);
       const targetTool = (targetPersona2 ? deps.getPersonaTool?.(targetPersona2) : void 0) ?? "claude";
-      const allowed = targetTool === "codex" ? CODEX_MODEL_IDS : CLAUDE_MODEL_IDS;
+      const allowed = targetTool === "codex" ? ((await deps.getCapabilities?.("codex"))?.models ?? []).map((m2) => m2.id).filter((id) => id !== "") : CLAUDE_MODEL_IDS;
       if (!allowed.includes(args.model)) {
         throw new ClawdError(
           ERROR_CODES.INVALID_PARAM,
@@ -51784,8 +51951,6 @@ async function forwardPeerExecToPeer(args) {
 }
 
 // src/tools/codex-history.ts
-var import_node_child_process6 = require("child_process");
-var DEFAULT_TIMEOUT_MS2 = 8e3;
 function rec2(v2) {
   return v2 && typeof v2 === "object" && !Array.isArray(v2) ? v2 : void 0;
 }
@@ -51844,34 +52009,6 @@ function threadItemToHistoryMessages(item) {
       return [];
   }
 }
-async function queryCodexAppServer(cwd, method, params, deps) {
-  const cmd = process.env.CODEX_BIN ?? "codex";
-  const args = ["app-server", "--listen", "stdio://"];
-  const proc = deps.spawnOverride ? deps.spawnOverride(cmd, args, cwd) : (0, import_node_child_process6.spawn)(cmd, args, { cwd, env: process.env, stdio: ["pipe", "pipe", "pipe"] });
-  const client = new CodexAppServerClient(proc, {});
-  const timeoutMs = deps.timeoutMs ?? DEFAULT_TIMEOUT_MS2;
-  let timer;
-  const timeout = new Promise((_2, reject) => {
-    timer = setTimeout(() => reject(new Error(`codex app-server ${method} timed out after ${timeoutMs}ms`)), timeoutMs);
-    proc.on("error", (err) => reject(new Error(`codex app-server spawn failed: ${err.message}`)));
-  });
-  try {
-    await Promise.race([
-      (async () => {
-        await client.request("initialize", {
-          clientInfo: { name: "clawd", title: "clawd", version: "0" },
-          capabilities: null
-        });
-        client.notify("initialized", {});
-      })(),
-      timeout
-    ]);
-    return await Promise.race([client.request(method, params), timeout]);
-  } finally {
-    if (timer) clearTimeout(timer);
-    if (proc.exitCode === null && proc.signalCode === null) proc.kill("SIGTERM");
-  }
-}
 var CodexHistoryReader = class {
   deps;
   constructor(deps = {}) {
@@ -51953,9 +52090,7 @@ var CodexHistoryReader = class {
 };
 
 // src/tools/codex-skills.ts
-var import_node_child_process7 = require("child_process");
 var import_node_path27 = __toESM(require("path"), 1);
-var DEFAULT_TIMEOUT_MS3 = 8e3;
 function str3(v2) {
   return typeof v2 === "string" ? v2 : void 0;
 }
@@ -51985,34 +52120,17 @@ function mapSkillsListResponse(res) {
   return out;
 }
 async function listCodexSkills(cwd, deps = {}) {
-  const cmd = process.env.CODEX_BIN ?? "codex";
-  const args = ["app-server", "--listen", "stdio://"];
-  const proc = deps.spawnOverride ? deps.spawnOverride(cmd, args, cwd) : (0, import_node_child_process7.spawn)(cmd, args, { cwd, env: process.env, stdio: ["pipe", "pipe", "pipe"] });
-  const client = new CodexAppServerClient(proc, {});
-  const timeoutMs = deps.timeoutMs ?? DEFAULT_TIMEOUT_MS3;
-  let timer;
-  const timeout = new Promise((_2, reject) => {
-    timer = setTimeout(() => reject(new Error(`codex app-server skills/list timed out after ${timeoutMs}ms`)), timeoutMs);
-    proc.on("error", (err) => reject(new Error(`codex app-server spawn failed: ${err.message}`)));
+  const res = await queryCodexAppServer(cwd, "skills/list", { cwds: [cwd] }, {
+    spawnOverride: deps.spawnOverride,
+    timeoutMs: deps.timeoutMs,
+    // skills parity：codex 不扫 .claude/skills/【实测 0.138.0】，persona 惯例装那里——
+    // 先写 extraRoots 再写 list（stdio 按写入顺序处理，fire-and-forget 不 await 回包；
+    // codex-session.ts ready 序列同款，两处保持一致）。失败不阻塞 list。
+    beforeRequest: (client) => {
+      void client.request("skills/extraRoots/set", { extraRoots: [import_node_path27.default.join(cwd, ".claude", "skills")] }).catch(() => void 0);
+    }
   });
-  try {
-    await Promise.race([
-      (async () => {
-        await client.request("initialize", {
-          clientInfo: { name: "clawd", title: "clawd", version: "0" },
-          capabilities: null
-        });
-        client.notify("initialized", {});
-      })(),
-      timeout
-    ]);
-    void client.request("skills/extraRoots/set", { extraRoots: [import_node_path27.default.join(cwd, ".claude", "skills")] }).catch(() => void 0);
-    const res = await Promise.race([client.request("skills/list", { cwds: [cwd] }), timeout]);
-    return mapSkillsListResponse(res);
-  } finally {
-    if (timer) clearTimeout(timer);
-    if (proc.exitCode === null && proc.signalCode === null) proc.kill("SIGTERM");
-  }
+  return mapSkillsListResponse(res);
 }
 
 // src/workspace/browser.ts
@@ -55079,7 +55197,7 @@ function readSpawnedByDesktopFromEnv(env = process.env) {
 var import_node_fs38 = __toESM(require("fs"), 1);
 var import_node_path42 = __toESM(require("path"), 1);
 var import_node_crypto9 = __toESM(require("crypto"), 1);
-var import_node_child_process10 = require("child_process");
+var import_node_child_process9 = require("child_process");
 
 // src/tunnel/tunnel-store.ts
 var import_node_fs35 = __toESM(require("fs"), 1);
@@ -55215,7 +55333,7 @@ function escape(v2) {
 var import_node_fs36 = __toESM(require("fs"), 1);
 var import_node_os13 = __toESM(require("os"), 1);
 var import_node_path40 = __toESM(require("path"), 1);
-var import_node_child_process8 = require("child_process");
+var import_node_child_process7 = require("child_process");
 var import_node_stream3 = require("stream");
 var import_promises5 = require("stream/promises");
 var FRPC_VERSION = "0.68.0";
@@ -55315,7 +55433,7 @@ async function extractFrpcFromTarball(tarball, binDir, version2, platform, destB
   import_node_fs36.default.mkdirSync(work, { recursive: true });
   try {
     await new Promise((resolve6, reject) => {
-      const proc = (0, import_node_child_process8.spawn)("tar", ["xzf", tarball, "-C", work], { stdio: "pipe" });
+      const proc = (0, import_node_child_process7.spawn)("tar", ["xzf", tarball, "-C", work], { stdio: "pipe" });
       proc.on("error", reject);
       proc.on("exit", (code) => code === 0 ? resolve6() : reject(new Error(`tar exited ${code}`)));
     });
@@ -55333,7 +55451,7 @@ async function extractFrpcFromTarball(tarball, binDir, version2, platform, destB
 // src/tunnel/frpc-process.ts
 var import_node_fs37 = __toESM(require("fs"), 1);
 var import_node_path41 = __toESM(require("path"), 1);
-var import_node_child_process9 = require("child_process");
+var import_node_child_process8 = require("child_process");
 function frpcPidFilePath(dataDir) {
   return import_node_path41.default.join(dataDir, "frpc.pid");
 }
@@ -55419,7 +55537,7 @@ async function killStaleFrpc(deps) {
 async function defaultScanFrpcPidsByCmdline(tomlPath, logger) {
   if (process.platform === "win32") return [];
   return new Promise((resolve6) => {
-    const ps = (0, import_node_child_process9.spawn)("ps", ["-axo", "pid=,command="], { stdio: ["ignore", "pipe", "ignore"] });
+    const ps = (0, import_node_child_process8.spawn)("ps", ["-axo", "pid=,command="], { stdio: ["ignore", "pipe", "ignore"] });
     let buf = "";
     ps.stdout.on("data", (c) => {
       buf += c.toString();
@@ -55588,7 +55706,7 @@ var TunnelManager = class {
         logLevel: "info"
       });
       await import_node_fs38.default.promises.writeFile(tomlPath, toml, { mode: 384 });
-      const proc = (this.deps.spawnImpl ?? import_node_child_process10.spawn)(frpcBin, ["-c", tomlPath], {
+      const proc = (this.deps.spawnImpl ?? import_node_child_process9.spawn)(frpcBin, ["-c", tomlPath], {
         stdio: ["ignore", "pipe", "pipe"]
       });
       const logDir = import_node_path42.default.join(this.deps.dataDir, "log");
@@ -56080,11 +56198,11 @@ var DeviceBindingClientError = class extends Error {
   code;
   cause;
 };
-var DEFAULT_TIMEOUT_MS4 = 8e3;
+var DEFAULT_TIMEOUT_MS2 = 8e3;
 async function upsertDeviceBinding(opts) {
   const doFetch = opts.fetchImpl ?? fetch;
   const ac = new AbortController();
-  const timer = setTimeout(() => ac.abort(), opts.timeoutMs ?? DEFAULT_TIMEOUT_MS4);
+  const timer = setTimeout(() => ac.abort(), opts.timeoutMs ?? DEFAULT_TIMEOUT_MS2);
   const body = { unionId: opts.unionId };
   if (opts.avatarUrl != null) body.avatarUrl = opts.avatarUrl;
   let res;
@@ -56332,6 +56450,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 +56793,7 @@ function buildSessionHandlers(deps) {
   };
   return {
     "session:create": create,
+    "session:importExternal": importExternal,
     "session:list": list,
     "session:get": get,
     "session:update": update,
@@ -56987,11 +57131,11 @@ init_protocol();
 init_protocol();
 
 // src/workspace/git.ts
-var import_node_child_process11 = require("child_process");
+var import_node_child_process10 = require("child_process");
 var import_node_fs43 = __toESM(require("fs"), 1);
 var import_node_path48 = __toESM(require("path"), 1);
 var import_node_util = require("util");
-var pexec = (0, import_node_util.promisify)(import_node_child_process11.execFile);
+var pexec = (0, import_node_util.promisify)(import_node_child_process10.execFile);
 function normalizePath(p2) {
   const resolved = import_node_path48.default.resolve(p2);
   try {
@@ -57738,6 +57882,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 +58074,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.277".length > 0 ? "0.2.277" : "dev";
+var version = "0.2.279".length > 0 ? "0.2.279" : "dev";
 
 // src/cli-probe/probe.ts
 var fs54 = __toESM(require("fs"), 1);
@@ -58945,7 +59090,7 @@ function buildExtensionHandlers(deps) {
 
 // src/app-builder/project-store.ts
 var import_node_fs44 = require("fs");
-var import_node_child_process12 = require("child_process");
+var import_node_child_process11 = require("child_process");
 var import_node_path55 = require("path");
 init_protocol();
 var PROJECTS_DIR = "projects";
@@ -59050,7 +59195,7 @@ var ProjectStore = class {
   async scaffold(name, templateSrcDir, scaffoldScriptPath) {
     const destDir = this.projectDir(name);
     return await new Promise((resolve6, reject) => {
-      const child = (0, import_node_child_process12.spawn)("bash", [scaffoldScriptPath, name, templateSrcDir, destDir], {
+      const child = (0, import_node_child_process11.spawn)("bash", [scaffoldScriptPath, name, templateSrcDir, destDir], {
         env: { ...process.env, PATH: process.env.PATH ?? "" },
         stdio: ["ignore", "pipe", "pipe"]
       });
@@ -59154,7 +59299,7 @@ var ProjectStore = class {
 };
 
 // src/app-builder/kill-port.ts
-var import_node_child_process13 = require("child_process");
+var import_node_child_process12 = require("child_process");
 async function killPortOccupants(port, ownedPids, logger) {
   let pids;
   try {
@@ -59196,7 +59341,7 @@ async function killPortOccupants(port, ownedPids, logger) {
 }
 function listPidsOnPort(port) {
   return new Promise((resolve6, reject) => {
-    (0, import_node_child_process13.execFile)(
+    (0, import_node_child_process12.execFile)(
       "lsof",
       ["-ti", `:${port}`],
       { timeout: 3e3 },
@@ -59268,7 +59413,7 @@ var PublishJobRegistry = class {
 };
 
 // src/app-builder/publish-job-runner.ts
-var import_node_child_process14 = require("child_process");
+var import_node_child_process13 = require("child_process");
 var import_node_fs45 = require("fs");
 var import_node_path56 = require("path");
 
@@ -59297,7 +59442,7 @@ function tailStderrLines(buf, n) {
 // src/app-builder/publish-job-runner.ts
 async function startPublishJob(deps, args) {
   const { registry: registry2, projectDir } = deps;
-  const spawn13 = deps.spawnImpl ?? import_node_child_process14.spawn;
+  const spawn12 = deps.spawnImpl ?? import_node_child_process13.spawn;
   if (registry2.has(args.name)) {
     return { jobId: registry2.get(args.name).jobId, status: "already-publishing" };
   }
@@ -59309,7 +59454,7 @@ async function startPublishJob(deps, args) {
   } catch {
     logStream = null;
   }
-  const child = spawn13("bash", [args.scriptPath, projDir, args.personaRoot ?? ""], {
+  const child = spawn12("bash", [args.scriptPath, projDir, args.personaRoot ?? ""], {
     cwd: projDir,
     env: process.env,
     stdio: ["ignore", "pipe", "pipe"]
@@ -60184,15 +60329,15 @@ var import_node_crypto17 = require("crypto");
 init_protocol();
 
 // src/peer-ops/run-command.ts
-var import_node_child_process15 = require("child_process");
+var import_node_child_process14 = require("child_process");
 var import_node_os21 = __toESM(require("os"), 1);
-var DEFAULT_TIMEOUT_MS5 = 3e4;
+var DEFAULT_TIMEOUT_MS3 = 3e4;
 var MAX_TIMEOUT_MS = 3e5;
 var MAX_OUTPUT_BYTES = 1048576;
 function runCommand(command, opts = {}) {
-  const timeoutMs = Math.min(opts.timeoutMs ?? DEFAULT_TIMEOUT_MS5, MAX_TIMEOUT_MS);
+  const timeoutMs = Math.min(opts.timeoutMs ?? DEFAULT_TIMEOUT_MS3, MAX_TIMEOUT_MS);
   return new Promise((resolve6) => {
-    const child = (0, import_node_child_process15.spawn)("bash", ["-c", command], { cwd: import_node_os21.default.homedir() });
+    const child = (0, import_node_child_process14.spawn)("bash", ["-c", command], { cwd: import_node_os21.default.homedir() });
     const out = [];
     const err = [];
     let outBytes = 0;
@@ -60407,7 +60552,7 @@ function buildMethodHandlers(deps) {
 }
 
 // src/app-builder/dev-server-supervisor.ts
-var import_node_child_process16 = require("child_process");
+var import_node_child_process15 = require("child_process");
 var import_node_events2 = require("events");
 var DEFAULT_READY_PATTERN = /Local:\s+https?:\/\/|Nest application successfully started|server listening on/i;
 var DevServerSupervisor = class extends import_node_events2.EventEmitter {
@@ -60444,7 +60589,7 @@ var DevServerSupervisor = class extends import_node_events2.EventEmitter {
       tunnelHost: args.tunnelHost,
       devCommand: cmd
     });
-    const child = (0, import_node_child_process16.spawn)("sh", ["-c", cmd], {
+    const child = (0, import_node_child_process15.spawn)("sh", ["-c", cmd], {
       cwd: args.cwd,
       env,
       stdio: "pipe",
@@ -60696,7 +60841,7 @@ async function dispatchRpc(method, frame, client, ctx, deps) {
 }
 
 // src/extension/runtime.ts
-var import_node_child_process17 = require("child_process");
+var import_node_child_process16 = require("child_process");
 var import_node_path60 = __toESM(require("path"), 1);
 var import_promises12 = require("timers/promises");
 
@@ -60804,7 +60949,7 @@ var Runtime = class {
       CLAWOS_EXT_PORT: String(port),
       CLAWOS_EXT_ID: extId
     };
-    const child = (0, import_node_child_process17.spawn)("sh", ["-c", cmd], {
+    const child = (0, import_node_child_process16.spawn)("sh", ["-c", cmd], {
       cwd: dir,
       env,
       stdio: ["ignore", "pipe", "pipe"],
@@ -61908,8 +62053,10 @@ async function startDaemon(config) {
     },
     // B 角色：判断 targetPersona 是否 public（跨设备授权边界，private 拒）。
     getPersonaPublic: (personaId2) => personaRegistry.get(personaId2)?.public ?? false,
-    // model 校验按 target persona 绑定 tool 选表（claude / codex 模型集不同）
-    getPersonaTool: (personaId2) => personaRegistry.get(personaId2)?.tool
+    // model 校验按 target persona 绑定 tool 选来源（claude / codex 模型集不同）
+    getPersonaTool: (personaId2) => personaRegistry.get(personaId2)?.tool,
+    // codex 模型表是运行时查 model/list 来的，校验必须问 capabilities（manager 侧有进程级缓存）
+    getCapabilities: (tool) => manager.getCapabilities(tool)
   });
   Object.assign(handlers, dispatchHandlers);
   const shiftHandlers = buildShiftInternalHandlers({