@narumitw/pi-sync 0.57.10 → 0.57.11

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @narumitw/pi-sync
 
+## 0.57.11
+
+### Patch Changes
+
+- 41c32db: Fix settings and transfer safety findings. Keep canonical settings available during replacement, order reads behind pending writes, and stop cancelled initialization. Bind manager actions and remote content-list adoption to the reviewed setup and connection, with cancellable network checks. Reject S3 redirects and correct SigV4 URI encoding. Preserve BOM-prefixed Pi settings and refuse unsafe aliased snapshot mutation paths while retaining recovery evidence.
+
 ## 0.57.10
 
 ### Patch Changes

package/README.md

@@ -77,7 +77,7 @@ Remote status: Not checked
 
 Use **Sync now** for bidirectional merging, or **Pull from remote…** and **Push to remote…** for reviewed directional transfers. **Settings**, **History**, and **Diagnostics** are also directly available. Switching appears only when multiple valid setups exist; review and access-recovery actions appear when needed. Pull and Push do not implicitly force overwrites.
 
-The main summary separates current state from actions and uses local state and cached check-time observations, not a fresh remote comparison. Choose **Check remote status** for a fresh read/check or **View differences** for file differences; `/sync status`, `/sync diff`, and `/sync help` remain available. Last applied shows a compact snapshot ID and states when application time is unavailable; History retains full IDs.
+The main summary separates current state from actions and uses local state and cached check-time observations, not a fresh remote comparison. Setup-specific actions stay bound to the displayed setup; if its configuration changes while the menu is open, review the refreshed setup before continuing. Choose **Check remote status** for a fresh read/check or **View differences** for file differences; `/sync status`, `/sync diff`, and `/sync help` remain available. Last applied shows a compact snapshot ID and states when application time is unavailable; History retains full IDs.
 
 After Pi Sync detects an included-content mismatch, the manager shows **Sync status: Review needed** and puts **Review synced content (recommended)** first.
 **Sync now** remains unavailable until you review the mismatch.
@@ -325,12 +325,16 @@ WebDAV requires HTTPS except loopback tests.
 URL credentials, query strings, fragments, unsafe redirects, weak/missing ETags, and ignored conditional headers fail closed.
 `/sync doctor` verifies collection and conditional-write behavior with an isolated probe, then repairs a missing active-snapshot history entry.
 
+S3/R2 requests reject redirects, including same-origin redirects; configure the canonical endpoint before syncing. Credentials and snapshot bodies are never forwarded to a redirect destination.
+
 S3/R2 publishes `latest.json` and history using ETag `If-Match`, or `If-None-Match: *` for first creation, then verifies the active pointer. Before each publication, an isolated `.pi-sync-probes/<random-id>` object verifies that the server rejects stale ETags and create-only writes to existing objects and rotates strong ETags. Credentials must allow read, write, and delete under the selected storage path; the probe is deleted even after cancellation. Missing/weak ETags, ignored conditions, and probe or cleanup failures stop publication. A failed cleanup reports the probe key for manual removal; bucket versioning may retain probe versions. `/sync doctor` remains read-only for S3/R2 and does not verify write support.
 
 Snapshot recovery is guarded: new journals record before/after images, older journals are retired only when their unchanged preimages are provable, and unrecognized bytes remain untouched for manual review. Current-session targets are never restored during startup. Preserve a blocked transaction and its backup, close Pi, and review the private evidence before restoring selected paths; malformed/unsupported journals are not disposable. Pi may have loaded resources before lifecycle recovery, so reload or restart explicitly after recovery if loaded resources need to match the restored files.
 
 Before pull or rollback, pi-sync writes a backup under `<agent-dir>/pi-sync/backups/`.
+Snapshot apply and recovery require canonical agent and session paths. Symlinked or otherwise aliased parent paths are refused before changing managed local files because Pi's file queue uses different keys for existing and missing aliases. Use canonical paths for local mutations and preserve any pending recovery evidence; an unresolved startup recovery barrier still blocks transfers. Old journals recorded under an alias require manual review because their exact root and target paths remain pinned. Changing the agent path alone does not authorize recovery or rewriting those journals.
 Apply preflights paths and checksums, journals mutations, and restores prior state only when current bytes match verified preimages or planned postimages. Unknown intermediate directory states and newer edits require review rather than a blind rollback. An interruption after replacement is armed can require manual recovery even if installation never ran; a later deletion of installed content is not treated as an unfinished remove.
