@narumitw/pi-sync 0.53.1 → 0.54.0

package/dist/chunks/{manager-ui-MHAHAKG3.ts → manager-ui-IURS4WXY.ts}

@@ -23,10 +23,10 @@ import {
 } from "./chunk-4SBTAVFL.ts";
 import {
   dispatchManagerResult
-} from "./chunk-FJGNDYGC.ts";
+} from "./chunk-VHXBCEVF.ts";
 import {
   runCancellableOperation
-} from "./chunk-TRCSEIAQ.ts";
+} from "./chunk-5ZWQ33XL.ts";
 import "./chunk-V6VZ5TLG.ts";
 import "./chunk-SDZCTCYQ.ts";
 import {
@@ -161,7 +161,7 @@ function attentionMainMenuItems(manager) {
   ];
 }
 function blockedSyncMenuItem(label, manager) {
-  if (label !== "Sync now (recommended)" || !manager.attentionBlocksSync) return void 0;
+  if (label !== "Sync now" || !manager.attentionBlocksSync) return void 0;
   return {
     id: "sync",
     label,
@@ -172,7 +172,7 @@ function blockedSyncMenuItem(label, manager) {
   };
 }
 async function showManagerAttention(ctx, attention, runRoute, signal, onSelectionResolved) {
-  const { showRemoteSelectionReview } = await import("./remote-selection-ui-Q2HUIBTL.ts");
+  const { showRemoteSelectionReview } = await import("./remote-selection-ui-6LJJ4IMQ.ts");
   if (signal?.aborted) return "close";
   const review = await showRemoteSelectionReview(ctx, attention.decision.setupName, signal, void 0, {
     decision: attention.decision,
@@ -450,11 +450,12 @@ function storageLocation(config) {
 
 // src/ui/manager-state.ts
 var MAIN_MENU_ACTIONS = [
-  "Sync now (recommended)",
-  "Switch sync setup",
-  "Status & changes",
+  "Sync now",
+  "Pull from remote\u2026",
+  "Push to remote\u2026",
   "Settings",
-  "More\u2026"
+  "History",
+  "Diagnostics"
 ];
 async function describeManagerState(signal, attention, inspectOperation = inspectOperationAvailability, observation) {
   let raw;
@@ -515,7 +516,9 @@ async function describeManagerState(signal, attention, inspectOperation = inspec
     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];
+    if (canSwitch) mainActions.push("Switch sync setup");
+    if (syncState?.unresolved?.length) mainActions.unshift("Review unresolved conflicts");
     const ordinaryTitle = [
       "Manage sync",
       "",
@@ -526,7 +529,7 @@ async function describeManagerState(signal, attention, inspectOperation = inspec
       `Automatic transfer at startup: ${config.automaticTransfer ? "On \u2014 upload/replace/delete at idle; no reload" : "Off"}`,
       `Last applied: ${lastAppliedSnapshot}`,
       ...syncState?.unresolved?.length ? [
-        `Unresolved: ${syncState.unresolved.length} dependency groups \xB7 review History & recovery`,
+        `Unresolved: ${syncState.unresolved.length} dependency groups \xB7 choose Review unresolved conflicts`,
         `Last observed: ${safeTerminalText(syncState.lastObservedSnapshot ?? "unknown")}`
       ] : [],
       ...currentAttention ? [
@@ -565,18 +568,24 @@ async function describeManagerState(signal, attention, inspectOperation = inspec
         "",
         "What do you want to do?"
       ].join("\n"),
-      actions: ["Sync setups\u2026", "Storage connections\u2026", "History & recovery\u2026", "Help"]
+      actions: ["Sync setups\u2026", "Storage connections\u2026", "History", "Help"]
     };
   }
 }
 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)", "History", "Help"];
   }
   if (operation.kind !== "free") {
-    return ["Refresh operation status", "Status & changes", "History & recovery\u2026", "Help"];
+    return ["Refresh operation status", "History", "Help"];
   }
-  return noSyncedContent ? ["Settings", ...canSwitch ? ["Switch sync setup"] : [], "Status & changes", "More\u2026"] : mainActions;
+  return noSyncedContent ? [
+    ...mainActions.includes("Review unresolved conflicts") ? ["Review unresolved conflicts"] : [],
+    "Settings",
+    ...canSwitch ? ["Switch sync setup"] : [],
+    "History",
+    "Diagnostics"
+  ] : mainActions;
 }
 function operationStatusLines(operation) {
   switch (operation.kind) {
@@ -584,16 +593,24 @@ 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; Transfer actions and Settings 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; Transfer actions and Settings 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; Transfer actions and Settings 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; Transfer actions and Settings 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; Transfer actions and Settings remain unavailable."];
   }
 }
 function backendStorageDescription(config) {
@@ -611,419 +628,96 @@ function backendStorageDescription(config) {
 }
 
 // src/ui/settings-ui.ts
+import { defineMenu as defineMenu4, runMenu as runMenu4 } from "@narumitw/pi-tui-kit";
+
+// src/ui/storage-connections-ui.ts
+import { isDeepStrictEqual } from "node:util";
 import { defineMenu as defineMenu2, runMenu as runMenu2 } from "@narumitw/pi-tui-kit";
-async function showSyncSettings(ctx, runRoute, signal) {
-  if (ctx.mode !== "tui") {
-    ctx.ui.notify(`Edit pi-sync settings manually: ${safeTerminalText(localConfigPath())}`, "info");
-    return;
-  }
-  const initial = await loadConfig();
-  if (signal?.aborted) return;
-  const setupName = initial.setupName;
+async function showStorageConnections(ctx, signal) {
+  let selectedName;
+  const nameById = /* @__PURE__ */ new Map();
   const menu = defineMenu2({
-    start: "settings",
+    start: "list",
     screens: {
-      settings: ({ state }) => ({
-        kind: "settings",
-        title: "Pi Sync Settings",
-        lines: [
-          `Sync setup: ${safeTerminalText(state.setupName)} \xB7 Storage connection: ${safeTerminalText(state.connectionName)}`
-        ],
-        items: [
-          {
-            id: "automatic",
-            label: "Automatic sync",
-            description: AUTOMATIC_SYNC_DESCRIPTION,
-            currentValue: state.automatic ? "On" : "Off",
-            values: ["On", "Off"],
-            action: "automatic"
-          },
-          {
-            id: "skipSecretScan",
-            label: "Skip secret scan (all setups)",
-            description: "All setups: allow pushes without checking managed local files for possible secrets.",
-            currentValue: state.skipSecretScan ? "On" : "Off",
-            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)",
-            description: "All setups: ask before a pull review, open it automatically, or switch without pulling.",
-            currentValue: setupSwitchActionLabel(state.onSwitch),
-            values: SETUP_SWITCH_ACTION_OPTIONS.map(({ label }) => label),
-            action: "on-switch"
-          },
-          {
-            id: "include",
-            label: "Included content",
-            description: `${state.include.length} selected path${state.include.length === 1 ? "" : "s"}. Choose which paths this setup syncs.`,
-            currentValue: "Open editor",
-            action: "include"
-          },
-          {
-            id: "remoteInclude",
-            label: "Compare synced content",
-            description: "Review this device and remote content lists before choosing either one.",
-            currentValue: "Review",
-            action: "remote-include"
-          },
-          {
-            id: "automaticTransfer",
-            label: "Automatic transfer at startup",
-            description: "May upload, replace, or delete selected files once at idle startup in TUI/RPC. Requires a baseline and conditional/lease publication; never reloads resources. Turning off cancels pending work.",
-            currentValue: state.automaticTransfer ? "On" : "Off",
-            values: ["On", "Off"],
-            action: "automatic-transfer"
-          },
-          {
-            id: "mergeSettings",
-            label: "Settings field merge (experimental)",
-            description: "Combine independent global settings.json fields using a verified private ancestor; arrays and nested objects remain atomic. No reload.",
-            currentValue: state.mergeSettings ? "On" : "Off",
-            values: ["On", "Off"],
-            action: "merge-settings"
-          },
-          {
-            id: "localFields",
-            label: "Machine-local settings fields",
-            description: "Root field names omitted from future portable snapshots. Policy changes require directional migration; old history remains.",
-            currentValue: `${state.localFields?.length ?? 0} fields \xB7 Edit`,
-            action: "local-fields"
-          },
-          {
-            id: "contentPolicy",
-            label: "Content / partial sync (experimental)",
-            description: "Version-5 opt-in: bounded text and prefix-only sessions; partial progress keeps full withheld versions and old baseline hashes.",
-            currentValue: state.mergeContent ? state.partialSync ? "Content & partial" : "Content only" : state.partialSync ? "Partial only" : "Off",
-            values: ["Off", "Content only", "Content & partial", "Partial only"],
-            action: "content-policy"
-          }
-        ]
+      list: ({ state }) => {
+        nameById.clear();
+        const names = Object.keys(state.profiles).sort((left, right) => left.localeCompare(right));
+        return {
+          kind: "actions",
+          title: "Storage connections",
+          lines: state.supportedVersion ? ["Server addresses and sign-in details, reusable across sync setups."] : ["Create supported pi-sync settings before managing storage connections."],
+          items: state.supportedVersion ? [
+            { id: "add", label: "Add storage connection", action: "add" },
+            ...names.map((name, index) => {
+              const id = `connection:${index}`;
+              nameById.set(id, name);
+              return {
+                id,
+                label: safeTerminalText(name),
+                description: connectionSummary(ownRecord(state.profiles[name]) ?? {}),
+                action: "select"
+              };
+            })
+          ] : [],
+          hint: "back"
+        };
+      },
+      detail: ({ state }) => ({
+        kind: "actions",
+        title: state.selected ? `Storage connection \u201C${safeTerminalText(state.selected.name)}\u201D` : "Storage connection",
+        lines: state.selected?.lines ?? ["This storage connection no longer exists."],
+        items: state.selected ? [
+          { id: "edit", label: "Edit storage connection\u2026", action: "edit" },
+          ...state.selected.usedBy.length === 0 ? [
+            {
+              id: "remove",
+              label: "Remove storage connection\u2026",
+              action: "remove"
+            }
+          ] : [],
+          { id: "back", label: "Back", action: "back" }
+        ] : [{ id: "back", label: "Back", action: "back" }],
+        hint: "back"
       })
     },
     actions: {
-      "content-policy": async ({ value, signal: actionSignal }) => {
-        const mutationSignal = signal ? AbortSignal.any([signal, actionSignal]) : actionSignal;
-        const validate = captureMutationOwner(ctx, mutationSignal);
+      add: async () => {
         try {
-          const previous = await loadConfig(setupName);
-          validate();
-          const mergeContent = value === "Content only" || value === "Content & partial";
-          const partialSync = value === "Partial only" || value === "Content & partial";
-          if (!await ctx.ui.confirm(
-            "Save experimental content policy?",
-            "This explicitly upgrades settings to version 5; partial snapshots use version 3 and older clients must refuse them. Text/session merge is conservative. Partial sync preserves withheld versions and old baselines. Disabling does not clear unresolved groups or recovery evidence. Review a directional migration first if portable policy changes.",
-            { signal: mutationSignal }
-          ))
-            return { kind: "rejected" };
-          validate();
-          await updateLocalConfig((current) => {
-            validate();
-            const setup = current.syncSetups[setupName];
-            if (!setup || Boolean(setup.sync.mergeContent) !== Boolean(previous.mergeContent) || Boolean(setup.sync.partialSync) !== Boolean(previous.partialSync))
-              throw new Error("Content policy changed during review.");
-            return {
-              ...current,
-              version: 5,
-              syncSetups: {
-                ...current.syncSetups,
-                [setupName]: { ...setup, sync: { ...setup.sync, mergeContent, partialSync } }
-              }
-            };
-          }, mutationSignal);
-          validate();
-          return { kind: "stay" };
+          await showAddStorageConnection(ctx, signal);
         } catch (error) {
-          if (!mutationSignal.aborted) notifySaveFailure(ctx, error);
-          return { kind: "rejected" };
+          if (!signal?.aborted) {
+            ctx.ui.notify(`Storage connection was not added: ${syncErrorGuidance(error)}`, "error");
+          }
         }
+        return { kind: "stay" };
       },
-      "merge-settings": async ({ value, signal: actionSignal }) => {
-        const mutationSignal = signal ? AbortSignal.any([signal, actionSignal]) : actionSignal;
-        const validate = captureMutationOwner(ctx, mutationSignal);
+      select: async ({ itemId }) => {
+        selectedName = nameById.get(itemId);
+        return selectedName ? { kind: "to", screen: "detail" } : { kind: "rejected" };
+      },
+      edit: async ({ state }) => {
+        if (!state.selected || state.selected.name !== selectedName) return { kind: "rejected" };
         try {
-          validate();
-          await updateSyncSetup(
-            setupName,
-            (setup) => ({ ...setup, sync: { ...setup.sync, mergeSettings: value === "On" } }),
-            { signal: mutationSignal }
-          );
-          validate();
-          return { kind: "stay" };
+          await editStorageConnection(ctx, state.selected.name, state.selected.profile, state.selected.usedBy, signal);
         } catch (error) {
-          if (!mutationSignal.aborted) notifySaveFailure(ctx, error);
-          return { kind: "rejected" };
+          notifyConnectionError(ctx, state.selected.name, error, signal);
         }
+        return { kind: "stay" };
       },
-      "local-fields": async ({ signal: actionSignal }) => {
-        const mutationSignal = signal ? AbortSignal.any([signal, actionSignal]) : actionSignal;
-        const validate = captureMutationOwner(ctx, mutationSignal);
+      remove: async ({ state }) => {
+        if (!state.selected || state.selected.name !== selectedName) return { kind: "rejected" };
+        const name = state.selected.name;
+        const confirmed = await ctx.ui.confirm(
+          "Remove storage connection?",
+          `Remove local storage connection \u201C${safeTerminalText(name)}\u201D? Remote data and history are not deleted.`,
+          { signal }
+        );
+        if (!confirmed || signal?.aborted) return { kind: "rejected" };
         try {
-          const previous = await loadConfig(setupName);
-          validate();
-          const input = await ctx.ui.input(
-            "Machine-local settings.json root fields (JSON string array)",
-            JSON.stringify(previous.localFields ?? []),
-            { signal: mutationSignal }
-          );
-          validate();
-          if (input === void 0) return { kind: "rejected" };
-          let fields;
-          try {
-            fields = normalizeLocalFields(JSON.parse(input));
-          } catch {
-            throw new Error("Invalid localFields JSON array; no policy was changed.");
-          }
-          if (sameLocalFields(previous.localFields, fields)) return { kind: "stay" };
-          const confirmed = await ctx.ui.confirm(
-            "Save portable field policy?",
-            "This opts into settings/snapshot version 4/2; older clients must refuse them. Future snapshots omit these fields, but old remote history is NOT erased. Review an explicit force push/pull migration before further sync. Removed rules can expose or replace local-only values.",
-            { signal: mutationSignal }
-          );
-          validate();
-          if (!confirmed) return { kind: "rejected" };
-          await updateLocalConfig((current) => {
-            validate();
-            const setup = current.syncSetups[setupName];
-            if (!setup || !sameLocalFields(setup.sync.localFields, previous.localFields))
-              throw new Error("Field policy changed while under review; reopen settings.");
-            return {
-              ...current,
-              version: current.version === 5 ? 5 : 4,
-              syncSetups: {
-                ...current.syncSetups,
-                [setupName]: { ...setup, sync: { ...setup.sync, localFields: fields } }
-              }
-            };
-          }, mutationSignal);
-          validate();
-          return { kind: "stay" };
-        } catch (error) {
-          if (!mutationSignal.aborted) notifySaveFailure(ctx, error);
-          return { kind: "rejected" };
-        }
-      },
-      automatic: async ({ value, signal: actionSignal }) => {
-        const automatic = value === "On";
-        const mutationSignal = signal ? AbortSignal.any([signal, actionSignal]) : actionSignal;
-        try {
-          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
-          });
-          if (mutationSignal.aborted) return { kind: "rejected" };
-          ctx.ui.notify(
-            `Automatic sync ${automatic ? "enabled" : "disabled"} for \u201C${safeTerminalText(setupName)}\u201D.`,
-            "info"
-          );
-          return { kind: "stay" };
-        } catch (error) {
-          if (!mutationSignal.aborted) notifySaveFailure(ctx, error);
-          return { kind: "rejected" };
-        }
-      },
-      "automatic-transfer": async ({ value, signal: actionSignal }) => {
-        const automaticTransfer = value === "On";
-        const mutationSignal = signal ? AbortSignal.any([signal, actionSignal]) : actionSignal;
-        try {
-          await updateSyncSetup(setupName, (setup) => ({ ...setup, sync: { ...setup.sync, automaticTransfer } }), {
-            signal: mutationSignal
-          });
-          if (mutationSignal.aborted) return { kind: "rejected" };
-          ctx.ui.notify(
-            `Automatic startup transfer ${automaticTransfer ? "enabled for the next session start" : "disabled"}. Completed transfers are not undone.`,
-            "info"
-          );
-          return { kind: "stay" };
-        } catch (error) {
-          if (!mutationSignal.aborted) notifySaveFailure(ctx, error);
-          return { kind: "rejected" };
-        }
-      },
-      "skip-secret-scan": async ({ value, signal: actionSignal }) => {
-        const skipSecretScan = value === "On";
-        const mutationSignal = signal ? AbortSignal.any([signal, actionSignal]) : actionSignal;
-        try {
-          const latest = await loadConfig(setupName);
-          if (mutationSignal.aborted) return { kind: "rejected" };
-          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");
-          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);
-          return { kind: "rejected" };
-        }
-      },
-      "on-switch": async ({ value, signal: actionSignal }) => {
-        const action = value ? setupSwitchActionFromLabel(value) : void 0;
-        if (!action) return { kind: "rejected" };
-        const mutationSignal = signal ? AbortSignal.any([signal, actionSignal]) : actionSignal;
-        try {
-          const latest = await loadConfig(setupName);
-          if (mutationSignal.aborted) return { kind: "rejected" };
-          if (latest.onSwitch === action) return { kind: "stay" };
-          await saveOnSwitch(action, mutationSignal);
-          if (mutationSignal.aborted) return { kind: "rejected" };
-          ctx.ui.notify(`After switching setup: ${value}.`, "info");
-          return { kind: "stay" };
-        } catch (error) {
-          if (!mutationSignal.aborted) notifySaveFailure(ctx, error);
-          return { kind: "rejected" };
-        }
-      },
-      include: async ({ signal: actionSignal }) => {
-        const editorSignal = signal ? AbortSignal.any([signal, actionSignal]) : actionSignal;
-        await runRoute("files", editorSignal, void 0, setupName);
-        return editorSignal.aborted ? { kind: "rejected" } : { kind: "stay" };
-      },
-      "remote-include": async ({ signal: actionSignal }) => {
-        const reviewSignal = signal ? AbortSignal.any([signal, actionSignal]) : actionSignal;
-        const { showRemoteSelectionReview } = await import("./remote-selection-ui-Q2HUIBTL.ts");
-        if (reviewSignal.aborted) return { kind: "rejected" };
-        const review = await showRemoteSelectionReview(ctx, setupName, reviewSignal, void 0, {
-          origin: "settings",
-          runRoute
-        });
-        if (reviewSignal.aborted) return { kind: "rejected" };
-        if (review.kind === "route-result") {
-          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" };
-      }
-    }
-  });
-  await runMenu2(ctx, menu, {
-    getState: () => loadConfig(setupName),
-    signal,
-    isCurrent: () => !signal?.aborted
-  });
-}
-function notifySaveFailure(ctx, error) {
-  ctx.ui.notify(
-    `Pi Sync settings save failed: ${safeTerminalText(error instanceof Error ? error.message : String(error))}`,
-    "error"
-  );
-}
-
-// src/ui/storage-connections-ui.ts
-import { isDeepStrictEqual } from "node:util";
-import { defineMenu as defineMenu3, runMenu as runMenu3 } from "@narumitw/pi-tui-kit";
-async function showStorageConnections(ctx, signal) {
-  let selectedName;
-  const nameById = /* @__PURE__ */ new Map();
-  const menu = defineMenu3({
-    start: "list",
-    screens: {
-      list: ({ state }) => {
-        nameById.clear();
-        const names = Object.keys(state.profiles).sort((left, right) => left.localeCompare(right));
-        return {
-          kind: "actions",
-          title: "Storage connections",
-          lines: state.supportedVersion ? ["Server addresses and sign-in details, reusable across sync setups."] : ["Create supported pi-sync settings before managing storage connections."],
-          items: state.supportedVersion ? [
-            { id: "add", label: "Add storage connection", action: "add" },
-            ...names.map((name, index) => {
-              const id = `connection:${index}`;
-              nameById.set(id, name);
-              return {
-                id,
-                label: safeTerminalText(name),
-                description: connectionSummary(ownRecord(state.profiles[name]) ?? {}),
-                action: "select"
-              };
-            })
-          ] : [],
-          hint: "back"
-        };
-      },
-      detail: ({ state }) => ({
-        kind: "actions",
-        title: state.selected ? `Storage connection \u201C${safeTerminalText(state.selected.name)}\u201D` : "Storage connection",
-        lines: state.selected?.lines ?? ["This storage connection no longer exists."],
-        items: state.selected ? [
-          { id: "edit", label: "Edit storage connection\u2026", action: "edit" },
-          ...state.selected.usedBy.length === 0 ? [
-            {
-              id: "remove",
-              label: "Remove storage connection\u2026",
-              action: "remove"
-            }
-          ] : [],
-          { id: "back", label: "Back", action: "back" }
-        ] : [{ id: "back", label: "Back", action: "back" }],
-        hint: "back"
-      })
-    },
-    actions: {
-      add: async () => {
-        try {
-          await showAddStorageConnection(ctx, signal);
-        } catch (error) {
-          if (!signal?.aborted) {
-            ctx.ui.notify(`Storage connection was not added: ${syncErrorGuidance(error)}`, "error");
-          }
-        }
-        return { kind: "stay" };
-      },
-      select: async ({ itemId }) => {
-        selectedName = nameById.get(itemId);
-        return selectedName ? { kind: "to", screen: "detail" } : { kind: "rejected" };
-      },
-      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);
-        } catch (error) {
-          notifyConnectionError(ctx, state.selected.name, error, signal);
-        }
-        return { kind: "stay" };
-      },
-      remove: async ({ state }) => {
-        if (!state.selected || state.selected.name !== selectedName) return { kind: "rejected" };
-        const name = state.selected.name;
-        const confirmed = await ctx.ui.confirm(
-          "Remove storage connection?",
-          `Remove local storage connection \u201C${safeTerminalText(name)}\u201D? Remote data and history are not deleted.`,
-          { signal }
-        );
-        if (!confirmed || signal?.aborted) return { kind: "rejected" };
-        try {
-          await removeStorageConnection(name, signal);
-          ctx.ui.notify(`Removed storage connection \u201C${safeTerminalText(name)}\u201D.`, "info");
-          selectedName = void 0;
-          return { kind: "back" };
+          await removeStorageConnection(name, signal);
+          ctx.ui.notify(`Removed storage connection \u201C${safeTerminalText(name)}\u201D.`, "info");
+          selectedName = void 0;
+          return { kind: "back" };
         } catch (error) {
           notifyConnectionError(ctx, name, error, signal);
           return { kind: "stay" };
@@ -1035,7 +729,7 @@ async function showStorageConnections(ctx, signal) {
       }
     }
   });
-  await runMenu3(ctx, menu, {
+  await runMenu2(ctx, menu, {
     getState: () => loadStorageMenuState(selectedName, signal),
     signal,
     isCurrent: () => !signal?.aborted
@@ -1251,12 +945,12 @@ function credentialSource(profile) {
 }
 
 // src/ui/setup/setup-switcher.ts
-import { defineMenu as defineMenu4, runMenu as runMenu4 } from "@narumitw/pi-tui-kit";
+import { defineMenu as defineMenu3, runMenu as runMenu3 } from "@narumitw/pi-tui-kit";
 async function selectSetupForSwitch(ctx, raw, targets, active, signal) {
   let selectedName;
   const nameById = /* @__PURE__ */ new Map();
   const profiles = ownRecord(raw.storageConnections);
-  const menu = defineMenu4({
+  const menu = defineMenu3({
     start: "setups",
     screens: {
       setups: () => ({
@@ -1288,7 +982,7 @@ async function selectSetupForSwitch(ctx, raw, targets, active, signal) {
       }
     }
   });
-  await runMenu4(ctx, menu, {
+  await runMenu3(ctx, menu, {
     getState: () => void 0,
     signal,
     isCurrent: () => !signal?.aborted
@@ -1372,124 +1066,530 @@ async function showSetupSwitcher(ctx, runRoute, selectedName, signal) {
         if (pullResult.kind === "closed" || pullResult.kind.endsWith("required")) {
           pullClosed = disposition.kind === "close";
         }
-        if (disposition.appliedRoute === "pull") return "applied";
-        if (pullResult.kind === "completed") return pullResult.outcome;
-        return pullResult.kind === "cancelled" ? "cancelled" : void 0;
+        if (disposition.appliedRoute === "pull") return "applied";
+        if (pullResult.kind === "completed") return pullResult.outcome;
+        return pullResult.kind === "cancelled" ? "cancelled" : void 0;
+      },
+      onSwitch,
+      signal,
+      syncConfigReviewIdentity(config)
+    );
+    if (pullClosed) return "closed";
+    return result.pullApplied ? "pull-attempted" : "switched";
+  } catch (error) {
+    if (signal?.aborted) return false;
+    ctx.ui.notify(
+      `Sync setup \u201C${safeTerminalText(name)}\u201D was not switched: ${safeTerminalText(errorMessage(error))}`,
+      "error"
+    );
+    return false;
+  }
+}
+
+// src/ui/setup/setup-actions.ts
+async function showSyncSetupManager(ctx, runRoute, signal) {
+  return showSyncSetups(
+    ctx,
+    {
+      add: async (setupSignal) => {
+        await showAddTarget(ctx, setupSignal);
+      },
+      edit: async (name, setupSignal) => {
+        await showEditSyncSetupStorage(ctx, name, setupSignal);
+      },
+      makeCurrent: async (name, setupSignal) => {
+        const result = await showSetupSwitcher(ctx, runRoute, name, setupSignal);
+        return result === "pull-attempted" || result === "closed" ? "exit" : void 0;
+      },
+      remove: async (name, setupSignal) => {
+        await showRemoveTarget(ctx, name, setupSignal);
+      }
+    },
+    signal
+  );
+}
+async function showAddTarget(ctx, signal) {
+  let raw = await readLocalConfigObject();
+  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 && raw.version !== 4 && raw.version !== 5) {
+    ctx.ui.notify("Version 1 and version 2 settings are unsupported and are never migrated.", "error");
+    return;
+  }
+  let profiles = ownRecord(raw.storageConnections) ?? {};
+  const name = await promptResourceName(ctx, "sync setup", "work", signal);
+  if (!name) return;
+  const createConnection = "Add a new storage connection\u2026";
+  let profile = await ctx.ui.select(
+    "Choose a storage connection\n\nReuse a server address and sign-in details. A new connection is saved separately and remains if you cancel this setup.",
+    [...Object.keys(profiles).sort(), createConnection, "Cancel"],
+    { signal }
+  );
+  if (signal?.aborted || !profile || profile === "Cancel") return;
+  if (profile === createConnection) {
+    const previousNames = new Set(Object.keys(profiles));
+    if (!await showAddStorageConnection(ctx, signal)) return;
+    if (signal?.aborted) return;
+    raw = await readLocalConfigObject() ?? raw;
+    if (signal?.aborted) return;
+    profiles = ownRecord(raw.storageConnections) ?? {};
+    profile = Object.keys(profiles).find((candidate) => !previousNames.has(candidate));
+    if (!profile) return;
+    ctx.ui.notify(
+      `Connection \u201C${safeTerminalText(profile)}\u201D saved. Cancelling setup will keep this connection.`,
+      "info"
+    );
+  }
+  const storageKind = ownRecord(profiles[profile])?.type;
+  if (storageKind === "webdav") {
+    const saved = await showAddWebDavTarget(ctx, name, profile, signal);
+    if (signal?.aborted) return;
+    if (saved) await refreshTargetCompletions();
+    return;
+  }
+  if (storageKind === "git") {
+    const saved = await showAddGitTarget(ctx, name, profile, signal);
+    if (signal?.aborted) return;
+    if (saved) await refreshTargetCompletions();
+    return;
+  }
+  await showAddS3Target(ctx, raw, profile, name, signal);
+}
+async function showEditSyncSetupStorage(ctx, name, signal) {
+  const partial = await loadPartialConfig(name);
+  if (signal?.aborted) return;
+  if (!partial.setupName) {
+    ctx.ui.notify("Create supported pi-sync settings before editing a named sync setup.", "info");
+    return;
+  }
+  if (partial.storageKind === "webdav") {
+    await showEditWebDavTarget(ctx, partial, signal);
+    return;
+  }
+  if (partial.storageKind === "git") {
+    await showEditGitTarget(ctx, partial, signal);
+    return;
+  }
+  await showEditS3Target(ctx, partial, signal);
+}
+async function showRemoveTarget(ctx, name, signal) {
+  const confirmed = await ctx.ui.confirm(
+    "Remove sync setup?",
+    `Remove local sync setup \u201C${safeTerminalText(name)}\u201D? Remote data and history are not deleted.`,
+    { signal }
+  );
+  if (signal?.aborted || !confirmed) return;
+  await removeSyncSetup(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");
+}
+
+// src/ui/settings-ui.ts
+async function showSyncSettings(ctx, runRoute, signal) {
+  let disposition = "back";
+  const exitSettings = () => {
+    disposition = "exit";
+    return { kind: "close" };
+  };
+  if (ctx.mode !== "tui") {
+    ctx.ui.notify(`Edit pi-sync settings manually: ${safeTerminalText(localConfigPath())}`, "info");
+    if (ctx.mode === "rpc" && ctx.hasUI) {
+      const management = defineMenu4({
+        start: "management",
+        screens: {
+          management: () => ({
+            kind: "actions",
+            title: "Sync settings management",
+            items: [
+              { id: "setups", label: "Manage sync setups", action: "setups" },
+              { id: "connections", label: "Manage storage connections", action: "connections" }
+            ],
+            hint: "back"
+          })
+        },
+        actions: {
+          setups: async ({ signal: actionSignal }) => {
+            const result = await showSyncSetupManager(ctx, runRoute, actionSignal);
+            return result === "exit" ? exitSettings() : { kind: "stay" };
+          },
+          connections: async ({ signal: actionSignal }) => {
+            await showStorageConnections(ctx, actionSignal);
+            return { kind: "stay" };
+          }
+        }
+      });
+      await runMenu4(ctx, management, { getState: () => void 0, signal, isCurrent: () => !signal?.aborted });
+    }
+    return disposition;
+  }
+  const initial = await loadConfig();
+  if (signal?.aborted) return "back";
+  const setupName = initial.setupName;
+  const menu = defineMenu4({
+    start: "settings",
+    screens: {
+      settings: ({ state }) => ({
+        kind: "settings",
+        title: "Pi Sync Settings",
+        lines: [
+          `Sync setup: ${safeTerminalText(state.setupName)} \xB7 Storage connection: ${safeTerminalText(state.connectionName)}`
+        ],
+        // Flat, searchable task ordering: Content, Destination, Automation, Merge, Other.
+        // Kit has no heading rows; avoid focusable fake headings or a new component.
+        items: [
+          {
+            id: "include",
+            label: "Included content",
+            description: `${state.include.length} selected path${state.include.length === 1 ? "" : "s"}. Choose which paths this setup syncs.`,
+            currentValue: "Open editor",
+            action: "include"
+          },
+          {
+            id: "remoteInclude",
+            label: "Compare synced content",
+            description: "Review this device and remote content lists before choosing either one.",
+            currentValue: "Review",
+            action: "remote-include"
+          },
+          {
+            id: "localFields",
+            label: "Machine-local settings fields",
+            description: "Root field names omitted from future portable snapshots. Policy changes require directional migration; old history remains.",
+            currentValue: `${state.localFields?.length ?? 0} fields \xB7 Edit`,
+            action: "local-fields"
+          },
+          {
+            id: "storageLocation",
+            label: "Storage location",
+            description: "Destination: edit this setup's bucket, branch, or path; remote history is not moved.",
+            currentValue: state.backend.type === "s3" ? `${safeTerminalText(state.backend.destination.bucket)} \xB7 ${safeTerminalText(state.backend.destination.prefix)}` : state.backend.type === "git" ? `${safeTerminalText(state.backend.destination.branch)} \xB7 ${safeTerminalText(state.backend.destination.directory)}` : safeTerminalText(state.backend.destination.path),
+            action: "storage-location"
+          },
+          {
+            id: "setups",
+            label: "Manage sync setups",
+            description: "Destination: add, switch, edit, or remove sync setups.",
+            currentValue: "Open",
+            action: "setups"
+          },
+          {
+            id: "connections",
+            label: "Manage storage connections",
+            description: "Destination: manage shared server addresses and credentials; edits may affect multiple setups.",
+            currentValue: "Open",
+            action: "connections"
+          },
+          {
+            id: "automatic",
+            label: "Automatic sync",
+            description: AUTOMATIC_SYNC_DESCRIPTION,
+            currentValue: state.automatic ? "On" : "Off",
+            values: ["On", "Off"],
+            action: "automatic"
+          },
+          {
+            id: "automaticTransfer",
+            label: "Automatic transfer at startup",
+            description: "May upload, replace, or delete selected files once at idle startup in TUI/RPC. Requires a baseline and conditional/lease publication; never reloads resources. Turning off cancels pending work.",
+            currentValue: state.automaticTransfer ? "On" : "Off",
+            values: ["On", "Off"],
+            action: "automatic-transfer"
+          },
+          {
+            id: "onSwitch",
+            label: "After switching setup (all setups)",
+            description: "All setups: ask before a pull review, open it automatically, or switch without pulling.",
+            currentValue: setupSwitchActionLabel(state.onSwitch),
+            values: SETUP_SWITCH_ACTION_OPTIONS.map(({ label }) => label),
+            action: "on-switch"
+          },
+          {
+            id: "mergeSettings",
+            label: "Settings field merge (experimental)",
+            description: "Combine independent global settings.json fields using a verified private ancestor; arrays and nested objects remain atomic. No reload.",
+            currentValue: state.mergeSettings ? "On" : "Off",
+            values: ["On", "Off"],
+            action: "merge-settings"
+          },
+          {
+            id: "contentPolicy",
+            label: "Content / partial sync (experimental)",
+            description: "Version-5 opt-in: bounded text and prefix-only sessions; partial progress keeps full withheld versions and old baseline hashes.",
+            currentValue: state.mergeContent ? state.partialSync ? "Content & partial" : "Content only" : state.partialSync ? "Partial only" : "Off",
+            values: ["Off", "Content only", "Content & partial", "Partial only"],
+            action: "content-policy"
+          },
+          {
+            id: "skipSecretScan",
+            label: "Skip secret scan (all setups)",
+            description: "All setups: allow pushes without checking managed local files for possible secrets.",
+            currentValue: state.skipSecretScan ? "On" : "Off",
+            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"
+          }
+        ]
+      })
+    },
+    actions: {
+      "storage-location": async ({ signal: actionSignal }) => {
+        const editorSignal = signal ? AbortSignal.any([signal, actionSignal]) : actionSignal;
+        await showEditSyncSetupStorage(ctx, setupName, editorSignal);
+        return resumeSettings(editorSignal);
+      },
+      setups: async ({ signal: actionSignal }) => {
+        const editorSignal = signal ? AbortSignal.any([signal, actionSignal]) : actionSignal;
+        const result = await showSyncSetupManager(ctx, runRoute, editorSignal);
+        return result === "exit" ? exitSettings() : resumeSettings(editorSignal);
+      },
+      connections: async ({ signal: actionSignal }) => {
+        const editorSignal = signal ? AbortSignal.any([signal, actionSignal]) : actionSignal;
+        await showStorageConnections(ctx, editorSignal);
+        return resumeSettings(editorSignal);
+      },
+      "content-policy": async ({ value, signal: actionSignal }) => {
+        const mutationSignal = signal ? AbortSignal.any([signal, actionSignal]) : actionSignal;
+        const validate = captureMutationOwner(ctx, mutationSignal);
+        try {
+          const previous = await loadConfig(setupName);
+          validate();
+          const mergeContent = value === "Content only" || value === "Content & partial";
+          const partialSync = value === "Partial only" || value === "Content & partial";
+          if (!await ctx.ui.confirm(
+            "Save experimental content policy?",
+            "This explicitly upgrades settings to version 5; partial snapshots use version 3 and older clients must refuse them. Text/session merge is conservative. Partial sync preserves withheld versions and old baselines. Disabling does not clear unresolved groups or recovery evidence. Review a directional migration first if portable policy changes.",
+            { signal: mutationSignal }
+          ))
+            return { kind: "rejected" };
+          validate();
+          await updateLocalConfig((current) => {
+            validate();
+            const setup = current.syncSetups[setupName];
+            if (!setup || Boolean(setup.sync.mergeContent) !== Boolean(previous.mergeContent) || Boolean(setup.sync.partialSync) !== Boolean(previous.partialSync))
+              throw new Error("Content policy changed during review.");
+            return {
+              ...current,
+              version: 5,
+              syncSetups: {
+                ...current.syncSetups,
+                [setupName]: { ...setup, sync: { ...setup.sync, mergeContent, partialSync } }
+              }
+            };
+          }, mutationSignal);
+          validate();
+          return { kind: "stay" };
+        } catch (error) {
+          if (!mutationSignal.aborted) notifySaveFailure(ctx, error);
+          return { kind: "rejected" };
+        }
+      },
+      "merge-settings": async ({ value, signal: actionSignal }) => {
+        const mutationSignal = signal ? AbortSignal.any([signal, actionSignal]) : actionSignal;
+        const validate = captureMutationOwner(ctx, mutationSignal);
+        try {
+          validate();
+          await updateSyncSetup(
+            setupName,
+            (setup) => ({ ...setup, sync: { ...setup.sync, mergeSettings: value === "On" } }),
+            { signal: mutationSignal }
+          );
+          validate();
+          return { kind: "stay" };
+        } catch (error) {
+          if (!mutationSignal.aborted) notifySaveFailure(ctx, error);
+          return { kind: "rejected" };
+        }
+      },
+      "local-fields": async ({ signal: actionSignal }) => {
+        const mutationSignal = signal ? AbortSignal.any([signal, actionSignal]) : actionSignal;
+        const validate = captureMutationOwner(ctx, mutationSignal);
+        try {
+          const previous = await loadConfig(setupName);
+          validate();
+          const input = await ctx.ui.input(
+            "Machine-local settings.json root fields (JSON string array)",
+            JSON.stringify(previous.localFields ?? []),
+            { signal: mutationSignal }
+          );
+          validate();
+          if (input === void 0) return { kind: "rejected" };
+          let fields;
+          try {
+            fields = normalizeLocalFields(JSON.parse(input));
+          } catch {
+            throw new Error("Invalid localFields JSON array; no policy was changed.");
+          }
+          if (sameLocalFields(previous.localFields, fields)) return { kind: "stay" };
+          const confirmed = await ctx.ui.confirm(
+            "Save portable field policy?",
+            "This opts into settings/snapshot version 4/2; older clients must refuse them. Future snapshots omit these fields, but old remote history is NOT erased. Review an explicit force push/pull migration before further sync. Removed rules can expose or replace local-only values.",
+            { signal: mutationSignal }
+          );
+          validate();
+          if (!confirmed) return { kind: "rejected" };
+          await updateLocalConfig((current) => {
+            validate();
+            const setup = current.syncSetups[setupName];
+            if (!setup || !sameLocalFields(setup.sync.localFields, previous.localFields))
+              throw new Error("Field policy changed while under review; reopen settings.");
+            return {
+              ...current,
+              version: current.version === 5 ? 5 : 4,
+              syncSetups: {
+                ...current.syncSetups,
+                [setupName]: { ...setup, sync: { ...setup.sync, localFields: fields } }
+              }
+            };
+          }, mutationSignal);
+          validate();
+          return { kind: "stay" };
+        } catch (error) {
+          if (!mutationSignal.aborted) notifySaveFailure(ctx, error);
+          return { kind: "rejected" };
+        }
+      },
+      automatic: async ({ value, signal: actionSignal }) => {
+        const automatic = value === "On";
+        const mutationSignal = signal ? AbortSignal.any([signal, actionSignal]) : actionSignal;
+        try {
+          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
+          });
+          if (mutationSignal.aborted) return { kind: "rejected" };
+          ctx.ui.notify(
+            `Automatic sync ${automatic ? "enabled" : "disabled"} for \u201C${safeTerminalText(setupName)}\u201D.`,
+            "info"
+          );
+          return { kind: "stay" };
+        } catch (error) {
+          if (!mutationSignal.aborted) notifySaveFailure(ctx, error);
+          return { kind: "rejected" };
+        }
       },
-      onSwitch,
-      signal,
-      syncConfigReviewIdentity(config)
-    );
-    if (pullClosed) return "closed";
-    return result.pullApplied ? "pull-attempted" : "switched";
-  } catch (error) {
-    if (signal?.aborted) return false;
-    ctx.ui.notify(
-      `Sync setup \u201C${safeTerminalText(name)}\u201D was not switched: ${safeTerminalText(errorMessage(error))}`,
-      "error"
-    );
-    return false;
-  }
-}
-
-// src/ui/setup/setup-actions.ts
-async function showSyncSetupManager(ctx, runRoute, signal) {
-  return showSyncSetups(
-    ctx,
-    {
-      add: async (setupSignal) => {
-        await showAddTarget(ctx, setupSignal);
+      "automatic-transfer": async ({ value, signal: actionSignal }) => {
+        const automaticTransfer = value === "On";
+        const mutationSignal = signal ? AbortSignal.any([signal, actionSignal]) : actionSignal;
+        try {
+          await updateSyncSetup(setupName, (setup) => ({ ...setup, sync: { ...setup.sync, automaticTransfer } }), {
+            signal: mutationSignal
+          });
+          if (mutationSignal.aborted) return { kind: "rejected" };
+          ctx.ui.notify(
+            `Automatic startup transfer ${automaticTransfer ? "enabled for the next session start" : "disabled"}. Completed transfers are not undone.`,
+            "info"
+          );
+          return { kind: "stay" };
+        } catch (error) {
+          if (!mutationSignal.aborted) notifySaveFailure(ctx, error);
+          return { kind: "rejected" };
+        }
       },
-      edit: async (name, setupSignal) => {
-        await showEditTarget(ctx, name, setupSignal);
+      "skip-secret-scan": async ({ value, signal: actionSignal }) => {
+        const skipSecretScan = value === "On";
+        const mutationSignal = signal ? AbortSignal.any([signal, actionSignal]) : actionSignal;
+        try {
+          const latest = await loadConfig(setupName);
+          if (mutationSignal.aborted) return { kind: "rejected" };
+          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");
+          return { kind: "stay" };
+        } catch (error) {
+          if (!mutationSignal.aborted) notifySaveFailure(ctx, error);
+          return { kind: "rejected" };
+        }
       },
-      makeCurrent: async (name, setupSignal) => {
-        const result = await showSetupSwitcher(ctx, runRoute, name, setupSignal);
-        return result === "pull-attempted" || result === "closed" ? "exit" : void 0;
+      "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);
+          return { kind: "rejected" };
+        }
       },
-      remove: async (name, setupSignal) => {
-        await showRemoveTarget(ctx, name, setupSignal);
+      "on-switch": async ({ value, signal: actionSignal }) => {
+        const action = value ? setupSwitchActionFromLabel(value) : void 0;
+        if (!action) return { kind: "rejected" };
+        const mutationSignal = signal ? AbortSignal.any([signal, actionSignal]) : actionSignal;
+        try {
+          const latest = await loadConfig(setupName);
+          if (mutationSignal.aborted) return { kind: "rejected" };
+          if (latest.onSwitch === action) return { kind: "stay" };
+          await saveOnSwitch(action, mutationSignal);
+          if (mutationSignal.aborted) return { kind: "rejected" };
+          ctx.ui.notify(`After switching setup: ${value}.`, "info");
+          return { kind: "stay" };
+        } catch (error) {
+          if (!mutationSignal.aborted) notifySaveFailure(ctx, error);
+          return { kind: "rejected" };
+        }
+      },
+      include: async ({ signal: actionSignal }) => {
+        const editorSignal = signal ? AbortSignal.any([signal, actionSignal]) : actionSignal;
+        await runRoute("files", editorSignal, void 0, setupName);
+        return editorSignal.aborted ? { kind: "rejected" } : { kind: "stay" };
+      },
+      "remote-include": async ({ signal: actionSignal }) => {
+        const reviewSignal = signal ? AbortSignal.any([signal, actionSignal]) : actionSignal;
+        const { showRemoteSelectionReview } = await import("./remote-selection-ui-6LJJ4IMQ.ts");
+        if (reviewSignal.aborted) return { kind: "rejected" };
+        const review = await showRemoteSelectionReview(ctx, setupName, reviewSignal, void 0, {
+          origin: "settings",
+          runRoute
+        });
+        if (reviewSignal.aborted) return { kind: "rejected" };
+        if (review.kind === "route-result") {
+          const disposition2 = await dispatchManagerResult(ctx, review.result, review.route, runRoute, reviewSignal);
+          return disposition2.kind === "close" ? exitSettings() : { kind: "stay" };
+        }
+        return review.kind === "closed" || review.kind === "stale" ? exitSettings() : { kind: "stay" };
       }
-    },
-    signal
-  );
-}
-async function showAddTarget(ctx, signal) {
-  let raw = await readLocalConfigObject();
-  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 && raw.version !== 4 && raw.version !== 5) {
-    ctx.ui.notify("Version 1 and version 2 settings are unsupported and are never migrated.", "error");
-    return;
-  }
-  let profiles = ownRecord(raw.storageConnections) ?? {};
-  const name = await promptResourceName(ctx, "sync setup", "work", signal);
-  if (!name) return;
-  const createConnection = "Add a new storage connection\u2026";
-  let profile = await ctx.ui.select(
-    "Choose a storage connection\n\nReuse a server address and sign-in details. A new connection is saved separately and remains if you cancel this setup.",
-    [...Object.keys(profiles).sort(), createConnection, "Cancel"],
-    { signal }
-  );
-  if (signal?.aborted || !profile || profile === "Cancel") return;
-  if (profile === createConnection) {
-    const previousNames = new Set(Object.keys(profiles));
-    if (!await showAddStorageConnection(ctx, signal)) return;
-    if (signal?.aborted) return;
-    raw = await readLocalConfigObject() ?? raw;
-    if (signal?.aborted) return;
-    profiles = ownRecord(raw.storageConnections) ?? {};
-    profile = Object.keys(profiles).find((candidate) => !previousNames.has(candidate));
-    if (!profile) return;
-    ctx.ui.notify(
-      `Connection \u201C${safeTerminalText(profile)}\u201D saved. Cancelling setup will keep this connection.`,
-      "info"
-    );
-  }
-  const storageKind = ownRecord(profiles[profile])?.type;
-  if (storageKind === "webdav") {
-    const saved = await showAddWebDavTarget(ctx, name, profile, signal);
-    if (signal?.aborted) return;
-    if (saved) await refreshTargetCompletions();
-    return;
-  }
-  if (storageKind === "git") {
-    const saved = await showAddGitTarget(ctx, name, profile, signal);
-    if (signal?.aborted) return;
-    if (saved) await refreshTargetCompletions();
-    return;
-  }
-  await showAddS3Target(ctx, raw, profile, name, signal);
-}
-async function showEditTarget(ctx, name, signal) {
-  const partial = await loadPartialConfig(name);
-  if (signal?.aborted) return;
-  if (!partial.setupName) {
-    ctx.ui.notify("Create supported pi-sync settings before editing a named sync setup.", "info");
-    return;
-  }
-  if (partial.storageKind === "webdav") {
-    await showEditWebDavTarget(ctx, partial, signal);
-    return;
-  }
-  if (partial.storageKind === "git") {
-    await showEditGitTarget(ctx, partial, signal);
-    return;
+    }
+  });
+  async function resumeSettings(editorSignal) {
+    if (editorSignal.aborted) return { kind: "close" };
+    try {
+      const active = await loadConfig();
+      if (editorSignal.aborted || active.setupName !== setupName) return { kind: "close" };
+      return { kind: "stay" };
+    } catch {
+      return { kind: "close" };
+    }
   }
-  await showEditS3Target(ctx, partial, signal);
+  await runMenu4(ctx, menu, {
+    getState: () => loadConfig(setupName),
+    signal,
+    isCurrent: () => !signal?.aborted
+  });
+  return disposition;
 }
-async function showRemoveTarget(ctx, name, signal) {
-  const confirmed = await ctx.ui.confirm(
-    "Remove sync setup?",
-    `Remove local sync setup \u201C${safeTerminalText(name)}\u201D? Remote data and history are not deleted.`,
-    { signal }
+function notifySaveFailure(ctx, error) {
+  ctx.ui.notify(
+    `Pi Sync settings save failed: ${safeTerminalText(error instanceof Error ? error.message : String(error))}`,
+    "error"
   );
-  if (signal?.aborted || !confirmed) return;
-  await removeSyncSetup(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");
 }
 
 // src/ui/manager-ui.ts
@@ -1510,52 +1610,15 @@ async function showSyncManager(ctx, runRoute, sessionSignal, options = {}) {
         return {
           kind: "actions",
           title: "Manage sync",
-          lines: state.manager.title.split("\n").slice(1),
+          // Frequent transfers stay visible; status is advisory and Help remains a direct route.
+          lines: [
+            ...state.manager.title.split("\n").slice(1),
+            "Help: /sync help \xB7 Fresh status: /sync status \xB7 Differences: /sync diff"
+          ],
           items: operationFirst ? [...managerItems, ...attentionItems] : [...attentionItems, ...managerItems],
           hint: "close"
         };
-      },
-      more: () => ({
-        kind: "actions",
-        title: "More options",
-        items: [
-          { id: "pull", label: "Pull from remote\u2026", action: "pull" },
-          { id: "push", label: "Push to remote\u2026", action: "push" },
-          { id: "setups", label: "Sync setups\u2026", action: "setups" },
-          {
-            id: "connections",
-            label: "Storage connections\u2026",
-            action: "connections"
-          },
-          {
-            id: "doctor",
-            label: "Check setup",
-            description: "Check current setup access. WebDAV also probes writes and repairs history.",
-            action: "doctor"
-          },
-          { id: "recovery", label: "History & recovery\u2026", to: "recovery" },
-          { id: "help", label: "Help", action: "help" },
-          { id: "back", label: "Back", action: "back" }
-        ],
-        hint: "back"
-      }),
-      recovery: ({ state }) => ({
-        kind: "actions",
-        title: "History & recovery",
-        items: [
-          { id: "history", label: "Browse history", action: "history" },
-          { id: "conflicts", label: "Review unresolved conflicts", action: "conflicts" },
-          {
-            id: "doctor",
-            label: "Check setup",
-            description: "WebDAV also probes writes and repairs history.",
-            action: "doctor"
-          },
-          ...state.manager.operation && operationCanRecover(state.manager.operation) ? [{ id: "unlock", label: "Recover stale operation", action: "unlock" }] : [],
-          { id: "back", label: "Back", action: "back" }
-        ],
-        hint: "back"
-      })
+      }
     },
     actions: {
       "review-attention": async () => {
@@ -1563,7 +1626,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-Q2HUIBTL.ts");
+          const { showRemoteSelectionReview } = await import("./remote-selection-ui-6LJJ4IMQ.ts");
           if (sessionSignal?.aborted) return { kind: "close" };
           const config = await loadConfig();
           if (sessionSignal?.aborted) return { kind: "close" };
@@ -1615,15 +1678,9 @@ 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" };
       },
-      diff: async () => {
-        const result = await runCancellableOperation(ctx, "Checking current sync setup\u2026", "diff", runRoute, {
-          signal: sessionSignal
-        });
-        return result.kind === "closed" ? { kind: "close" } : { kind: "stay" };
-      },
       settings: async () => {
-        await showSyncSettings(ctx, runRoute, sessionSignal);
-        return { kind: "stay" };
+        const result = await showSyncSettings(ctx, runRoute, sessionSignal);
+        return { kind: result === "exit" ? "close" : "stay" };
       },
       pull: async () => {
         const result = await runCancellableOperation(ctx, "Checking remote changes\u2026", "pull", runRoute, {
@@ -1652,8 +1709,13 @@ async function showSyncManager(ctx, runRoute, sessionSignal, options = {}) {
         return { kind: "stay" };
       },
       history: async () => {
-        await runRoute("history");
-        return { kind: "stay" };
+        const result = await runCancellableOperation(ctx, "Loading sync history\u2026", "history", runRoute, {
+          signal: sessionSignal,
+          commitAware: true,
+          cancelAcrossDialogs: true,
+          cancelledMessage: "History review cancelled; no files were changed."
+        });
+        return { kind: result.kind === "closed" ? "close" : "stay" };
       },
       doctor: async () => {
         const result = await runCancellableOperation(ctx, "Checking setup access\u2026", "doctor", runRoute, {
@@ -1661,11 +1723,6 @@ async function showSyncManager(ctx, runRoute, sessionSignal, options = {}) {
         });
         return { kind: result.kind === "closed" ? "close" : "stay" };
       },
-      unlock: async ({ state, signal: 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);
         return { kind: result === "close" ? "close" : "stay" };
@@ -1686,8 +1743,7 @@ async function showSyncManager(ctx, runRoute, sessionSignal, options = {}) {
         });
         const disposition = await dispatchManagerResult(ctx, result, "sync", runRoute, sessionSignal);
         return disposition.kind === "close" ? { kind: "close" } : { kind: "stay" };
-      },
-      back: async () => ({ kind: "back" })
+      }
     }
   });
   await runMenu5(ctx, menu, {
@@ -1709,24 +1765,33 @@ async function showSyncManager(ctx, runRoute, sessionSignal, options = {}) {
   });
 }
 function syncMainMenuItem(label) {
-  if (label === "More\u2026") return { id: "more", label, to: "more" };
-  if (label === "History & recovery\u2026") return { id: "recovery", label, to: "recovery" };
-  const actions = /* @__PURE__ */ new Map([
-    ["Sync now (recommended)", "sync"],
-    ["Switch sync setup", "switch"],
-    ["Status & changes", "diff"],
-    ["Settings", "settings"],
-    ["Restore sync access\u2026 (recommended)", "recover"],
-    ["Refresh operation status", "refresh"],
-    ["Sync setups\u2026", "setups"],
-    ["Storage connections\u2026", "connections"],
-    ["Help", "help"],
-    ["Set up sync", "init"],
-    ["Use existing settings", "init"]
-  ]);
-  return { id: actions.get(label) ?? "help", label, action: actions.get(label) ?? "help" };
+  const actions = {
+    "Sync now": "sync",
+    "Pull from remote\u2026": "pull",
+    "Push to remote\u2026": "push",
+    "Switch sync setup": "switch",
+    Settings: "settings",
+    History: "history",
+    Diagnostics: "doctor",
+    "Review unresolved conflicts": "conflicts",
+    "Restore sync access\u2026 (recommended)": "recover",
+    "Refresh operation status": "refresh",
+    "Sync setups\u2026": "setups",
+    "Storage connections\u2026": "connections",
+    Help: "help",
+    "Set up sync": "init",
+    "Use existing settings": "init"
+  };
+  const action = actions[label];
+  if (!action) throw new Error(`Unknown sync manager action: ${label}`);
+  return {
+    id: action,
+    label,
+    action,
+    ...action === "doctor" ? { description: "Check setup access; WebDAV also probes writes and repairs history." } : {}
+  };
 }
 export {
   showSyncManager
 };
-//# sourceMappingURL=manager-ui-MHAHAKG3.ts.map
+//# sourceMappingURL=manager-ui-IURS4WXY.ts.map