dsh-plugin-update 0.5.8 → 0.6.0

package/dist/host-batch.js

@@ -19,10 +19,13 @@ import { createHostUpdate } from "./host.js";
 import { defaultHomeDir } from "./reader.js";
 import { compareReleaseVersions } from "./service.js";
 import {
-  createBatchDiskPorts,
+  createBatchOwnerPorts,
   createSkipDiskPorts,
   createUpdateQueuePorts,
-  isVersionSkipped
+  emptyBatchInventory,
+  isVersionSkipped,
+  normalizeBatchInventory,
+  normalizeBatchPrefs
 } from "./store.js";
 const DEFAULT_DRAIN_INTERVAL_MS = 5e3;
 const MIN_DRAIN_INTERVAL_MS = 1e3;
@@ -405,31 +408,56 @@ function createMultiHostUpdate(deps = {}, options) {
     return runtime;
   });
   const runtimeByKey = new Map(runtimes.map((rt) => [rt.spec.key, rt]));
-  const batchPorts = batchScope && batchScope.profileDir ? createBatchDiskPorts(batchScope.homeDir, batchScope.profileDir) : null;
+  const ownerPorts = batchScope && batchScope.profileDir ? createBatchOwnerPorts(batchScope.homeDir, batchScope.profileDir, prefix) : null;
   let memSession = null;
