@inventec/dsh-copilot-auth 1.0.2 → 1.1.1

package/src/refresh-flow.mjs

@@ -0,0 +1,127 @@
+// refresh-flow.mjs — 「刷新可用模型目录」client 侧状态机。
+// reduce 为纯函数（不执行 I/O）；runEffect/advance 只使用注入的 fetchImpl——
+// 本模块不直接引用全局 fetch，所有网络能力经注入获得（node:test 可测）。
+// 状态：idle → previewing → confirming → applying → restartNeeded / failed；
+// apply 409 → previewing 自动重拉（Y2-1：409 响应不携带新 preview，client 重新
+// POST preview）→ 成功进 confirming(staleNotice)；restartNeeded 可由 /status 水合。
+import { routes } from "./shared.mjs";
+
+export const initial = Object.freeze({ name: "idle" });
+
+// reduce(state, event) → [nextState, effect | null]
+// effect 为数据化指令：{type:"preview",mode} | {type:"apply",mode,digests} | {type:"status"}
+export function reduce(state, event) {
+  switch (state.name) {
+    case "idle":
+    case "failed":
+    case "restartNeeded": {
+      if (event.type === "start") {
+        return [{ name: "previewing", mode: event.mode, stale: false }, { type: "preview", mode: event.mode }];
+      }
+      if (state.name === "failed" && event.type === "dismiss") return [initial, null];
+      if (state.name === "idle" && event.type === "init") return [state, { type: "status" }];
+      if (event.type === "hydrate") {
+        const refresh = event.status?.refresh;
+        if (!event.status) return [state, null]; // status 拉取失败不硬失败
+        if (refresh?.lastError === "state-corrupt") return [{ name: "failed", error: "state-corrupt" }, null];
+        if (refresh?.pendingRestart === true) return [{ name: "restartNeeded" }, null];
+        return state.name === "idle" ? [state, null] : [state, null];
+      }
+      return [state, null];
+    }
+    case "previewing": {
+      if (event.type === "preview-ok") {
+        return [{ name: "confirming", preview: event.preview, mode: state.mode, staleNotice: state.stale === true }, null];
+      }
+      if (event.type === "preview-fail") return [{ name: "failed", error: event.error }, null];
+      return [state, null]; // previewing 期间忽略 start 等重复事件
+    }
+    case "confirming": {
+      if (event.type === "start") {
+        // catalogSource==="local" 时弹窗提供「改用内置覆盖层预览」：
+        // 发 mode:"overlay" 的新 preview（不直接 apply，R2-5），新 diff 需再次确认
+        return [{ name: "previewing", mode: event.mode, stale: false }, { type: "preview", mode: event.mode }];
+      }
+      if (event.type === "confirm") {
+        return [
+          { name: "applying", mode: state.mode, digests: state.preview.digests },
+          { type: "apply", mode: state.mode, digests: state.preview.digests },
+        ];
+      }
+      if (event.type === "cancel") return [initial, null];
+      return [state, null];
+    }
+    case "applying": {
+      if (event.type === "apply-ok") return [{ name: "restartNeeded" }, null];
+      if (event.type === "apply-stale") {
+        // 409 preview-stale：以原 mode 重新 preview（保持 overlay 来源，R2-5）
+        return [{ name: "previewing", mode: state.mode, stale: true }, { type: "preview", mode: state.mode }];
+      }
+      if (event.type === "apply-fail") return [{ name: "failed", error: event.error }, null];
+      return [state, null]; // applying 态忽略 confirm/start（双击只发一次）
+    }
+    default:
+      return [state, null];
+  }
+}
+
+// 副作用执行器：effect → 结果事件。只经注入的 fetchImpl 发请求。
+export async function runEffect(effect, fetchImpl) {
+  const r = routes();
+  const post = (url, body) =>
+    fetchImpl(url, {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify(body),
+    });
+  if (effect.type === "preview") {
+    try {
+      const res = await post(r.refreshPreview, effect.mode ? { mode: effect.mode } : {});
+      const body = await res.json();
+      return res.status === 200 && body?.ok
+        ? { type: "preview-ok", preview: body }
+        : { type: "preview-fail", error: body?.error ?? `HTTP ${res.status}` };
+    } catch (err) {
+      return { type: "preview-fail", error: String(err?.message ?? err) };
+    }
+  }
+  if (effect.type === "apply") {
+    try {
+      const res = await post(r.refreshApply, {
+        digests: effect.digests,
+        ...(effect.mode ? { mode: effect.mode } : {}),
+      });
+      const body = await res.json().catch(() => null);
+      if (res.status === 409) return { type: "apply-stale" };
+      return res.status === 200 && body?.ok
+        ? { type: "apply-ok" }
+        : { type: "apply-fail", error: body?.error ?? `HTTP ${res.status}` };
+    } catch (err) {
+      return { type: "apply-fail", error: String(err?.message ?? err) };
+    }
+  }
+  if (effect.type === "status") {
+    try {
+      const res = await fetchImpl(r.status);
+      return { type: "hydrate", status: await res.json() };
+    } catch {
+      return { type: "hydrate", status: null };
+    }
+  }
+  throw new Error(`unknown effect: ${effect.type}`);
+}
+
+// controller：reduce → 执行 effect → 结果事件回送 reduce → 循环至无 effect。
+// client.jsx 必须只经 advance 驱动状态机，不直接调 reduce/runEffect。
+// onState 在每个 reduce 步同步回调（含 effect 执行前）——UI 借此即时落中间态
+// （applying 期间重复 confirm 被 reducer 忽略，双击只发一次）。
+export async function advance(state, event, fetchImpl, onState) {
+  let [s, fx] = reduce(state, event);
+  onState?.(s);
+  while (fx) {
+    const resultEvent = await runEffect(fx, fetchImpl);
+    [s, fx] = reduce(s, resultEvent);
+    onState?.(s);
+  }
+  return s;
+}