+The file queue coordinates one Pi runtime, not separate processes or lock-unaware editors. Hash-based journals cannot distinguish a later write of identical recorded bytes; they do not provide a cross-process compare-and-swap.
 Merged transfers instead retain a private publication/apply/baseline journal and roll forward only when the active remote candidate and every changed local preimage/postimage can be verified. A crash or uncertain publication is reconciled through `/sync sync` without blind republishing. If newer local or remote changes prevent reconciliation, preserve the evidence, review `/sync diff`, and explicitly choose `push --force` or `pull --force`; the chosen direction archives the old journal. Disabling automatic transfer does not undo completed transfers. Do not downgrade while a merge or snapshot recovery journal is pending.
 
 Removing a local setup or connection never deletes remote data.

package/dist/chunks/{agent-candidate-EYB35AGL.ts → agent-candidate-OCDPRI5G.ts}

@@ -5,20 +5,20 @@ import {
   buildAgentEvidence,
   digest,
   parseAgentCandidate
-} from "./chunk-IMMMZUFC.ts";
-import "./chunk-AO6EDUA6.ts";
-import "./chunk-CDQGSZL3.ts";
+} from "./chunk-67INJPKR.ts";
+import "./chunk-AKMV47YC.ts";
+import "./chunk-6LD5KX55.ts";
 import "./chunk-ZW5ZLGBI.ts";
-import "./chunk-TO2GMX3K.ts";
-import "./chunk-73MDIVYJ.ts";
+import "./chunk-XJHQPB3E.ts";
+import "./chunk-DN4IA7MR.ts";
+import "./chunk-AR2DGDUI.ts";
 import "./chunk-SWRVXVFD.ts";
 import "./chunk-2JZFHNLM.ts";
 import "./chunk-T2SJD3N7.ts";
-import "./chunk-PHANBTVM.ts";
-import "./chunk-DFJGTVPX.ts";
-import "./chunk-DO55XUNU.ts";
-import "./chunk-AR2DGDUI.ts";
-import "./chunk-YZ5BQNRZ.ts";
+import "./chunk-ESKOPQVB.ts";
+import "./chunk-KYTT7KV4.ts";
+import "./chunk-CBLTWXAU.ts";
+import "./chunk-FHE2DCA2.ts";
 import "./chunk-PRUEIIK7.ts";
 export {
   applyAgentCandidate,
@@ -26,4 +26,4 @@ export {
   digest,
   parseAgentCandidate
 };
-//# sourceMappingURL=agent-candidate-EYB35AGL.ts.map
+//# sourceMappingURL=agent-candidate-OCDPRI5G.ts.map

package/dist/chunks/{agent-plan-KO43GTOR.ts → agent-plan-P5B5RGZ7.ts}

@@ -3,40 +3,40 @@
 import {
   fileHashMap,
   sameHashes
-} from "./chunk-JY2RVOUL.ts";
+} from "./chunk-Y4UVXOLQ.ts";
 import {
   AgentResolutionRequired
 } from "./chunk-3ST7RSYN.ts";
-import "./chunk-UGSSZWQ6.ts";
+import "./chunk-MKSMJPVA.ts";
 import {
   syncConfigReviewIdentity
-} from "./chunk-RX3WGWVL.ts";
+} from "./chunk-OVBAW7KV.ts";
 import "./chunk-X7R6DCVF.ts";
 import {
   applyAgentCandidate,
   buildAgentEvidence,
   digest
-} from "./chunk-IMMMZUFC.ts";
-import "./chunk-AO6EDUA6.ts";
+} from "./chunk-67INJPKR.ts";
+import "./chunk-AKMV47YC.ts";
 import {
   readMergeAncestors
-} from "./chunk-CDQGSZL3.ts";
+} from "./chunk-6LD5KX55.ts";
 import "./chunk-ZW5ZLGBI.ts";
