@clawos-dev/clawd 0.2.549 → 0.2.551

package/dist/cli.cjs

@@ -59723,14 +59723,27 @@ function toClawdError(err) {
   if (err instanceof RepoError || err instanceof GithubApiError) return new ClawdError(ERROR_CODES.INTERNAL, err.message);
   return new ClawdError(ERROR_CODES.INTERNAL, err instanceof Error ? err.message : String(err));
 }
-function mustBeScanning(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`);
-  }
-  return scan;
+function isLiveScan(live, scan) {
+  if (!live) return false;
+  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);
+    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 cacheMs = deps.secretsCacheMs ?? SECRETS_CACHE_MS;
   const secretsCache = /* @__PURE__ */ new Map();
   const runCache = /* @__PURE__ */ new Map();
@@ -59767,6 +59780,7 @@ function buildDeployHandlers(deps) {
       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));
@@ -59803,6 +59817,7 @@ function buildDeployHandlers(deps) {
     response: { type: "deploy:state", ...await stateOf(personaId2) }
   });
   async function beginScan(personaId2, dir, current, head, want) {
+    liveScans.set(personaId2, {});
     const prevManifest = await readDeployFile(dir).catch(() => void 0);
     const scanBase = pickScanBase({
       // **文件在 ≠ 清单能用**：硬扫一开头就写了一份空清单，那一轮没跑完（OTA 重启 / butler 崩，
@@ -59847,8 +59862,23 @@ function buildDeployHandlers(deps) {
     };
     const started = deps.startScan(personaId2, scanBase);
     if ("sessionId" in started) {
+      liveScans.set(personaId2, { sessionId: started.sessionId });
       await writeScan(dir, { status: "scanning", scanSessionId: started.sessionId, ...withMcp });
+      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());
+        if (!settled) return;
+        await writeScan(dir, settled);
+        deps.warn?.("deploy scan ended without finishScan", { personaId: personaId2, why: settled.error });
+      }).catch((err) => {
+        if (mine()) liveScans.delete(personaId2);
+        deps.warn?.("deploy scan settle failed", { personaId: personaId2, error: String(err) });
+      });
     } else {
+      liveScans.delete(personaId2);
       await writeScan(dir, {
         status: "failed",
         ...withMcp,
@@ -59901,7 +59931,7 @@ function buildDeployHandlers(deps) {
     ensureOwner(ctx);
     const args = parseArgs2(DeployReportFindingArgsSchema, frame, "deploy:reportFinding");
     const dir = mustPersona(args.personaId);
-    const scan = mustBeScanning(await readScan(dir), "deploy:reportFinding");
+    const scan = mustBeLiveScan(args.personaId, await readScan(dir), "deploy:reportFinding");
     let item;
     try {
       item = parseFinding(args.kind, args.item);
@@ -59922,7 +59952,7 @@ function buildDeployHandlers(deps) {
     ensureOwner(ctx);
     const args = parseArgs2(DeployFinishScanArgsSchema, frame, "deploy:finishScan");
     const dir = mustPersona(args.personaId);
-    const scan = mustBeScanning(await readScan(dir), "deploy:finishScan");
+    const scan = mustBeLiveScan(args.personaId, await readScan(dir), "deploy:finishScan");
     await writeScan(dir, {
       ...scan,
       status: "done",
@@ -59956,8 +59986,13 @@ function buildDeployHandlers(deps) {
       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\u53D1\u5E03`);
-    const current = await readScan(dir);
-    if (current?.status === "scanning") return { response: { type: "deploy:release", outcome: "scanning" } };
+    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;
@@ -59967,7 +60002,12 @@ function buildDeployHandlers(deps) {
         throw toClawdError(err);
       }
       runCache.delete(personaId2);
-      await beginScan(personaId2, dir, current, head, scanBase);
+      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 readDeployFile(dir);
@@ -70930,7 +70970,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.549".length > 0 ? "0.2.549" : "dev";
+var version = "0.2.551".length > 0 ? "0.2.551" : "dev";
 
 // src/cli-probe/probe.ts
 var fs78 = __toESM(require("fs"), 1);