+  let memInventory = null;
+  let memPrefs = {};
   let driveActive = false;
   let liveSession = null;
   let lastRun = null;
   let drainTimer = null;
   let disposed = false;
   async function readSession() {
-    if (batchPorts) return await batchPorts.readBatch();
+    if (ownerPorts) return await ownerPorts.readBatch();
     return memSession ?? emptyBatchSession();
   }
   async function saveSession(session) {
-    if (batchPorts) {
-      await batchPorts.writeBatch(session);
+    if (ownerPorts) {
+      await ownerPorts.writeBatch(session);
       return;
     }
     memSession = session;
   }
   async function clearSession() {
-    if (batchPorts) {
-      await batchPorts.clearBatch();
+    if (ownerPorts) {
+      await ownerPorts.clearBatch();
       return;
     }
     memSession = emptyBatchSession();
   }
+  async function readInventory() {
+    if (ownerPorts) return await ownerPorts.readInventory();
+    return memInventory ?? emptyBatchInventory();
+  }
+  async function writeInventory(inventory) {
+    if (ownerPorts) {
+      await ownerPorts.writeInventory(inventory);
+      return;
+    }
+    memInventory = inventory;
+  }
+  async function readPrefs() {
+    if (ownerPorts) return await ownerPorts.readPrefs();
+    return memPrefs;
+  }
+  async function writePrefs(prefs) {
+    const normalized = normalizeBatchPrefs(prefs);
+    if (ownerPorts) {
+      await ownerPorts.writePrefs(normalized);
+      return;
+    }
+    memPrefs = normalized;
+  }
   function newSessionId() {
     const suffix = String(randomId() ?? "").replace(/[^A-Za-z0-9._~-]/g, "").slice(0, 24);
     return now().toString(36) + "-" + (suffix || hash8(String(now())));
@@ -499,7 +527,19 @@ function createMultiHostUpdate(deps = {}, options) {
   }
   async function table(session, refresh = true) {
     const built = await buildRows(session, refresh);
-    return { ok: true, session: built.session, rows: built.rows, progress: progressOf(built.session) };
+    let inventory = emptyBatchInventory();
+    let prefs = {};
+    try {
+      inventory = await readInventory();
+    } catch {
+      inventory = emptyBatchInventory();
+    }
+    try {
+      prefs = await readPrefs();
+    } catch {
+      prefs = {};
+    }
+    return { ok: true, session: built.session, rows: built.rows, progress: progressOf(built.session), inventory, prefs };
   }
   function denied() {
     if (!scopeError) return null;
@@ -609,14 +649,42 @@ function createMultiHostUpdate(deps = {}, options) {
     if (refuse) return refuse;
     const session = await readSession();
     if (!driveActive) {
+      const at = now();
+      let prev = emptyBatchInventory();
+      try {
+        prev = await readInventory();
+      } catch {
+        prev = emptyBatchInventory();
+      }
+      const entries = { ...prev.entries };
       for (const rt of runtimes) {
         try {
           const outcome = await rt.check(rt.spec.key, rt.spec);
           rt.cache = { ...rt.cache, error: outcome.kind === "failed" ? outcome.error : null };
+          const snapshot = asRecord(rt.cache.snapshot);
+          const installed = firstText(snapshot["installedVersion"], snapshot["runningVersion"]);
+          const canInstallRaw = snapshot["canInstall"];
+          const canInstall = typeof canInstallRaw === "boolean" ? canInstallRaw : null;
+          if (outcome.kind === "update") {
+            entries[rt.spec.key] = { lastCheckedAt: at, installedVersion: installed, latestVersion: outcome.version, canInstall, error: null };
+          } else if (outcome.kind === "current") {
+            entries[rt.spec.key] = { lastCheckedAt: at, installedVersion: installed, latestVersion: installed, canInstall: false, error: null };
+          } else if (outcome.kind === "skipped") {
+            entries[rt.spec.key] = { lastCheckedAt: at, installedVersion: installed, latestVersion: outcome.version, canInstall: false, error: null };
+          } else {
+            entries[rt.spec.key] = { lastCheckedAt: at, installedVersion: installed, latestVersion: firstText(snapshot["latestVersion"]), canInstall, error: outcome.error };
+          }
         } catch (error) {
-          rt.cache = { ...rt.cache, error: errorPayloadOf(error).error };
+          const code = errorPayloadOf(error).error;
+          rt.cache = { ...rt.cache, error: code };
+          const snapshot = asRecord(rt.cache.snapshot);
+          entries[rt.spec.key] = { lastCheckedAt: at, installedVersion: firstText(snapshot["installedVersion"], snapshot["runningVersion"]), latestVersion: firstText(snapshot["latestVersion"]), canInstall: typeof snapshot["canInstall"] === "boolean" ? snapshot["canInstall"] : null, error: code };
         }
       }
+      try {
+        await writeInventory(normalizeBatchInventory({ version: 1, updatedAt: at, entries }, at));
+      } catch {
+      }
     }
     return await table(session, false);
   }
@@ -682,11 +750,12 @@ function createMultiHostUpdate(deps = {}, options) {
     if (refuse) return refuse;
     if (driveActive) return { ok: false, error: "update-busy", errorKind: "update-busy" };
     const disk = await readSession();
-    if (disk.entries.length === 0) return await table(disk);
+    const hadUnfinished = disk.entries.length > 0 && !isBatchFinished(disk);
+    if (!hadUnfinished) return { ...await table(disk), resumed: false };
     const resumed = resumeBatchSession(disk, now());
     if (resumed !== disk) await saveSession(resumed);
     try {
-      return await table(await drive(resumed, null, Number.POSITIVE_INFINITY));
+      return { ...await table(await drive(resumed, null, Number.POSITIVE_INFINITY)), resumed: true };
     } catch (error) {
       return { ok: false, ...errorPayloadOf(error) };
     }
@@ -727,12 +796,32 @@ function createMultiHostUpdate(deps = {}, options) {
       void tickDrain();
     }, drainIntervalMs);
   }
+  async function prefsPhone() {
+    const refuse = denied();
+    if (refuse) return refuse;
+    return { ok: true, prefs: await readPrefs() };
+  }
+  async function prefsSavePhone(args) {
+    const refuse = denied();
+    if (refuse) return refuse;
+    const current = await readPrefs();
+    const next = { ...current };
+    if ("checkOnOpen" in args) {
+      const v = args["checkOnOpen"];
+      if (typeof v !== "boolean") return { ok: false, error: "check-failed", errorKind: "check-failed" };
+      next.checkOnOpen = v;
+    }
+    await writePrefs(next);
+    return { ok: true, prefs: next };
+  }
   const phoneNames = {
     status: prefix + ".batchStatus",
     check: prefix + ".batchCheck",
     install: prefix + ".batchInstall",
     resume: prefix + ".batchResume",
-    cancel: prefix + ".batchCancel"
+    cancel: prefix + ".batchCancel",
+    prefs: prefix + ".batchPrefs",
+    prefsSave: prefix + ".batchPrefsSave"
   };
   function phone(fn) {
     return async (args) => {
@@ -749,6 +838,8 @@ function createMultiHostUpdate(deps = {}, options) {
   handlers[phoneNames.install] = phone((args) => installPhone(args));
   handlers[phoneNames.resume] = phone(() => resumePhone());
   handlers[phoneNames.cancel] = phone(() => cancelPhone());
+  handlers[phoneNames.prefs] = phone(() => prefsPhone());
+  handlers[phoneNames.prefsSave] = phone((args) => prefsSavePhone(args));
   for (const rt of runtimes) {
     for (const name of Object.keys(rt.host.handlers)) {
       const handler = rt.host.handlers[name];

package/dist/http.d.ts

@@ -11,8 +11,8 @@ export declare const DEFAULT_HTTP_STATUS_TIMEOUT_MS = 15000;
 /** 单插件电话动作名（旧三电话与 src/config.ts PHONE_ACTIONS 同字面，不另起字面；#38 加 updateChangelog）。 */
 export declare const HTTP_PHONE_ACTIONS: readonly ["updateStatus", "updateCheck", "updateInstall", "updateChangelog"];
 export type HttpPhoneAction = (typeof HTTP_PHONE_ACTIONS)[number];
-/** 批量五电话动作名（与 src/panel-batch.ts buildBatchPhoneNames 同字面，不另起字面；同一内核）。 */
-export declare const HTTP_BATCH_ACTIONS: readonly ["batchStatus", "batchCheck", "batchInstall", "batchResume", "batchCancel"];
+/** 批量七电话动作名（与 src/panel-batch.ts buildBatchPhoneNames 同字面，不另起字面；同一内核）。 */
+export declare const HTTP_BATCH_ACTIONS: readonly ["batchStatus", "batchCheck", "batchInstall", "batchResume", "batchCancel", "batchPrefs", "batchPrefsSave"];
 export type HttpBatchAction = (typeof HTTP_BATCH_ACTIONS)[number];
 /** 逐电话覆写表：键为全电话名（prefix.动作）或短动作名；未知键拒绝。 */
 export type HttpRoutes = Record<string, string>;

package/dist/http.js

@@ -11,7 +11,7 @@ const DEFAULT_HTTP_CHECK_TIMEOUT_MS = 15e3;
 const DEFAULT_HTTP_INSTALL_TIMEOUT_MS = 16 * 6e4;
 const DEFAULT_HTTP_STATUS_TIMEOUT_MS = 15e3;
 const HTTP_PHONE_ACTIONS = ["updateStatus", "updateCheck", "updateInstall", "updateChangelog"];
-const HTTP_BATCH_ACTIONS = ["batchStatus", "batchCheck", "batchInstall", "batchResume", "batchCancel"];
+const HTTP_BATCH_ACTIONS = ["batchStatus", "batchCheck", "batchInstall", "batchResume", "batchCancel", "batchPrefs", "batchPrefsSave"];
 function isAbsoluteUrl(value) {
   return /^https?:\/\//i.test(value);
 }

package/dist/panel-batch.d.ts

@@ -55,13 +55,22 @@ export interface BatchPanelOptions {
      */
     onCloseRequested?: () => void | Promise<void>;
     /**
-     * 语言覆盖（#60 窗口期占位：本票只加选项不消费，传了暂不生效，消费留给 #61-#66）。
+     * 语言覆盖（#59 起消费：新文案走集中字典单语渲染；既有散落文案保持基线不变）。
      * 形态与入口件一致：'zh' | 'en' | { getActive(): string; subscribe?(cb): () => void }。
      */
     locale?: unknown;
+    /**
+     * 打开面板自动查（#59 D3）：缺省 true。false 即手动挡（行为回今天，只修文案）。
+     * 优先级：用户偏好（prefs.json）> 本选项 > 缺省。
+     */
+    checkOnOpen?: boolean;
+    /**
+     * 自动继续未终态轮次（#59 Q3：与显式按钮并存，常开）。false 可关（测试与特殊集成用）。
+     */
+    autoResume?: boolean;
 }
 /** 面板可点的动作（HTML 上 data-act 一一对应；测试走同一条路）。 */
-export type BatchPanelActionKind = 'check' | 'install' | 'resume' | 'cancel' | 'row-install' | 'row-skip' | 'row-resume-skip' | 'row-cancel-queue' | 'row-copy-manual' | 'row-copy-diag' | 'toggle-details' | 'restart' | 'close';
+export type BatchPanelActionKind = 'check' | 'install' | 'resume' | 'cancel' | 'row-install' | 'row-skip' | 'row-resume-skip' | 'row-cancel-queue' | 'row-copy-manual' | 'row-copy-diag' | 'toggle-details' | 'restart' | 'close' | 'toggle-check-on-open';
 /** 挂载点：只要有 innerHTML 的容器即可（浏览器元素或测试替身都行）。 */
 export interface BatchPanelContainer {
     innerHTML: string;
@@ -76,20 +85,22 @@ export interface BatchPanelController {
     setMode(mode: BatchPanelMode): void;
     unmount(): void;
 }
-/** 批量五个电话名（与宿主侧 MultiHostUpdate.phoneNames 同一形状）。 */
+/** 批量七个电话名（与宿主侧 MultiHostUpdate.phoneNames 同一形状）。 */
 export interface BatchPhoneNames {
     status: string;
     check: string;
     install: string;
     resume: string;
     cancel: string;
+    prefs: string;
+    prefsSave: string;
 }
 /** 批量面板轮询口径（默认 1.5 秒、下限 250 毫秒，与单插件面板同一套下限）。 */
 export declare const BATCH_PANEL_POLL: {
     readonly defaultMs: 1500;
     readonly minMs: 250;
 };
-/** 批量电话名拼法：前缀 + 五个固定动作名（前缀形状校验与单插件面板同一套）。 */
+/** 批量电话名拼法：前缀 + 七个固定动作名（前缀形状校验与单插件面板同一套）。 */
 export declare function buildBatchPhoneNames(prefix: string): BatchPhoneNames;
 export interface BatchLedgerCounts {
     /** phase=ready：有新版、还没安装。 */
@@ -114,20 +125,37 @@ export interface BatchLedgerCounts {
  * 宿主忙时先写占位再回 update-busy，面板把它翻回「可更新」，免得总账把它报成失败。
  */
 export declare function batchLedgerCounts(rows: readonly BatchRowView[]): BatchLedgerCounts;
-/** 分类计数 → 一句话总账（只出现非零档，顺序固定：可更新 · 安装中 · 待查 · 待重启 · 失败 · 已跳过 · 已最新）。 */
-export declare function batchLedgerText(counts: BatchLedgerCounts): string;
+/** 分类计数 → 一句话总账（只出现非零档，顺序固定：可更新 · 安装中 · 待查 · 待重启 · 失败 · 已跳过 · 已最新；#64 单语：缺省 zh 零回归）。 */
+export declare function batchLedgerText(counts: BatchLedgerCounts, lang?: unknown): string;
 /**
  * 排队中的状态词：只回答「还要等多久」。位置从该行的队列视图来。
  * queue.ts 的 position 是 waiting 顺位（队首为 1、0 = 自己正在装），而正在装的那一家也压在这一家前面，
  * 所以「前方 N 个」= position N（队首那家前方正好 1 个：正在装的拥有者）。
  * 位置取不到（宿主只记了忙、没给占位读数）就说「等前面安装完」，不猜数字。
  */
-export declare function batchQueuedStatus(position: number | null): string;
+export declare function batchQueuedStatus(position: number | null, lang?: unknown): string;
+/** 知识账本里的一行（只做展示，不参与安装决策）。 */
+export interface BatchKnowledgeEntry {
+    lastCheckedAt: number;
+    installedVersion: string | null;
+    latestVersion: string | null;
+    canInstall: boolean | null;
+    error: string | null;
+}
+/** 有未终态行（控制区出现条件：盘上有没做完的一轮）。 */
+export declare function hasUnfinishedRows(rows: readonly BatchRowView[], session?: unknown): boolean;
+export declare function unfinishedCount(rows: readonly BatchRowView[], session?: unknown): number;
 /**
  * 一行的状态词：只回答一个问题——这家的**下一步**是什么。
  * 中文可执行，不写相位英文（相位只留在 data-phase 属性上，给人看的这句永远是动作）。
+ * （#59 D2：调用方在无轮次 + 有知识时优先用 batchRowKnowledgeText；本函数语义冻结，旧快照不动。）
+ */
+export declare function batchRowStatus(row: BatchRowView, skippedVersion?: string | null, lang?: unknown): string;
+/**
+ * 无轮次时的知识行（#59 D2）：pending + 有知识即按知识展示；有轮次未做完仍走执行态。
+ * 无知识（从没查过）回 null，调用方回退旧 pending 文案。
  */
-export declare function batchRowStatus(row: BatchRowView, skippedVersion?: string | null): string;
+export declare function batchRowKnowledgeText(row: BatchRowView, entry: BatchKnowledgeEntry | null, lang?: unknown): string | null;
 export interface BatchPanelRenderInput {
     rows?: readonly BatchRowView[];
     theme?: UpdatePanelTheme;
@@ -151,15 +179,23 @@ export interface BatchPanelRenderInput {
     noticeKey?: string | null;
     /** 键 -> 该行已取到的日志全文（只传有文本的；取不到与没展开即中性提示，不挡安装）。 */
     changelogs?: Record<string, string | null>;
+    /** 轮次会话（有未终态行才画控制区；不传按行相位回退旧口径，兼容旧快照）。 */
+    session?: unknown;
+    /** 知识账本（无轮次时行按知识展示；只做展示，不参与安装决策）。 */
+    inventory?: unknown;
+    /** 偏好（底部勾选的受控状态；不传不画勾选）。 */
+    prefs?: unknown;
+    /** 语言（单语渲染新文案用；不传跟随全局信号）。 */
+    lang?: unknown;
 }
 /** 整面板 HTML（含样式；重绘即整体替换 innerHTML，故每次都带 style 也只留一份）。 */
 export declare function renderBatchPanelHTML(input: BatchPanelRenderInput): string;
 export declare const UPDATE_BATCH_PANEL_CSS: string;
 /**
- * 批量面板的 D5 皮肤（#20 同一套口径：只换颜色/字体/间距，不改顺序、不藏东西）。
+ * 批量面板的 Archive 皮肤（#20 同一套口径：只换颜色/字体/间距，不改顺序、不藏东西）。
  * 卷宗抬头右侧给大印章留 120px（与单插件面板档案头同一处理）。
  */
-export declare const UPDATE_BATCH_PANEL_D5_CSS: string;
+export declare const UPDATE_BATCH_PANEL_ARCHIVE_CSS: string;
 /**
  * 挂批量面板（调用方一行即跑）：
  * ```js