-import "./chunk-TO2GMX3K.ts";
+import "./chunk-XJHQPB3E.ts";
 import {
   readStateForConfig,
   syncStateFingerprint
-} from "./chunk-73MDIVYJ.ts";
+} from "./chunk-DN4IA7MR.ts";
+import "./chunk-AR2DGDUI.ts";
 import "./chunk-SWRVXVFD.ts";
 import "./chunk-2JZFHNLM.ts";
 import "./chunk-T2SJD3N7.ts";
 import {
   createSnapshot
-} from "./chunk-PHANBTVM.ts";
-import "./chunk-DFJGTVPX.ts";
-import "./chunk-DO55XUNU.ts";
-import "./chunk-AR2DGDUI.ts";
-import "./chunk-YZ5BQNRZ.ts";
+} from "./chunk-ESKOPQVB.ts";
+import "./chunk-KYTT7KV4.ts";
+import "./chunk-CBLTWXAU.ts";
+import "./chunk-FHE2DCA2.ts";
 import {
   ContinuousError
 } from "./chunk-DT7M4VQS.ts";
@@ -117,4 +117,4 @@ async function resolveAgentPlan(ctx, options, config, backend, state, local, loc
 export {
   resolveAgentPlan
 };
-//# sourceMappingURL=agent-plan-KO43GTOR.ts.map
+//# sourceMappingURL=agent-plan-P5B5RGZ7.ts.map

package/dist/chunks/{agent-refusal-retry-C2HQROTP.ts → agent-refusal-retry-476YGNU5.ts}

@@ -3,27 +3,27 @@
 import {
   confirmMergeReview
 } from "./chunk-KHBPED6W.ts";
-import "./chunk-Z5O2TLNF.ts";
-import "./chunk-MRIPZGPR.ts";
+import "./chunk-TZC7GDJE.ts";
+import "./chunk-FLHCOJCD.ts";
 import {
   captureMutationOwner
-} from "./chunk-5WJQ6XOW.ts";
+} from "./chunk-GNYGNHFF.ts";
 import {
   safeTerminalText
 } from "./chunk-AMJRUXFT.ts";
 import {
   loadConfig
-} from "./chunk-RX3WGWVL.ts";
+} from "./chunk-OVBAW7KV.ts";
 import "./chunk-X7R6DCVF.ts";
 import "./chunk-PWMWOJP4.ts";
+import "./chunk-AR2DGDUI.ts";
 import "./chunk-SWRVXVFD.ts";
 import "./chunk-2JZFHNLM.ts";
 import "./chunk-T2SJD3N7.ts";
-import "./chunk-PHANBTVM.ts";
-import "./chunk-DFJGTVPX.ts";
-import "./chunk-DO55XUNU.ts";
-import "./chunk-AR2DGDUI.ts";
-import "./chunk-YZ5BQNRZ.ts";
+import "./chunk-ESKOPQVB.ts";
+import "./chunk-KYTT7KV4.ts";
+import "./chunk-CBLTWXAU.ts";
+import "./chunk-FHE2DCA2.ts";
 
 // src/sync/agent-refusal-retry.ts
 async function confirmAgentRefusalRetry(ctx, setup, evidence, validate, signal) {
@@ -69,4 +69,4 @@ async function confirmAgentRefusalRetry(ctx, setup, evidence, validate, signal)
 export {
   confirmAgentRefusalRetry
 };
-//# sourceMappingURL=agent-refusal-retry-C2HQROTP.ts.map
+//# sourceMappingURL=agent-refusal-retry-476YGNU5.ts.map

package/dist/chunks/{agent-store-UT52DS7B.ts → agent-store-RJSMNOYP.ts}

@@ -2,9 +2,12 @@
 // @ts-nocheck -- generated JavaScript uses a .ts extension for Pi's Jiti loader.
 import {
   withLock
-} from "./chunk-MDUORMCK.ts";
+} from "./chunk-6O3EDBRL.ts";
 import "./chunk-PWMWOJP4.ts";
