@narumitw/pi-sync 0.57.10 → 0.57.11

package/dist/chunks/{manager-ui-DGRTG76I.ts → manager-ui-LM7DSJ2Y.ts}

@@ -6,7 +6,7 @@ import {
   setupSwitchActionFromLabel,
   setupSwitchActionLabel,
   useSyncSetup
-} from "./chunk-PWA3YN5Z.ts";
+} from "./chunk-CPT2BN6N.ts";
 import {
   applyS3CredentialUpdate,
   chooseS3CredentialUpdate,
@@ -26,41 +26,41 @@ import {
   showEditS3Target,
   showEditWebDavStorageProfile,
   showEditWebDavTarget
-} from "./chunk-UCD7TQDT.ts";
+} from "./chunk-3IYAPMST.ts";
 import {
   automaticSyncSummary
 } from "./chunk-ECYCNZOE.ts";
 import {
   dispatchManagerResult
-} from "./chunk-M5IV3KL2.ts";
+} from "./chunk-ZDDBZH72.ts";
 import {
   runCancellableOperation
-} from "./chunk-BJXSCGQK.ts";
-import "./chunk-QWV3XKNJ.ts";
-import "./chunk-RAMHGOX2.ts";
+} from "./chunk-OKPPZA4D.ts";
+import "./chunk-TIMWN2RH.ts";
+import "./chunk-OJARL2TG.ts";
 import {
   confirmMergeReview
 } from "./chunk-KHBPED6W.ts";
-import "./chunk-Z5O2TLNF.ts";
+import "./chunk-TZC7GDJE.ts";
 import {
   addStorageConnection,
   removeStorageConnection,
   removeSyncSetup,
   updateStorageConnection,
   updateSyncSetup
-} from "./chunk-JXWTEJS5.ts";
-import "./chunk-MRIPZGPR.ts";
+} from "./chunk-45COPAK7.ts";
+import "./chunk-FLHCOJCD.ts";
 import {
   syncErrorGuidance
 } from "./chunk-G4RUXRWZ.ts";
 import {
   sameLocalFields
-} from "./chunk-UGSSZWQ6.ts";
+} from "./chunk-MKSMJPVA.ts";
 import {
   observationMatchesConfig,
   observationSummary,
   syncAttentionMatchesConfig
-} from "./chunk-U77DWNRH.ts";
+} from "./chunk-Q23JJW7E.ts";
 import {
   AUTOMATIC_SYNC_DESCRIPTION,
   STARTUP_TRANSFER_DESCRIPTION,
@@ -68,7 +68,7 @@ import {
 } from "./chunk-NLWS55B6.ts";
 import {
   captureMutationOwner
-} from "./chunk-5WJQ6XOW.ts";
+} from "./chunk-GNYGNHFF.ts";
 import {
   safeTerminalText
 } from "./chunk-AMJRUXFT.ts";
@@ -92,7 +92,7 @@ import {
   syncCheckConfigFingerprint,
   syncConfigReviewIdentity,
   updateLocalConfig
-} from "./chunk-RX3WGWVL.ts";
+} from "./chunk-OVBAW7KV.ts";
 import {
   normalizeLocalFields
 } from "./chunk-X7R6DCVF.ts";
@@ -100,7 +100,7 @@ import {
   inspectLock,
   isLockGuardHeld,
   isStaleLock
-} from "./chunk-MDUORMCK.ts";
+} from "./chunk-6O3EDBRL.ts";
 import {
   throwIfAborted
 } from "./chunk-PWMWOJP4.ts";
@@ -108,18 +108,18 @@ import "./chunk-ZW5ZLGBI.ts";
 import {
   readStateForConfig,
   syncStateFingerprint
-} from "./chunk-73MDIVYJ.ts";
+} from "./chunk-DN4IA7MR.ts";
+import "./chunk-AR2DGDUI.ts";
 import "./chunk-SWRVXVFD.ts";
 import "./chunk-2JZFHNLM.ts";
 import "./chunk-T2SJD3N7.ts";
