@narumitw/pi-sync 0.50.2 → 0.51.0

package/dist/chunks/{manager-ui-5KLKVMRC.ts → manager-ui-763NEKJY.ts}

@@ -2,33 +2,36 @@
 // @ts-nocheck -- generated JavaScript uses a .ts extension for Pi's Jiti loader.
 import {
   dispatchManagerResult
-} from "./chunk-G4RNQQZS.ts";
+} from "./chunk-E42GXD6D.ts";
 import {
   runCancellableOperation
-} from "./chunk-4CHTZMEO.ts";
+} from "./chunk-7KHKWL3Q.ts";
 import {
   SETUP_SWITCH_ACTION_OPTIONS,
   saveOnSwitch,
   setupSwitchActionFromLabel,
   setupSwitchActionLabel,
   useSyncSetup
-} from "./chunk-SL64RLXR.ts";
-import "./chunk-HUDQATCL.ts";
-import "./chunk-T2B5IU74.ts";
+} from "./chunk-DZUSTGQV.ts";
+import "./chunk-Q32CQWPM.ts";
+import "./chunk-HGJH56KR.ts";
 import {
   observationMatchesConfig,
   observationSummary,
   syncAttentionMatchesConfig
-} from "./chunk-5B3FXBLE.ts";
+} from "./chunk-6546TS54.ts";
 import {
   inspectLock,
   isLockGuardHeld,
   isStaleLock
-} from "./chunk-ETTRJDNP.ts";
+} from "./chunk-QLSN7AGX.ts";
+import {
+  configureSyncStatus
+} from "./chunk-K3RIEL6J.ts";
 import {
   readStateForConfig,
   syncStateFingerprint
-} from "./chunk-CCSN3F47.ts";
+} from "./chunk-YPXGU5OR.ts";
 import {
   AUTOMATIC_SYNC_DESCRIPTION,
   applyS3CredentialUpdate,
@@ -49,21 +52,21 @@ import {
   showEditS3Target,
   showEditWebDavStorageProfile,
   showEditWebDavTarget
-} from "./chunk-KW7YQEZN.ts";
+} from "./chunk-UA7RXOIT.ts";
 import {
   automaticSyncSummary
-} from "./chunk-Z4DQF6L3.ts";
-import "./chunk-CHH26D4F.ts";
+} from "./chunk-ECYCNZOE.ts";
+import "./chunk-YFADF5ZQ.ts";
 import {
   safeTerminalText
-} from "./chunk-LTBWGSBV.ts";
+} from "./chunk-MSSW6F3R.ts";
 import {
   addStorageConnection,
   removeStorageConnection,
   removeSyncSetup,
   updateStorageConnection,
   updateSyncSetup
-} from "./chunk-LCRI3ABW.ts";
+} from "./chunk-2RZSQWBH.ts";
 import {
   activeLocalConfigPath,
   isCloudflareR2Endpoint,
@@ -76,23 +79,23 @@ import {
   readLocalConfigObject,
   syncConfigReviewIdentity,
   updateLocalConfig
-} from "./chunk-C7XY5NF5.ts";
-import "./chunk-6LP3MCR2.ts";
-import "./chunk-ZI5MXMEX.ts";
-import "./chunk-TEN2ZBJV.ts";
+} from "./chunk-4MPIH46N.ts";
+import "./chunk-2JZFHNLM.ts";
+import "./chunk-BVVP33U5.ts";
+import "./chunk-T2SJD3N7.ts";
 import {
   syncErrorGuidance
-} from "./chunk-CPEHGXJV.ts";
+} from "./chunk-G4RUXRWZ.ts";
 import {
   errorMessage
-} from "./chunk-2B2ELUF5.ts";
-import "./chunk-OEX4ABY6.ts";
-import "./chunk-THMF4BVL.ts";
-import "./chunk-T3HH3UEJ.ts";
+} from "./chunk-7D5SF7P3.ts";
+import "./chunk-EEJPYTWE.ts";
+import "./chunk-SWUXA3MH.ts";
+import "./chunk-OVDTF5CH.ts";
 import {
   compareSyncInclude,
   syncIncludeSelection
-} from "./chunk-JAAKLL6M.ts";
+} from "./chunk-IVXEDPAD.ts";
 
 // src/ui/manager-ui.ts
 import { defineMenu as defineMenu5, runMenu as runMenu5 } from "@narumitw/pi-tui-kit";