-import "./chunk-73MDIVYJ.ts";
+import "./chunk-DN4IA7MR.ts";
+import {
+  writeJson
+} from "./chunk-AR2DGDUI.ts";
 import {
   LOCKFILE_FS_ADAPTER,
   LOCK_GUARD_STALE_MS,
@@ -13,10 +16,7 @@ import {
 } from "./chunk-SWRVXVFD.ts";
 import "./chunk-2JZFHNLM.ts";
 import "./chunk-T2SJD3N7.ts";
-import {
-  writeJson
-} from "./chunk-AR2DGDUI.ts";
-import "./chunk-YZ5BQNRZ.ts";
+import "./chunk-FHE2DCA2.ts";
 import {
   ContinuousError
 } from "./chunk-DT7M4VQS.ts";
@@ -172,4 +172,4 @@ export {
   saveAgentCandidate,
   withAgentClaim
 };
-//# sourceMappingURL=agent-store-UT52DS7B.ts.map
+//# sourceMappingURL=agent-store-RJSMNOYP.ts.map

package/dist/chunks/{agent-sync-VM3TXWA3.ts → agent-sync-EUK2CPSS.ts}

@@ -2,21 +2,21 @@
 // @ts-nocheck -- generated JavaScript uses a .ts extension for Pi's Jiti loader.
 import {
   withAgentSyncLock
-} from "./chunk-ODF2M4RF.ts";
+} from "./chunk-F7E3VFXU.ts";
 import "./chunk-3ST7RSYN.ts";
 import "./chunk-K3RIEL6J.ts";
-import "./chunk-MDUORMCK.ts";
+import "./chunk-6O3EDBRL.ts";
 import "./chunk-PWMWOJP4.ts";
-import "./chunk-73MDIVYJ.ts";
+import "./chunk-DN4IA7MR.ts";
+import "./chunk-AR2DGDUI.ts";
 import "./chunk-SWRVXVFD.ts";
 import "./chunk-2JZFHNLM.ts";
 import "./chunk-T2SJD3N7.ts";
-import "./chunk-AR2DGDUI.ts";
-import "./chunk-YZ5BQNRZ.ts";
+import "./chunk-FHE2DCA2.ts";
 import "./chunk-DT7M4VQS.ts";
 import "./chunk-YDVQYUHE.ts";
 import "./chunk-PRUEIIK7.ts";
 export {
   withAgentSyncLock
 };
-//# sourceMappingURL=agent-sync-VM3TXWA3.ts.map
+//# sourceMappingURL=agent-sync-EUK2CPSS.ts.map

package/dist/chunks/{chunk-UCD7TQDT.ts → chunk-3IYAPMST.ts}

@@ -9,7 +9,7 @@ import {
   saveNewV3Settings,
   updateStorageConnection,
   updateSyncSetup
-} from "./chunk-JXWTEJS5.ts";
+} from "./chunk-45COPAK7.ts";
 import {
   syncErrorGuidance
 } from "./chunk-G4RUXRWZ.ts";
@@ -33,7 +33,7 @@ import {
   readLocalConfigObject,
   requiredString,
   validateConfigName
-} from "./chunk-RX3WGWVL.ts";
+} from "./chunk-OVBAW7KV.ts";
 import {
   throwIfAborted
 } from "./chunk-PWMWOJP4.ts";
@@ -49,7 +49,7 @@ import {
 } from "./chunk-T2SJD3N7.ts";
 import {
   DEFAULT_SYNC_INCLUDE
-} from "./chunk-DFJGTVPX.ts";
+} from "./chunk-KYTT7KV4.ts";
 
 // src/commands/setup-completions.ts
 async function refreshTargetCompletions() {
@@ -1031,4 +1031,4 @@ export {
   showAddWebDavStorageProfile,
   showEditWebDavStorageProfile
 };
-//# sourceMappingURL=chunk-UCD7TQDT.ts.map
+//# sourceMappingURL=chunk-3IYAPMST.ts.map

package/dist/chunks/{chunk-JXWTEJS5.ts → chunk-45COPAK7.ts}

@@ -1,15 +1,17 @@
 // @generated by scripts/build-runtime.mjs; do not edit.
 // @ts-nocheck -- generated JavaScript uses a .ts extension for Pi's Jiti loader.
 import {
+  configFromSettings,
   effectiveSyncSetupRemoteIdentity,
   localConfigPath,
+  syncCheckConfigFingerprint,
   syncSetupStorageReview,
   updateLocalConfig,
   validateConfigName
-} from "./chunk-RX3WGWVL.ts";
+} from "./chunk-OVBAW7KV.ts";
 import {
   normalizeSyncInclude
-} from "./chunk-DFJGTVPX.ts";
+} from "./chunk-KYTT7KV4.ts";
 
 // src/settings/settings-management.ts
 import { isDeepStrictEqual } from "node:util";
