@clawos-dev/clawd 0.2.552 → 0.2.554

package/dist/cli.cjs

@@ -5989,13 +5989,13 @@ function sharedConnectorSecrets(m3) {
 function requiredSecretEnvNames(m3) {
   return [.../* @__PURE__ */ new Set([...m3.secrets.flatMap((s2) => s2.env), ...sharedConnectorSecrets(m3).flatMap((s2) => s2.env)])];
 }
-var EnvCliSchema, EnvSecretSchema, EnvAssetSchema, ConnectorNameSchema, CONNECTOR_KINDS, CONNECTOR_RUNNERS, CONNECTOR_PROTOCOLS, CREDENTIAL_SOURCES, CONNECTOR_AUTHS, ConnectorFieldSchema, EnvConnectorSchema, MANIFEST_BODY, EnvManifestBodySchema, EnvironmentManifestSchema, EnvEvidenceSchema;
+var EnvPackageSchema, EnvSecretSchema, ConnectorNameSchema, CONNECTOR_KINDS, CONNECTOR_RUNNERS, CONNECTOR_PROTOCOLS, CREDENTIAL_SOURCES, CONNECTOR_AUTHS, ConnectorFieldSchema, EnvConnectorSchema, normalizeLegacyManifest, MANIFEST_BODY, EnvManifestBodySchema, EnvironmentManifestSchema, EnvEvidenceSchema;
 var init_environment_schemas = __esm({
   "../protocol/src/environment-schemas.ts"() {
     "use strict";
     init_zod();
-    EnvCliSchema = external_exports.object({
-      // 可执行文件名，装配后要能在 PATH 里直接调到（'aliyun' / 's' / 'pnpm' / 'python3'）
+    EnvPackageSchema = external_exports.object({
+      // 装完后在 PATH 里能直接调到的名字（'aliyun' / 's' / 'pnpm' / 'python3'）；npm 包报 bin 名，包名进 from
       name: external_exports.string().min(1),
       /**
        * 从哪装，约定 `<kind>:<ref>`：`npm:@serverless-devs/s` / `github:aliyun/aliyun-cli` /
@@ -6028,9 +6028,6 @@ var init_environment_schemas = __esm({
       // supabase 是 url/anon/service-role/jwt 四个），所以是数组不是单值。
       env: external_exports.array(external_exports.string().min(1)).min(1)
     });
-    EnvAssetSchema = external_exports.object({
-      name: external_exports.string().min(1)
-    });
     ConnectorNameSchema = external_exports.string().regex(/^[a-z0-9-]+$/, "\u8FDE\u63A5\u5668\u540D\u53EA\u80FD\u662F\u5C0F\u5199\u5B57\u6BCD\u3001\u6570\u5B57\u548C\u77ED\u6A2A\u7EBF");
     CONNECTOR_KINDS = ["proxy", "env"];
     CONNECTOR_RUNNERS = ["mcp", "cli"];
@@ -6049,10 +6046,23 @@ var init_environment_schemas = __esm({
       fields: external_exports.array(ConnectorFieldSchema).default([]),
       http: external_exports.object({ url: external_exports.string().min(1), headers: external_exports.record(external_exports.string(), external_exports.string()) }).optional()
     });
+    normalizeLegacyManifest = (v3) => {
+      if (!v3 || typeof v3 !== "object") return v3;
+      let o2 = v3;
+      if ("clis" in o2 && Array.isArray(o2.clis)) {
+        const { clis, ...rest } = o2;
+        o2 = "packages" in rest ? rest : { ...rest, packages: clis };
+      }
+      if ("assets" in o2 && Array.isArray(o2.assets) && o2.assets.length === 0) {
+        const { assets: _dropped, ...rest } = o2;
+        o2 = rest;
+      }
+      return o2;
+    };
     MANIFEST_BODY = {
-      clis: external_exports.array(EnvCliSchema),
+      // 构镜像时要装进去的所有东西（工具 / 运行时 / 包）。底座已有的构建器会跳过；persona 目录整个进镜像，不在这里列
+      packages: external_exports.array(EnvPackageSchema),
       secrets: external_exports.array(EnvSecretSchema),
-      assets: external_exports.array(EnvAssetSchema),
       /**
        * 装了哪些连接器（design 2026-09-11-mcp-connector §3.1）。一条一个对象，形状见 `EnvConnectorSchema`。
        *
@@ -6064,14 +6074,14 @@ var init_environment_schemas = __esm({
       connectors: external_exports.array(EnvConnectorSchema).default([])
     };
     EnvManifestBodySchema = external_exports.object(MANIFEST_BODY);
-    EnvironmentManifestSchema = external_exports.object({
+    EnvironmentManifestSchema = external_exports.preprocess(normalizeLegacyManifest, external_exports.object({
       // 格式版本。manifest 要跨进程（daemon 扫 → 镜像构建器读）也跨时间（部署记录留档），
       // 加字段兼容但改语义不兼容，留一个显式版本位。
       version: external_exports.literal(1),
       ...MANIFEST_BODY
-    }).strict();
+    }).strict());
     EnvEvidenceSchema = external_exports.object({
-      // 这条证据支持的是哪一项：`${kind}:${name}`，如 'cli:aliyun' / 'secret:aliyun-ak'
+      // 这条证据支持的是哪一项：`${kind}:${name}`，如 'package:aliyun' / 'secret:aliyun-ak' / 'connector:feishu'
       target: external_exports.string().min(1),
       // 一句人话：为什么需要它 + 从哪看出来的。单据默认显示这句。
       reason: external_exports.string().min(1),
@@ -6087,10 +6097,13 @@ var init_environment_schemas = __esm({
 });
 
 // ../protocol/src/deploy-schemas.ts
-function isScanFresh(scan, repo2) {
+function contentHeadOf(repo2, released) {
+  return released && repo2.head === released.head ? released.contentHead : repo2.head;
+}
+function isScanFresh(scan, repo2, released) {
   if (!scan || !repo2) return false;
   if (scan.status !== "done") return false;
-  return scan.head === repo2.head && !repo2.dirty;
+  return scan.head === contentHeadOf(repo2, released) && !repo2.dirty;
 }
 function cloudEngineOk(tool) {
   return (tool || "claude") === "codex";
@@ -6098,7 +6111,7 @@ function cloudEngineOk(tool) {
 function repoSlug(url) {
   return url.trim().replace(/^git@[^:]+:/, "").replace(/^https?:\/\/[^/]+\//, "").replace(/\.git$/, "");
 }
-var DeployFileSchema, SCAN_BASE_KINDS, ScanBaseKindSchema, DeployScanStatusSchema, DeployScanSchema, DeployRepoSchema, DeploySecretPresenceSchema, DEPLOY_STAGE_STATUSES, DeployStageStatusSchema, DEPLOY_STAGE_KEYS, DeployStageKeySchema, DeployJobSchema, DeployRunSchema, DeployStateSchema, DeployReleaseResultSchema, DeployPersonaArgsSchema, DeployReleaseArgsSchema, DeployPatchArgsSchema, DeployPutSecretArgsSchema, DeployRerunJobArgsSchema, DeployReportFindingArgsSchema, DeployFinishScanArgsSchema, PERSONA_REPO_ORG;
+var DeployFileSchema, SCAN_BASE_KINDS, ScanBaseKindSchema, DeployScanStatusSchema, DeployScanSchema, DeployReleasedSchema, DeployScanFileSchema, DeployRepoSchema, DeploySecretPresenceSchema, DEPLOY_STAGE_STATUSES, DeployStageStatusSchema, DEPLOY_STAGE_KEYS, DeployStageKeySchema, DeployJobSchema, DeployRunSchema, DeployStateSchema, DeployReleaseResultSchema, DeployPersonaArgsSchema, DeployScanArgsSchema, DeployReleaseArgsSchema, DeployPatchArgsSchema, DeployPutSecretArgsSchema, DeployRerunJobArgsSchema, DeployReportFindingArgsSchema, DeployFinishScanArgsSchema, PERSONA_REPO_ORG;
 var init_deploy_schemas = __esm({
   "../protocol/src/deploy-schemas.ts"() {
     "use strict";
@@ -6113,33 +6126,30 @@ var init_deploy_schemas = __esm({
     ScanBaseKindSchema = external_exports.enum(SCAN_BASE_KINDS);
     DeployScanStatusSchema = external_exports.enum(["scanning", "done", "failed"]);
     DeployScanSchema = external_exports.object({
+      /** 历史里指名用（发布 / patch / putSecret 都按它找）。daemon 生成；存量单条记录迁过来的叫 `legacy` */
+      id: external_exports.string().min(1),
+      /**
+       * 这次扫描的清单——原来在 `deploy.json` 里的那份，现在每次扫描各存一份。
+       * 扫描期由 `deploy:reportFinding` 逐条长出来，扫完人在页面上改（`deploy:patch`）也改这份；
+       * 发布时选中的那条被写成 `deploy.json` 进仓库。
+       */
+      manifest: EnvironmentManifestSchema,
       /** 干这次扫描的 butler 会话，「看它怎么干的」入口 */
       scanSessionId: external_exports.string().optional(),
       status: DeployScanStatusSchema,
       evidence: external_exports.array(EnvEvidenceSchema).default([]),
       notes: external_exports.array(external_exports.string()).default([]),
-      /** 扫描时被告知的共享资产名单（判「扫描器后来长了新本事」用） */
-      scannedAssets: external_exports.array(external_exports.string()).default([]),
       /**
-       * 这次扫描是**对哪个 commit 的断言**。`deploy:release` 在起扫描之前会先把 persona 目录
-       * 提交（只提交不推，推是发布末尾那一下的事），所以这个值一定是仓库里真实存在的一版。
+       * 这次扫描是**对哪个内容版本的断言**：起扫描前先把 persona 目录提交到本地（只提交不推，推是发布的事），
+       * 落存那一下的 HEAD 就是它——发布 commit 不算内容版本，见 `contentHeadOf`。所以这个值一定是仓库里真实存在的一版，
+       * 同一内容上扫几次 `head` 都相同。**从此不动**：发布不再把它挪成发布 commit（线上是哪版记在 `DeployReleased` 里）。
        *
-       * 有了它，「清单过没过时」才是个可判定的等式（`head === repo.head`），
+       * 有了它，「清单过没过时」才是个可判定的等式（`head === contentHeadOf(repo, released)`），
        * 而不是从 `dirty` / `ahead` 里猜——那两个字段判不出「清单是好几版之前扫的」。
        *
        * 缺席 = 旧版 clawd 扫的记录。**一律当过时**：没有第三种情况，重扫一次就有了。
        */
       head: external_exports.string().min(1).optional(),
-      /**
-       * 上次**发布**推的那个 commit ——「线上正跑的是哪一版」在本机唯一的答案，
-       * 也就是软扫的基准。只有 `deploy:release` 写它，扫描不动。
-       *
-       * 为什么不能用 `head` 顶替：`head` 被扫描和发布轮流覆盖（扫描前落存一版、发布后又挪一版），
-       * 它回答的是「清单绑在哪个 commit 上」，回答不了「上次发布是哪一版」。
-       *
-       * 缺席 = 这个 persona 还从没发布过，没有线上版本可比，软扫退硬扫。
-       */
-      releasedHead: external_exports.string().min(1).optional(),
       /**
        * 这次**实际**怎么扫的。档位由 daemon 定（有线上版本可比 + 有跑完的清单 → 软扫，否则硬扫），
        * 页面要显示的是真正发生的那个。
@@ -6148,12 +6158,23 @@ var init_deploy_schemas = __esm({
        * 定成必填会让 `readScan` 当场抛、上云页面直接打不开。而老记录确实都是从零扫的。
        */
       baseKind: ScanBaseKindSchema.default("hard"),
-      /** 软扫比的那个 commit（= `releasedHead`）。硬扫时缺席 */
+      /** 软扫比的那个 commit（= 当时 `DeployReleased.head`）。硬扫时缺席 */
       base: external_exports.string().min(1).optional(),
       startedAt: external_exports.number(),
       finishedAt: external_exports.number().optional(),
       error: external_exports.string().optional()
     }).strict();
+    DeployReleasedSchema = external_exports.object({
+      head: external_exports.string().min(1),
+      contentHead: external_exports.string().min(1),
+      scanId: external_exports.string().min(1),
+      at: external_exports.number()
+    }).strict();
+    DeployScanFileSchema = external_exports.object({
+      version: external_exports.literal(2),
+      scans: external_exports.array(DeployScanSchema),
+      released: DeployReleasedSchema.optional()
+    }).strict();
     DeployRepoSchema = external_exports.object({
       url: external_exports.string().min(1),
       branch: external_exports.string().min(1),
@@ -6202,8 +6223,10 @@ var init_deploy_schemas = __esm({
       /** 本机 GitHub 身份（机器级，githubAuth:* 的同一份；上云页顶上那张卡用）。老 daemon 不给（可选只为兼容），UI 缺席时按未知处理 */
       github: GithubAuthStatusSchema.optional(),
       repo: DeployRepoSchema.optional(),
-      file: DeployFileSchema.optional(),
-      scan: DeployScanSchema.optional(),
+      /** 扫描历史，升序，最后一条最新。没扫过就是空数组 */
+      scans: external_exports.array(DeployScanSchema).default([]),
+      /** 线上正跑的是哪一版；从没发布过就缺席 */
+      released: DeployReleasedSchema.optional(),
       /** 没仓库时缺席（查不了） */
       secrets: external_exports.array(DeploySecretPresenceSchema).optional(),
       /**
@@ -6212,27 +6235,28 @@ var init_deploy_schemas = __esm({
        */
       run: DeployRunSchema.optional(),
       /**
-       * `.clawd/deploy.json` 读不出来（人手改坏了）时的人话。有它就没有 `file`。
-       * 页面据此给一条能走的路（重新扫描会整份重写），而不是白屏。
+       * `.clawd/deploy-scan.json` 读不出来（坏 JSON / 不合形状）时的人话。有它 `scans` 为空。
+       * 页面据此给一条能走的路（重新扫描会重建这个文件），而不是白屏。
        */
-      fileError: external_exports.string().optional()
+      historyError: external_exports.string().optional()
+    }).strict();
+    DeployReleaseResultSchema = external_exports.object({
+      sha: external_exports.string().min(1),
+      actionsUrl: external_exports.string().min(1)
     }).strict();
-    DeployReleaseResultSchema = external_exports.discriminatedUnion("outcome", [
-      external_exports.object({
-        outcome: external_exports.literal("pushed"),
-        sha: external_exports.string().min(1),
-        actionsUrl: external_exports.string().min(1)
-      }).strict(),
-      external_exports.object({ outcome: external_exports.literal("scanning") }).strict()
-    ]);
     DeployPersonaArgsSchema = external_exports.object({
       personaId: external_exports.string().min(1)
     }).strict();
-    DeployReleaseArgsSchema = DeployPersonaArgsSchema.extend({
+    DeployScanArgsSchema = DeployPersonaArgsSchema.extend({
       scanBase: ScanBaseKindSchema.optional()
     }).strict();
+    DeployReleaseArgsSchema = DeployPersonaArgsSchema.extend({
+      scanId: external_exports.string().min(1)
+    }).strict();
     DeployPatchArgsSchema = external_exports.object({
       personaId: external_exports.string().min(1),
+      /** 改的是历史里哪次扫描的清单。扫描期 butler 删条目也走这条（scanId 在它的任务提示里） */
+      scanId: external_exports.string().min(1),
       patch: external_exports.object({
         // 人工补依赖；整份替换 manifest
         manifest: EnvironmentManifestSchema.optional()
@@ -6240,6 +6264,8 @@ var init_deploy_schemas = __esm({
     }).strict();
     DeployPutSecretArgsSchema = external_exports.object({
       personaId: external_exports.string().min(1),
+      /** 按哪次扫描的清单校验凭据名 / env 名。值本身是仓库级的（GitHub Secrets），跟扫描无关 */
+      scanId: external_exports.string().min(1),
       // 对应 manifest.secrets[].name
       name: external_exports.string().min(1),
       // 环境变量名 → 值。key 必须是该 secret 声明过的 env 之一，handler 校验。
@@ -6252,7 +6278,7 @@ var init_deploy_schemas = __esm({
     }).strict();
     DeployReportFindingArgsSchema = external_exports.object({
       personaId: external_exports.string().min(1),
-      kind: external_exports.enum(["cli", "secret", "asset", "connector"]),
+      kind: external_exports.enum(["package", "secret", "connector"]),
       // 该条目在 manifest 对应数组里的内容（形状随 kind 变，handler 按 kind 收窄校验）
       // connector 的 item 是 butler 报的 CLI 连接器（{ name, fields? }），daemon 补齐 kind / runner / id 后落进清单；
       // MCP 连接器不经这里——由 daemon 从 .mcp.json 机械列出（design 2026-09-11-mcp-connector §3.2）
@@ -7578,7 +7604,7 @@ var init_persona_schemas = __esm({
   "../protocol/src/persona-schemas.ts"() {
     "use strict";
     init_zod();
-    PERSONA_SIZES = ["small", "medium", "large"];
+    PERSONA_SIZES = ["tiny", "small", "medium", "large"];
     PersonaSizeSchema = external_exports.enum(PERSONA_SIZES);
     PersonaFileSchema = external_exports.object({
       personaId: external_exports.string(),
@@ -7596,7 +7622,7 @@ var init_persona_schemas = __esm({
       // 与 model 平行：persona 新建 session 的默认 tool，可平滑切换。
       tool: external_exports.string().optional(),
       /**
-       * 云上任务 Pod 的规格档（design 2026-09-18-persona-size）：`small` / `medium` / `large`，没写按 medium。
+       * 云上任务 Pod 的规格档（design 2026-09-18-persona-size）：`tiny` / `small` / `medium` / `large`，没写按 medium。
        * 只有发布上云的流水线读它（cloud-host/pipeline/deploy-file.mjs 收窄值域，不认识的拒发）；本机跑不看。
        * 协议层同 model / effort 保持 string（文件层向前兼容）；改它的入口是上云页标题行的规格下拉
        * （design 2026-09-20-persona-size-ui），`persona:update` 那头按 PersonaSizeSchema 收窄。
@@ -7713,7 +7739,7 @@ var init_persona_schemas = __esm({
         model: external_exports.string().optional(),
         effort: external_exports.string().optional(),
         tool: external_exports.string().optional(),
-        // 云上任务 Pod 的规格档：只收三档之一（PersonaFile 层是 string，边界在这里收窄）
+        // 云上任务 Pod 的规格档：只收四档之一（PersonaFile 层是 string，边界在这里收窄）
         size: PersonaSizeSchema.optional(),
         personality: external_exports.string().optional(),
         // 人格补充层正文（见 PersonaInfoResponseSchema.personalityLocal）。与 personality 各写
@@ -8987,15 +9013,19 @@ var init_methods = __esm({
       },
       // ---- deploy:*（persona 上云：persona 目录 = git 仓库工作树，发布 = 推送触发仓库流水线）----
       "deploy:get": {
-        summary: "\u4E0A\u4E91\u9875\u9762\u8981\u7684\u5168\u90E8\uFF1A\u4ED3\u5E93\u7ED1\u5B9A\u72B6\u6001\uFF08git \u73B0\u7B97\uFF09\u3001\u90E8\u7F72\u6587\u4EF6\u3001\u626B\u63CF\u8BB0\u5F55\u3001\u4ED3\u5E93 Secrets \u91CC\u5404\u53D8\u91CF\u540D\u586B\u8FC7\u6CA1\u6709\uFF08**\u53EA\u6709\u540D\u5B57\u548C\u65F6\u95F4\uFF0C\u6CA1\u6709\u503C**\uFF09\uFF1Bowner-only",
+        summary: "\u4E0A\u4E91\u9875\u9762\u8981\u7684\u5168\u90E8\uFF1A\u4ED3\u5E93\u7ED1\u5B9A\u72B6\u6001\uFF08git \u73B0\u7B97\uFF09\u3001\u626B\u63CF\u5386\u53F2\uFF08\u6BCF\u6761\u5E26\u6E05\u5355\u5FEB\u7167\uFF09\u3001\u7EBF\u4E0A\u6B63\u8DD1\u7684\u662F\u54EA\u4E00\u7248\u3001\u4ED3\u5E93 Secrets \u91CC\u5404\u53D8\u91CF\u540D\u586B\u8FC7\u6CA1\u6709\uFF08**\u53EA\u6709\u540D\u5B57\u548C\u65F6\u95F4\uFF0C\u6CA1\u6709\u503C**\uFF09\uFF1Bowner-only",
         args: DeployPersonaArgsSchema
       },
+      "deploy:scan": {
+        summary: "\u8D77\u4E00\u6B21\u626B\u63CF\u3002**\u6CA1\u4ED3\u5E93\u5148\u5EFA\u4ED3**\uFF08GitHub REST \u5EFA\u5728\u7EC4\u7EC7\u4E0B\u3001\u79C1\u6709\uFF0Cgit \u63A8\u9996\u4E2A\u63D0\u4EA4\uFF1Btoken \u6765\u81EA\u672C\u673A git \u7684\u8EAB\u4EFD\uFF0C\u6CA1\u6388\u6743\u5148\u62D2\uFF09\u3002\u628A persona \u76EE\u5F55\u63D0\u4EA4\u5230\u672C\u5730\uFF08\u4E0D\u63A8\uFF09\u3001\u5728\u626B\u63CF\u5386\u53F2\u91CC\u8FFD\u52A0\u4E00\u6761\u3001\u8D77 persona-butler \u7684\u626B\u63CF\u4F1A\u8BDD\uFF1B\u6B63\u5728\u626B\u7684\u8BDD\u539F\u6837\u8FD4\u56DE\u4E0D\u8D77\u7B2C\u4E8C\u4E2A\u4F1A\u8BDD\u3002\u5E26 scanBase\uFF08hard / soft\uFF09\u6309\u8BE5\u6863\u4F4D\u626B\uFF08soft \u4E0D\u6210\u7ACB\u81EA\u52A8\u9000 hard\uFF09\uFF0C\u7F3A\u5E2D daemon \u81EA\u52A8\u5B9A\uFF1Bowner-only",
+        args: DeployScanArgsSchema
+      },
       "deploy:patch": {
-        summary: "\u7F16\u8F91\u90E8\u7F72\u6587\u4EF6\uFF1A\u624B\u5DE5\u8865\u4F9D\u8D56\u3002**\u4E0D\u80FD\u4ECE\u8FD9\u91CC\u4F20\u51ED\u636E\u7684\u503C**\uFF08\u503C\u8D70 deploy:putSecret\uFF09\uFF1Bowner-only",
+        summary: "\u7F16\u8F91\u5386\u53F2\u91CC\u67D0\u6B21\u626B\u63CF\u7684\u6E05\u5355\uFF08scanId \u6307\u540D\uFF09\uFF1A\u624B\u5DE5\u8865 / \u5220\u4F9D\u8D56\uFF0C\u626B\u63CF\u671F butler \u5220\u6761\u76EE\u4E5F\u8D70\u8FD9\u6761\u3002**\u4E0D\u80FD\u4ECE\u8FD9\u91CC\u4F20\u51ED\u636E\u7684\u503C**\uFF08\u503C\u8D70 deploy:putSecret\uFF09\uFF1Bowner-only",
         args: DeployPatchArgsSchema
       },
       "deploy:putSecret": {
-        summary: "\u628A\u4E00\u6761\u51ED\u636E\u7684\u503C\u5199\u8FDB\u4ED3\u5E93\u7684 GitHub Secrets\uFF08GitHub REST\uFF0C\u503C\u7528\u4ED3\u5E93\u516C\u94A5\u5C01\u7BB1\u540E\u4E0A\u4F20\uFF09\u3002**\u8FD9\u662F\u503C\u552F\u4E00\u7684\u5165\u53E3**\uFF1A\u5165\u53C2\u4E0D\u8FDB\u65E5\u5FD7\u3001\u54CD\u5E94\u4E0D\u56DE\u663E\u503C\u3001\u672C\u673A\u4E0D\u843D\u76D8\u3002env \u540D\u5FC5\u987B\u662F\u8BE5\u51ED\u636E\u5728\u6E05\u5355\u91CC\u58F0\u660E\u8FC7\u7684\uFF1Bowner-only",
+        summary: "\u628A\u4E00\u6761\u51ED\u636E\u7684\u503C\u5199\u8FDB\u4ED3\u5E93\u7684 GitHub Secrets\uFF08GitHub REST\uFF0C\u503C\u7528\u4ED3\u5E93\u516C\u94A5\u5C01\u7BB1\u540E\u4E0A\u4F20\uFF09\u3002**\u8FD9\u662F\u503C\u552F\u4E00\u7684\u5165\u53E3**\uFF1A\u5165\u53C2\u4E0D\u8FDB\u65E5\u5FD7\u3001\u54CD\u5E94\u4E0D\u56DE\u663E\u503C\u3001\u672C\u673A\u4E0D\u843D\u76D8\u3002env \u540D\u5FC5\u987B\u662F scanId \u90A3\u6B21\u6E05\u5355\u91CC\u8BE5\u51ED\u636E\u58F0\u660E\u8FC7\u7684\uFF1Bowner-only",
         args: DeployPutSecretArgsSchema
       },
       "deploy:reportFinding": {
@@ -9007,11 +9037,11 @@ var init_methods = __esm({
         args: DeployFinishScanArgsSchema
       },
       "deploy:release": {
-        summary: "\u53D1\u5E03\u2014\u2014\u4E0A\u4E91\u552F\u4E00\u7684\u52A8\u4F5C\uFF0C\u626B\u63CF\u662F\u5B83\u7684\u7B2C\u4E00\u6BB5\u3002**\u6CA1\u4ED3\u5E93\u5148\u5EFA\u4ED3**\uFF08GitHub REST \u5EFA\u5728\u7EC4\u7EC7\u4E0B\u3001\u79C1\u6709\uFF0Cgit \u63A8\u9996\u4E2A\u63D0\u4EA4\uFF1Btoken \u6765\u81EA\u672C\u673A git \u7684\u8EAB\u4EFD\uFF0C\u6CA1\u6388\u6743\u5148\u62D2\uFF09\u3002\u6E05\u5355\u8FC7\u65F6\uFF08persona \u6539\u8FC7 / \u6CA1\u626B\u8FC7 / \u4E0A\u6B21\u626B\u5931\u8D25\uFF09\uFF1A\u5148\u628A persona \u76EE\u5F55\u63D0\u4EA4\u5230\u672C\u5730\uFF08\u4E0D\u63A8\uFF09\uFF0C\u8D77 persona-butler \u7684\u626B\u63CF\u4F1A\u8BDD\uFF0C\u56DE outcome=scanning\u2014\u2014\u7ED3\u679C\u5199\u8FDB .clawd/deploy.json\uFF08\u6E05\u5355\uFF0C\u8FDB\u4ED3\u5E93\uFF09\u4E0E .clawd/deploy-scan.json\uFF08\u8BC1\u636E\uFF0C\u4E0D\u8FDB\u4ED3\u5E93\uFF09\uFF0C\u6B63\u5728\u626B\u7684\u8BDD\u539F\u6837\u8FD4\u56DE\u4E0D\u8D77\u7B2C\u4E8C\u4E2A\u4F1A\u8BDD\u3002\u6E05\u5355\u65B0\u9C9C\uFF1A\u8FC7\u95F8\uFF08\u6BCF\u4E2A\u53D8\u91CF\u540D\u90FD\u5728 Secrets \u91CC\u3001\u8FDE\u63A5\u5668\u6765\u6E90\u70B9\u8FC7\u3001\u9009\u4E86\u6A21\u578B\uFF09\u2192 \u91CD\u5199 workflow \u6A21\u677F \u2192 git add -A \u2192 \u7A7A\u63D0\u4EA4\u4E5F\u5141\u8BB8 \u2192 push\uFF0C\u56DE outcome=pushed \u5E26 commit \u4E0E Actions \u5730\u5740\uFF1B\u4ED3\u5E93\u91CC\u7684\u6D41\u6C34\u7EBF\u63A5\u7740\u6784\u955C\u50CF\u3001\u8BD5\u8DD1\u3001\u767B\u8BB0\u3002\u5E26 scanBase\uFF08hard / soft\uFF09= \u8FD9\u6B21\u4E00\u5B9A\u5148\u626B\u3001\u6309\u8BE5\u6863\u4F4D\u626B\uFF08soft \u4E0D\u6210\u7ACB\u81EA\u52A8\u9000 hard\uFF09\uFF0C\u6E05\u5355\u65B0\u9C9C\u4E5F\u56DE scanning\uFF1Bowner-only",
+        summary: "\u628A\u5386\u53F2\u91CC scanId \u90A3\u6B21\u626B\u63CF\u7684\u6E05\u5355\u53D1\u4E0A\u53BB\u3002\u90A3\u6B21\u5FC5\u987B\u626B\u5B8C\u3001\u4E14\u5BF9\u5E94\u5F53\u524D\u5185\u5BB9\u7248\u672C\uFF08persona \u4E4B\u540E\u6CA1\u6539\u8FC7\uFF09\uFF0C\u5426\u5219\u62D2\u2014\u2014\u5148 deploy:scan\u3002\u8FC7\u95F8\uFF08\u6BCF\u4E2A\u53D8\u91CF\u540D\u90FD\u5728 Secrets \u91CC\u3001\u8FDE\u63A5\u5668\u6765\u6E90\u70B9\u8FC7\u3001\u9009\u4E86\u6A21\u578B\uFF09\u2192 \u628A\u90A3\u4EFD\u6E05\u5355\u5199\u6210 .clawd/deploy.json \u2192 \u91CD\u5199 workflow \u6A21\u677F \u2192 git add -A \u2192 \u7A7A\u63D0\u4EA4\u4E5F\u5141\u8BB8 \u2192 push\uFF0C\u56DE commit \u4E0E Actions \u5730\u5740\uFF1B\u4ED3\u5E93\u91CC\u7684\u6D41\u6C34\u7EBF\u63A5\u7740\u6784\u955C\u50CF\u3001\u8BD5\u8DD1\u3001\u767B\u8BB0\u3002\u540C\u4E00\u7248\u53EF\u4EE5\u53CD\u590D\u53D1\uFF08\u7528\u540C\u4E00\u4EFD\u6E05\u5355\u518D\u8D70\u4E00\u904D\uFF09\uFF1Bowner-only",
         args: DeployReleaseArgsSchema
       },
       "deploy:rerunJob": {
-        summary: "\u539F\u6837\u91CD\u8DD1\u6700\u65B0\u90A3\u6761\u6D41\u6C34\u7EBF\u91CC\u5931\u8D25\u7684\u67D0\u4E00\u6BB5\uFF08GitHub REST rerun job\uFF09\u3002**\u540C\u4E00\u4E2A commit\u3001\u540C\u4E00\u4EFD\u8F93\u5165**\uFF0C\u4E0D\u4EA7\u751F\u65B0\u63D0\u4EA4\u2014\u2014\u6539\u4E86 persona \u5185\u5BB9\u6216\u51ED\u636E\u8981\u8D70 deploy:release\u3002jobId \u5FC5\u987B\u5C5E\u4E8E\u6700\u65B0\u90A3\u6761 run\uFF1Bowner-only",
+        summary: "\u539F\u6837\u91CD\u8DD1\u6700\u65B0\u90A3\u6761\u6D41\u6C34\u7EBF\u91CC\u5931\u8D25\u7684\u67D0\u4E00\u6BB5\uFF08GitHub REST rerun job\uFF09\u3002**\u540C\u4E00\u4E2A commit\u3001\u540C\u4E00\u4EFD\u8F93\u5165**\uFF0C\u4E0D\u4EA7\u751F\u65B0\u63D0\u4EA4\u2014\u2014\u6539\u4E86 persona \u5185\u5BB9\u8981 deploy:scan \u518D deploy:release\u3002jobId \u5FC5\u987B\u5C5E\u4E8E\u6700\u65B0\u90A3\u6761 run\uFF1Bowner-only",
         args: DeployRerunJobArgsSchema
       },
       // ---- githubAuth:*（本机 GitHub 身份，机器级；spec 2026-09-15-github-auth-unify-design §4.3）----
@@ -9718,11 +9748,12 @@ function isCodexFamily(tool) {
 function isRpcAgentTool(tool) {
   return isCodexFamily(tool) || tool === PI_TOOL_ID;
 }
-var CODEX_CLOUD_TOOL_ID, PI_TOOL_ID;
+var CLOUD_TOOL_SUFFIX, CODEX_CLOUD_TOOL_ID, PI_TOOL_ID;
 var init_tool_family = __esm({
   "../protocol/src/tool-family.ts"() {
     "use strict";
-    CODEX_CLOUD_TOOL_ID = "codex-cloud";
+    CLOUD_TOOL_SUFFIX = "-cloud";
+    CODEX_CLOUD_TOOL_ID = `codex${CLOUD_TOOL_SUFFIX}`;
     PI_TOOL_ID = "pi";
   }
 });
@@ -32801,7 +32832,7 @@ var require_websocket = __commonJS({
     var http2 = require("http");
     var net2 = require("net");
     var tls = require("tls");
-    var { randomBytes, createHash: createHash2 } = require("crypto");
+    var { randomBytes: randomBytes2, createHash: createHash2 } = require("crypto");
     var { Duplex, Readable: Readable3 } = require("stream");
     var { URL: URL2 } = require("url");
     var PerMessageDeflate2 = require_permessage_deflate();
@@ -33331,7 +33362,7 @@ var require_websocket = __commonJS({
         }
       }
       const defaultPort = isSecure ? 443 : 80;
-      const key = randomBytes(16).toString("base64");
+      const key = randomBytes2(16).toString("base64");
       const request = isSecure ? https.request : http2.request;
       const protocolSet = /* @__PURE__ */ new Set();
       let perMessageDeflate;
@@ -44494,7 +44525,7 @@ Env (advanced):
 var import_node_path78 = __toESM(require("path"), 1);
 var import_node_fs60 = __toESM(require("fs"), 1);
 var import_node_os28 = __toESM(require("os"), 1);
-var import_node_crypto22 = require("crypto");
+var import_node_crypto23 = require("crypto");
 var import_node_url5 = require("url");
 
 // src/logger.ts
@@ -51856,6 +51887,7 @@ function driveCodexThread(opts) {
         ...translateNotification(method, params)
       ] : [];
       if (events.length) sink.pushEvents(events);
+      if (route === "foreground" && method === "turn/completed") opts.onTurnCompleted?.();
     },
     onServerRequest: (id, method, params) => {
       const p3 = params ?? {};
@@ -55304,6 +55336,7 @@ function redactEvidence(evidence) {
 // src/deploy/deploy-file.ts
 var import_promises4 = __toESM(require("fs/promises"), 1);
 var import_node_path33 = __toESM(require("path"), 1);
+var import_node_crypto8 = require("crypto");
 init_protocol();
 
 // src/deploy/connectors.ts
@@ -55493,26 +55526,79 @@ async function readDeployFile(dir) {
 async function writeDeployFile(dir, file) {
   await writeJson(import_node_path33.default.join(dir, DEPLOY_FILE), DeployFileSchema.parse(file));
 }
-async function readScan(dir) {
-  const raw = await readJson(import_node_path33.default.join(dir, SCAN_FILE));
+async function readDeployFileRaw(dir) {
+  try {
+    return await import_promises4.default.readFile(import_node_path33.default.join(dir, DEPLOY_FILE), "utf8");
+  } catch (err) {
+    if (err.code === "ENOENT") return void 0;
+    throw err;
+  }
+}
+async function restoreDeployFileRaw(dir, raw) {
+  const file = import_node_path33.default.join(dir, DEPLOY_FILE);
+  if (raw === void 0) await import_promises4.default.rm(file, { force: true });
+  else await import_promises4.default.writeFile(file, raw);
+}
+var emptyScanFile = () => ({ version: 2, scans: [] });
+var LEGACY_SCAN_ID = "legacy";
+var newScanId = () => (0, import_node_crypto8.randomBytes)(4).toString("hex");
+var z1 = DeployScanSchema.omit({ id: true, manifest: true }).extend({ releasedHead: DeployScanSchema.shape.head }).strict();
+function migrateV1(v1, manifest) {
+  const { releasedHead, ...rest } = v1;
+  const entry = { ...rest, id: LEGACY_SCAN_ID, manifest: manifest ?? emptyDeployFile().manifest };
+  return {
+    version: 2,
+    scans: [entry],
+    ...releasedHead ? { released: { head: releasedHead, contentHead: releasedHead, scanId: LEGACY_SCAN_ID, at: v1.head === releasedHead ? v1.finishedAt ?? v1.startedAt : 0 } } : {}
+  };
+}
+function normalizeLegacyScan(raw) {
+  const fix = (o2) => {
+    if (!o2 || typeof o2 !== "object") return o2;
+    const { scannedAssets: _dropped, ...rest } = o2;
+    if (Array.isArray(rest.evidence)) {
+      rest.evidence = rest.evidence.map((e) => {
+        if (!e || typeof e !== "object" || typeof e.target !== "string") return e;
+        const target = e.target;
+        return target.startsWith("cli:") ? { ...e, target: `package:${target.slice("cli:".length)}` } : e;
+      });
+    }
+    return rest;
+  };
+  if (raw && typeof raw === "object" && Array.isArray(raw.scans)) {
+    return { ...raw, scans: raw.scans.map(fix) };
+  }
+  return fix(raw);
+}
+async function readScanFile(dir) {
+  const raw = normalizeLegacyScan(await readJson(import_node_path33.default.join(dir, SCAN_FILE)));
   if (raw === void 0) return void 0;
-  const parsed = DeployScanSchema.safeParse(raw);
-  if (!parsed.success) {
-    const first = parsed.error.issues[0];
-    throw new Error(`${SCAN_FILE} \u4E0D\u5408\u5F62\u72B6\uFF1A${first ? `${first.path.join(".")} ${first.message}` : ""}`);
+  const badShape = (issues) => {
+    const first = issues[0];
+    return new Error(`${SCAN_FILE} \u4E0D\u5408\u5F62\u72B6\uFF1A${first ? `${first.path.join(".")} ${first.message}` : ""}`);
+  };
+  if (typeof raw === "object" && raw !== null && !("version" in raw)) {
+    const v1 = z1.safeParse(raw);
+    if (!v1.success) throw badShape(v1.error.issues);
+    return migrateV1(v1.data, (await readDeployFile(dir).catch(() => void 0))?.manifest);
   }
+  const parsed = DeployScanFileSchema.safeParse(raw);
+  if (!parsed.success) throw badShape(parsed.error.issues);
   return parsed.data;
 }
-async function writeScan(dir, scan) {
-  await writeJson(import_node_path33.default.join(dir, SCAN_FILE), DeployScanSchema.parse(scan));
+async function writeScanFile(dir, file) {
+  await writeJson(import_node_path33.default.join(dir, SCAN_FILE), DeployScanFileSchema.parse(file));
+}
+function replaceScan(file, entry) {
+  const idx = file.scans.findIndex((s2) => s2.id === entry.id);
+  return { ...file, scans: idx === -1 ? [...file.scans, entry] : file.scans.map((s2, i2) => i2 === idx ? entry : s2) };
 }
 function emptyDeployFile() {
-  return { version: 1, manifest: { version: 1, clis: [], secrets: [], assets: [], connectors: [] } };
+  return { version: 1, manifest: { version: 1, packages: [], secrets: [], connectors: [] } };
 }
 var FINDING_SCHEMAS = {
-  cli: EnvCliSchema,
+  package: EnvPackageSchema,
   secret: EnvSecretSchema,
-  asset: EnvAssetSchema,
   // butler 报的是 CLI 连接器的「名字 + 它读的环境变量名」，kind / runner / id 由 daemon 补
   //（handlers/deploy.ts 的 cliConnectorFromFinding）。MCP 连接器不经上报口，由 scanMcpConnectors 机械列出。
   connector: CliConnectorFindingSchema
@@ -55525,26 +55611,26 @@ function parseFinding(kind, item) {
   }
   return parsed.data;
 }
-function upsertFinding(file, kind, item) {
+function upsertFinding(manifest, kind, item) {
   if (kind === "connector") {
     const incoming = item;
-    const have = file.manifest.connectors;
+    const have = manifest.connectors;
     const idx2 = have.findIndex((c2) => c2.name === incoming.name);
-    if (idx2 !== -1 && have[idx2].runner === "mcp" && incoming.runner === "cli") return file;
+    if (idx2 !== -1 && have[idx2].runner === "mcp" && incoming.runner === "cli") return manifest;
     const merged = mergeConnector(idx2 === -1 ? void 0 : have[idx2], incoming);
     const connectors = idx2 === -1 ? [...have, merged] : have.map((c2, i2) => i2 === idx2 ? merged : c2);
-    return { ...file, manifest: { ...file.manifest, connectors } };
+    return { ...manifest, connectors };
   }
-  const key = kind === "cli" ? "clis" : kind === "secret" ? "secrets" : "assets";
-  const list = [...file.manifest[key]];
+  const key = kind === "package" ? "packages" : "secrets";
+  const list = [...manifest[key]];
   const idx = list.findIndex((x2) => x2.name === item.name);
   if (idx === -1) list.push(item);
   else list[idx] = item;
-  return { ...file, manifest: { ...file.manifest, [key]: list } };
+  return { ...manifest, [key]: list };
 }
-function requiredEnvNames(file) {
-  if (!file) return [];
-  return requiredSecretEnvNames(file.manifest);
+function requiredEnvNames(manifest) {
+  if (!manifest) return [];
+  return requiredSecretEnvNames(manifest);
 }
 
 // src/deploy/repo.ts
@@ -59305,26 +59391,26 @@ var L2 = [
   "          rm -rf persona/.git",
   "          node clawos/cloud-host/provision/build-image.mjs \\",
   "            --manifest persona/.clawd/deploy.json \\",
-  '            --from "$REGISTRY/$IMAGE_NAME:base" \\',
+  '            --from "$REGISTRY/$IMAGE_NAME:base-${{ steps.plan.outputs.engine }}" \\',
   "            --persona-dir persona \\",
   // persona 在镜像里落 /clawd/personas/<id>/（与本机同构），id 是 gateway 登记的名字；同 smoke / register 用的那个输出
   "            --persona-id '${{ steps.plan.outputs.persona_id }}' \\",
   '            --tag "$REGISTRY/$IMAGE_NAME:${{ steps.plan.outputs.tag }}"',
   "",
-  "      - name: \u955C\u50CF\u65AD\u8A00\uFF08\u6E05\u5355\u91CC\u7684 CLI \u90FD\u5728\u3001bundle \u91CC persona \u5728\uFF09",
-  "        # /opt/versions.sh \u6BCF\u884C\u90FD\u4EE5 `|| echo` \u6536\u5C3E\u3001\u6C38\u8FDC exit 0\uFF0C\u53EA\u80FD\u9A8C\u8F93\u51FA\uFF1A\u6BB5\u6570\u8981\u7B49\u4E8E\u6E05\u5355\u91CC\u7684",
-  "        # CLI \u6570\uFF0C\u6BCF\u6BB5\u4E0B\u9762\u8981\u6709\u7248\u672C\u53F7\u3002\u955C\u50CF ENTRYPOINT \u662F sh -c\uFF0C\u547D\u4EE4\u8981\u4F5C\u4E3A\u4E00\u4E2A\u5B57\u7B26\u4E32\u4F20\u3002",
+  "      - name: \u955C\u50CF\u65AD\u8A00\uFF08\u6E05\u5355\u91CC\u8981\u88C5\u7684\u90FD\u5728\u3001bundle \u91CC persona \u5728\uFF09",
+  "        # /opt/versions.sh \u6BCF\u884C\u90FD\u4EE5 `|| echo` \u6536\u5C3E\u3001\u6C38\u8FDC exit 0\uFF0C\u53EA\u80FD\u9A8C\u8F93\u51FA\uFF1A\u6BB5\u6570\u8981\u7B49\u4E8E\u6E05\u5355 packages \u7684",
+  "        # \u6761\u6570\uFF0C\u6BCF\u6BB5\u4E0B\u9762\u8981\u6709\u7248\u672C\u53F7\u3002\u955C\u50CF ENTRYPOINT \u662F sh -c\uFF0C\u547D\u4EE4\u8981\u4F5C\u4E3A\u4E00\u4E2A\u5B57\u7B26\u4E32\u4F20\u3002",
   "        run: |",
   '          IMG="$REGISTRY/$IMAGE_NAME:${{ steps.plan.outputs.tag }}"',
   `          OUT=$(docker run --rm "$IMG" '/opt/versions.sh')`,
   '          echo "$OUT"',
-  `          WANT=$(node -e 'const m=JSON.parse(require("fs").readFileSync("persona/.clawd/deploy.json","utf8"));console.log(((m.manifest??m).clis??[]).length)')`,
+  `          WANT=$(node -e 'const m=JSON.parse(require("fs").readFileSync("persona/.clawd/deploy.json","utf8"));const b=m.manifest??m;console.log((b.packages??b.clis??[]).length)')`,
   `          echo "$OUT" | awk -v want="$WANT" '`,
   '            /^--- / { name=$2; if ((getline v) <= 0) v=""; n++',
   '                      if (v !~ /[0-9]+\\.[0-9]+/) { printf "  \u2717 %s \u6CA1\u62A5\u51FA\u7248\u672C\u53F7\uFF1A%s\\n", name, v > "/dev/stderr"; bad++ } }',
-  '            END { if (n != want) { printf "  \u2717 \u955C\u50CF\u91CC\u53EA\u6709 %d \u4E2A CLI \u6BB5\uFF0C\u6E05\u5355\u8981\u6C42 %d \u4E2A\\n", n, want > "/dev/stderr"; bad++ }',
+  '            END { if (n != want) { printf "  \u2717 \u955C\u50CF\u91CC\u53EA\u6709 %d \u6BB5\u7248\u672C\u8F93\u51FA\uFF0C\u6E05\u5355\u8981\u88C5 %d \u4E2A\\n", n, want > "/dev/stderr"; bad++ }',
   "                  exit bad ? 1 : 0 }'",
-  '          echo "  \u2713 $WANT \u4E2A CLI \u90FD\u5728\u4E14\u62A5\u5F97\u51FA\u7248\u672C"',
+  '          echo "  \u2713 \u6E05\u5355\u91CC\u8981\u88C5\u7684 $WANT \u4E2A\u90FD\u5728\u4E14\u62A5\u5F97\u51FA\u7248\u672C"',
   `          docker run --rm "$IMG" 'test -d /clawd/personas/\${{ steps.plan.outputs.persona_id }}' \\`,
   '            || { echo "  \u2717 /clawd/personas/${{ steps.plan.outputs.persona_id }} \u4E0D\u5728" >&2; exit 1; }',
   '          echo "  \u2713 persona \u76EE\u5F55\u5728"',
@@ -59357,6 +59443,7 @@ var L2 = [
   "            --model '${{ steps.plan.outputs.model }}' \\",
   "            --effort '${{ steps.plan.outputs.effort }}' \\",
   "            --size '${{ steps.plan.outputs.size }}' \\",
+  "            --engine '${{ steps.plan.outputs.engine }}' \\",
   "            --connectors '${{ steps.plan.outputs.connectors }}' \\",
   "            --run-number '${{ github.run_number }}'",
   "",
@@ -59381,6 +59468,7 @@ var L2 = [
   "            --model '${{ steps.plan.outputs.model }}' \\",
   "            --effort '${{ steps.plan.outputs.effort }}' \\",
   "            --size '${{ steps.plan.outputs.size }}' \\",
+  "            --engine '${{ steps.plan.outputs.engine }}' \\",
   "            --connectors '${{ steps.plan.outputs.connectors }}'",
   ""
 ];
@@ -59596,7 +59684,7 @@ async function release(exec, api, args) {
   await mustGit(exec, args.dir, [...identity, "commit", "--allow-empty", "-m", `clawd: \u53D1\u5E03 ${stamp}`], "\u63D0\u4EA4");
   await gitPush(exec, args.dir, args.auth);
   const sha = await mustGit(exec, args.dir, ["rev-parse", "HEAD"], "\u8BFB\u63D0\u4EA4");
-  return { outcome: "pushed", sha, actionsUrl: `https://github.com/${repoSlug(info.url)}/actions` };
+  return { sha, actionsUrl: `https://github.com/${repoSlug(info.url)}/actions` };
 }
 
 // src/deploy/scan-base.ts
@@ -59675,17 +59763,6 @@ async function rerunJob(api, slug, jobId) {
 
 // src/deploy/scan-task.ts
 var BUTLER_PERSONA_ID = "persona-clawd-butler";
-var SCANNABLE_ASSETS = [];
-function staleScannerAssets(scan, known = SCANNABLE_ASSETS) {
-  const knew = new Set(scan.scannedAssets ?? []);
-  return known.filter((a2) => !knew.has(a2.name));
-}
-var STALE_ASSETS_NOTE_PREFIX = "\u3010\u4E0A\u4E91\u626B\u63CF\u3011";
-function describeStaleAssets(stale) {
-  if (stale.length === 0) return void 0;
-  const plain = (s2) => s2.replace(/\*\*/g, "").replace(/\s+/g, " ").trim();
-  return `${STALE_ASSETS_NOTE_PREFIX}\u8FD9\u6B21\u626B\u63CF\u7684\u65F6\u5019\uFF0C\u626B\u63CF\u5668\u8FD8\u4E0D\u77E5\u9053\u6709${stale.map((a2) => `\u300C${a2.name}\u300D`).join("\u3001")}\u8FD9${stale.length > 1 ? "\u51E0" : ""}\u9879\u5171\u4EAB\u8D44\u4EA7\uFF0C\u6240\u4EE5\u6E05\u5355\u91CC\u53EF\u80FD\u6F0F\u4E86\u58F0\u660E\u3002${stale.map((a2) => ` ${a2.name} \u662F\uFF1A${plain(a2.what)}`).join("")} \u7528\u5F97\u4E0A\u7684\u8BDD\uFF0C\u5728\u6E05\u5355\u91CC\u8865\u4E00\u6761 asset\u3002`;
-}
 function settleEndedScan(outcome, current, now) {
   if (current?.status !== "scanning") return void 0;
   return {
@@ -59697,13 +59774,11 @@ function settleEndedScan(outcome, current, now) {
 }
 function reconcileInterruptedScans(deps) {
   const flipped = [];
-  for (const { personaId: personaId2, scan } of deps.scans) {
-    if (scan?.status !== "scanning") continue;
+  for (const { personaId: personaId2, file } of deps.files) {
+    if (!file || !file.scans.some((s2) => s2.status === "scanning")) continue;
     deps.write(personaId2, {
-      ...scan,
-      status: "failed",
-      finishedAt: deps.now,
-      error: "daemon \u91CD\u542F\uFF0C\u626B\u63CF\u4F1A\u8BDD\u5DF2\u4E2D\u65AD\u2014\u2014\u518D\u70B9\u4E00\u6B21\u300C\u53D1\u5E03\u300D\u4F1A\u91CD\u65B0\u626B\u63CF"
+      ...file,
+      scans: file.scans.map((s2) => s2.status === "scanning" ? { ...s2, status: "failed", finishedAt: deps.now, error: "daemon \u91CD\u542F\uFF0C\u626B\u63CF\u4F1A\u8BDD\u5DF2\u4E2D\u65AD\u2014\u2014\u518D\u70B9\u4E00\u6B21\u300C\u91CD\u65B0\u626B\u63CF\u300D" } : s2)
     });
     flipped.push(personaId2);
   }
@@ -59733,21 +59808,33 @@ function isLiveScan(live, scan) {
   return live.sessionId === void 0 || live.sessionId === scan.scanSessionId;
 }
 function buildDeployHandlers(deps) {
-  const scannableAssets = deps.scannableAssets ?? SCANNABLE_ASSETS;
   const liveScans = /* @__PURE__ */ new Map();
-  const settleStale = async (dir, scan) => {
-    const settled = { ...scan, status: "failed", finishedAt: deps.now(), error: "\u626B\u63CF\u8BB0\u5F55\u505C\u5728 scanning\uFF0C\u4F46\u6CA1\u6709\u6B63\u5728\u8DD1\u7684\u626B\u63CF\u4F1A\u8BDD" };
-    await writeScan(dir, settled);
+  const readHistory = async (dir) => await readScanFile(dir) ?? emptyScanFile();
+  const settleStale = async (personaId2, dir, file) => {
+    const live = liveScans.get(personaId2);
+    const stale = file.scans.filter((s2) => s2.status === "scanning" && !isLiveScan(live, s2));
+    if (stale.length === 0) return file;
+    const settled = {
+      ...file,
+      scans: file.scans.map((s2) => stale.includes(s2) ? { ...s2, status: "failed", finishedAt: deps.now(), error: "\u626B\u63CF\u8BB0\u5F55\u505C\u5728 scanning\uFF0C\u4F46\u6CA1\u6709\u6B63\u5728\u8DD1\u7684\u626B\u63CF\u4F1A\u8BDD" } : s2)
+    };
+    await writeScanFile(dir, settled);
     return settled;
   };
-  const mustBeLiveScan = (personaId2, scan, method) => {
-    if (scan?.status !== "scanning") {
-      throw invalid(`${method} \u53EA\u5728\u626B\u63CF\u671F\u53EF\u7528\uFF08\u5F53\u524D ${scan?.status ?? "\u6CA1\u6709\u626B\u63CF\u8BB0\u5F55"}\uFF09`);
-    }
-    if (!isLiveScan(liveScans.get(personaId2), scan)) {
-      throw invalid(`${method} \u53EA\u5728\u626B\u63CF\u671F\u53EF\u7528\uFF08\u8BB0\u5F55\u505C\u5728 scanning\uFF0C\u4F46\u6CA1\u6709\u6B63\u5728\u8DD1\u7684\u626B\u63CF\u4F1A\u8BDD\uFF09`);
-    }
-    return scan;
+  const mustBeLiveScan = (personaId2, file, method) => {
+    const scanning = file.scans.filter((s2) => s2.status === "scanning");
+    if (scanning.length === 0) {
+      const last = file.scans[file.scans.length - 1];
+      throw invalid(`${method} \u53EA\u5728\u626B\u63CF\u671F\u53EF\u7528\uFF08\u5F53\u524D ${last?.status ?? "\u6CA1\u6709\u626B\u63CF\u8BB0\u5F55"}\uFF09`);
+    }
+    const live = scanning.find((s2) => isLiveScan(liveScans.get(personaId2), s2));
+    if (!live) throw invalid(`${method} \u53EA\u5728\u626B\u63CF\u671F\u53EF\u7528\uFF08\u8BB0\u5F55\u505C\u5728 scanning\uFF0C\u4F46\u6CA1\u6709\u6B63\u5728\u8DD1\u7684\u626B\u63CF\u4F1A\u8BDD\uFF09`);
+    return live;
+  };
+  const mustScan = (file, scanId) => {
+    const entry = file.scans.find((s2) => s2.id === scanId);
+    if (!entry) throw invalid(`\u626B\u63CF\u5386\u53F2\u91CC\u6CA1\u6709 ${scanId} \u8FD9\u4E00\u6761\uFF0C\u5237\u65B0\u770B\u770B`);
+    return entry;
   };
   const cacheMs = deps.secretsCacheMs ?? SECRETS_CACHE_MS;
   const secretsCache = /* @__PURE__ */ new Map();
@@ -59777,20 +59864,15 @@ function buildDeployHandlers(deps) {
     const github = await deps.githubIdentity.status();
     const auth = deps.githubIdentity.cached();
     const api = auth ? deps.githubApi(auth.token) : void 0;
-    let file;
-    let fileError;
+    let file = emptyScanFile();
+    let historyError;
     try {
-      file = await readDeployFile(dir);
+      file = await readHistory(dir);
     } catch (err) {
-      fileError = err instanceof Error ? err.message : String(err);
-    }
-    let scan = await readScan(dir);
-    if (scan?.status === "scanning" && !isLiveScan(liveScans.get(personaId2), scan)) scan = await settleStale(dir, scan);
-    if (scan && scan.status === "done") {
-      const stale = describeStaleAssets(staleScannerAssets(scan, scannableAssets));
-      const kept = scan.notes.filter((n2) => !n2.startsWith(STALE_ASSETS_NOTE_PREFIX));
-      scan = { ...scan, notes: stale ? [...kept, stale] : kept };
+      historyError = err instanceof Error ? err.message : String(err);
     }
+    file = await settleStale(personaId2, dir, file);
+    const { scans } = file;
     let secrets;
     let run;
     if (repo2 && api && github.status === "authorized") {
@@ -59811,72 +59893,56 @@ function buildDeployHandlers(deps) {
       personaId: personaId2,
       github,
       ...repo2 ? { repo: repo2 } : {},
-      ...file ? { file } : {},
-      ...scan ? { scan } : {},
+      scans,
+      ...file.released ? { released: file.released } : {},
       ...secrets ? { secrets } : {},
       ...run ? { run } : {},
-      ...fileError ? { fileError } : {}
+      ...historyError ? { historyError } : {}
     };
   }
   const view = async (personaId2) => ({
     response: { type: "deploy:state", ...await stateOf(personaId2) }
   });
-  async function beginScan(personaId2, dir, current, head, want) {
+  async function beginScan(personaId2, dir, file, contentHead, want) {
     liveScans.set(personaId2, {});
-    const prevManifest = await readDeployFile(dir).catch(() => void 0);
+    const releasedEntry = file.released ? file.scans.find((s2) => s2.id === file.released.scanId) : void 0;
     const scanBase = pickScanBase({
-      // **文件在 ≠ 清单能用**：硬扫一开头就写了一份空清单，那一轮没跑完（OTA 重启 / butler 崩，
-      // 见 scan-task.ts 的收尾判定）的话文件在、内容是空的。所以判据连上「上一轮扫完了」。
-      hasUsableManifest: prevManifest !== void 0 && current?.status === "done",
-      releasedHead: await hasCommit(deps.exec, dir, current?.releasedHead) ? current?.releasedHead : void 0,
+      // **有记录 ≠ 清单能用**：被发那条要是没跑完（OTA 重启 / butler 崩，见 scan-task.ts 的收尾判定）清单是半截的。
+      hasUsableManifest: releasedEntry?.status === "done",
+      releasedHead: await hasCommit(deps.exec, dir, file.released?.head) ? file.released?.head : void 0,
       ...want ? { want } : {}
     });
-    const startedAt = deps.now();
-    const base = {
-      evidence: scanBase.kind === "hard" ? [] : current?.evidence ?? [],
-      // notes 反过来不沿用：它是「这次扫描要老板处理的事」，沿用会把上次的事项一直复读
-      notes: [],
-      scannedAssets: [],
-      startedAt,
-      head,
-      // 发布记的那个 commit 跟扫描无关，原样带过去，别让重扫把软扫的基准弄丢。
-      //
-      // **哪怕上面 hasCommit 刚判定它已经不在仓库里，也照样留着**：探测失败也包括 git 没跑起来
-      // 这种一过性情况，据此把它抹掉就等于「一次 git 抽风 → 永久失去软扫，直到下次发布」，
-      // 比留一个死 sha 糟得多。留着的代价只是 UI 上「从零重扫」多显示一阵子（那期间两个按钮
-      // 都退硬扫、行为一致不出错），下次发布就自愈。
-      ...current?.releasedHead ? { releasedHead: current.releasedHead } : {},
-      baseKind: scanBase.kind,
-      ...scanBase.base ? { base: scanBase.base } : {}
-    };
-    await writeScan(dir, { status: "scanning", ...base });
-    if (scanBase.kind === "hard") await writeDeployFile(dir, emptyDeployFile());
+    const lastDone = [...file.scans].reverse().find((s2) => s2.status === "done");
+    const seed = scanBase.kind === "soft" && releasedEntry ? releasedEntry.manifest : { ...emptyDeployFile().manifest, connectors: (lastDone?.manifest.connectors ?? []).filter((c2) => c2.runner === "mcp") };
     const mcp = scanMcpConnectors(dir);
-    const current0 = await readDeployFile(dir) ?? emptyDeployFile();
-    const carried = scanBase.kind === "hard" ? (prevManifest?.manifest.connectors ?? []).filter((c2) => c2.runner === "mcp") : current0.manifest.connectors;
-    await writeDeployFile(dir, {
-      ...current0,
-      // 文件读不出来（坏 JSON）时保持原样：当成「零个 MCP」会把清单里的连接器清光，而发布闸对零连接器是放行的
-      manifest: { ...current0.manifest, connectors: mcp.readable ? mergeScannedConnectors(carried, mcp.connectors) : carried }
-    });
     const mcpTargets = new Set(mcp.evidence.map((e) => e.target));
-    const withMcp = {
-      ...base,
-      evidence: [...base.evidence.filter((e) => !mcpTargets.has(e.target)), ...mcp.evidence.map(redactEvidence)],
-      notes: mcp.warnings.map((w3) => `${MCP_SCAN_NOTE_PREFIX}${w3}`)
+    const carriedEvidence = scanBase.kind === "soft" && releasedEntry ? releasedEntry.evidence : [];
+    const entry = {
+      id: newScanId(),
+      status: "scanning",
+      manifest: { ...seed, connectors: mcp.readable ? mergeScannedConnectors(seed.connectors, mcp.connectors) : seed.connectors },
+      evidence: [...carriedEvidence.filter((e) => !mcpTargets.has(e.target)), ...mcp.evidence.map(redactEvidence)],
+      // notes 不沿用：它是「这次扫描要老板处理的事」，沿用会把上次的事项一直复读
+      notes: mcp.warnings.map((w3) => `${MCP_SCAN_NOTE_PREFIX}${w3}`),
+      startedAt: deps.now(),
+      head: contentHead,
+      baseKind: scanBase.kind,
+      ...scanBase.base ? { base: scanBase.base } : {}
     };
-    const started = deps.startScan(personaId2, scanBase);
+    await writeScanFile(dir, replaceScan(file, entry));
+    const started = deps.startScan(personaId2, scanBase, entry.id);
     if ("sessionId" in started) {
       liveScans.set(personaId2, { sessionId: started.sessionId });
-      await writeScan(dir, { status: "scanning", scanSessionId: started.sessionId, ...withMcp });
+      await writeScanFile(dir, replaceScan(await readHistory(dir), { ...entry, scanSessionId: started.sessionId }));
       const mine = () => liveScans.get(personaId2)?.sessionId === started.sessionId;
       void started.ended.then(async (outcome) => {
         if (mine()) liveScans.delete(personaId2);
-        const current2 = await readScan(dir).catch(() => void 0);
-        if (liveScans.has(personaId2) || current2?.scanSessionId !== started.sessionId) return;
-        const settled = settleEndedScan(outcome, current2, deps.now());
+        const current = await readHistory(dir).catch(() => void 0);
+        const own = current?.scans.find((s2) => s2.id === entry.id);
+        if (!current || !own || liveScans.has(personaId2) || own.scanSessionId !== started.sessionId) return;
+        const settled = settleEndedScan(outcome, own, deps.now());
         if (!settled) return;
-        await writeScan(dir, settled);
+        await writeScanFile(dir, replaceScan(current, settled));
         deps.warn?.("deploy scan ended without finishScan", { personaId: personaId2, why: settled.error });
       }).catch((err) => {
         if (mine()) liveScans.delete(personaId2);
@@ -59884,12 +59950,12 @@ function buildDeployHandlers(deps) {
       });
     } else {
       liveScans.delete(personaId2);
-      await writeScan(dir, {
+      await writeScanFile(dir, replaceScan(await readHistory(dir), {
+        ...entry,
         status: "failed",
-        ...withMcp,
         finishedAt: deps.now(),
         error: `\u8D77\u626B\u63CF\u4F1A\u8BDD\u5931\u8D25\uFF1A${started.error}`
-      });
+      }));
     }
   }
   const get = async (frame, _client, ctx) => {
@@ -59902,20 +59968,21 @@ function buildDeployHandlers(deps) {
     ensureOwner(ctx);
     const args = parseArgs2(DeployPatchArgsSchema, frame, "deploy:patch");
     const dir = mustPersona(args.personaId);
-    const file = await readDeployFile(dir) ?? emptyDeployFile();
-    const next = {
-      ...file,
-      ...args.patch.manifest ? { manifest: args.patch.manifest } : {}
-    };
-    await writeDeployFile(dir, next);
+    const file = await readHistory(dir);
+    const entry = mustScan(file, args.scanId);
+    if (entry.status === "failed") throw invalid("\u8FD9\u6B21\u626B\u63CF\u6CA1\u8DD1\u5B8C\uFF0C\u6E05\u5355\u4E0D\u5B8C\u6574\uFF0C\u6539\u5B83\u6CA1\u610F\u4E49\u2014\u2014\u91CD\u65B0\u626B\u63CF");
+    if (entry.status === "scanning" && mustBeLiveScan(args.personaId, file, "deploy:patch").id !== entry.id) {
+      throw invalid("deploy:patch \u6307\u540D\u7684\u4E0D\u662F\u6B63\u5728\u8DD1\u7684\u90A3\u6B21\u626B\u63CF");
+    }
+    if (args.patch.manifest) await writeScanFile(dir, replaceScan(file, { ...entry, manifest: args.patch.manifest }));
     return view(args.personaId);
   };
   const putSecret = async (frame, _client, ctx) => {
     ensureOwner(ctx);
     const args = parseArgs2(DeployPutSecretArgsSchema, frame, "deploy:putSecret");
     const dir = mustPersona(args.personaId);
-    const file = await readDeployFile(dir);
-    const declared = file ? [...file.manifest.secrets, ...sharedConnectorSecrets(file.manifest)].find((s2) => s2.name === args.name) : void 0;
+    const { manifest } = mustScan(await readHistory(dir), args.scanId);
+    const declared = [...manifest.secrets, ...sharedConnectorSecrets(manifest)].find((s2) => s2.name === args.name);
     if (!declared) throw invalid(`\u6E05\u5355\u91CC\u6CA1\u6709\u53EB\u300C${args.name}\u300D\u7684\u51ED\u636E`);
     const allowed = new Set(declared.env);
     for (const key of Object.keys(args.values)) {
@@ -59936,7 +60003,8 @@ function buildDeployHandlers(deps) {
     ensureOwner(ctx);
     const args = parseArgs2(DeployReportFindingArgsSchema, frame, "deploy:reportFinding");
     const dir = mustPersona(args.personaId);
-    const scan = mustBeLiveScan(args.personaId, await readScan(dir), "deploy:reportFinding");
+    const file = await readHistory(dir);
+    const scan = mustBeLiveScan(args.personaId, file, "deploy:reportFinding");
     let item;
     try {
       item = parseFinding(args.kind, args.item);
@@ -59944,37 +60012,34 @@ function buildDeployHandlers(deps) {
       throw invalid(err instanceof Error ? err.message : String(err));
     }
     if (args.kind === "connector") item = cliConnectorFromFinding(item);
-    const file = await readDeployFile(dir) ?? emptyDeployFile();
-    await writeDeployFile(dir, upsertFinding(file, args.kind, item));
     const target = `${args.kind}:${item.name}`;
-    await writeScan(dir, {
+    await writeScanFile(dir, replaceScan(file, {
       ...scan,
+      manifest: upsertFinding(scan.manifest, args.kind, item),
       evidence: [...scan.evidence.filter((e) => e.target !== target), redactEvidence({ target, ...args.evidence })]
-    });
+    }));
     return view(args.personaId);
   };
   const finishScan = async (frame, _client, ctx) => {
     ensureOwner(ctx);
     const args = parseArgs2(DeployFinishScanArgsSchema, frame, "deploy:finishScan");
     const dir = mustPersona(args.personaId);
-    const scan = mustBeLiveScan(args.personaId, await readScan(dir), "deploy:finishScan");
-    await writeScan(dir, {
+    const file = await readHistory(dir);
+    const scan = mustBeLiveScan(args.personaId, file, "deploy:finishScan");
+    await writeScanFile(dir, replaceScan(file, {
       ...scan,
       status: "done",
       finishedAt: deps.now(),
       // 存疑项也是 agent 的自由文本，跟证据同一道涂抹。daemon 自己扫 .mcp.json 时发现的问题
       //（带 MCP_SCAN_NOTE_PREFIX）留着——butler 不知道那些，它的那份不该把它们冲掉
       notes: [...scan.notes.filter((n2) => n2.startsWith(MCP_SCAN_NOTE_PREFIX)), ...args.notes.map(redactSecretValues)],
-      // 记下这次扫描**被告知有哪些共享资产**。以后资产表长出新条目时，只有扫的时候还不知道
-      // 它的那些记录会被提示一次（见 staleScannerAssets）
-      scannedAssets: scannableAssets.map((a2) => a2.name),
       error: void 0
-    });
+    }));
     return view(args.personaId);
   };
-  const releaseHandler = async (frame, _client, ctx) => {
+  const scanHandler = async (frame, _client, ctx) => {
     ensureOwner(ctx);
-    const { personaId: personaId2, scanBase } = parseArgs2(DeployReleaseArgsSchema, frame, "deploy:release");
+    const { personaId: personaId2, scanBase } = parseArgs2(DeployScanArgsSchema, frame, "deploy:scan");
     const dir = mustPersona(personaId2);
     const wrong = wrongEngine(deps.personaEngine(personaId2)?.tool);
     if (wrong) throw invalid(wrong);
@@ -59990,33 +60055,43 @@ function buildDeployHandlers(deps) {
       repo2 = await repoInfo(deps.exec, dir);
       if (!repo2) throw new ClawdError(ERROR_CODES.INTERNAL, "\u4ED3\u5E93\u5EFA\u597D\u4E86\u4F46\u8BFB\u4E0D\u5230 origin");
     }
+    if (repo2.branch !== "main") throw invalid(`\u5F53\u524D\u5728\u5206\u652F ${repo2.branch}\uFF0C\u4ED3\u5E93\u91CC\u7684\u6D41\u6C34\u7EBF\u53EA\u8BA4 main\uFF1B\u5207\u56DE main \u518D\u626B\u63CF`);
+    const live = liveScans.get(personaId2);
+    if (live && live.sessionId === void 0) return view(personaId2);
+    let file = await readHistory(dir).catch(() => emptyScanFile());
+    if (file.scans.some((s2) => s2.status === "scanning" && isLiveScan(live, s2))) return view(personaId2);
+    file = await settleStale(personaId2, dir, file);
+    let head;
+    try {
+      head = await commitAll(deps.exec, { dir, message: `clawd: \u626B\u63CF\u524D\u843D\u5B58 ${new Date(deps.now()).toISOString()}` });
+    } catch (err) {
+      throw toClawdError(err);
+    }
+    runCache.delete(personaId2);
+    try {
+      await beginScan(personaId2, dir, file, contentHeadOf({ head }, file.released), scanBase);
+    } catch (err) {
+      liveScans.delete(personaId2);
+      throw err;
+    }
+    return view(personaId2);
+  };
+  const releaseHandler = async (frame, _client, ctx) => {
+    ensureOwner(ctx);
+    const { personaId: personaId2, scanId } = parseArgs2(DeployReleaseArgsSchema, frame, "deploy:release");
+    const dir = mustPersona(personaId2);
+    const wrong = wrongEngine(deps.personaEngine(personaId2)?.tool);
+    if (wrong) throw invalid(wrong);
+    const { auth, api } = await requireGithub();
+    const repo2 = await repoInfo(deps.exec, dir);
+    if (!repo2) throw invalid("\u8FD8\u6CA1\u6709\u4ED3\u5E93\u2014\u2014\u5148\u70B9\u300C\u5F00\u59CB\u626B\u63CF\u300D\uFF08\u4F1A\u5EFA\u4ED3\uFF09");
     if (repo2.branch !== "main") throw invalid(`\u5F53\u524D\u5728\u5206\u652F ${repo2.branch}\uFF0C\u4ED3\u5E93\u91CC\u7684\u6D41\u6C34\u7EBF\u53EA\u8BA4 main\uFF1B\u5207\u56DE main \u518D\u53D1\u5E03`);
-    const starting = liveScans.get(personaId2);
-    if (starting && starting.sessionId === void 0) return { response: { type: "deploy:release", outcome: "scanning" } };
-    let current = await readScan(dir);
-    if (current?.status === "scanning") {
-      if (isLiveScan(liveScans.get(personaId2), current)) return { response: { type: "deploy:release", outcome: "scanning" } };
-      current = await settleStale(dir, current);
-    }
-    const fileUsable = await readDeployFile(dir).then((f2) => f2 !== void 0).catch(() => false);
-    if (scanBase !== void 0 || !fileUsable || !isScanFresh(current, repo2)) {
-      let head;
-      try {
-        head = await commitAll(deps.exec, { dir, message: `clawd: \u626B\u63CF\u524D\u843D\u5B58 ${new Date(deps.now()).toISOString()}` });
-      } catch (err) {
-        throw toClawdError(err);
-      }
-      runCache.delete(personaId2);
-      try {
-        await beginScan(personaId2, dir, current, head, scanBase);
-      } catch (err) {
-        liveScans.delete(personaId2);
-        throw err;
-      }
-      return { response: { type: "deploy:release", outcome: "scanning" } };
+    const file = await readHistory(dir);
+    const entry = mustScan(file, scanId);
+    if (entry.status !== "done") throw invalid(entry.status === "scanning" ? "\u8FD9\u6B21\u626B\u63CF\u8FD8\u5728\u8DD1\uFF0C\u7B49\u5B83\u626B\u5B8C" : "\u8FD9\u6B21\u626B\u63CF\u6CA1\u8DD1\u5B8C\uFF0C\u6E05\u5355\u4E0D\u5B8C\u6574\u2014\u2014\u91CD\u65B0\u626B\u63CF");
+    if (!isScanFresh(entry, repo2, file.released)) {
+      throw invalid(repo2.dirty ? "\u6709\u672A\u63D0\u4EA4\u7684\u6539\u52A8\uFF0C\u6E05\u5355\u662F\u6539\u52A8\u524D\u626B\u7684\u2014\u2014\u91CD\u65B0\u626B\u63CF" : "\u8FD9\u6B21\u626B\u63CF\u5BF9\u5E94\u7684\u4E0D\u662F\u5F53\u524D\u8FD9\u4E00\u7248 persona\u2014\u2014\u91CD\u65B0\u626B\u63CF");
     }
-    const file = await readDeployFile(dir);
-    if (!file) throw invalid("\u8FD8\u6CA1\u626B\u63CF\u51FA\u6E05\u5355");
     const blockers = [];
     let present;
     try {
@@ -60024,18 +60099,28 @@ function buildDeployHandlers(deps) {
     } catch (err) {
       throw toClawdError(err);
     }
-    const missing = requiredEnvNames(file).filter((e) => !present.has(e));
+    const missing = requiredEnvNames(entry.manifest).filter((e) => !present.has(e));
     if (missing.length > 0) blockers.push(`${missing.join(" / ")} \u8FD8\u6CA1\u586B`);
-    for (const c2 of file.manifest.connectors) blockers.push(...connectorBlockers(c2));
+    for (const c2 of entry.manifest.connectors) blockers.push(...connectorBlockers(c2));
     if (!deps.personaEngine(personaId2)?.model) {
       blockers.push("\u8FD8\u6CA1\u9009\u6A21\u578B\uFF08\u5207\u5F15\u64CE\u65F6\u4F1A\u6E05\u7A7A\uFF09\u2014\u2014\u53BB persona \u8BBE\u7F6E\u91CC\u9009\u4E00\u4E2A");
     }
     if (blockers.length > 0) throw invalid(`\u8FD8\u5DEE\uFF1A${blockers.join("\uFF1B")}`);
+    const before = await readDeployFileRaw(dir);
     try {
-      const result = await release(deps.exec, api, { dir, now: deps.now, auth });
+      await writeDeployFile(dir, { version: 1, manifest: entry.manifest });
+      let result;
+      try {
+        result = await release(deps.exec, api, { dir, now: deps.now, auth });
+      } catch (err) {
+        if ((await repoInfo(deps.exec, dir))?.head === repo2.head) await restoreDeployFileRaw(dir, before);
+        throw err;
+      }
       runCache.delete(personaId2);
-      const scanned = await readScan(dir);
-      if (scanned) await writeScan(dir, { ...scanned, head: result.sha, releasedHead: result.sha });
+      await writeScanFile(dir, {
+        ...await readHistory(dir),
+        released: { head: result.sha, contentHead: entry.head, scanId: entry.id, at: deps.now() }
+      });
       return { response: { type: "deploy:release", ...result } };
     } catch (err) {
       throw toClawdError(err);
@@ -60046,7 +60131,7 @@ function buildDeployHandlers(deps) {
     const { personaId: personaId2, jobId } = parseArgs2(DeployRerunJobArgsSchema, frame, "deploy:rerunJob");
     const dir = mustPersona(personaId2);
     const repo2 = await repoInfo(deps.exec, dir);
-    if (!repo2) throw invalid("\u8FD8\u6CA1\u6709\u4ED3\u5E93\uFF0C\u5148\u70B9\u4E00\u6B21\u300C\u53D1\u5E03\u5230\u4E91\u4E0A\u300D\u5EFA\u4ED3");
+    if (!repo2) throw invalid("\u8FD8\u6CA1\u6709\u4ED3\u5E93\u2014\u2014\u5148\u70B9\u300C\u5F00\u59CB\u626B\u63CF\u300D\uFF08\u4F1A\u5EFA\u4ED3\uFF09");
     const slug = repoSlug(repo2.url);
     const { api } = await requireGithub();
     const run = await latestRun(api, slug);
@@ -60064,6 +60149,7 @@ function buildDeployHandlers(deps) {
   };
   return {
     "deploy:get": get,
+    "deploy:scan": scanHandler,
     "deploy:patch": patch,
     "deploy:putSecret": putSecret,
     "deploy:reportFinding": reportFinding,
@@ -61102,7 +61188,7 @@ ${formatLarkSpeakerReminder(speaker)}`
 }
 
 // src/lark-bot-connector/envelope.ts
-var import_node_crypto8 = require("crypto");
+var import_node_crypto9 = require("crypto");
 var LARK_ENVELOPE_PREFIX = "clawdlbe1";
 function verifyLarkEventEnvelope(args) {
   const { token, publicKeyPem } = args;
@@ -61121,7 +61207,7 @@ function verifyLarkEventEnvelope(args) {
   const data = Buffer.from(`${prefix}.${payloadB64}`, "utf8");
   let sigOk = false;
   try {
-    sigOk = (0, import_node_crypto8.verify)(null, data, publicKeyPem, Buffer.from(sigB64, "base64url"));
+    sigOk = (0, import_node_crypto9.verify)(null, data, publicKeyPem, Buffer.from(sigB64, "base64url"));
   } catch {
     sigOk = false;
   }
@@ -62488,6 +62574,7 @@ var GATEWAY_ROUTES = {
   healthz: () => "/healthz",
   session: (personaId2) => `/p/${encodeURIComponent(personaId2)}/session`,
   sessionSend: (personaId2, sessionId) => `/p/${encodeURIComponent(personaId2)}/session/${encodeURIComponent(sessionId)}`,
+  sessionMirror: (personaId2, sessionId) => `/p/${encodeURIComponent(personaId2)}/session/${encodeURIComponent(sessionId)}/mirror`,
   // 调用方自己那块盘的用量（design 2026-09-19-cloud-volume-usage §3.3）：同样按人、不挂 persona
   volume: () => "/me/volume"
 };
@@ -62504,7 +62591,7 @@ function cloudPersonaToFile(p3) {
   return {
     personaId: p3.personaId + CLOUD_PERSONA_ID_SUFFIX,
     label: p3.personaId,
-    tool: CODEX_CLOUD_TOOL_ID,
+    tool: p3.engine + CLOUD_TOOL_SUFFIX,
     ...p3.model ? { model: p3.model } : {},
     ...p3.effort ? { effort: p3.effort } : {},
     public: false,
@@ -62552,9 +62639,14 @@ var CloudGatewayClient = class {
     for (const raw of rows) {
       const d2 = raw;
       if (d2.kind !== "official" || typeof d2.personaId !== "string") continue;
+      if (typeof d2.engine !== "string" || !d2.engine) {
+        this.deps.logger?.warn("cloud persona row has no engine, skipped", { personaId: d2.personaId });
+        continue;
+      }
       out.push({
         personaId: d2.personaId,
         gatewayUrl,
+        engine: d2.engine,
         ...typeof d2.image === "string" ? { image: d2.image } : {},
         ...typeof d2.model === "string" && d2.model ? { model: d2.model } : {},
         ...typeof d2.effort === "string" && d2.effort ? { effort: d2.effort } : {},
@@ -62577,14 +62669,17 @@ var CloudGatewayClient = class {
   /**
    * 会话通道。返回的行流在 Pod 就绪前就能 write：写入先攒着，收到 `ready` 控制行后按序 POST 出去——
    * 编排那头一构造就发 initialize，不用知道 Pod 还在起。
+   * `toolSessionId`：调用方预分配的引擎会话 id（pi 的 --session-id；codex 的 thread id 是协议内的、不传），进 open 的 body `engineSessionId`
+   * （契约 2026-09-18 §3.2）。
    */
-  async openSession(personaId2) {
+  async openSession(personaId2, opts = {}) {
     const { apiKey, gatewayUrl } = await this.credentials();
     return openHttpLineStream({
       fetchImpl: this.fetchImpl,
       gatewayUrl,
       apiKey,
       personaId: personaId2,
+      ...opts.toolSessionId ? { engineSessionId: opts.toolSessionId } : {},
       logger: this.deps.logger
     });
   }
@@ -62629,7 +62724,7 @@ function parseControlLine(line) {
   }
 }
 function openHttpLineStream(opts) {
-  const { fetchImpl, gatewayUrl, apiKey, personaId: personaId2, logger } = opts;
+  const { fetchImpl, gatewayUrl, apiKey, personaId: personaId2, engineSessionId, logger } = opts;
   const headers = { authorization: `Bearer ${apiKey}`, "content-type": "application/json" };
   const ac = new AbortController();
   const lineCbs = [];
@@ -62686,7 +62781,7 @@ function openHttpLineStream(opts) {
       res = await fetchImpl(gatewayUrl + GATEWAY_ROUTES.session(personaId2), {
         method: "POST",
         headers,
-        body: "{}",
+        body: JSON.stringify(engineSessionId ? { engineSessionId } : {}),
         signal: ac.signal
       });
     } catch (e) {
@@ -62782,6 +62877,16 @@ function openHttpLineStream(opts) {
     close: () => {
       ac.abort();
       finish();
+    },
+    mirror: async () => {
+      if (closed || !sessionId) return;
+      const url = gatewayUrl + GATEWAY_ROUTES.sessionMirror(personaId2, sessionId);
+      try {
+        const res = await fetchImpl(url, { method: "POST", headers, body: "" });
+        if (!res.ok) logger?.warn("cloud session mirror failed", { status: res.status });
+      } catch (e) {
+        if (!closed) logger?.warn("cloud session mirror error", { message: e.message });
+      }
     }
   };
 }
@@ -62928,6 +63033,7 @@ function createCloudCodexSession(ctx, sink, deps) {
   paths.catch(() => {
   });
   stream.onClose(() => rejectPaths(new Error("\u4E91\u4E0A\u901A\u9053\u5728 ready \u4E4B\u524D\u5173\u4E86\uFF0C\u62FF\u4E0D\u5230 Pod \u8DEF\u5F84")));
+  let channel = null;
   const driver = driveCodexThread({
     ctx,
     sink,
@@ -62937,7 +63043,8 @@ function createCloudCodexSession(ctx, sink, deps) {
     imageInput: cloudImageInput(deps),
     // skills 在 Pod 里由 persona 目录自带，本机路径对它没意义
     // 「让对端走人」= 断开下行流，gateway 收到就删 Job；信号对 Pod 没有意义
-    kill: () => stream.close()
+    kill: () => stream.close(),
+    onTurnCompleted: () => void channel?.mirror()
   });
   if (!personaId2) {
     queueMicrotask(() => {
@@ -62947,7 +63054,8 @@ function createCloudCodexSession(ctx, sink, deps) {
     return driver.session;
   }
   void deps.client.openSession(personaId2).then(
-    (channel) => {
+    (opened) => {
+      channel = opened;
       channel.onControl((c2) => {
         if (c2.kind === "ready") {
           resolvePaths({ personaDir: c2.personaDir, workDir: c2.workDir });
@@ -63110,7 +63218,7 @@ var PiRpcClient = class {
 
 // src/tools/pi-session.ts
 var import_node_child_process10 = require("child_process");
-var import_node_crypto9 = require("crypto");
+var import_node_crypto10 = require("crypto");
 var import_node_fs35 = __toESM(require("fs"), 1);
 var import_node_path39 = __toESM(require("path"), 1);
 
@@ -63288,7 +63396,7 @@ ${dirs.map((d2) => `- ${d2}`).join("\n")}`;
 }
 function createPiSession(ctx, sink, deps = {}) {
   const cmd = process.env.PI_BIN ?? "pi";
-  const sessionId = ctx.toolSessionId ?? (0, import_node_crypto9.randomUUID)();
+  const sessionId = ctx.toolSessionId ?? (0, import_node_crypto10.randomUUID)();
   const skillsDir = import_node_path39.default.join(ctx.cwd, ".claude", "skills");
   const exists = deps.skillsDirExists ?? ((d2) => import_node_fs35.default.existsSync(d2));
   const args = buildPiArgs(ctx, {
@@ -64735,7 +64843,7 @@ var wrapper_default = import_websocket.default;
 
 // src/transport/local-ws-server.ts
 var import_node_http = __toESM(require("http"), 1);
-var import_node_crypto10 = require("crypto");
+var import_node_crypto11 = require("crypto");
 var LocalWsServer = class {
   constructor(opts) {
     this.opts = opts;
@@ -64952,7 +65060,7 @@ var LocalWsServer = class {
     }
   }
   onConnection(socket, remoteAddress) {
-    const id = (0, import_node_crypto10.randomUUID)();
+    const id = (0, import_node_crypto11.randomUUID)();
     const subscribedSessions = /* @__PURE__ */ new Map();
     const handle = {
       id,
@@ -65917,7 +66025,7 @@ var import_node_path49 = __toESM(require("path"), 1);
 // src/attachment/upload.ts
 var import_node_fs43 = __toESM(require("fs"), 1);
 var import_node_path47 = __toESM(require("path"), 1);
-var import_node_crypto11 = __toESM(require("crypto"), 1);
+var import_node_crypto12 = __toESM(require("crypto"), 1);
 var import_promises7 = require("stream/promises");
 var UploadError = class extends Error {
   constructor(code, message) {
@@ -65941,11 +66049,11 @@ async function writeUploadedAttachment(args) {
   } catch (err) {
     throw new UploadError("STORAGE_ERROR", `mkdir failed: ${err.message}`);
   }
-  const hasher = import_node_crypto11.default.createHash("sha256");
+  const hasher = import_node_crypto12.default.createHash("sha256");
   let actualSize = 0;
   const tmpPath = import_node_path47.default.join(
     attachmentsRoot,
-    `.upload-${process.pid}-${Date.now()}-${import_node_crypto11.default.randomBytes(4).toString("hex")}`
+    `.upload-${process.pid}-${Date.now()}-${import_node_crypto12.default.randomBytes(4).toString("hex")}`
   );
   try {
     await (0, import_promises7.pipeline)(
@@ -66789,7 +66897,7 @@ function runAttachmentGc(args) {
 // src/attachment/group.ts
 var import_node_fs46 = __toESM(require("fs"), 1);
 var import_node_path51 = __toESM(require("path"), 1);
-var import_node_crypto12 = __toESM(require("crypto"), 1);
+var import_node_crypto13 = __toESM(require("crypto"), 1);
 init_protocol();
 var GroupFileStore = class {
   dataDir;
@@ -66878,7 +66986,7 @@ var GroupFileStore = class {
       entries[idx] = next;
     } else {
       next = {
-        id: `gf-${import_node_crypto12.default.randomBytes(6).toString("base64url")}`,
+        id: `gf-${import_node_crypto13.default.randomBytes(6).toString("base64url")}`,
         relPath: input.relPath,
         from: input.from,
         label: input.label,
@@ -67024,7 +67132,7 @@ function readSpawnedByDesktopFromEnv(env = process.env) {
 // src/tunnel/tunnel-manager.ts
 var import_node_fs51 = __toESM(require("fs"), 1);
 var import_node_path56 = __toESM(require("path"), 1);
-var import_node_crypto13 = __toESM(require("crypto"), 1);
+var import_node_crypto14 = __toESM(require("crypto"), 1);
 var import_node_child_process15 = require("child_process");
 
 // src/tunnel/tunnel-store.ts
@@ -67523,7 +67631,7 @@ var TunnelManager = class {
         override: this.deps.frpcBinaryOverride ?? void 0
       });
       const tomlPath = import_node_path56.default.join(this.deps.dataDir, "frpc.toml");
-      const proxyName = `clawd-${t2.subdomain}-${localPort}-${import_node_crypto13.default.randomBytes(3).toString("hex")}`;
+      const proxyName = `clawd-${t2.subdomain}-${localPort}-${import_node_crypto14.default.randomBytes(3).toString("hex")}`;
       const toml = buildFrpcToml({
         serverAddr: t2.frpsHost,
         serverPort: t2.frpsPort,
@@ -67624,7 +67732,7 @@ async function waitForFrpcReady(proc, timeoutMs) {
 // src/tunnel/device-key.ts
 var import_node_os18 = __toESM(require("os"), 1);
 var import_node_path57 = __toESM(require("path"), 1);
-var import_node_crypto14 = __toESM(require("crypto"), 1);
+var import_node_crypto15 = __toESM(require("crypto"), 1);
 var DERIVE_SALT = "clawd-tunnel-device-v1";
 function deriveStableDeviceKey(opts = {}) {
   const hostname = opts.hostname ?? import_node_os18.default.hostname();
@@ -67634,13 +67742,13 @@ function deriveStableDeviceKey(opts = {}) {
   const normalizedDataDir = opts.dataDir ? import_node_path57.default.resolve(opts.dataDir) : null;
   const isDefaultDir = normalizedDataDir == null || normalizedDataDir === defaultDataDir;
   const input = isDefaultDir ? `${hostname}::${uid}` : `${hostname}::${uid}::${normalizedDataDir}`;
-  return import_node_crypto14.default.createHmac("sha256", DERIVE_SALT).update(input).digest("hex").slice(0, 32);
+  return import_node_crypto15.default.createHmac("sha256", DERIVE_SALT).update(input).digest("hex").slice(0, 32);
 }
 
 // src/auth-store.ts
 var import_node_fs52 = __toESM(require("fs"), 1);
 var import_node_path58 = __toESM(require("path"), 1);
-var import_node_crypto15 = __toESM(require("crypto"), 1);
+var import_node_crypto16 = __toESM(require("crypto"), 1);
 var AUTH_FILE_NAME = "auth.json";
 function authFilePath(dataDir) {
   return import_node_path58.default.join(dataDir, AUTH_FILE_NAME);
@@ -67677,10 +67785,10 @@ function loadOrCreateTunnelDeviceKey(opts) {
   return tunnelDeviceKey;
 }
 function defaultGenerateToken() {
-  return import_node_crypto15.default.randomBytes(32).toString("base64url");
+  return import_node_crypto16.default.randomBytes(32).toString("base64url");
 }
 function defaultGenerateOwnerPrincipalId() {
-  return `owner-${import_node_crypto15.default.randomUUID()}`;
+  return `owner-${import_node_crypto16.default.randomUUID()}`;
 }
 function readAuthFile(file) {
   try {
@@ -67812,7 +67920,7 @@ var OwnerIdentityStore = class {
 };
 
 // src/feishu-auth/login-flow.ts
-var import_node_crypto16 = __toESM(require("crypto"), 1);
+var import_node_crypto17 = __toESM(require("crypto"), 1);
 var STATE_TTL_MS = 5 * 60 * 1e3;
 var LoginFlow = class {
   constructor(deps) {
@@ -67821,7 +67929,7 @@ var LoginFlow = class {
   deps;
   pendingStates = /* @__PURE__ */ new Map();
   start() {
-    const state = import_node_crypto16.default.randomBytes(16).toString("base64url");
+    const state = import_node_crypto17.default.randomBytes(16).toString("base64url");
     const now = (this.deps.now ?? Date.now)();
     this.pendingStates.set(state, now);
     this.gcExpired(now);
@@ -68352,7 +68460,7 @@ init_protocol();
 var import_node_fs55 = __toESM(require("fs"), 1);
 var import_node_os20 = __toESM(require("os"), 1);
 var import_node_path61 = __toESM(require("path"), 1);
-var import_node_crypto17 = require("crypto");
+var import_node_crypto18 = require("crypto");
 init_claude_history();
 function readJsonlEntries(file) {
   const raw = import_node_fs55.default.readFileSync(file, "utf8");
@@ -68389,7 +68497,7 @@ function forkSession(input) {
     throw new Error(`fork: messageUuid not found in transcript: ${input.messageUuid}`);
   }
   const sliced = mainEntries.slice(0, targetIdx + 1);
-  const forkedToolSessionId = (0, import_node_crypto17.randomUUID)();
+  const forkedToolSessionId = (0, import_node_crypto18.randomUUID)();
   let parentUuid = null;
   const forkedLines = [];
   for (const entry of sliced) {
@@ -70715,6 +70823,7 @@ var METHOD_GRANT_MAP = {
   // deploy:*（persona 上云）：全部 owner-only。里面有凭据录入口、建仓和推送，
   // guest 不该看见更不该动。
   "deploy:get": ADMIN_ANY,
+  "deploy:scan": ADMIN_ANY,
   "deploy:patch": ADMIN_ANY,
   "deploy:putSecret": ADMIN_ANY,
   "deploy:reportFinding": ADMIN_ANY,
@@ -70928,6 +71037,7 @@ var METHOD_GRANT_MAP = {
   "device:connections": ADMIN_ANY
 };
 var HUMAN_ONLY_METHODS = [
+  "deploy:scan",
   "deploy:release",
   "deploy:putSecret",
   "deploy:rerunJob",
@@ -70975,7 +71085,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.552".length > 0 ? "0.2.552" : "dev";
+var version = "0.2.554".length > 0 ? "0.2.554" : "dev";
 
 // src/cli-probe/probe.ts
 var fs78 = __toESM(require("fs"), 1);
@@ -71372,7 +71482,7 @@ init_protocol();
 // src/extension/bundle-zip.ts
 var import_promises11 = __toESM(require("fs/promises"), 1);
 var import_node_path67 = __toESM(require("path"), 1);
-var import_node_crypto18 = __toESM(require("crypto"), 1);
+var import_node_crypto19 = __toESM(require("crypto"), 1);
 var import_jszip2 = __toESM(require_lib3(), 1);
 async function bundleExtensionDir(dir) {
   const entries = await listFilesSorted(dir);
@@ -71387,7 +71497,7 @@ async function bundleExtensionDir(dir) {
     compression: "DEFLATE",
     compressionOptions: { level: 6 }
   });
-  const sha256 = import_node_crypto18.default.createHash("sha256").update(buffer).digest("hex");
+  const sha256 = import_node_crypto19.default.createHash("sha256").update(buffer).digest("hex");
   return { buffer, sha256 };
 }
 var FIXED_DATE = /* @__PURE__ */ new Date("2020-01-01T00:00:00.000Z");
@@ -71455,7 +71565,7 @@ function computePublishCheck(args) {
 var import_promises12 = __toESM(require("fs/promises"), 1);
 var import_node_path69 = __toESM(require("path"), 1);
 var import_node_os25 = __toESM(require("os"), 1);
-var import_node_crypto19 = __toESM(require("crypto"), 1);
+var import_node_crypto20 = __toESM(require("crypto"), 1);
 var import_jszip3 = __toESM(require_lib3(), 1);
 
 // src/extension/paths.ts
@@ -71484,7 +71594,7 @@ var InstallError = class extends Error {
 };
 async function installFromChannel(args, deps) {
   const { channelRef, snapshotHash, bundleZip } = args;
-  const computed = import_node_crypto19.default.createHash("sha256").update(bundleZip).digest("hex");
+  const computed = import_node_crypto20.default.createHash("sha256").update(bundleZip).digest("hex");
   if (computed !== snapshotHash) {
     throw new InstallError(
       "HASH_MISMATCH",
@@ -71576,7 +71686,7 @@ async function installFromChannel(args, deps) {
 var import_promises13 = __toESM(require("fs/promises"), 1);
 var import_node_path70 = __toESM(require("path"), 1);
 var import_node_os26 = __toESM(require("os"), 1);
-var import_node_crypto20 = __toESM(require("crypto"), 1);
+var import_node_crypto21 = __toESM(require("crypto"), 1);
 var import_jszip4 = __toESM(require_lib3(), 1);
 var UpdateError = class extends Error {
   constructor(code, message) {
@@ -71614,7 +71724,7 @@ async function updateFromChannel(args, deps) {
     if (e instanceof UpdateError) throw e;
     throw e;
   }
-  const computed = import_node_crypto20.default.createHash("sha256").update(bundleZip).digest("hex");
+  const computed = import_node_crypto21.default.createHash("sha256").update(bundleZip).digest("hex");
   if (computed !== snapshotHash) {
     throw new UpdateError(
       "HASH_MISMATCH",
@@ -72743,7 +72853,7 @@ async function uninstall(deps) {
 }
 
 // src/handlers/index.ts
-var import_node_crypto21 = require("crypto");
+var import_node_crypto22 = require("crypto");
 
 // src/handlers/peer-exec.ts
 init_protocol();
@@ -72898,7 +73008,7 @@ function buildMethodHandlers(deps) {
           const c2 = deps.contactStore.get(deviceId);
           return c2 ? { deviceId: c2.deviceId, remoteUrl: c2.remoteUrl, connectToken: c2.connectToken } : null;
         },
-        genId: () => (0, import_node_crypto21.randomUUID)(),
+        genId: () => (0, import_node_crypto22.randomUUID)(),
         now: () => Date.now(),
         forwardInboxPostToPeer,
         logger: deps.logger
@@ -73627,7 +73737,7 @@ async function startDaemon(config) {
   const channelStore = createChannelStore({
     filePath: import_node_path78.default.join(config.dataDir, "channels.json"),
     now: () => Date.now(),
-    genId: () => `ch-${(0, import_node_crypto22.randomUUID)().slice(0, 8)}`,
+    genId: () => `ch-${(0, import_node_crypto23.randomUUID)().slice(0, 8)}`,
     onFlushError: (err) => logger.error("channel store flush failed", {
       reason: err instanceof Error ? err.message : String(err)
     })
@@ -73636,7 +73746,7 @@ async function startDaemon(config) {
   const topicStore = createTopicStore({
     filePath: import_node_path78.default.join(config.dataDir, "topics.json"),
     now: () => Date.now(),
-    genId: () => `tp-${(0, import_node_crypto22.randomUUID)().slice(0, 8)}`,
+    genId: () => `tp-${(0, import_node_crypto23.randomUUID)().slice(0, 8)}`,
     onFlushError: (err) => logger.error("topic store flush failed", {
       reason: err instanceof Error ? err.message : String(err)
     })
@@ -73644,7 +73754,7 @@ async function startDaemon(config) {
   await topicStore.load();
   let deliverPendingRef;
   const personaDispatchManager = new PersonaDispatchManager({
-    genId: () => (0, import_node_crypto22.randomUUID)(),
+    genId: () => (0, import_node_crypto23.randomUUID)(),
     store: dispatchStore,
     now: () => Date.now(),
     onCompleted: (sid) => deliverPendingRef?.(sid),
@@ -74609,15 +74719,15 @@ async function startDaemon(config) {
   });
   Object.assign(handlers, shiftHandlers);
   {
-    const scans = await Promise.all(personaStore.list().map(async (personaId2) => ({
+    const files = await Promise.all(personaStore.list().map(async (personaId2) => ({
       personaId: personaId2,
-      scan: await readScan(personaStore.personaDirPath(personaId2)).catch(() => void 0)
+      file: await readScanFile(personaStore.personaDirPath(personaId2)).catch(() => void 0)
     })));
     const interrupted = reconcileInterruptedScans({
-      scans,
+      files,
       now: Date.now(),
-      write: (personaId2, scan) => {
-        void writeScan(personaStore.personaDirPath(personaId2), scan).catch((err) => {
+      write: (personaId2, file) => {
+        void writeScanFile(personaStore.personaDirPath(personaId2), file).catch((err) => {
           logger.warn("deploy scan reconcile write failed", { personaId: personaId2, error: String(err) });
         });
       }
@@ -74638,10 +74748,7 @@ async function startDaemon(config) {
     org: PERSONA_REPO_ORG,
     now: () => Date.now(),
     warn: (msg, meta) => logger.warn(msg, meta),
-    startScan: (personaId2, scanBase) => {
-      const assetLines = SCANNABLE_ASSETS.map(
-        (a2) => `  - ${a2.name}${a2.path ? `\uFF08${a2.path(config.dataDir)}\uFF09` : ""}\uFF1A${a2.what}`
-      ).join("\n");
+    startScan: (personaId2, scanBase, scanId) => {
       const baseLines = scanBase.base ? [
         `\u672C\u6B21\u662F**${SCAN_BASE_LABEL[scanBase.kind]}**\uFF1A\u53EA\u770B\u8DDF\u7EBF\u4E0A\u6B63\u8DD1\u90A3\u7248\u7684\u5DEE\u522B\uFF0C`,
         `\u90A3\u4E00\u7248\u662F commit ${scanBase.base}\u3002`,
@@ -74651,14 +74758,12 @@ async function startDaemon(config) {
         `\u672C\u6B21\u662F**${SCAN_BASE_LABEL[scanBase.kind]}**\uFF1A\u4ECE\u96F6\u628A persona \u6574\u4E2A\u8BFB\u4E00\u904D\uFF0C\u6E05\u5355\u662F\u7A7A\u7684\u3002`
       ];
       const prompt = [
-        `\u626B\u63CF persona\u300C${personaId2}\u300D\u7684\u90E8\u7F72\u73AF\u5883\uFF0CpersonaId=${personaId2}\u3002`,
+        `\u626B\u63CF persona\u300C${personaId2}\u300D\u7684\u90E8\u7F72\u73AF\u5883\uFF0CpersonaId=${personaId2}\uFF0CscanId=${scanId}\u3002`,
         "",
         `persona \u76EE\u5F55\uFF1A${personaStore.personaDirPath(personaId2)}`,
+        `\u8FD9\u6B21\u626B\u63CF\u5728\u5386\u53F2\u91CC\u7684 id \u662F ${scanId}\uFF08\u6536\u5C3E\u524D\u8981\u5220\u6E05\u5355\u6761\u76EE\u65F6 deploy:patch \u7528\u5B83\u6307\u540D\uFF09\u3002`,
         ...baseLines,
         "",
-        "\u53EF\u4EE5\u58F0\u660E\u7684 persona \u76EE\u5F55\u4E4B\u5916\u7684\u5171\u4EAB\u8D44\u4EA7\uFF08\u7528\u5230\u54EA\u6761\u5C31\u62A5\u54EA\u6761\uFF09\uFF1A",
-        assetLines || "  \uFF08\u65E0\uFF09",
-        "",
         "\u6309 scan-persona-for-deploy skill \u5E72\u6D3B\uFF1A\u8FB9\u67E5\u8FB9\u7528 deploy:reportFinding \u4E0A\u62A5\uFF0C",
         "\u5168\u90E8\u67E5\u5B8C\u8C03 deploy:finishScan \u6536\u5C3E\u3002"
       ].join("\n");