@narumitw/pi-sync 0.54.2 → 0.56.0

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

@@ -1,7 +1,9 @@
 // @generated by scripts/build-runtime.mjs; do not edit.
 // @ts-nocheck -- generated JavaScript uses a .ts extension for Pi's Jiti loader.
 import {
-  AUTOMATIC_SYNC_DESCRIPTION,
+  confirmMergeReview
+} from "./chunk-5XZOC7FD.ts";
+import {
   applyS3CredentialUpdate,
   chooseS3CredentialUpdate,
   chooseS3Credentials,
@@ -20,56 +22,58 @@ import {
   showEditS3Target,
   showEditWebDavStorageProfile,
   showEditWebDavTarget
-} from "./chunk-4SBTAVFL.ts";
+} from "./chunk-QSHMOL3I.ts";
 import {
   dispatchManagerResult
-} from "./chunk-VHXBCEVF.ts";
+} from "./chunk-EUMINX7L.ts";
 import {
   runCancellableOperation
-} from "./chunk-5ZWQ33XL.ts";
-import "./chunk-V6VZ5TLG.ts";
-import "./chunk-SDZCTCYQ.ts";
+} from "./chunk-JJTARUSO.ts";
+import "./chunk-YK52VDXG.ts";
 import {
   SETUP_SWITCH_ACTION_OPTIONS,
   saveOnSwitch,
   setupSwitchActionFromLabel,
   setupSwitchActionLabel,
   useSyncSetup
-} from "./chunk-UQ3ALBIB.ts";
+} from "./chunk-GP5DU62N.ts";
+import "./chunk-OEWQVWLC.ts";
+import {
+  addStorageConnection,
+  removeStorageConnection,
+  removeSyncSetup,
+  updateStorageConnection,
+  updateSyncSetup
+} from "./chunk-B4QZBDBT.ts";
 import {
   observationMatchesConfig,
   observationSummary,
   syncAttentionMatchesConfig
-} from "./chunk-5RZPINUQ.ts";
+} from "./chunk-GSNPASKB.ts";
 import {
-  captureMutationOwner,
-  inspectLock,
-  isLockGuardHeld,
-  isStaleLock
-} from "./chunk-IJ6VV6FN.ts";
-import "./chunk-PWMWOJP4.ts";
+  captureMutationOwner
+} from "./chunk-UOHR7LRO.ts";
 import {
   automaticSyncSummary
 } from "./chunk-ECYCNZOE.ts";
 import {
   configureSyncStatus
 } from "./chunk-K3RIEL6J.ts";
-import "./chunk-2DI6PDZV.ts";
+import {
+  AUTOMATIC_SYNC_DESCRIPTION,
+  STARTUP_TRANSFER_DESCRIPTION,
+  startupTransferSummary
+} from "./chunk-NLWS55B6.ts";
 import {
   safeTerminalText
 } from "./chunk-AMJRUXFT.ts";
+import "./chunk-UBV24CG4.ts";
 import {
-  readStateForConfig,
-  syncStateFingerprint
-} from "./chunk-4QVPTIZB.ts";
-import "./chunk-BVVP33U5.ts";
+  syncErrorGuidance
+} from "./chunk-G4RUXRWZ.ts";
 import {
-  addStorageConnection,
-  removeStorageConnection,
-  removeSyncSetup,
-  updateStorageConnection,
-  updateSyncSetup
-} from "./chunk-CHSIAC4N.ts";
+  errorMessage
+} from "./chunk-7D5SF7P3.ts";
 import {
   activeLocalConfigPath,
   isCloudflareR2Endpoint,
@@ -80,27 +84,35 @@ import {
   normalizeS3Endpoint,
   ownRecord,
   readLocalConfigObject,
+  requireSettings,
+  syncCheckConfigFingerprint,
   syncConfigReviewIdentity,
   updateLocalConfig
-} from "./chunk-3B4Z2SKV.ts";
-import "./chunk-2JZFHNLM.ts";
-import "./chunk-T2SJD3N7.ts";
-import "./chunk-ZX2Q6THB.ts";
-import {
-  syncErrorGuidance
-} from "./chunk-G4RUXRWZ.ts";
-import {
-  errorMessage
-} from "./chunk-7D5SF7P3.ts";
+} from "./chunk-QO333NM4.ts";
 import {
   normalizeLocalFields,
   sameLocalFields
 } from "./chunk-A6HU4ERM.ts";