@@ -98,6 +100,11 @@ async function updateSyncSetup(name, update, options = {}) {
   await updateSettings((settings) => {
     const setup = settings.syncSetups[name];
     if (!setup) throw new Error(`Sync setup not found: ${name}`);
+    if (options.expectedConfigFingerprint !== void 0 && syncCheckConfigFingerprint(configFromSettings(settings, name)) !== options.expectedConfigFingerprint) {
+      throw new SyncSetupReviewChangedError(
+        `Sync setup \u201C${name}\u201D changed while it was open; reopen it and review the current configuration.`
+      );
+    }
     if (options.expectedInclude && !sameNames(normalizeSyncInclude(setup.sync.include), options.expectedInclude)) {
       throw new SyncSetupReviewChangedError(
         `Sync setup \u201C${name}\u201D included content changed while it was open; reopen it and review the current selection.`
@@ -195,4 +202,4 @@ export {
   removeSyncSetup,
   removeStorageConnection
 };
-//# sourceMappingURL=chunk-JXWTEJS5.ts.map
+//# sourceMappingURL=chunk-45COPAK7.ts.map

package/dist/chunks/chunk-45COPAK7.ts.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/settings/settings-management.ts"],
+  "sourcesContent": ["import { isDeepStrictEqual } from \"node:util\";\nimport { normalizeSyncInclude } from \"../sync/sync-policy.js\";\nimport {\n  configFromSettings,\n  type SyncSetupStorageReview,\n  syncCheckConfigFingerprint,\n  syncSetupStorageReview,\n} from \"./config.js\";\nimport { localConfigPath } from \"./config-file.js\";\nimport { updateLocalConfig } from \"./settings-store.js\";\nimport type { PiSyncSettingsV3, StorageConnectionSettings, SyncSetupSettings } from \"./settings-types.js\";\nimport { effectiveSyncSetupRemoteIdentity, validateConfigName } from \"./settings-validation.js\";\n\nexport class SyncSetupReviewChangedError extends Error {\n  constructor(message: string) {\n    super(message);\n    this.name = \"SyncSetupReviewChangedError\";\n  }\n}\n\nexport async function saveNewV3Settings(\n  input: {\n    setupName: string;\n    connectionName: string;\n    connection: StorageConnectionSettings;\n    setup: SyncSetupSettings;\n  },\n  signal?: AbortSignal,\n) {\n  validateConfigName(input.setupName, \"sync setup\");\n  validateConfigName(input.connectionName, \"storage connection\");\n  const settings: PiSyncSettingsV3 = {\n    version: 3,\n    activeSyncSetup: input.setupName,\n    onSwitch: \"ask-before-pull\",\n    skipSecretScan: false,\n    storageConnections: { [input.connectionName]: structuredClone(input.connection) },\n    syncSetups: {\n      [input.setupName]: {\n        ...structuredClone(input.setup),\n        storage: { ...input.setup.storage, connection: input.connectionName },\n      },\n    },\n  };\n  return updateLocalConfig((current) => {\n    if (Object.keys(current.storageConnections).length || Object.keys(current.syncSetups).length) {\n      throw new Error(`Settings already exist: ${localConfigPath()}`);\n    }\n    return { ...current, ...settings };\n  }, signal);\n}\n\nexport async function addStorageConnection(name: string, connection: StorageConnectionSettings, signal?: AbortSignal) {\n  validateConfigName(name, \"storage connection\");\n  await updateSettings((settings) => {\n    if (Object.hasOwn(settings.storageConnections, name)) {\n      throw new Error(`Storage connection already exists: ${name}`);\n    }\n    return {\n      ...settings,\n      storageConnections: {\n        ...settings.storageConnections,\n        [name]: structuredClone(connection),\n      },\n    };\n  }, signal);\n}\n\nexport async function updateStorageConnection(\n  name: string,\n  update: (connection: StorageConnectionSettings) => StorageConnectionSettings,\n  expectedSetups?: readonly string[],\n  signal?: AbortSignal,\n) {\n  validateConfigName(name, \"storage connection\");\n  await updateSettings((settings) => {\n    const connection = settings.storageConnections[name];\n    if (!connection) throw new Error(`Storage connection not found: ${name}`);\n    const currentSetups = referencingSetupNames(settings.syncSetups, name);\n    if (expectedSetups && !sameNames(currentSetups, expectedSetups)) {\n      throw new Error(\n        `Storage connection \u201C${name}\u201D usage changed while it was open; reopen it and review the affected sync setups.`,\n      );\n    }\n    const nextConnection = update(structuredClone(connection));\n    const nextConnections = { ...settings.storageConnections, [name]: nextConnection };\n    assertUniqueLocations(settings.syncSetups, nextConnections);\n    return { ...settings, storageConnections: nextConnections };\n  }, signal);\n}\n\nexport async function addSyncSetup(\n  name: string,\n  setup: SyncSetupSettings,\n  signal?: AbortSignal,\n  expectedConnection?: StorageConnectionSettings,\n) {\n  validateConfigName(name, \"sync setup\");\n  await updateSettings((settings) => {\n    if (Object.hasOwn(settings.syncSetups, name)) throw new Error(`Sync setup already exists: ${name}`);\n    if (!Object.hasOwn(settings.storageConnections, setup.storage.connection)) {\n      throw new Error(`Storage connection not found: ${setup.storage.connection}`);\n    }\n    if (\n      expectedConnection &&\n      !isDeepStrictEqual(settings.storageConnections[setup.storage.connection], expectedConnection)\n    ) {\n      throw new SyncSetupReviewChangedError(\"Storage connection changed while the setup review was open; reopen it.\");\n    }\n    const nextSetups = { ...settings.syncSetups, [name]: structuredClone(setup) };\n    assertUniqueLocations(nextSetups, settings.storageConnections);\n    return {\n      ...settings,\n      syncSetups: nextSetups,\n      ...(settings.activeSyncSetup ? {} : { activeSyncSetup: name }),\n    };\n  }, signal);\n}\n\nexport async function updateSyncSetup(\n  name: string,\n  update: (setup: SyncSetupSettings) => SyncSetupSettings,\n  options: {\n    expectedStorage?: SyncSetupStorageReview;\n    expectedInclude?: readonly string[];\n    expectedConnection?: StorageConnectionSettings;\n    expectedConfigFingerprint?: string;\n    signal?: AbortSignal;\n  } = {},\n) {\n  validateConfigName(name, \"sync setup\");\n  await updateSettings((settings) => {\n    const setup = settings.syncSetups[name];\n    if (!setup) throw new Error(`Sync setup not found: ${name}`);\n    if (\n      options.expectedConfigFingerprint !== undefined &&\n      syncCheckConfigFingerprint(configFromSettings(settings, name)) !== options.expectedConfigFingerprint\n    ) {\n      throw new SyncSetupReviewChangedError(\n        `Sync setup \u201C${name}\u201D changed while it was open; reopen it and review the current configuration.`,\n      );\n    }\n    if (options.expectedInclude && !sameNames(normalizeSyncInclude(setup.sync.include), options.expectedInclude)) {\n      throw new SyncSetupReviewChangedError(\n        `Sync setup \u201C${name}\u201D included content changed while it was open; reopen it and review the current selection.`,\n      );\n    }\n    if (options.expectedStorage) {\n      const connectionName = setup.storage.connection;\n      const connection = settings.storageConnections[connectionName];\n      if (\n        !connection ||\n        !sameStorageReview(syncSetupStorageReview(name, setup, connectionName, connection), options.expectedStorage)\n      ) {\n        throw new SyncSetupReviewChangedError(\n          `Sync setup \u201C${name}\u201D storage changed while it was open; reopen it and review the current storage location.`,\n        );\n      }\n    }\n    if (\n      options.expectedConnection &&\n      !isDeepStrictEqual(settings.storageConnections[setup.storage.connection], options.expectedConnection)\n    ) {\n      throw new SyncSetupReviewChangedError(\"Storage connection changed while the setup review was open; reopen it.\");\n    }\n    const nextSetup = update(structuredClone(setup));\n    if (!Object.hasOwn(settings.storageConnections, nextSetup.storage.connection)) {\n      throw new Error(`Storage connection not found: ${nextSetup.storage.connection}`);\n    }\n    const nextSetups = { ...settings.syncSetups, [name]: nextSetup };\n    assertUniqueLocations(nextSetups, settings.storageConnections);\n    return { ...settings, syncSetups: nextSetups };\n  }, options.signal);\n}\n\nexport async function removeSyncSetup(name: string, signal?: AbortSignal) {\n  validateConfigName(name, \"sync setup\");\n  await updateSettings((settings) => {\n    if (!Object.hasOwn(settings.syncSetups, name)) throw new Error(`Sync setup not found: ${name}`);\n    const isCurrent = settings.activeSyncSetup === name;\n    if (isCurrent && Object.keys(settings.syncSetups).length > 1) {\n      throw new Error(\"Switch to another sync setup before removing the current setup.\");\n    }\n    const syncSetups = { ...settings.syncSetups };\n    delete syncSetups[name];\n    const next = { ...settings, syncSetups };\n    if (isCurrent) delete next.activeSyncSetup;\n    return next;\n  }, signal);\n}\n\nexport async function removeStorageConnection(name: string, signal?: AbortSignal) {\n  validateConfigName(name, \"storage connection\");\n  await updateSettings((settings) => {\n    const referenced = referencingSetupNames(settings.syncSetups, name)[0];\n    if (referenced) {\n      throw new Error(`Storage connection \u201C${name}\u201D is used by sync setup \u201C${referenced}\u201D.`);\n    }\n    if (!Object.hasOwn(settings.storageConnections, name)) {\n      throw new Error(`Storage connection not found: ${name}`);\n    }\n    const storageConnections = { ...settings.storageConnections };\n    delete storageConnections[name];\n    return { ...settings, storageConnections };\n  }, signal);\n}\n\nasync function updateSettings(update: (settings: PiSyncSettingsV3) => PiSyncSettingsV3, signal?: AbortSignal) {\n  return updateLocalConfig((settings) => {\n    if (settings.version !== 3 && settings.version !== 4 && settings.version !== 5) {\n      throw new Error(\"Storage connections and sync setups require version 3 or 4 or 5 pi-sync settings.\");\n    }\n    return update(settings);\n  }, signal);\n}\n\nfunction referencingSetupNames(setups: Record<string, SyncSetupSettings>, connection: string) {\n  return Object.entries(setups)\n    .filter(([, setup]) => setup.storage.connection === connection)\n    .map(([name]) => name)\n    .sort((left, right) => left.localeCompare(right));\n}\n\nfunction assertUniqueLocations(\n  setups: Record<string, SyncSetupSettings>,\n  connections: Record<string, StorageConnectionSettings>,\n) {\n  const identities = new Map<string, string>();\n  for (const [name, setup] of Object.entries(setups)) {\n    const connection = connections[setup.storage.connection];\n    if (!connection) throw new Error(`Storage connection not found: ${setup.storage.connection}`);\n    const identity = effectiveSyncSetupRemoteIdentity(setup, connection);\n    const previous = identities.get(identity);\n    if (previous) {\n      throw new Error(`Sync setup \u201C${name}\u201D duplicates the storage location of \u201C${previous}\u201D.`);\n    }\n    identities.set(identity, name);\n  }\n}\n\nfunction sameNames(left: readonly string[], right: readonly string[]) {\n  return left.length === right.length && left.every((name, index) => name === right[index]);\n}\n\nfunction sameStorageReview(left: SyncSetupStorageReview, right: SyncSetupStorageReview) {\n  return (\n    left.connectionName === right.connectionName &&\n    left.storageKind === right.storageKind &&\n    left.storagePath === right.storagePath &&\n    left.bucket === right.bucket &&\n    left.branch === right.branch\n  );\n}\n"],
+  "mappings": "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",
+  "names": []
+}

package/dist/chunks/{chunk-DOJRPBQU.ts → chunk-5TSCBBPP.ts}

@@ -2,15 +2,15 @@
 // @ts-nocheck -- generated JavaScript uses a .ts extension for Pi's Jiti loader.
 import {
   mergeJournalIdentity
-} from "./chunk-66GAUVDL.ts";
+} from "./chunk-BEST45H2.ts";
 import {
   mergePathIdentity,
   planFileMerge
-} from "./chunk-TO2GMX3K.ts";
+} from "./chunk-XJHQPB3E.ts";
 import {
   statePathForConfig,
   syncStateFingerprint
-} from "./chunk-73MDIVYJ.ts";
+} from "./chunk-DN4IA7MR.ts";
 import {
   syncDirectory,
   writeJson
@@ -226,4 +226,4 @@ export {
   saveConflictArtifact,
   readConflictArtifact
 };
-//# sourceMappingURL=chunk-DOJRPBQU.ts.map
+//# sourceMappingURL=chunk-5TSCBBPP.ts.map

package/dist/chunks/{chunk-IMMMZUFC.ts → chunk-67INJPKR.ts}

@@ -4,20 +4,20 @@ import {
   COUPLED_FIELDS,
   mergeSettingsJson,
   snapshotFile
-} from "./chunk-AO6EDUA6.ts";
+} from "./chunk-AKMV47YC.ts";
 import {
   edits,
   isMergeTextPath,
   lines,
   text
-} from "./chunk-CDQGSZL3.ts";
+} from "./chunk-6LD5KX55.ts";
 import {
   parseJsonObjectDocument,
   parseSettingsDocument
 } from "./chunk-ZW5ZLGBI.ts";
 import {
   scanSnapshot
-} from "./chunk-PHANBTVM.ts";
+} from "./chunk-ESKOPQVB.ts";
 import {
   AGENT_INPUT_BYTES,
   AGENT_MAX_UNITS,
@@ -217,4 +217,4 @@ export {
   parseAgentCandidate,
   applyAgentCandidate
 };
-//# sourceMappingURL=chunk-IMMMZUFC.ts.map
+//# sourceMappingURL=chunk-67INJPKR.ts.map

package/dist/chunks/{chunk-CDQGSZL3.ts → chunk-6LD5KX55.ts}

@@ -7,18 +7,18 @@ import {
 import {
   collidingPaths,
   planFileMerge
-} from "./chunk-TO2GMX3K.ts";
+} from "./chunk-XJHQPB3E.ts";
 import {
   statePathForConfig,
   syncStateFingerprint
-} from "./chunk-73MDIVYJ.ts";
-import {
-  backendIdentityCoordinates
-} from "./chunk-2JZFHNLM.ts";
+} from "./chunk-DN4IA7MR.ts";
 import {
   syncDirectory,
   writeJson
 } from "./chunk-AR2DGDUI.ts";
+import {
+  backendIdentityCoordinates
+} from "./chunk-2JZFHNLM.ts";
 
 // src/state/merge-baseline-store.ts
 import { createHash } from "node:crypto";
@@ -393,4 +393,4 @@ export {
   readMergeAncestor,
   pruneMergeBaselines
 };
-//# sourceMappingURL=chunk-CDQGSZL3.ts.map
+//# sourceMappingURL=chunk-6LD5KX55.ts.map

package/dist/chunks/{chunk-MDUORMCK.ts → chunk-6O3EDBRL.ts}

@@ -6,7 +6,7 @@ import {
 import {
   ensureStateDir,
   lockPath
-} from "./chunk-73MDIVYJ.ts";
+} from "./chunk-DN4IA7MR.ts";
 import {
   LOCKFILE_FS_ADAPTER,
   LOCK_GUARD_STALE_MS,
@@ -255,4 +255,4 @@ export {
   isStaleLock,
   unlock
 };
-//# sourceMappingURL=chunk-MDUORMCK.ts.map
+//# sourceMappingURL=chunk-6O3EDBRL.ts.map