-import "./chunk-PHANBTVM.ts";
+import "./chunk-ESKOPQVB.ts";
 import {
   compareSyncInclude,
   syncIncludeSelection
-} from "./chunk-DFJGTVPX.ts";
-import "./chunk-DO55XUNU.ts";
-import "./chunk-AR2DGDUI.ts";
-import "./chunk-YZ5BQNRZ.ts";
+} from "./chunk-KYTT7KV4.ts";
+import "./chunk-CBLTWXAU.ts";
+import "./chunk-FHE2DCA2.ts";
 
 // src/ui/manager-ui.ts
 import { defineMenu as defineMenu5, runMenu as runMenu5 } from "@narumitw/pi-tui-kit";
@@ -190,7 +190,7 @@ function blockedSyncMenuItem(label, manager) {
   };
 }
 async function showManagerAttention(ctx, attention, runRoute, signal, onSelectionResolved) {
-  const { showRemoteSelectionReview } = await import("./remote-selection-ui-OHMIQ32X.ts");
+  const { showRemoteSelectionReview } = await import("./remote-selection-ui-TD4C4W3J.ts");
   if (signal?.aborted) return "close";
   const review = await showRemoteSelectionReview(ctx, attention.decision.setupName, signal, void 0, {
     decision: attention.decision,
@@ -560,7 +560,7 @@ async function describeManagerState(signal, attention, inspectOperation = inspec
       `Automatic sync: ${automaticSyncSummary(config.automatic)}`,
       `Startup transfer: ${startupTransferSummary(config)}`,
       `Agent mode: ${config.agentMode ? "On (experimental; autonomous merged sync)" : "Off"}`,
-      ...config.continuous ? await (await import("./continuous-record-4DQ2EAZS.ts")).continuousStatusLines(config) : [],
+      ...config.continuous ? await (await import("./continuous-record-AH7JGYKM.ts")).continuousStatusLines(config) : [],
       `Last applied: ${lastAppliedSnapshot}`,
       ...noSyncedContent ? ["", "No included content is selected. Choose included content in Settings before syncing."] : [],
       "",
@@ -569,6 +569,7 @@ async function describeManagerState(signal, attention, inspectOperation = inspec
     return {
       title: (changesBlocked ? ["Manage sync", ...operationStatusLines(operation)] : ordinaryTitle).join("\n"),
       actions: operationActions(operation, noSyncedContent, canSwitch, mainActions),
+      configReview: { setupName: config.setupName, fingerprint: syncCheckConfigFingerprint(config) },
       operation,
       ...currentObservation ? { observation: currentObservation } : {},
       ...currentAttention ? {
@@ -1315,7 +1316,7 @@ async function showRemoveTarget(ctx, name, signal) {
 }
 
 // src/ui/settings-ui.ts
-async function showSyncSettings(ctx, runRoute, signal) {
+async function showSyncSettings(ctx, runRoute, signal, reviewedSetup) {
   let disposition = "back";
   const exitSettings = () => {
     disposition = "exit";
@@ -1352,7 +1353,7 @@ async function showSyncSettings(ctx, runRoute, signal) {
     }
     return disposition;
   }
-  const initial = await loadConfig();
+  const initial = await loadConfig(reviewedSetup);
   if (signal?.aborted) return "back";
   const setupName = initial.setupName;
   const groups = {
@@ -1803,7 +1804,7 @@ async function showSyncSettings(ctx, runRoute, signal) {
       },
       "remote-include": async ({ signal: actionSignal }) => {
         const reviewSignal = signal ? AbortSignal.any([signal, actionSignal]) : actionSignal;
-        const { showRemoteSelectionReview } = await import("./remote-selection-ui-OHMIQ32X.ts");
+        const { showRemoteSelectionReview } = await import("./remote-selection-ui-TD4C4W3J.ts");
         if (reviewSignal.aborted) return { kind: "rejected" };
         const review = await showRemoteSelectionReview(ctx, setupName, reviewSignal, void 0, {
           origin: "settings",
@@ -1870,6 +1871,15 @@ async function showSyncManager(ctx, runRoute, sessionSignal, options = {}) {
     await runRoute("help");
     return;
   }
+  const validateOwner = captureMutationOwner(ctx, sessionSignal);
+  const isCurrent = () => {
+    try {
+      validateOwner();
+      return true;
+    } catch {
+      return false;
+    }
+  };
   const menu = defineMenu5({
     start: "main",
     screens: {
@@ -1893,12 +1903,13 @@ async function showSyncManager(ctx, runRoute, sessionSignal, options = {}) {
       }
     },
     actions: {
-      "review-attention": async () => {
-        const attention = options.getAttention?.();
+      "review-attention": async ({ state }) => {
+        const attention = state.manager.attention;
+        if (attention && options.getAttention?.() !== attention) return { kind: "stay" };
         if (!attention) {
-          const observation = options.getObservation?.();
+          const observation = state.manager.observation;
           if (!observation) return { kind: "stay" };
-          const { showRemoteSelectionReview } = await import("./remote-selection-ui-OHMIQ32X.ts");
+          const { showRemoteSelectionReview } = await import("./remote-selection-ui-TD4C4W3J.ts");
           if (sessionSignal?.aborted) return { kind: "close" };
           const config = await loadConfig();
           if (sessionSignal?.aborted) return { kind: "close" };
@@ -1929,24 +1940,21 @@ async function showSyncManager(ctx, runRoute, sessionSignal, options = {}) {
         );
         return { kind: disposition };
       },
-      sync: async () => {
+      sync: async ({ state }) => {
         const pendingAttention = options.getAttention?.();
-        if (pendingAttention) {
-          const activeConfig = await loadConfig();
-          if (sessionSignal?.aborted) return { kind: "close" };
-          if (pendingAttention.decision.setupName === activeConfig.setupName) {
-            ctx.ui.notify("Review synced content before starting Sync now.", "warning");
-            return { kind: "stay" };
-          }
+        if (pendingAttention?.decision.setupName === state.manager.configReview?.setupName) {
+          ctx.ui.notify("Review synced content before starting Sync now.", "warning");
+          return { kind: "stay" };
         }
         const result = await runCancellableOperation(ctx, "Checking current sync setup\u2026", "sync", runRoute, {
           commitAware: true,
-          signal: sessionSignal
+          signal: sessionSignal,
+          target: state.manager.configReview?.setupName
         });
         const disposition = await dispatchManagerResult(ctx, result, "sync", runRoute, sessionSignal);
         return disposition.kind === "close" ? { kind: "close" } : { kind: "stay" };
       },
-      "retry-refusal": async ({ signal: actionSignal }) => {
+      "retry-refusal": async ({ state, signal: actionSignal }) => {
         const signal = sessionSignal ? AbortSignal.any([sessionSignal, actionSignal]) : actionSignal;
         const validate = captureMutationOwner(ctx, signal);
         validate();
@@ -1955,6 +1963,7 @@ async function showSyncManager(ctx, runRoute, sessionSignal, options = {}) {
           commitAware: true,
           cancelAcrossDialogs: true,
           signal,
+          target: state.manager.configReview?.setupName,
           cancelledMessage: "Model retry cancelled. Submitted requests and committed writes cannot be undone."
         });
         if (signal.aborted) return { kind: "close" };
@@ -1970,23 +1979,25 @@ async function showSyncManager(ctx, runRoute, sessionSignal, options = {}) {
         const result = await showSetupSwitcher(ctx, runRoute, void 0, sessionSignal);
         return result === "pull-attempted" || result === "closed" ? { kind: "close" } : { kind: "stay" };
       },
-      settings: async () => {
-        const result = await showSyncSettings(ctx, runRoute, sessionSignal);
+      settings: async ({ state }) => {
+        const result = await showSyncSettings(ctx, runRoute, sessionSignal, state.manager.configReview?.setupName);
         return { kind: result === "exit" ? "close" : "stay" };
       },
-      pull: async () => {
+      pull: async ({ state }) => {
         const result = await runCancellableOperation(ctx, "Checking remote changes\u2026", "pull", runRoute, {
           commitAware: true,
           cancelledMessage: "Pull check cancelled; no local files were changed.",
+          target: state.manager.configReview?.setupName,
           signal: sessionSignal
         });
         const disposition = await dispatchManagerResult(ctx, result, "pull", runRoute, sessionSignal);
         return disposition.kind === "close" ? { kind: "close" } : { kind: "stay" };
       },
-      push: async () => {
+      push: async ({ state }) => {
         const result = await runCancellableOperation(ctx, "Preparing push preview\u2026", "push", runRoute, {
           commitAware: true,
           cancelledMessage: "Push preparation cancelled; no remote files were changed.",
+          target: state.manager.configReview?.setupName,
           signal: sessionSignal
         });
         const disposition = await dispatchManagerResult(ctx, result, "push", runRoute, sessionSignal);
@@ -2000,31 +2011,34 @@ async function showSyncManager(ctx, runRoute, sessionSignal, options = {}) {
         await showStorageConnections(ctx, sessionSignal);
         return { kind: "stay" };
       },
-      history: async () => {
+      history: async ({ state }) => {
         const result = await runCancellableOperation(ctx, "Loading sync history\u2026", "history", runRoute, {
           signal: sessionSignal,
           commitAware: true,
           cancelAcrossDialogs: true,
+          target: state.manager.configReview?.setupName,
           cancelledMessage: "History review cancelled; no files were changed."
         });
         return { kind: result.kind === "closed" ? "close" : "stay" };
       },
-      diff: async () => {
+      diff: async ({ state }) => {
         const result = await runCancellableOperation(ctx, "Comparing local and remote\u2026", "diff", runRoute, {
+          target: state.manager.configReview?.setupName,
           signal: sessionSignal
         });
         return { kind: result.kind === "closed" ? "close" : "stay" };
       },
-      status: async () => {
+      status: async ({ state }) => {
         const result = await runCancellableOperation(ctx, "Checking remote status\u2026", "status", runRoute, {
+          target: state.manager.configReview?.setupName,
           signal: sessionSignal
         });
         return { kind: result.kind === "closed" ? "close" : "stay" };
       },
-      doctor: async ({ signal: actionSignal }) => {
+      doctor: async ({ state, signal: actionSignal }) => {
         const signal = sessionSignal ? AbortSignal.any([sessionSignal, actionSignal]) : actionSignal;
         const validate = captureMutationOwner(ctx, signal);
-        const config = await loadConfig();
+        const config = await loadConfig(state.manager.configReview?.setupName);
         validate();
         const confirmed = await ctx.ui.confirm(
           "Run diagnostics?",
@@ -2058,11 +2072,12 @@ S3/R2 reads the latest pointer without writing. Git reads remote snapshots and c
         return { kind: "close" };
       },
       init: async () => {
-        await runRoute("init");
+        await runRoute("init", sessionSignal);
         return { kind: "stay" };
       },
-      conflicts: async () => {
+      conflicts: async ({ state }) => {
         const result = await runCancellableOperation(ctx, "Reviewing private conflicts\u2026", "conflicts", runRoute, {
+          target: state.manager.configReview?.setupName,
           commitAware: true,
           signal: sessionSignal
         });
@@ -2071,6 +2086,42 @@ S3/R2 reads the latest pointer without writing. Git reads remote snapshots and c
       }
     }
   });
+  for (const action of [
+    "review-attention",
+    "sync",
+    "retry-refusal",
+    "settings",
+    "pull",
+    "push",
+    "history",
+    "diff",
+    "status",
+    "doctor",
+    "conflicts"
+  ]) {
+    const activate = menu.actions[action];
+    menu.actions[action] = async (invocation) => {
+      validateOwner();
+      const review = invocation.state.manager.configReview;
+      let current = false;
+      try {
+        const config = await loadConfig();
+        validateOwner();
+        invocation.signal.throwIfAborted();
+        current = review?.fingerprint === syncCheckConfigFingerprint(config);
+      } catch {
+        if (!isCurrent() || invocation.signal.aborted) return { kind: "close" };
+      }
+      if (!current) {
+        ctx.ui.notify(
+          "Sync setup changed while the manager was open. Review the refreshed setup before continuing.",
+          "warning"
+        );
+        return { kind: "stay" };
+      }
+      return activate(invocation);
+    };
+  }
   const menuContext = {
     ...ctx,
     ui: {
@@ -2101,7 +2152,7 @@ S3/R2 reads the latest pointer without writing. Git reads remote snapshots and c
       return { manager };
     },
     signal: sessionSignal,
-    isCurrent: () => !sessionSignal?.aborted
+    isCurrent
   });
 }
 function syncMainMenuItem(label) {
@@ -2137,4 +2188,4 @@ function syncMainMenuItem(label) {
 export {
   showSyncManager
 };
-//# sourceMappingURL=manager-ui-DGRTG76I.ts.map
+//# sourceMappingURL=manager-ui-LM7DSJ2Y.ts.map