package/src/shared.mjs

@@ -7,5 +7,7 @@ export const routes = () => ({
   state: `${ROUTE_PREFIX}/state`,
   status: `${ROUTE_PREFIX}/status`,
   logout: `${ROUTE_PREFIX}/logout`,
+  refreshPreview: `${ROUTE_PREFIX}/refresh/preview`,
+  refreshApply: `${ROUTE_PREFIX}/refresh/apply`,
 });
 export const emptyState = () => ({ status: "idle", notices: [], error: undefined });

package/src/state.mjs

@@ -0,0 +1,98 @@
+// state.mjs — 持久状态的唯一读写层（薄层，落盘逻辑都在 atomic-json）。
+// 状态文件：~/.dsh/copilot-auth-state.json（路径由 host 决定），原子写。
+// lastError 规则（R3-6）：顶层 lastError/lastErrorAt 是唯一诊断面；journal 相位内
+// 错误同时投影顶层；任一相位成功推进/消费时清除；state 损坏改名留存 .corrupt-<ts>
+// 不覆盖，返回带 state-corrupt 的安全态，且后续普通保存不得抹掉留存文件。
+import { renameSync } from "node:fs";
+import { readJson, writeJsonAtomic } from "./atomic-json.mjs";
+
+export const STATE_VERSION = 1;
+export const CATALOG_IDENTITY = { packageName: "@earendil-works/pi-ai", catalogSchemaVersion: 1 };
+export const JOURNAL_PHASES = ["prepared", "catalog-committed-needs-restart"];
+export const RESTART_REASONS = ["refresh", "self-heal"];
+
+export function freshState() {
+  return {
+    version: STATE_VERSION,
+    activated: false,
+    restartState: null,
+    appliedOverlay: {}, // 与 catalog 同构，不夹带插件私有字段
+    appliedProvenance: null, // { sourcePiAiVersion, integrity, appliedAgainstPiAiVersion, catalogSchemaVersion: 1 }
+    journal: null,
+    lastError: null,
+    lastErrorAt: null,
+  };
+}
+
+export function loadState(path) {
+  let raw;
+  let corrupt = false;
+  try {
+    raw = readJson(path);
+  } catch {
+    corrupt = true;
+  }
+  if (!corrupt && raw !== undefined && (typeof raw !== "object" || raw === null || Array.isArray(raw))) {
+    corrupt = true; // 解析成功但形状非法同样按损坏处理
+  }
+  if (corrupt) {
+    // 解析失败/形状非法 → 改名留存 .corrupt-<ts>，返回安全态
+    try {
+      renameSync(path, `${path}.corrupt-${Date.now()}`);
+    } catch { /* 改名失败不阻断安全态返回 */ }
+    const s = freshState();
+    s.lastError = "state-corrupt";
+    s.lastErrorAt = new Date().toISOString();
+    return s;
+  }
+  if (raw === undefined) return freshState();
+  // 迁移：未知/缺失字段回落默认（当前仅 version 1）
+  return { ...freshState(), ...raw, version: STATE_VERSION };
+}
+
+export function saveState(path, state) {
+  writeJsonAtomic(path, state);
+}
+
+export function setLastError(state, error) {
+  return { ...state, lastError: String(error?.message ?? error), lastErrorAt: new Date().toISOString() };
+}
+
+export function clearLastError(state) {
+  return { ...state, lastError: null, lastErrorAt: null };
+}
+
+// journal 相位转移辅助：仅在 prepared → catalog-committed-needs-restart 单向前进。
+export function createJournal({
+  settingsBaseline, targetIds, pendingOverlay, appliedAgainstPiAiVersion,
+  catalogBaselineDigest, patchedCatalogDigest, source,
+}) {
+  return {
+    phase: "prepared",
+    createdAt: new Date().toISOString(),
+    appliedAgainstPiAiVersion,
+    catalogIdentity: { ...CATALOG_IDENTITY },
+    settingsBaseline, // raw user 层完整配置视图（R3-2）
+    targetIds,
+    pendingOverlay, // catalog-shaped 增量（R3-4），provenance 不夹带在条目里
+    catalogBaselineDigest,
+    patchedCatalogDigest,
+    source, // { kind: "latest" | "overlay" | "local", piAiVersion?, integrity? }
+    lastError: null,
+  };
+}
+
+export function advanceJournal(journal) {
+  if (journal?.phase !== "prepared") {
+    throw new Error(`cannot advance journal from phase ${journal?.phase}`);
+  }
+  return { ...journal, phase: "catalog-committed-needs-restart" };
+}
+
+// restartState 只表达「目录写入需跨 boot 加载」（R3-5），不携带 settings 意图。
+export function restartMarker(reason, expectedEntriesDigest) {
+  if (!RESTART_REASONS.includes(reason)) {
+    throw new Error(`unknown restart reason: ${reason}`);
+  }
+  return { reason, expectedEntriesDigest, since: new Date().toISOString() };
+}