+import {
+  inspectLock,
+  isLockGuardHeld,
+  isStaleLock
+} from "./chunk-AAEEHR7H.ts";
+import {
+  throwIfAborted
+} from "./chunk-PWMWOJP4.ts";
 import {
   compareSyncInclude,
   syncIncludeSelection
 } from "./chunk-QOFMXPM5.ts";
 import "./chunk-ZW5ZLGBI.ts";
+import {
+  readStateForConfig,
+  syncStateFingerprint
+} from "./chunk-UPNVIUBN.ts";
+import "./chunk-SWRVXVFD.ts";
+import "./chunk-2JZFHNLM.ts";
+import "./chunk-T2SJD3N7.ts";
 import "./chunk-HUZ5CR4W.ts";
 
 // src/ui/manager-ui.ts
@@ -172,7 +184,7 @@ function blockedSyncMenuItem(label, manager) {
   };
 }
 async function showManagerAttention(ctx, attention, runRoute, signal, onSelectionResolved) {
-  const { showRemoteSelectionReview } = await import("./remote-selection-ui-6LJJ4IMQ.ts");
+  const { showRemoteSelectionReview } = await import("./remote-selection-ui-5725JDNC.ts");
   if (signal?.aborted) return "close";
   const review = await showRemoteSelectionReview(ctx, attention.decision.setupName, signal, void 0, {
     decision: attention.decision,
@@ -254,10 +266,6 @@ async function countValidSyncSetups(setups, signal) {
   }
   return count;
 }
-function throwIfAborted(signal) {
-  if (!signal?.aborted) return;
-  throw signal.reason instanceof Error ? signal.reason : new DOMException("The operation was aborted", "AbortError");
-}
 async function showSyncSetups(ctx, actions, signal) {
   let selectedName;
   let exit = false;
@@ -395,6 +403,8 @@ async function loadSetupMenuState(selectedName, signal) {
       `Sessions: ${selection.sessions ? "On \u2014 privacy-sensitive" : "Off"}`,
       `Automatic sync: ${config.automatic ? "On" : "Off"}`,
       `Automatic transfer at startup: ${config.automaticTransfer ? "On \u2014 may upload, replace, or delete selected files; no reload" : "Off"}`,
+      `Agent mode: ${config.agentMode ? "On (experimental; autonomous merged sync)" : "Off"}`,
+      `Continuous sync: ${config.continuous ? config.agentMode ? "On (experimental; recurring requests and transfers)" : "Saved On; paused until Agent mode is enabled" : "Off"}`,
       isCurrent ? "Edit included content and automatic sync in /sync \u2192 Settings." : "To edit included content or automatic sync, make this setup current, then open /sync \u2192 Settings."
     ];
   } catch (error) {
@@ -453,6 +463,8 @@ var MAIN_MENU_ACTIONS = [
   "Sync now",
   "Pull from remote\u2026",
   "Push to remote\u2026",
+  "View differences",
+  "Check remote status",
   "Settings",
   "History",
   "Diagnostics"
@@ -514,7 +526,7 @@ async function describeManagerState(signal, attention, inspectOperation = inspec
     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 lastAppliedSnapshot = changesBlocked ? "Unavailable while operations are locked" : syncState?.lastAppliedSnapshot ? `${truncateToWidth(safeTerminalText(syncState.lastAppliedSnapshot), 20, "\u2026")} (application time unavailable; full ID in History)` : syncState ? "Never synced" : "Unavailable";
     const canSwitch = await countValidSyncSetups(configuredTargets, signal) > 1;
     const mainActions = [...MAIN_MENU_ACTIONS];
     if (canSwitch) mainActions.push("Switch sync setup");
@@ -524,10 +536,7 @@ async function describeManagerState(signal, attention, inspectOperation = inspec
       "",
       `Current sync setup: ${safeTerminalText(config.setupName)}`,
       `Storage: ${backendStorageDescription(config)}`,
-      `Included: ${selection.builtIns.length} built-in group${selection.builtIns.length === 1 ? "" : "s"} \xB7 ${selection.custom.length} extra path${selection.custom.length === 1 ? "" : "s"} \xB7 Sessions ${selection.sessions ? "on" : "off"}`,
-      `Automatic sync: ${automaticSyncSummary(config.automatic)}`,
-      `Automatic transfer at startup: ${config.automaticTransfer ? "On \u2014 upload/replace/delete at idle; no reload" : "Off"}`,
-      `Last applied: ${lastAppliedSnapshot}`,
+      "CURRENT STATE",
       ...syncState?.unresolved?.length ? [
         `Unresolved: ${syncState.unresolved.length} dependency groups \xB7 choose Review unresolved conflicts`,
         `Last observed: ${safeTerminalText(syncState.lastObservedSnapshot ?? "unknown")}`
@@ -540,9 +549,15 @@ 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"],
+      `Included: ${selection.builtIns.length} built-in group${selection.builtIns.length === 1 ? "" : "s"} \xB7 ${selection.custom.length} extra path${selection.custom.length === 1 ? "" : "s"} \xB7 Sessions ${selection.sessions ? "on" : "off"}`,
+      `Automatic sync: ${automaticSyncSummary(config.automatic)}`,
+      `Startup transfer: ${startupTransferSummary(config)}`,
+      `Agent mode: ${config.agentMode ? "On (experimental; autonomous merged sync)" : "Off"}`,
+      ...config.continuous ? await (await import("./continuous-record-LFRVXQBD.ts")).continuousStatusLines(config) : [],
+      `Last applied: ${lastAppliedSnapshot}`,
       ...noSyncedContent ? ["", "No included content is selected. Choose included content in Settings before syncing."] : [],
       "",
-      "What do you want to do?"
+      "ACTIONS \xB7 transfer, inspect, or manage"
     ];
     return {
       title: (changesBlocked ? ["Manage sync", ...operationStatusLines(operation)] : ordinaryTitle).join("\n"),
@@ -630,8 +645,112 @@ 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
+// src/ui/agent-mode-setting.ts
 import { isDeepStrictEqual } from "node:util";
+var AGENT_MODE_DESCRIPTION = "This setup, experimental: one autonomous merged sync next startup and on Sync now. Sends eligible conflict text to the selected Pi model; may incur costs and replace/delete selected local and remote content without transfer prompts. No automatic reload. Unsupported conflicts pause.";
+var CONTINUOUS_DESCRIPTION = "This setup, experimental: recurring sync while Pi is open. Requires Agent mode. Watches selected files, checks the remote every 60\u201366 seconds, and retries temporary failures. Local changes and retries can cause extra requests between polls. May disclose conflict text and incur model/storage costs. No automatic reload.";
+function saveContinuousMode(ctx, setupName, enabled, signal) {
+  return saveAgentMode(ctx, setupName, enabled, signal, "continuous");
+}
+async function saveAgentMode(ctx, setupName, enabled, signal, preference = "agentMode") {
+  const validate = captureMutationOwner(ctx, signal);
+  const settings = await requireSettings();
+  validate();
+  const setup = settings.syncSetups[setupName];
+  if (!setup || settings.activeSyncSetup !== setupName) throw new Error("Current sync setup changed; reopen Settings.");
+  const continuous = preference === "continuous";
+  const label = continuous ? "Continuous sync" : "Agent mode";
+  if (enabled && continuous && !setup.sync.agentMode) throw new Error("Enable Agent mode before Continuous sync.");
+  if (Boolean(setup.sync[preference]) === enabled) return true;
+  if (enabled) {
+    const summary = [
+      `Setup: ${safeTerminalText(setupName)}`,
+      `Storage connection: ${safeTerminalText(setup.storage.connection)}`,
+      `Storage path: ${safeTerminalText(setup.storage.path)}`,
+      ...setup.storage.bucket ? [`Bucket: ${safeTerminalText(String(setup.storage.bucket))}`] : [],
+      ...setup.storage.branch ? [`Branch: ${safeTerminalText(String(setup.storage.branch))}`] : [],
+      `Included paths: ${setup.sync.include.map(safeTerminalText).join(", ")}`,
+      continuous ? CONTINUOUS_DESCRIPTION : AGENT_MODE_DESCRIPTION,
+      ...continuous ? [
+        "Upgrade all Pi processes sharing this agent directory before enabling Continuous sync. Monitoring starts after the /sync command or manager closes. An elected idle local session uses its selected Pi model; another session can use a different provider/model. Each computer is a separate replica.",
+        "Automatic requests are limited to two per candidate and two per replica binding in a rolling 15-minute window, across restarts. Network/storage checks and requests may incur costs. Retries start at five seconds and grow to five minutes. These are request bounds, not a currency cap."
+      ] : setup.sync.continuous ? ["The saved Continuous sync preference will resume monitoring after the /sync command or manager closes."] : [],
+      "Only bounded Markdown/plain-text conflicts and atomic global settings choices are eligible. Model errors can change intended behavior. Session histories, code, deletion conflicts and path collisions are not model-resolved.",
+      "The existing baseline, selection, secret-scan and publication checks remain. Pi Sync cannot exclude arbitrary concurrent local writers. Disabling does not undo completed transfers or provider charges. No transfer starts from Settings."
+    ].join("\n\n");
+    if (!await confirmMergeReview(
+      ctx,
+      `Enable experimental ${label}?`,
+      summary,
+      signal,
+      () => !signal?.aborted,
+      `Enable ${label}`,
+      summary.split("\n")
+    ))
+      return false;
+    validate();
+  }
+  await updateLocalConfig((current) => {
+    validate();
+    if (current.activeSyncSetup !== setupName || !isDeepStrictEqual(current.syncSetups[setupName], setup) || !isDeepStrictEqual(
+      current.storageConnections[setup.storage.connection],
+      settings.storageConnections[setup.storage.connection]
+    ))
+      throw new Error("Sync setup or connection changed during Agent mode review; reopen Settings.");
+    return {
+      ...current,
+      syncSetups: { ...current.syncSetups, [setupName]: { ...setup, sync: { ...setup.sync, [preference]: enabled } } }
+    };
+  }, signal);
+  return true;
+}
+
+// src/ui/settings-frame.ts
+import { stripVTControlCharacters } from "node:util";
+function boundedSettingsUI(ctx) {
+  return {
+    ...ctx.ui,
+    custom: (factory, options) => ctx.ui.custom((tui, ...args) => {
+      const terminal = new Proxy(tui.terminal, {
+        get: (target, key) => key === "rows" ? Math.max(8, target.rows) : Reflect.get(target, key)
+      });
+      const screenTui = new Proxy(tui, {
+        get(target, key) {
+          if (key === "terminal") return terminal;
+          const value = Reflect.get(target, key);
+          return typeof value === "function" ? value.bind(target) : value;
+        }
+      });
+      const guard = (component2) => {
+        const render = component2.render.bind(component2);
+        const handleMouse = component2.handleMouse?.bind(component2);
+        let sourceRow = 0;
+        const compact = () => tui.terminal.rows < 8;
+        component2.render = (width) => {
+          if (width <= 0) return [];
+          const lines = render(width);
+          if (!compact()) return lines;
+          const active = lines.findIndex((line) => stripVTControlCharacters(line).startsWith("\u2192"));
+          const search = lines.findIndex((line) => stripVTControlCharacters(line).startsWith(">"));
+          sourceRow = active < 0 ? Math.max(0, search) : active;
+          return lines.slice(sourceRow, sourceRow + 1);
+        };
+        if (handleMouse)
+          component2.handleMouse = (event) => {
+            if (event.width <= 0 || compact() && event.y !== 0) return void 0;
+            component2.render(event.width);
+            return handleMouse(compact() ? { ...event, y: event.y + sourceRow } : event);
+          };
+        return component2;
+      };
+      const component = factory(screenTui, ...args);
+      return component instanceof Promise ? component.then(guard) : guard(component);
+    }, options)
+  };
+}
+
+// src/ui/storage-connections-ui.ts
+import { isDeepStrictEqual as isDeepStrictEqual2 } from "node:util";
 import { defineMenu as defineMenu2, runMenu as runMenu2 } from "@narumitw/pi-tui-kit";
 async function showStorageConnections(ctx, signal) {
   let selectedName;
@@ -826,7 +945,7 @@ async function editStorageConnection(ctx, name, profile, usedBy, signal) {
     (saveSignal) => updateStorageConnection(
       name,
       (current) => {
-        if (current.type !== "s3" || !isDeepStrictEqual(current, profile)) {
+        if (current.type !== "s3" || !isDeepStrictEqual2(current, profile)) {
           throw new Error("Storage connection changed while it was open; reopen it.");
         }
         return {
@@ -1038,6 +1157,8 @@ async function showSetupSwitcher(ctx, runRoute, selectedName, signal) {
       `Included content: ${config.include.length} paths`,
       `Automatic sync: ${automaticSyncSummary(config.automatic)} \xB7 Sessions: ${config.include.includes("sessions") ? "On" : "Off"}`,
       `Automatic transfer at startup: ${config.automaticTransfer ? "On \u2014 may upload, replace, or delete selected files; no reload" : "Off"}`,
+      `Agent mode: ${config.agentMode ? "On (experimental; autonomous merged sync)" : "Off"}`,
+      `Continuous sync: ${config.continuous ? config.agentMode ? "On (experimental; recurring requests and transfers)" : "Saved On; paused until Agent mode is enabled" : "Off"}`,
       "",
       switchEffect
     ].join("\n"),
@@ -1227,118 +1348,172 @@ async function showSyncSettings(ctx, runRoute, signal) {
   const initial = await loadConfig();
   if (signal?.aborted) return "back";
   const setupName = initial.setupName;
+  const groups = {
+    content: { label: "Sync content", ids: ["include", "remoteInclude", "localFields"] },
+    behavior: {
+      label: "Sync behavior",
+      ids: ["automatic", "automaticTransfer", "agentMode", "continuous", "onSwitch"]
+    },
+    storage: { label: "Storage & setups", ids: ["storageLocation", "setups", "connections"] },
+    advanced: { label: "Advanced", ids: ["mergeSettings", "contentPolicy", "skipSecretScan", "showStatus", "debug"] },
+    all: { label: "All settings (search)", ids: [] }
+  };
+  let saveStatus = "Simple choices save immediately. Back does not undo saved changes.";
+  const settingsScreen = (state, group) => ({
+    kind: "settings",
+    title: `Pi Sync Settings \xB7 ${groups[group].label}`,
+    lines: [
+      `Setup: ${safeTerminalText(state.setupName)} \xB7 Connection: ${safeTerminalText(state.connectionName)}`,
+      saveStatus
+    ],
+    items: [
+      {
+        id: "include",
+        label: "Included paths",
+        description: "This setup: choose paths in a draft, then review and Save or Discard. No transfer is started.",
+        currentValue: `${state.include.length} paths \xB7 Edit`,
+        action: "include"
+      },
+      {
+        id: "remoteInclude",
+        label: "Compare included paths",
+        description: "This setup: compare included-path policies, not file contents. Review before saving either list; no files transfer unless you explicitly Continue.",
+        currentValue: "Review",
+        action: "remote-include"
+      },
+      {
+        id: "localFields",
+        label: "Machine-local fields",
+        description: "This setup: settings.json root fields excluded from future portable snapshots, not project overrides. Policy changes require reviewed directional migration; old history remains.",
+        currentValue: `${state.localFields?.length ?? 0} fields \xB7 Edit`,
+        action: "local-fields"
+      },
+      {
+        id: "storageLocation",
+        label: "Storage location",
+        description: "This setup: review and save bucket, branch, or path changes. 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: "This device: add, switch, edit, or remove sync setups. Each edit identifies its owner before saving.",
+        currentValue: "Open",
+        action: "setups"
+      },
+      {
+        id: "connections",
+        label: "Manage storage connections",
+        description: "Shared connections on this device: review affected setups before saving server or credential changes.",
+        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: "Startup transfer",
+        description: `${STARTUP_TRANSFER_DESCRIPTION} Saved preference and requirements: ${startupTransferSummary(state)}.`,
+        currentValue: state.automaticTransfer ? "On" : "Off",
+        values: ["On", "Off"],
+        action: "automatic-transfer"
+      },
+      {
+        id: "agentMode",
+        label: "Agent mode (experimental)",
+        description: AGENT_MODE_DESCRIPTION,
+        currentValue: state.agentMode ? "On" : "Off",
+        values: ["On", "Off"],
+        action: "agent-mode"
+      },
+      {
+        id: "continuous",
+        label: "Continuous sync (experimental)",
+        description: `${CONTINUOUS_DESCRIPTION}${state.continuous && !state.agentMode ? " Saved On, but paused until Agent mode is enabled." : ""}`,
+        currentValue: state.continuous ? "On" : "Off",
+        values: ["On", "Off"],
+        action: "continuous"
+      },
+      {
+        id: "onSwitch",
+        label: "On setup switch",
+        description: "All setups on this device: ask before a pull review, open it automatically, or switch without pulling. Applies to subsequent switches.",
+        currentValue: setupSwitchActionLabel(state.onSwitch),
+        values: SETUP_SWITCH_ACTION_OPTIONS.map(({ label }) => label),
+        action: "on-switch"
+      },
+      {
+        id: "mergeSettings",
+        label: "Merge settings fields",
+        description: "This setup, experimental opt-in: merge independent global settings.json root fields with a verified private ancestor. Arrays and nested objects remain atomic. Applies to subsequent sync; no reload.",
+        currentValue: state.mergeSettings ? "On" : "Off",
+        values: ["On", "Off"],
+        action: "merge-settings"
+      },
+      {
+        id: "contentPolicy",
+        label: "Content merge / partial progress",
+        description: "This setup, experimental opt-in: review the version-5 upgrade before saving. Merge bounded text and prefix-only sessions; partial progress keeps withheld versions and baselines. Applies to subsequent sync; disabling does not clear recovery evidence.",
+        currentValue: state.mergeContent ? state.partialSync ? "Merge + partial" : "Merge only" : state.partialSync ? "Partial only" : "Off",
+        values: ["Off", "Merge only", "Merge + partial", "Partial only"],
+        action: "content-policy"
+      },
+      {
+        id: "skipSecretScan",
+        label: "Skip secret scan",
+        description: "All setups on this device: skip possible-secret checks on subsequent pushes, including automatic pushes. Other safety checks remain. Diagnostics still scans.",
+        currentValue: state.skipSecretScan ? "On" : "Off",
+        values: ["On", "Off"],
+        action: "skip-secret-scan"
+      },
+      {
+        id: "showStatus",
+        label: "Show sync status",
+        description: "All setups on this device: saved and applied immediately to Pi status. Review widgets and notifications remain available.",
+        currentValue: state.showStatus ? "On" : "Off",
+        values: ["On", "Off"],
+        action: "show-status"
+      },
+      {
+        id: "debug",
+        label: "Debug startup timings",
+        description: "All setups on this device: show startup durations in TUI/RPC notifications. Applies next session start; no credentials or file contents.",
+        currentValue: state.debug ? "On" : "Off",
+        values: ["On", "Off"],
+        action: "debug"
+      }
+    ].filter((item) => group === "all" || groups[group].ids.includes(item.id))
+  });
   const menu = defineMenu4({
-    start: "settings",
+    start: "categories",
     screens: {
-      settings: ({ state }) => ({
-        kind: "settings",
+      categories: ({ state }) => ({
+        kind: "actions",
         title: "Pi Sync Settings",
         lines: [
-          `Sync setup: ${safeTerminalText(state.setupName)} \xB7 Storage connection: ${safeTerminalText(state.connectionName)}`
+          `Setup: ${safeTerminalText(state.setupName)} \xB7 Connection: ${safeTerminalText(state.connectionName)}`,
+          "Choose a task, or search all settings. Scope is shown in each setting's description.",
+          saveStatus
         ],
-        // 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"
-          }
-        ]
-      })
+        items: Object.entries(groups).map(([id, group]) => ({
+          id,
+          label: group.label,
+          to: id
+        })),
+        hint: "back"
+      }),
+      content: ({ state }) => settingsScreen(state, "content"),
+      behavior: ({ state }) => settingsScreen(state, "behavior"),
+      storage: ({ state }) => settingsScreen(state, "storage"),
+      advanced: ({ state }) => settingsScreen(state, "advanced"),
+      all: ({ state }) => settingsScreen(state, "all")
     },
     actions: {
       "storage-location": async ({ signal: actionSignal }) => {
@@ -1362,8 +1537,8 @@ async function showSyncSettings(ctx, runRoute, signal) {
         try {
           const previous = await loadConfig(setupName);
           validate();
-          const mergeContent = value === "Content only" || value === "Content & partial";
-          const partialSync = value === "Partial only" || value === "Content & partial";
+          const mergeContent = value === "Merge only" || value === "Merge + partial";
+          const partialSync = value === "Partial only" || value === "Merge + 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.",
@@ -1371,6 +1546,7 @@ async function showSyncSettings(ctx, runRoute, signal) {
           ))
             return { kind: "rejected" };
           validate();
+          ctx.ui.notify("Saving reviewed Pi Sync policy\u2026", "info");
           await updateLocalConfig((current) => {
             validate();
             const setup = current.syncSetups[setupName];
@@ -1386,6 +1562,8 @@ async function showSyncSettings(ctx, runRoute, signal) {
             };
           }, mutationSignal);
           validate();
+          saveStatus = "Saved reviewed policy for this setup. Applies to subsequent sync operations; recovery evidence is retained.";
+          ctx.ui.notify(saveStatus, "info");
           return { kind: "stay" };
         } catch (error) {
           if (!mutationSignal.aborted) notifySaveFailure(ctx, error);
@@ -1436,6 +1614,7 @@ async function showSyncSettings(ctx, runRoute, signal) {
           );
           validate();
           if (!confirmed) return { kind: "rejected" };
+          ctx.ui.notify("Saving reviewed Pi Sync policy\u2026", "info");
           await updateLocalConfig((current) => {
             validate();
             const setup = current.syncSetups[setupName];
@@ -1451,6 +1630,8 @@ async function showSyncSettings(ctx, runRoute, signal) {
             };
           }, mutationSignal);
           validate();
+          saveStatus = "Saved reviewed policy for this setup. Applies to subsequent sync operations; recovery evidence is retained.";
+          ctx.ui.notify(saveStatus, "info");
           return { kind: "stay" };
         } catch (error) {
           if (!mutationSignal.aborted) notifySaveFailure(ctx, error);
@@ -1478,6 +1659,56 @@ async function showSyncSettings(ctx, runRoute, signal) {
           return { kind: "rejected" };
         }
       },
+      "agent-mode": async ({ value, signal: actionSignal }) => {
+        const mutationSignal = signal ? AbortSignal.any([signal, actionSignal]) : actionSignal;
+        const validate = captureMutationOwner(ctx, mutationSignal);
+        try {
+          const saved = await saveAgentMode(ctx, setupName, value === "On", mutationSignal);
+          if (!saved) return { kind: "rejected" };
+          try {
+            validate();
+            ctx.ui.notify(
+              "Agent mode saved. Applies to subsequent sync and the next session start; no transfer started.",
+              "info"
+            );
+          } catch {
+          }
+          return { kind: "stay" };
+        } catch (error) {
+          try {
+            validate();
+          } catch {
+            return { kind: "rejected" };
+          }
+          notifySaveFailure(ctx, error);
+          return { kind: "rejected" };
+        }
+      },
+      continuous: async ({ value, signal: actionSignal }) => {
+        const mutationSignal = signal ? AbortSignal.any([signal, actionSignal]) : actionSignal;
+        const validate = captureMutationOwner(ctx, mutationSignal);
+        try {
+          const saved = await saveContinuousMode(ctx, setupName, value === "On", mutationSignal);
+          if (!saved) return { kind: "rejected" };
+          try {
+            validate();
+            ctx.ui.notify(
+              value === "On" ? "Continuous sync enabled. Monitoring starts after the /sync command or manager closes; completed work is not undone." : "Continuous sync disabled. Completed work is not undone.",
+              "info"
+            );
+          } catch {
+          }
+          return { kind: "stay" };
+        } catch (error) {
+          try {
+            validate();
+          } catch {
+            return { kind: "rejected" };
+          }
+          notifySaveFailure(ctx, error);
+          return { kind: "rejected" };
+        }
+      },
       "automatic-transfer": async ({ value, signal: actionSignal }) => {
         const automaticTransfer = value === "On";
         const mutationSignal = signal ? AbortSignal.any([signal, actionSignal]) : actionSignal;
@@ -1529,6 +1760,18 @@ async function showSyncSettings(ctx, runRoute, signal) {
           return { kind: "rejected" };
         }
       },
+      debug: async ({ value, signal: actionSignal }) => {
+        const debug = value === "On";
+        const mutationSignal = signal ? AbortSignal.any([signal, actionSignal]) : actionSignal;
+        try {
+          await updateLocalConfig((settings) => ({ ...settings, debug }), mutationSignal);
+          if (mutationSignal.aborted) return { kind: "rejected" };
+          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" };
@@ -1553,7 +1796,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-6LJJ4IMQ.ts");
+        const { showRemoteSelectionReview } = await import("./remote-selection-ui-5725JDNC.ts");
         if (reviewSignal.aborted) return { kind: "rejected" };
         const review = await showRemoteSelectionReview(ctx, setupName, reviewSignal, void 0, {
           origin: "settings",
@@ -1568,6 +1811,28 @@ async function showSyncSettings(ctx, runRoute, signal) {
       }
     }
   });
+  for (const id of [
+    "automatic",
+    "automatic-transfer",
+    "merge-settings",
+    "skip-secret-scan",
+    "show-status",
+    "debug",
+    "on-switch"
+  ]) {
+    const save = menu.actions[id];
+    menu.actions[id] = async (action) => {
+      const validate = captureMutationOwner(ctx, action.signal);
+      validate();
+      ctx.ui.notify("Saving Pi Sync setting\u2026", "info");
+      const result = await save(action);
+      if (action.signal.aborted || signal?.aborted) return { kind: "rejected" };
+      validate();
+      saveStatus = result?.kind === "rejected" ? "Save failed or rejected. Previous value retained; retry is available." : id === "automatic-transfer" || id === "automatic" || id === "debug" ? "Saved. Enabling startup work applies next session start; completed transfers are not undone." : "Saved. Applies to subsequent operations; status visibility applies immediately.";
+      ctx.ui.notify(saveStatus, result?.kind === "rejected" ? "warning" : "info");
+      return result;
+    };
+  }
   async function resumeSettings(editorSignal) {
     if (editorSignal.aborted) return { kind: "close" };
     try {
@@ -1578,7 +1843,7 @@ async function showSyncSettings(ctx, runRoute, signal) {
       return { kind: "close" };
     }
   }
-  await runMenu4(ctx, menu, {
+  await runMenu4({ ...ctx, ui: boundedSettingsUI(ctx) }, menu, {
     getState: () => loadConfig(setupName),
     signal,
     isCurrent: () => !signal?.aborted
@@ -1626,7 +1891,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-6LJJ4IMQ.ts");
+          const { showRemoteSelectionReview } = await import("./remote-selection-ui-5725JDNC.ts");
           if (sessionSignal?.aborted) return { kind: "close" };
           const config = await loadConfig();
           if (sessionSignal?.aborted) return { kind: "close" };
@@ -1717,12 +1982,45 @@ async function showSyncManager(ctx, runRoute, sessionSignal, options = {}) {
         });
         return { kind: result.kind === "closed" ? "close" : "stay" };
       },
-      doctor: async () => {
-        const result = await runCancellableOperation(ctx, "Checking setup access\u2026", "doctor", runRoute, {
+      diff: async () => {
+        const result = await runCancellableOperation(ctx, "Comparing local and remote\u2026", "diff", runRoute, {
+          signal: sessionSignal
+        });
+        return { kind: result.kind === "closed" ? "close" : "stay" };
+      },
+      status: async () => {
+        const result = await runCancellableOperation(ctx, "Checking remote status\u2026", "status", runRoute, {
           signal: sessionSignal
         });
         return { kind: result.kind === "closed" ? "close" : "stay" };
       },
+      doctor: async ({ signal: actionSignal }) => {
+        const signal = sessionSignal ? AbortSignal.any([sessionSignal, actionSignal]) : actionSignal;
+        const validate = captureMutationOwner(ctx, signal);
+        const config = await loadConfig();
+        validate();
+        const confirmed = await ctx.ui.confirm(
+          "Run diagnostics?",
+          `Setup: ${safeTerminalText(config.setupName)}
+Storage: ${backendStorageDescription(config)}
+S3/R2 reads the latest pointer without writing. Git reads remote snapshots and checks its cache. WebDAV probes conditional writes and cleanup, and can repair a missing history entry. Possible-secret checks still run. This is not the read-only Check remote status action.`,
+          { signal }
+        );
+        if (signal.aborted) return { kind: "close" };
+        validate();
+        if (!confirmed) return { kind: "stay" };
+        const latest = await loadConfig();
+        validate();
+        if (syncCheckConfigFingerprint(config) !== syncCheckConfigFingerprint(latest)) {
+          ctx.ui.notify("Setup changed during diagnostics review; reopen Diagnostics.", "warning");
+          return { kind: "stay" };
+        }
+        const result = await runCancellableOperation(ctx, "Checking setup access\u2026", "doctor", runRoute, {
+          signal,
+          target: config.setupName
+        });
+        return { kind: result.kind === "closed" ? "close" : "stay" };
+      },
       recover: async ({ state, signal: actionSignal }) => {
         const result = await recoverSyncAccess(ctx, state.manager, runRoute, sessionSignal, actionSignal);
         return { kind: result === "close" ? "close" : "stay" };
@@ -1769,6 +2067,8 @@ function syncMainMenuItem(label) {
     "Sync now": "sync",
     "Pull from remote\u2026": "pull",
     "Push to remote\u2026": "push",
+    "View differences": "diff",
+    "Check remote status": "status",
     "Switch sync setup": "switch",
     Settings: "settings",
     History: "history",
@@ -1788,10 +2088,10 @@ function syncMainMenuItem(label) {
     id: action,
     label,
     action,
-    ...action === "doctor" ? { description: "Check setup access; WebDAV also probes writes and repairs history." } : {}
+    description: action === "doctor" ? "Manage: review backend checks before running." : action === "settings" || action === "history" || action === "switch" ? "Manage" : action === "sync" ? "Transfer: choose a safe direction or review conflicts." : action === "pull" ? "Transfer: remote \u2192 local; review writes and removals." : action === "push" ? "Transfer: local \u2192 remote active snapshot; review publication." : action === "status" || action === "diff" ? "Inspect: read current local and remote state without transferring files." : void 0
   };
 }
 export {
   showSyncManager
 };
-//# sourceMappingURL=manager-ui-IURS4WXY.ts.map
+//# sourceMappingURL=manager-ui-KRAW3NE2.ts.map