@narumitw/pi-sync 0.51.0 → 0.52.0

package/dist/chunks/manager-result-dispatcher-VIDT3QBU.ts

@@ -0,0 +1,23 @@
+// @generated by scripts/build-runtime.mjs; do not edit.
+// @ts-nocheck -- generated JavaScript uses a .ts extension for Pi's Jiti loader.
+import {
+  dispatchManagerResult
+} from "./chunk-WKPX2SIC.ts";
+import "./chunk-2CBF6SMT.ts";
+import "./chunk-V6VZ5TLG.ts";
+import "./chunk-QHSQCK7L.ts";
+import "./chunk-K3RIEL6J.ts";
+import "./chunk-AMJRUXFT.ts";
+import "./chunk-CHSIAC4N.ts";
+import "./chunk-3B4Z2SKV.ts";
+import "./chunk-2JZFHNLM.ts";
+import "./chunk-T2SJD3N7.ts";
+import "./chunk-7D5SF7P3.ts";
+import "./chunk-A6HU4ERM.ts";
+import "./chunk-QOFMXPM5.ts";
+import "./chunk-ZW5ZLGBI.ts";
+import "./chunk-HUZ5CR4W.ts";
+export {
+  dispatchManagerResult
+};
+//# sourceMappingURL=manager-result-dispatcher-VIDT3QBU.ts.map

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

@@ -1,37 +1,5 @@
 // @generated by scripts/build-runtime.mjs; do not edit.
 // @ts-nocheck -- generated JavaScript uses a .ts extension for Pi's Jiti loader.
-import {
-  dispatchManagerResult
-} from "./chunk-E42GXD6D.ts";
-import {
-  runCancellableOperation
-} from "./chunk-7KHKWL3Q.ts";
-import {
-  SETUP_SWITCH_ACTION_OPTIONS,
-  saveOnSwitch,
-  setupSwitchActionFromLabel,
-  setupSwitchActionLabel,
-  useSyncSetup
-} from "./chunk-DZUSTGQV.ts";
-import "./chunk-Q32CQWPM.ts";
-import "./chunk-HGJH56KR.ts";
-import {
-  observationMatchesConfig,
-  observationSummary,
-  syncAttentionMatchesConfig
-} from "./chunk-6546TS54.ts";
-import {
-  inspectLock,
-  isLockGuardHeld,
-  isStaleLock
-} from "./chunk-QLSN7AGX.ts";
-import {
-  configureSyncStatus
-} from "./chunk-K3RIEL6J.ts";
-import {
-  readStateForConfig,
-  syncStateFingerprint
-} from "./chunk-YPXGU5OR.ts";
 import {
   AUTOMATIC_SYNC_DESCRIPTION,
   applyS3CredentialUpdate,
@@ -52,21 +20,56 @@ import {
   showEditS3Target,
   showEditWebDavStorageProfile,
   showEditWebDavTarget
-} from "./chunk-UA7RXOIT.ts";
+} from "./chunk-4SBTAVFL.ts";
+import {
+  dispatchManagerResult
+} from "./chunk-WKPX2SIC.ts";
+import {
+  runCancellableOperation
+} from "./chunk-2CBF6SMT.ts";
+import "./chunk-V6VZ5TLG.ts";
+import "./chunk-QHSQCK7L.ts";
+import {
+  SETUP_SWITCH_ACTION_OPTIONS,
+  saveOnSwitch,
+  setupSwitchActionFromLabel,
+  setupSwitchActionLabel,
+  useSyncSetup
+} from "./chunk-UQ3ALBIB.ts";
+import {
+  observationMatchesConfig,
+  observationSummary,
+  syncAttentionMatchesConfig
+} from "./chunk-5RZPINUQ.ts";
+import {
+  captureMutationOwner,
+  inspectLock,
+  isLockGuardHeld,
+  isStaleLock
+} from "./chunk-IJ6VV6FN.ts";
+import "./chunk-PWMWOJP4.ts";
 import {
   automaticSyncSummary
 } from "./chunk-ECYCNZOE.ts";
-import "./chunk-YFADF5ZQ.ts";
+import {
+  configureSyncStatus
+} from "./chunk-K3RIEL6J.ts";
+import "./chunk-2DI6PDZV.ts";
 import {
   safeTerminalText
-} from "./chunk-MSSW6F3R.ts";
+} from "./chunk-AMJRUXFT.ts";
+import {
+  readStateForConfig,
+  syncStateFingerprint
+} from "./chunk-4QVPTIZB.ts";
+import "./chunk-BVVP33U5.ts";
 import {
   addStorageConnection,
   removeStorageConnection,
   removeSyncSetup,
   updateStorageConnection,
   updateSyncSetup
-} from "./chunk-2RZSQWBH.ts";
+} from "./chunk-CHSIAC4N.ts";
 import {
   activeLocalConfigPath,
   isCloudflareR2Endpoint,
@@ -79,23 +82,26 @@ import {
   readLocalConfigObject,
   syncConfigReviewIdentity,
   updateLocalConfig
-} from "./chunk-4MPIH46N.ts";
+} from "./chunk-3B4Z2SKV.ts";
 import "./chunk-2JZFHNLM.ts";