@@ -137,8 +140,7 @@ function operationCanRecover(availability) {
 
 // src/ui/manager-attention.ts
 function attentionMainMenuItems(manager) {
-  if (!manager.attention && manager.observation?.inspection.selectionState?.kind !== "different")
-    return [];
+  if (!manager.attention && manager.observation?.inspection.selectionState?.kind !== "different") return [];
   const disabled = manager.attentionReviewDisabled === true;
   return [
     {
@@ -164,29 +166,18 @@ function blockedSyncMenuItem(label, manager) {
   };
 }
 async function showManagerAttention(ctx, attention, runRoute, signal, onSelectionResolved) {
-  const { showRemoteSelectionReview } = await import("./remote-selection-ui-D7RBRJNL.ts");
+  const { showRemoteSelectionReview } = await import("./remote-selection-ui-TZTJF32Y.ts");
   if (signal?.aborted) return "close";
-  const review = await showRemoteSelectionReview(
-    ctx,
-    attention.decision.setupName,
-    signal,
-    void 0,
-    {
-      decision: attention.decision,
-      origin: attention.origin,
-      runRoute,
-      onSelectionResolved
-    }
-  );
+  const review = await showRemoteSelectionReview(ctx, attention.decision.setupName, signal, void 0, {
+    decision: attention.decision,
+    origin: attention.origin,
+    runRoute,
+    onSelectionResolved
+  });
   if (review.kind === "route-result") {
-    const disposition = await dispatchManagerResult(
-      ctx,
-      review.result,
-      review.route,
-      runRoute,
-      signal,
-      { onSelectionResolved }
-    );
+    const disposition = await dispatchManagerResult(ctx, review.result, review.route, runRoute, signal, {
+      onSelectionResolved
+    });
     return disposition.kind;
   }
   return review.kind === "closed" || review.kind === "stale" ? "close" : "stay";
@@ -197,10 +188,7 @@ import { runConfirmation } from "@narumitw/pi-tui-kit";
 async function recoverSyncAccess(ctx, manager, runRoute, sessionSignal, actionSignal) {
   const operation = manager.operation;
   if (!operation || !operationCanRecover(operation)) {
-    ctx.ui.notify(
-      "Operation status changed. Refresh the manager before retrying recovery.",
-      "warning"
-    );
+    ctx.ui.notify("Operation status changed. Refresh the manager before retrying recovery.", "warning");
     return "stay";
   }
   const signal = sessionSignal ? AbortSignal.any([sessionSignal, actionSignal]) : actionSignal;
@@ -220,10 +208,7 @@ async function recoverSyncAccess(ctx, manager, runRoute, sessionSignal, actionSi
     signal,
     isCurrent: () => !signal.aborted,
     onError: (_currentCtx, error) => {
-      ctx.ui.notify(
-        `Recovery confirmation failed: ${safeTerminalText(errorMessage(error))}`,
-        "error"
-      );
+      ctx.ui.notify(`Recovery confirmation failed: ${safeTerminalText(errorMessage(error))}`, "error");
     }
   });
   if (confirmation.kind === "stale") return "close";
@@ -423,10 +408,7 @@ async function loadSetupMenuState(selectedName, signal) {
 }
 function notifySetupChangeError(ctx, name, error, signal) {
   if (signal?.aborted) return;
-  ctx.ui.notify(
-    `Sync setup \u201C${safeTerminalText(name)}\u201D was not changed: ${menuErrorMessage(error)}`,
-    "error"
-  );
+  ctx.ui.notify(`Sync setup \u201C${safeTerminalText(name)}\u201D was not changed: ${menuErrorMessage(error)}`, "error");
 }
 function menuErrorMessage(error) {
   return syncErrorGuidance(error);
@@ -520,18 +502,13 @@ async function describeManagerState(signal, attention, inspectOperation = inspec
       }
       if (signal?.aborted) throw signal.reason;
     }
-    const attentionComparison = currentAttention ? compareSyncInclude(
-      currentAttention.decision.localInclude,
-      currentAttention.decision.remoteInclude
-    ) : void 0;
+    const attentionComparison = currentAttention ? compareSyncInclude(currentAttention.decision.localInclude, currentAttention.decision.remoteInclude) : void 0;
     const noSyncedContent = config.include.length === 0;
     const syncState = changesBlocked ? void 0 : await readStateForConfig(config).catch(() => void 0);
     const currentObservation = observation && observationMatchesConfig(observation, config) && syncState && syncStateFingerprint(syncState) === observation.inspection.stateIdentity ? observation : void 0;
     const lastAppliedSnapshot = changesBlocked ? "Unavailable while operations are locked" : syncState?.lastAppliedSnapshot ? safeTerminalText(syncState.lastAppliedSnapshot) : syncState ? "Never synced" : "Unavailable";
     const canSwitch = await countValidSyncSetups(configuredTargets, signal) > 1;
-    const mainActions = MAIN_MENU_ACTIONS.filter(
-      (action) => action !== "Switch sync setup" || canSwitch
-    );
+    const mainActions = MAIN_MENU_ACTIONS.filter((action) => action !== "Switch sync setup" || canSwitch);
     const ordinaryTitle = [
       "Manage sync",
       "",
@@ -548,10 +525,7 @@ async function describeManagerState(signal, attention, inspectOperation = inspec
         `Startup check (${safeTerminalText(currentObservation.checkedAt)}): ${observationSummary(currentObservation)}`,
         "Check-time observation only; synchronization rechecks current content."
       ] : ["Remote status: Not checked"],
-      ...noSyncedContent ? [
-        "",
-        "No included content is selected. Choose included content in Settings before syncing."
-      ] : [],
+      ...noSyncedContent ? ["", "No included content is selected. Choose included content in Settings before syncing."] : [],
       "",
       "What do you want to do?"
     ];
@@ -585,12 +559,7 @@ async function describeManagerState(signal, attention, inspectOperation = inspec
 }
 function operationActions(operation, noSyncedContent, canSwitch, mainActions) {
   if (operationCanRecover(operation)) {
-    return [
-      "Restore sync access\u2026 (recommended)",
-      "Status & changes",
-      "History & recovery\u2026",
-      "Help"
-    ];
+    return ["Restore sync access\u2026 (recommended)", "Status & changes", "History & recovery\u2026", "Help"];
   }
   if (operation.kind !== "free") {
     return ["Refresh operation status", "Status & changes", "History & recovery\u2026", "Help"];
@@ -603,26 +572,16 @@ function operationStatusLines(operation) {
       return [];
     case "live": {
       const command = truncateToWidth(safeTerminalText(operation.lock.command), 16, "\u2026");
-      return [
-        `Running: ${command} (pid ${operation.lock.pid}). Wait, then refresh; Settings and More return.`
-      ];
+      return [`Running: ${command} (pid ${operation.lock.pid}). Wait, then refresh; Settings and More return.`];
     }
     case "busy":
-      return [
-        "Pi-sync may be starting or finishing. Wait, then refresh; Settings and More remain unavailable."
-      ];
+      return ["Pi-sync may be starting or finishing. Wait, then refresh; Settings and More remain unavailable."];
     case "recoverable-stale":
-      return [
-        "Sync paused: old lock remains. Close other Pi sessions then restore; Settings and More return."
-      ];
+      return ["Sync paused: old lock remains. Close other Pi sessions then restore; Settings and More return."];
     case "recoverable-unreadable":
-      return [
-        "Sync paused: owner unknown. Close other Pi sessions then restore; Settings and More return."
-      ];
+      return ["Sync paused: owner unknown. Close other Pi sessions then restore; Settings and More return."];
     case "inspection-error":
-      return [
-        "Lock check failed. Fix path access, then refresh; Settings and More remain unavailable."
-      ];
+      return ["Lock check failed. Fix path access, then refresh; Settings and More remain unavailable."];
   }
 }
 function backendStorageDescription(config) {
@@ -675,6 +634,14 @@ async function showSyncSettings(ctx, runRoute, signal) {
             values: ["On", "Off"],
             action: "skip-secret-scan"
           },
+          {
+            id: "showStatus",
+            label: "Show status (all setups)",
+            description: "All setups: show sync progress and attention in Pi status.",
+            currentValue: state.showStatus ? "On" : "Off",
+            values: ["On", "Off"],
+            action: "show-status"
+          },
           {
             id: "onSwitch",
             label: "After switching setup (all setups)",
@@ -708,11 +675,9 @@ async function showSyncSettings(ctx, runRoute, signal) {
           const latest = await loadConfig(setupName);
           if (mutationSignal.aborted) return { kind: "rejected" };
           if (latest.automatic === automatic) return { kind: "stay" };
-          await updateSyncSetup(
-            setupName,
-            (setup) => ({ ...setup, sync: { ...setup.sync, automatic } }),
-            { signal: mutationSignal }
-          );
+          await updateSyncSetup(setupName, (setup) => ({ ...setup, sync: { ...setup.sync, automatic } }), {
+            signal: mutationSignal
+          });
           if (mutationSignal.aborted) return { kind: "rejected" };
           ctx.ui.notify(
             `Automatic sync ${automatic ? "enabled" : "disabled"} for \u201C${safeTerminalText(setupName)}\u201D.`,
@@ -733,10 +698,24 @@ async function showSyncSettings(ctx, runRoute, signal) {
           if (latest.skipSecretScan === skipSecretScan) return { kind: "stay" };
           await updateLocalConfig((settings) => ({ ...settings, skipSecretScan }), mutationSignal);
           if (mutationSignal.aborted) return { kind: "rejected" };
-          ctx.ui.notify(
-            `Secret scan ${skipSecretScan ? "disabled" : "enabled"} for pushes in all setups.`,
-            "info"
-          );
+          ctx.ui.notify(`Secret scan ${skipSecretScan ? "disabled" : "enabled"} for pushes in all setups.`, "info");
+          return { kind: "stay" };
+        } catch (error) {
+          if (!mutationSignal.aborted) notifySaveFailure(ctx, error);
+          return { kind: "rejected" };
+        }
+      },
+      "show-status": async ({ value, signal: actionSignal }) => {
+        const showStatus = value === "On";
+        const mutationSignal = signal ? AbortSignal.any([signal, actionSignal]) : actionSignal;
+        try {
+          const latest = await loadConfig(setupName);
+          if (mutationSignal.aborted) return { kind: "rejected" };
+          if (latest.showStatus === showStatus) return { kind: "stay" };
+          await updateLocalConfig((settings) => ({ ...settings, showStatus }), mutationSignal);
+          if (mutationSignal.aborted) return { kind: "rejected" };
+          configureSyncStatus(ctx, showStatus);
+          ctx.ui.notify(`Pi Sync status ${showStatus ? "enabled" : "disabled"} for all setups.`, "info");
           return { kind: "stay" };
         } catch (error) {
           if (!mutationSignal.aborted) notifySaveFailure(ctx, error);
@@ -767,7 +746,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-D7RBRJNL.ts");
+        const { showRemoteSelectionReview } = await import("./remote-selection-ui-TZTJF32Y.ts");
         if (reviewSignal.aborted) return { kind: "rejected" };
         const review = await showRemoteSelectionReview(ctx, setupName, reviewSignal, void 0, {
           origin: "settings",
@@ -775,13 +754,7 @@ async function showSyncSettings(ctx, runRoute, signal) {
         });
         if (reviewSignal.aborted) return { kind: "rejected" };
         if (review.kind === "route-result") {
-          const disposition = await dispatchManagerResult(
-            ctx,
-            review.result,
-            review.route,
-            runRoute,
-            reviewSignal
-          );
+          const disposition = await dispatchManagerResult(ctx, review.result, review.route, runRoute, reviewSignal);
           return disposition.kind === "close" ? { kind: "close" } : { kind: "stay" };
         }
         return review.kind === "closed" || review.kind === "stale" ? { kind: "close" } : { kind: "stay" };
@@ -795,10 +768,7 @@ async function showSyncSettings(ctx, runRoute, signal) {
   });
 }
 function notifySaveFailure(ctx, error) {
-  ctx.ui.notify(
-    `Pi Sync settings save failed: ${error instanceof Error ? error.message : String(error)}`,
-    "error"
-  );
+  ctx.ui.notify(`Pi Sync settings save failed: ${error instanceof Error ? error.message : String(error)}`, "error");
 }
 
 // src/ui/storage-connections-ui.ts
@@ -869,13 +839,7 @@ async function showStorageConnections(ctx, signal) {
       edit: async ({ state }) => {
         if (!state.selected || state.selected.name !== selectedName) return { kind: "rejected" };
         try {
-          await editStorageConnection(
-            ctx,
-            state.selected.name,
-            state.selected.profile,
-            state.selected.usedBy,
-            signal
-          );
+          await editStorageConnection(ctx, state.selected.name, state.selected.profile, state.selected.usedBy, signal);
         } catch (error) {
           notifyConnectionError(ctx, state.selected.name, error, signal);
         }
@@ -942,10 +906,7 @@ async function loadStorageMenuState(selectedName, signal) {
 }
 function notifyConnectionError(ctx, name, error, signal) {
   if (signal?.aborted) return;
-  ctx.ui.notify(
-    `Storage connection \u201C${safeTerminalText(name)}\u201D was not changed: ${syncErrorGuidance(error)}`,
-    "error"
-  );
+  ctx.ui.notify(`Storage connection \u201C${safeTerminalText(name)}\u201D was not changed: ${syncErrorGuidance(error)}`, "error");
 }
 async function editStorageConnection(ctx, name, profile, usedBy, signal) {
   if (ctx.mode !== "tui") {
@@ -985,11 +946,7 @@ async function editStorageConnection(ctx, name, profile, usedBy, signal) {
   );
   if (!region || signal?.aborted) return;
   const storedCredentials = ownRecord(profile.credentials) ?? {};
-  const credentials = await chooseS3CredentialUpdate(
-    ctx,
-    { ...profile, ...storedCredentials },
-    signal
-  );
+  const credentials = await chooseS3CredentialUpdate(ctx, { ...profile, ...storedCredentials }, signal);
   if (!credentials || signal?.aborted) return;
   const saved = await saveReviewedDraft(
     ctx,
@@ -1013,10 +970,7 @@ async function editStorageConnection(ctx, name, profile, usedBy, signal) {
           ...current,
           endpoint,
           region,
-          credentials: applyS3CredentialUpdate(
-            current.credentials,
-            credentials
-          )
+          credentials: applyS3CredentialUpdate(current.credentials, credentials)
         };
       },
       usedBy,
@@ -1043,12 +997,7 @@ async function showAddStorageConnection(ctx, signal) {
   if (signal?.aborted || !preset || preset === "Cancel") return false;
   if (preset === "WebDAV") return showAddWebDavStorageProfile(ctx, signal);
   if (preset === "Git") return showAddGitStorageProfile(ctx, signal);
-  const name = await promptResourceName(
-    ctx,
-    "storage connection",
-    preset === "Cloudflare R2" ? "r2" : "s3",
-    signal
-  );
+  const name = await promptResourceName(ctx, "storage connection", preset === "Cloudflare R2" ? "r2" : "s3", signal);
   if (!name || signal?.aborted) return false;
   const endpoint = await requiredValueInput(
     ctx,
@@ -1196,10 +1145,7 @@ async function showSetupSwitcher(ctx, runRoute, selectedName, signal) {
     if (!name) return false;
   }
   if (!name || !Object.hasOwn(targets, name)) {
-    ctx.ui.notify(
-      `Sync setup \u201C${safeTerminalText(name ?? "unknown")}\u201D no longer exists.`,
-      "warning"
-    );
+    ctx.ui.notify(`Sync setup \u201C${safeTerminalText(name ?? "unknown")}\u201D no longer exists.`, "warning");
     return false;
   }
   if (name === active) {
@@ -1303,10 +1249,7 @@ async function showAddTarget(ctx, signal) {
   if (signal?.aborted) return;
   if (!raw) return void ctx.ui.notify("Set up the first sync setup before adding another.", "info");
   if (raw.version !== 3) {
-    ctx.ui.notify(
-      "Version 1 and version 2 settings are unsupported and are never migrated.",
-      "error"
-    );
+    ctx.ui.notify("Version 1 and version 2 settings are unsupported and are never migrated.", "error");
     return;
   }
   let profiles = ownRecord(raw.storageConnections) ?? {};
@@ -1376,10 +1319,7 @@ async function showRemoveTarget(ctx, name, signal) {
   if (signal?.aborted) return;
   await refreshTargetCompletions();
   if (signal?.aborted) return;
-  ctx.ui.notify(
-    `Removed sync setup \u201C${safeTerminalText(name)}\u201D; remote data was not deleted.`,
-    "info"
-  );
+  ctx.ui.notify(`Removed sync setup \u201C${safeTerminalText(name)}\u201D; remote data was not deleted.`, "info");
 }
 
 // src/ui/manager-ui.ts
@@ -1452,7 +1392,7 @@ async function showSyncManager(ctx, runRoute, sessionSignal, options = {}) {
         if (!attention) {
           const observation = options.getObservation?.();
           if (!observation) return { kind: "stay" };
-          const { showRemoteSelectionReview } = await import("./remote-selection-ui-D7RBRJNL.ts");
+          const { showRemoteSelectionReview } = await import("./remote-selection-ui-TZTJF32Y.ts");
           if (sessionSignal?.aborted) return { kind: "close" };
           const config = await loadConfig();
           if (sessionSignal?.aborted) return { kind: "close" };
@@ -1460,20 +1400,14 @@ async function showSyncManager(ctx, runRoute, sessionSignal, options = {}) {
             options.onObservationInvalidated?.();
             return { kind: "stay" };
           }
-          const result = await showRemoteSelectionReview(
-            ctx,
-            observation.setupName,
-            sessionSignal,
-            void 0,
-            {
-              origin: "sync",
-              runRoute,
-              onSelectionResolved: () => {
-                if (!sessionSignal?.aborted && options.getObservation?.() === observation)
-                  options.onObservationInvalidated?.();
-              }
+          const result = await showRemoteSelectionReview(ctx, observation.setupName, sessionSignal, void 0, {
+            origin: "sync",
+            runRoute,
+            onSelectionResolved: () => {
+              if (!sessionSignal?.aborted && options.getObservation?.() === observation)
+                options.onObservationInvalidated?.();
             }
-          );
+          });
           if (sessionSignal?.aborted) return { kind: "close" };
           if (result.kind === "route-result") {
             return dispatchManagerResult(ctx, result.result, result.route, runRoute, sessionSignal);
@@ -1499,23 +1433,11 @@ async function showSyncManager(ctx, runRoute, sessionSignal, options = {}) {
             return { kind: "stay" };
           }
         }
-        const result = await runCancellableOperation(
-          ctx,
-          "Checking current sync setup\u2026",
-          "sync",
-          runRoute,
-          {
-            commitAware: true,
-            signal: sessionSignal
-          }
-        );
-        const disposition = await dispatchManagerResult(
-          ctx,
-          result,
-          "sync",
-          runRoute,
-          sessionSignal
-        );
+        const result = await runCancellableOperation(ctx, "Checking current sync setup\u2026", "sync", runRoute, {
+          commitAware: true,
+          signal: sessionSignal
+        });
+        const disposition = await dispatchManagerResult(ctx, result, "sync", runRoute, sessionSignal);
         return disposition.kind === "close" ? { kind: "close" } : { kind: "stay" };
       },
       switch: async () => {
@@ -1523,13 +1445,9 @@ async function showSyncManager(ctx, runRoute, sessionSignal, options = {}) {
         return result === "pull-attempted" || result === "closed" ? { kind: "close" } : { kind: "stay" };
       },
       diff: async () => {
-        const result = await runCancellableOperation(
-          ctx,
-          "Checking current sync setup\u2026",
-          "diff",
-          runRoute,
-          { signal: sessionSignal }
-        );
+        const result = await runCancellableOperation(ctx, "Checking current sync setup\u2026", "diff", runRoute, {
+          signal: sessionSignal
+        });
         return result.kind === "closed" ? { kind: "close" } : { kind: "stay" };
       },
       settings: async () => {
@@ -1537,45 +1455,21 @@ async function showSyncManager(ctx, runRoute, sessionSignal, options = {}) {
         return { kind: "stay" };
       },
       pull: async () => {
-        const result = await runCancellableOperation(
-          ctx,
-          "Checking remote changes\u2026",
-          "pull",
-          runRoute,
-          {
-            commitAware: true,
-            cancelledMessage: "Pull check cancelled; no local files were changed.",
-            signal: sessionSignal
-          }
-        );
-        const disposition = await dispatchManagerResult(
-          ctx,
-          result,
-          "pull",
-          runRoute,
-          sessionSignal
-        );
+        const result = await runCancellableOperation(ctx, "Checking remote changes\u2026", "pull", runRoute, {
+          commitAware: true,
+          cancelledMessage: "Pull check cancelled; no local files were changed.",
+          signal: sessionSignal
+        });
+        const disposition = await dispatchManagerResult(ctx, result, "pull", runRoute, sessionSignal);
         return disposition.kind === "close" ? { kind: "close" } : { kind: "stay" };
       },
       push: async () => {
-        const result = await runCancellableOperation(
-          ctx,
-          "Preparing push preview\u2026",
-          "push",
-          runRoute,
-          {
-            commitAware: true,
-            cancelledMessage: "Push preparation cancelled; no remote files were changed.",
-            signal: sessionSignal
-          }
-        );
-        const disposition = await dispatchManagerResult(
-          ctx,
-          result,
-          "push",
-          runRoute,
-          sessionSignal
-        );
+        const result = await runCancellableOperation(ctx, "Preparing push preview\u2026", "push", runRoute, {
+          commitAware: true,
+          cancelledMessage: "Push preparation cancelled; no remote files were changed.",
+          signal: sessionSignal
+        });
+        const disposition = await dispatchManagerResult(ctx, result, "push", runRoute, sessionSignal);
         return disposition.kind === "close" ? { kind: "close" } : { kind: "stay" };
       },
       setups: async () => {
@@ -1591,34 +1485,18 @@ async function showSyncManager(ctx, runRoute, sessionSignal, options = {}) {
         return { kind: "stay" };
       },
       doctor: async () => {
-        const result = await runCancellableOperation(
-          ctx,
-          "Checking setup access\u2026",
-          "doctor",
-          runRoute,
-          { signal: sessionSignal }
-        );
+        const result = await runCancellableOperation(ctx, "Checking setup access\u2026", "doctor", runRoute, {
+          signal: sessionSignal
+        });
         return { kind: result.kind === "closed" ? "close" : "stay" };
       },
       unlock: async ({ state, signal: actionSignal }) => {
-        const result = await recoverSyncAccess(
-          ctx,
-          state.manager,
-          runRoute,
-          sessionSignal,
-          actionSignal
-        );
+        const result = await recoverSyncAccess(ctx, state.manager, runRoute, sessionSignal, actionSignal);
         if (result === "close") return { kind: "close" };
         return result === "restored" ? { kind: "to", screen: "main" } : { kind: "stay" };
       },
       recover: async ({ state, signal: actionSignal }) => {
-        const result = await recoverSyncAccess(
-          ctx,
-          state.manager,
-          runRoute,
-          sessionSignal,
-          actionSignal
-        );
+        const result = await recoverSyncAccess(ctx, state.manager, runRoute, sessionSignal, actionSignal);
         return { kind: result === "close" ? "close" : "stay" };
       },
       refresh: async () => ({ kind: "stay" }),
@@ -1637,12 +1515,7 @@ async function showSyncManager(ctx, runRoute, sessionSignal, options = {}) {
     getState: async () => {
       const pendingAttention = options.getAttention?.();
       const observation = options.getObservation?.();
-      const manager = await describeManagerState(
-        sessionSignal,
-        pendingAttention,
-        void 0,
-        observation
-      );
+      const manager = await describeManagerState(sessionSignal, pendingAttention, void 0, observation);
       if (sessionSignal?.aborted) return { manager };
       if (observation && options.getObservation?.() === observation && !manager.observation && !(manager.operation && operationBlocksChanges(manager.operation))) {
         options.onObservationInvalidated?.();
@@ -1677,4 +1550,4 @@ function syncMainMenuItem(label) {
 export {
   showSyncManager
 };
-//# sourceMappingURL=manager-ui-5KLKVMRC.ts.map
+//# sourceMappingURL=manager-ui-763NEKJY.ts.map