@marktrue/dsh-mobile-remote 3.2.1-alpha.3 → 3.2.1-rc.1

package/lib/update-supervisor.js

@@ -14,6 +14,7 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { spawn, spawnSync } from "node:child_process";
+import { appendOperationLog } from "./plugin-update-log.js";
 import {
 	TRANSACTION_PHASE,
 	acquireLock,
@@ -35,6 +36,7 @@ import {
 import { pluginContentDigest } from "./plugin-content-digest.js";
 import { verifyFrozenPackage } from "./runtime-dependency-snapshot.js";
 import { restartPlan } from "./plugin-self-update.js";
+import { shellOptions } from "./tool-process.js";
 
 /** 等待宿主的默认超时：足够冷启动（含语料预热），又不至于让用户无限等。 */
 export const DEFAULT_WAIT_TIMEOUT_MS = 180_000;
@@ -154,21 +156,23 @@ export function defaultRestart({ restartForm, port, pid = null, profile = "web",
  * 默认恢复器（F4）：把依赖指回**快照**（而不是可能已变的原 clone/tag/source），
  * 再重装；并检查安装结果。
  */
-export async function defaultRestore({ profileDir, snapshotDir: snapDir, expectedContentSha256, profileSnapshot, lockPath, lease }) {
+export async function defaultRestore({ profileDir, snapshotDir: snapDir, expectedContentSha256, profileSnapshot, dependencyKey, preserveSpecifier = false, lockPath, lease }) {
   if (!snapDir || !snapshotReady(snapDir) || (expectedContentSha256 && pluginContentDigest(snapDir) !== expectedContentSha256)) {
     return { ok: false, error: "snapshot-unavailable" };
   }
   try {
     assertUpdateLease(lockPath, lease);
     // 一次受代际保护的仲裁里恢复 profile/lockfile（A 阻塞：不再有 assert→write 空窗）。
-    const restored = restoreOwnedProfile({ profileDir, snapshotDir: snapDir, snapshot: profileSnapshot, lockPath, lease });
+    const restoreKey = dependencyKey || profileSnapshot?.dependencyKey || 'dsh-mobile-remote';
+    const restored = restoreOwnedProfile({ profileDir, snapshotDir: snapDir, snapshot: profileSnapshot, key: restoreKey,
+      preserveSpecifier, lockPath, lease });
     if (!restored.ok) return { ok: false, error: restored.error };
-    // 直接把**已验证自包含**的快照发布为安装目录：旧字节精确、离线可加载，
-    // 不依赖 pnpm 把依赖内联进插件目录（真实 pnpm 会放到 sibling，containment 判据必错）。
-    const published = publishOwnedSnapshotLink({ profileDir, snapshotDir: snapDir, lockPath, lease });
+    // 直接把**已验证自包含**的快照发布为安装目录：旧字节精确、离线可加载；
+    // npm 事务保留原精确 registry spec，legacy 事务继续使用 file: 快照 spec。
+    const published = publishOwnedSnapshotLink({ profileDir, snapshotDir: snapDir, key: restoreKey, lockPath, lease });
     if (!published.ok) return { ok: false, error: published.error };
     assertUpdateLease(lockPath, lease);
-    const actualRoot = join(profileDir, "node_modules", "dsh-mobile-remote");
+    const actualRoot = join(profileDir, "node_modules", ...restoreKey.split("/"));
     if (pluginContentDigest(actualRoot) !== expectedContentSha256) return { ok: false, error: "restored-content-mismatch" };
     const verified = verifyFrozenPackage(actualRoot);
     if (!verified.ok) return { ok: false, error: `restored-snapshot-invalid: ${verified.error}` };
@@ -178,7 +182,8 @@ export async function defaultRestore({ profileDir, snapshotDir: snapDir, expecte
 
 /** 默认安装器（监督器是独立进程，阻塞没关系）。 */
 export function defaultRunInstall(profileDir) {
-	const r = spawnSync("pnpm", ["install"], { cwd: profileDir, encoding: "utf8" });
+	// Windows 上 pnpm 是 pnpm.cmd，必须经 shell 解析。
+	const r = spawnSync("pnpm", ["install"], { cwd: profileDir, encoding: "utf8", ...shellOptions() });
 	if (r.error) return { ok: false, error: r.error.message };
 	if (r.status !== 0) return { ok: false, error: (r.stderr || `exit ${r.status}`).trim() };
 	return { ok: true };
@@ -203,14 +208,22 @@ export async function runTransaction({ stateFile, tx, timeoutMs = DEFAULT_WAIT_T
     // 已经处于 rolling-back（安装失败/恢复重试）：**直接续做恢复**，不重复"先重启再等待"。
     if (tx.phase !== TRANSACTION_PHASE.ROLLING_BACK) {
       const entryPhase = phaseAt();
+      log("supervisor: restarting host to load candidate plugin");
       const result = await restart({ ...tx, pid: tx.hostPid, log });
       assertUpdateLease(lockPath, lease);
-      if (!result?.ok) failure = `restart-failed: ${result?.error ?? "unknown"}`;
-      else {
+      if (!result?.ok) {
+        log("supervisor: candidate restart failed");
+        failure = `restart-failed: ${result?.error ?? "unknown"}`;
+      } else {
+        log("supervisor: waiting for candidate health confirmation");
         const healthy = await waitImpl({ ...tx, expectContentSha256: tx.targetContentSha256,
           expectVersion: tx.targetVersion, timeoutMs, pollMs });
         assertUpdateLease(lockPath, lease);
-        if (healthy.ok) return finish(TRANSACTION_PHASE.SETTLED, { ok: true, matched: healthy.matched, at: new Date(now()).toISOString() }, [entryPhase]);
+        if (healthy.ok) {
+          log("supervisor: candidate plugin health confirmed");
+          return finish(TRANSACTION_PHASE.SETTLED, { ok: true, matched: healthy.matched, at: new Date(now()).toISOString() }, [entryPhase]);
+        }
+        log("supervisor: candidate health check failed; rollback required");
         failure = healthy.error;
       }
       if (!tx.previousSnapshotDir) return finish(TRANSACTION_PHASE.FAILED, { ok: false, reason: "rollback-target-missing", error: failure }, [entryPhase]);
@@ -227,16 +240,28 @@ export async function runTransaction({ stateFile, tx, timeoutMs = DEFAULT_WAIT_T
     const claimed = claimOwnedRecovery(stateFile, { owner }, { lockPath, lease, currentFile: tx.currentFile });
     if (!claimed.ok) return { ok: false, error: claimed.error, transaction: claimed.transaction };
     tx = claimed.transaction;
+    log("supervisor: restoring previous plugin snapshot");
     const restored = await restore({ profileDir: tx.profileDir, snapshotDir: tx.previousSnapshotDir,
-      expectedContentSha256: tx.previousContentSha256, profileSnapshot: tx.profileSnapshot, lockPath, lease, runInstall });
+      expectedContentSha256: tx.previousContentSha256, profileSnapshot: tx.profileSnapshot,
+      dependencyKey: tx.dependencyKey || tx.profileSnapshot?.dependencyKey,
+      preserveSpecifier: Boolean(tx.npmCandidate), lockPath, lease, runInstall });
     assertUpdateLease(lockPath, lease);
-    if (!restored?.ok) return finish(TRANSACTION_PHASE.FAILED, { ok: false, reason: "rollback-restore-failed", error: restored?.error }, ["rolling-back"]);
+    if (!restored?.ok) {
+      log("supervisor: previous plugin snapshot restore failed");
+      return finish(TRANSACTION_PHASE.FAILED, { ok: false, reason: "rollback-restore-failed", error: restored?.error }, ["rolling-back"]);
+    }
+    log("supervisor: restarting host with previous plugin");
     const result = await restart({ ...tx, pid: null, log });
     assertUpdateLease(lockPath, lease);
-    if (!result?.ok) return finish(TRANSACTION_PHASE.FAILED, { ok: false, reason: "rollback-restart-failed", error: result?.error }, ["rolling-back"]);
+    if (!result?.ok) {
+      log("supervisor: rollback restart failed");
+      return finish(TRANSACTION_PHASE.FAILED, { ok: false, reason: "rollback-restart-failed", error: result?.error }, ["rolling-back"]);
+    }
+    log("supervisor: waiting for previous plugin health confirmation");
     const back = await waitImpl({ ...tx, expectContentSha256: tx.previousContentSha256,
       expectVersion: "", timeoutMs, pollMs });
     assertUpdateLease(lockPath, lease);
+    log(back.ok ? "supervisor: previous plugin health confirmed" : "supervisor: previous plugin health not confirmed");
     return finish(back.ok ? TRANSACTION_PHASE.ROLLED_BACK : TRANSACTION_PHASE.FAILED,
       { ok: false, reason: back.ok ? "rolled-back" : "rollback-unconfirmed", error: back.ok ? failure : back.error }, ["rolling-back"]);
   } catch(e) {
@@ -297,7 +322,16 @@ async function main() {
 	}
 	const timeoutMs = Number(args.timeout ?? 0) > 0 ? Number(args.timeout) * 1000 : DEFAULT_WAIT_TIMEOUT_MS;
 	const pollMs = Number(args.poll ?? 0) > 0 ? Number(args.poll) : DEFAULT_POLL_MS;
-	const log = (m) => console.log(m);
+	const txAtStart = readTransaction(stateFile);
+	const generation = txAtStart?.lease?.generation ?? args.generation;
+	const currentFile = txAtStart?.currentFile ?? "";
+	const logHome = currentFile ? dirname(dirname(dirname(currentFile))) : (process.env.HOME ?? "");
+	const log = (message) => {
+		if (logHome && generation) {
+			try { appendOperationLog({ home: logHome, generation, stage: "supervisor", text: message, redactPaths: [logHome, txAtStart?.profileDir] }); } catch { /* progress logging must not block recovery */ }
+		}
+		console.log("supervisor: progress event recorded");
+	};
 	const finalState = args.arm
 		? await superviseArmed({ stateFile, readyFile: args.ready, opId: args.op, generation: args.generation, timeoutMs, pollMs, log })
 		: await superviseUpdate({ stateFile, opId: args.op, generation: args.generation, timeoutMs, pollMs, log });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marktrue/dsh-mobile-remote",
-  "version": "3.2.1-alpha.3",
+  "version": "3.2.1-rc.1",
   "description": "DSH Mobile：把 DeepSeek Harness 变成随身控制台——手机远程发消息派活、看进度、收通知、审批决策、管理会话；配套 Flutter App（当前 Android 端，iOS 未开发）",
   "type": "module",
   "main": "lib/index.js",
@@ -52,7 +52,7 @@
     "qrcode"
   ],
   "optionalDependencies": {
-    "@marktrue/dsh-mobile-remote-app": "npm:@marktrue/dsh-mobile-remote@3.2.1-alpha.3-app"
+    "@marktrue/dsh-mobile-remote-app": "npm:@marktrue/dsh-mobile-remote@3.2.1-rc.1-app"
   },
   "peerDependencies": {
     "@deepseek-ai/dsh-credentials": ">=0.1.0-rc.6 <0.3.0",