-import "./chunk-BVVP33U5.ts";
 import "./chunk-T2SJD3N7.ts";
+import "./chunk-ZX2Q6THB.ts";
 import {
   syncErrorGuidance
 } from "./chunk-G4RUXRWZ.ts";
 import {
   errorMessage
 } from "./chunk-7D5SF7P3.ts";
-import "./chunk-EEJPYTWE.ts";
-import "./chunk-SWUXA3MH.ts";
-import "./chunk-OVDTF5CH.ts";
+import {
+  normalizeLocalFields,
+  sameLocalFields
+} from "./chunk-A6HU4ERM.ts";
 import {
   compareSyncInclude,
   syncIncludeSelection
-} from "./chunk-IVXEDPAD.ts";
+} from "./chunk-QOFMXPM5.ts";
+import "./chunk-ZW5ZLGBI.ts";
+import "./chunk-HUZ5CR4W.ts";
 
 // src/ui/manager-ui.ts
 import { defineMenu as defineMenu5, runMenu as runMenu5 } from "@narumitw/pi-tui-kit";
@@ -166,7 +172,7 @@ function blockedSyncMenuItem(label, manager) {
   };
 }
 async function showManagerAttention(ctx, attention, runRoute, signal, onSelectionResolved) {
-  const { showRemoteSelectionReview } = await import("./remote-selection-ui-TZTJF32Y.ts");
+  const { showRemoteSelectionReview } = await import("./remote-selection-ui-SMF5CLFO.ts");
   if (signal?.aborted) return "close";
   const review = await showRemoteSelectionReview(ctx, attention.decision.setupName, signal, void 0, {
     decision: attention.decision,
@@ -388,6 +394,7 @@ async function loadSetupMenuState(selectedName, signal) {
       `Included content: ${selection.builtIns.length} built-in groups \xB7 ${selection.custom.length} extra paths`,
       `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"}`,
       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) {
@@ -474,7 +481,7 @@ async function describeManagerState(signal, attention, inspectOperation = inspec
     };
   }
   const configuredTargets = ownRecord(raw.syncSetups);
-  if (raw.version === 3 && configuredTargets && Object.keys(configuredTargets).length === 0) {
+  if ((raw.version === 3 || raw.version === 4 || raw.version === 5) && configuredTargets && Object.keys(configuredTargets).length === 0) {
     return {
       title: [
         "Manage sync",
@@ -516,7 +523,12 @@ async function describeManagerState(signal, attention, inspectOperation = inspec
       `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}`,
+      ...syncState?.unresolved?.length ? [
+        `Unresolved: ${syncState.unresolved.length} dependency groups \xB7 review History & recovery`,
+        `Last observed: ${safeTerminalText(syncState.lastObservedSnapshot ?? "unknown")}`
+      ] : [],
       ...currentAttention ? [
         currentAttention.decision.setupName === config.setupName ? "Sync status: Review needed" : `Sync status: Review needed for setup ${safeTerminalText(currentAttention.decision.setupName)}`,
         attentionComparison?.remoteOnly.length === 0 && attentionComparison.localOnly.length === 0 ? "Only the synced-content order differs." : `Remote-only paths: ${attentionComparison?.remoteOnly.length ?? 0} \xB7 Device-only paths: ${attentionComparison?.localOnly.length ?? 0}`,
@@ -663,11 +675,143 @@ async function showSyncSettings(ctx, runRoute, signal) {
             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"
           }
         ]
       })
     },
     actions: {
+      "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;
@@ -689,6 +833,24 @@ async function showSyncSettings(ctx, runRoute, signal) {
           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;
@@ -746,7 +908,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-TZTJF32Y.ts");
+        const { showRemoteSelectionReview } = await import("./remote-selection-ui-SMF5CLFO.ts");
         if (reviewSignal.aborted) return { kind: "rejected" };
         const review = await showRemoteSelectionReview(ctx, setupName, reviewSignal, void 0, {
           origin: "settings",
@@ -768,7 +930,10 @@ async function showSyncSettings(ctx, runRoute, signal) {
   });
 }
 function notifySaveFailure(ctx, error) {
-  ctx.ui.notify(`Pi Sync settings save failed: ${error instanceof Error ? error.message : String(error)}`, "error");
+  ctx.ui.notify(
+    `Pi Sync settings save failed: ${safeTerminalText(error instanceof Error ? error.message : String(error))}`,
+    "error"
+  );
 }
 
 // src/ui/storage-connections-ui.ts
@@ -786,8 +951,8 @@ async function showStorageConnections(ctx, signal) {
         return {
           kind: "actions",
           title: "Storage connections",
-          lines: state.version3 ? ["Server addresses and sign-in details, reusable across sync setups."] : ["Create version 3 settings before managing storage connections."],
-          items: state.version3 ? [
+          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}`;
@@ -882,11 +1047,15 @@ async function loadStorageMenuState(selectedName, signal) {
   const profiles = ownRecord(raw?.storageConnections) ?? {};
   const profile = selectedName ? ownRecord(profiles[selectedName]) : void 0;
   if (!selectedName || !profile) {
-    return { version3: raw?.version === 3, profiles, selected: void 0 };
+    return {
+      supportedVersion: raw?.version === 3 || raw?.version === 4 || raw?.version === 5,
+      profiles,
+      selected: void 0
+    };
   }
   const usedBy = referencingSetups(raw, selectedName);
   return {
-    version3: raw?.version === 3,
+    supportedVersion: raw?.version === 3 || raw?.version === 4 || raw?.version === 5,
     profiles,
     selected: {
       name: selectedName,
@@ -911,7 +1080,7 @@ function notifyConnectionError(ctx, name, error, signal) {
 async function editStorageConnection(ctx, name, profile, usedBy, signal) {
   if (ctx.mode !== "tui") {
     ctx.ui.notify(
-      "Editing storage connections requires TUI mode for safe credential handling. Edit the private version 3 settings file instead.",
+      "Editing storage connections requires TUI mode for safe credential handling. Edit the private pi-sync settings file instead.",
       "warning"
     );
     return;
@@ -984,7 +1153,7 @@ async function editStorageConnection(ctx, name, profile, usedBy, signal) {
 async function showAddStorageConnection(ctx, signal) {
   if (ctx.mode !== "tui") {
     ctx.ui.notify(
-      "Adding storage connections requires TUI mode for safe credential handling. Edit the private version 3 settings file instead.",
+      "Adding storage connections requires TUI mode for safe credential handling. Edit the private pi-sync settings file instead.",
       "warning"
     );
     return false;
@@ -1129,7 +1298,7 @@ async function selectSetupForSwitch(ctx, raw, targets, active, signal) {
 async function showSetupSwitcher(ctx, runRoute, selectedName, signal) {
   const raw = await readLocalConfigObject();
   if (signal?.aborted) return false;
-  if (raw?.version !== 3) {
+  if (raw?.version !== 3 && raw?.version !== 4 && raw?.version !== 5) {
     ctx.ui.notify("Add a second sync setup before switching setups.", "info");
     return false;
   }
@@ -1174,6 +1343,7 @@ async function showSetupSwitcher(ctx, runRoute, selectedName, signal) {
       `Storage: ${backendStorageDescription(config)}`,
       `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"}`,
       "",
       switchEffect
     ].join("\n"),
@@ -1248,7 +1418,7 @@ 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) {
+  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;
   }
@@ -1295,7 +1465,7 @@ async function showEditTarget(ctx, name, signal) {
   const partial = await loadPartialConfig(name);
   if (signal?.aborted) return;
   if (!partial.setupName) {
-    ctx.ui.notify("Create version 3 settings before editing a named sync setup.", "info");
+    ctx.ui.notify("Create supported pi-sync settings before editing a named sync setup.", "info");
     return;
   }
   if (partial.storageKind === "webdav") {
@@ -1374,6 +1544,7 @@ async function showSyncManager(ctx, runRoute, sessionSignal, options = {}) {
         title: "History & recovery",
         items: [
           { id: "history", label: "Browse history", action: "history" },
+          { id: "conflicts", label: "Review unresolved conflicts", action: "conflicts" },
           {
             id: "doctor",
             label: "Check setup",
@@ -1392,7 +1563,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-TZTJF32Y.ts");
+          const { showRemoteSelectionReview } = await import("./remote-selection-ui-SMF5CLFO.ts");
           if (sessionSignal?.aborted) return { kind: "close" };
           const config = await loadConfig();
           if (sessionSignal?.aborted) return { kind: "close" };
@@ -1508,6 +1679,14 @@ async function showSyncManager(ctx, runRoute, sessionSignal, options = {}) {
         await runRoute("init");
         return { kind: "stay" };
       },
+      conflicts: async () => {
+        const result = await runCancellableOperation(ctx, "Reviewing private conflicts\u2026", "conflicts", runRoute, {
+          commitAware: true,
+          signal: sessionSignal
+        });
+        const disposition = await dispatchManagerResult(ctx, result, "sync", runRoute, sessionSignal);
+        return disposition.kind === "close" ? { kind: "close" } : { kind: "stay" };
+      },
       back: async () => ({ kind: "back" })
     }
   });
@@ -1550,4 +1729,4 @@ function syncMainMenuItem(label) {
 export {
   showSyncManager
 };
-//# sourceMappingURL=manager-ui-763NEKJY.ts.map
+//# sourceMappingURL=manager-ui-HSMHS3OK.ts.map