@@ -74592,6 +74632,7 @@ async function startDaemon(config) {
     githubApi: (token) => createGithubApi({ token }),
     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}`
@@ -74623,16 +74664,7 @@ async function startDaemon(config) {
         logger.error("deploy scan session failed to start", { personaId: personaId2, error: String(err) });
         return { error: String(err) };
       }
-      void handle.ended.then(async (outcome) => {
-        const dir = personaStore.personaDirPath(personaId2);
-        const settled = settleEndedScan(outcome, await readScan(dir).catch(() => void 0), Date.now());
-        if (!settled) return;
-        await writeScan(dir, settled);
-        logger.warn("deploy scan ended without finishScan", { personaId: personaId2, why: settled.error });
-      }).catch((err) => {
-        logger.warn("deploy scan settle failed", { personaId: personaId2, error: String(err) });
-      });
-      return { sessionId: handle.sessionId };
+      return { sessionId: handle.sessionId, ended: handle.ended };
     }
   });
   Object.assign(handlers, deployHandlers);

package/dist/persona-defaults/persona-app-builder/extension-kit/examples/nestjs-react/server/pnpm-workspace.yaml

@@ -0,0 +1,7 @@
+# 本目录就是一个独立的 pnpm 项目（packages 只列自己：pnpm 10 没有这一段会报 "packages field missing"，12 不强求；
+# 同时也让 pnpm 在这里止步、不往上爬进 clawos 的 workspace）。
+packages:
+  - '.'
+# 同 web/pnpm-workspace.yaml：pnpm 12 起 build 脚本要显式允许，@nestjs/core 有 postinstall。
+allowBuilds:
+  "@nestjs/core": true

package/dist/persona-defaults/persona-app-builder/extension-kit/examples/nestjs-react/web/pnpm-workspace.yaml

@@ -0,0 +1,9 @@
+# 本目录就是一个独立的 pnpm 项目（packages 只列自己：pnpm 10 没有这一段会报 "packages field missing"，12 不强求；
+# 同时也让 pnpm 在这里止步、不往上爬进 clawos 的 workspace）。
+packages:
+  - '.'
+# pnpm 12 起「依赖带 build 脚本但没被显式允许」= install 直接失败（ERR_PNPM_IGNORED_BUILDS），且 pnpm 11 起不再读 package.json 的 pnpm 字段，
+# 允许名单只能写在这里（写法同 clawd/pnpm-workspace.yaml）。vite 拖的 esbuild 有 postinstall。
+# 以后加依赖 install 又报这个错 = 把它点名进来（本机 pnpm 10 的 warning 会列出来）。
+allowBuilds:
+  esbuild: true

package/dist/persona-defaults/persona-clawd-butler/.claude/skills/scan-persona-for-deploy/SKILL.md

@@ -270,7 +270,12 @@ GitHub release / apt，你得告诉我它从哪装」。
 
 ## 纪律
 
-- **只读不写**：不要修改被扫 persona 目录里的任何文件，不要执行它的脚本。
+- **只读不写**：不要修改被扫 persona 目录里的任何文件，不要执行它的脚本。**`.clawd/deploy.json` 和
+  `.clawd/deploy-scan.json` 也在内**——它们只能经 `deploy:reportFinding` / `deploy:patch` / `deploy:finishScan` 改。
+  把扫描记录手改回 `scanning` 没有用：daemon 只认它自己起的、还活着的扫描，会话一结束记录就不归你了，
+  改回去只会被翻成 failed。
+- **扫完之后老板在这个会话里让你「重新扫」「改成硬扫 / 软扫」：不要动。** 不改文件、不重跑流程、不再上报。
+  回一句让他去页面重新点「发布」——按钮右边的下拉能选硬扫 / 软扫，daemon 会起新的扫描会话。
 - **宁缺毋滥**：拿不准的去查清，不要编一条依赖进清单；查清了、且过得了 `notes` 那三道门槛的才是 note。
   多报一条假依赖会让镜像装一堆没用的东西；漏报一条真依赖，云上试跑和用起来会发现，补一行再发一次就行。
 - **没调 `finishScan` 就等于没扫完**——中途卡住也要调，把卡在哪写进 `notes`，别让页面一直停在

package/dist/persona-defaults/persona-dataclaw-builder/extension-kit/examples/nestjs-react/server/pnpm-workspace.yaml

@@ -0,0 +1,7 @@
+# 本目录就是一个独立的 pnpm 项目（packages 只列自己：pnpm 10 没有这一段会报 "packages field missing"，12 不强求；
+# 同时也让 pnpm 在这里止步、不往上爬进 clawos 的 workspace）。
+packages:
+  - '.'
+# 同 web/pnpm-workspace.yaml：pnpm 12 起 build 脚本要显式允许，@nestjs/core 有 postinstall。
+allowBuilds:
+  "@nestjs/core": true

package/dist/persona-defaults/persona-dataclaw-builder/extension-kit/examples/nestjs-react/web/pnpm-workspace.yaml

@@ -0,0 +1,9 @@
+# 本目录就是一个独立的 pnpm 项目（packages 只列自己：pnpm 10 没有这一段会报 "packages field missing"，12 不强求；
+# 同时也让 pnpm 在这里止步、不往上爬进 clawos 的 workspace）。
+packages:
+  - '.'
+# pnpm 12 起「依赖带 build 脚本但没被显式允许」= install 直接失败（ERR_PNPM_IGNORED_BUILDS），且 pnpm 11 起不再读 package.json 的 pnpm 字段，
+# 允许名单只能写在这里（写法同 clawd/pnpm-workspace.yaml）。vite 拖的 esbuild 有 postinstall。
+# 以后加依赖 install 又报这个错 = 把它点名进来（本机 pnpm 10 的 warning 会列出来）。
+allowBuilds:
+  esbuild: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawos-dev/clawd",
-  "version": "0.2.549",
+  "version": "0.2.551",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",