@narumitw/pi-sync 0.50.2 → 0.51.0

package/dist/chunks/{chunk-AUSDLD6F.ts → chunk-T56RNRZJ.ts}

@@ -3,7 +3,7 @@
 import {
   filterSnapshotForConfigPolicy,
   isSessionPath
-} from "./chunk-OEX4ABY6.ts";
+} from "./chunk-EEJPYTWE.ts";
 import {
   canonicalSnapshotPathForConfig,
   customIncludePathsByLower,
@@ -11,7 +11,7 @@ import {
   isConfiguredSnapshotPath,
   normalizeSyncInclude,
   toPosix
-} from "./chunk-JAAKLL6M.ts";
+} from "./chunk-IVXEDPAD.ts";
 
 // src/sync/sync-state.ts
 function hasLocalChanges(local, state, config) {
@@ -20,19 +20,13 @@ function hasLocalChanges(local, state, config) {
 function remoteChangedSinceState(head, state, config, sameRevision) {
   if (!head) return Boolean(state.lastAppliedSnapshot);
   if (head.snapshotId !== state.lastAppliedSnapshot) return true;
-  if (state.lastRemoteRevision && !sameRevision(head.revision, state.lastRemoteRevision))
-    return true;
+  if (state.lastRemoteRevision && !sameRevision(head.revision, state.lastRemoteRevision)) return true;
   if (syncIncludeChanged(state, config)) return true;
   return includeFromSelectionConfig(config).includes("sessions") && !state.include?.includes("sessions") && head.syncSessions;
 }
 function hasRemoteChanges(remote, state, config, ignoredPaths = /* @__PURE__ */ new Set()) {
   if (remote.id === state.lastAppliedSnapshot && !syncPolicyChanged(state, config)) return false;
-  return !snapshotHashesMatchState(
-    filterSnapshotForConfigPolicy(remote, config),
-    state,
-    config,
-    ignoredPaths
-  );
+  return !snapshotHashesMatchState(filterSnapshotForConfigPolicy(remote, config), state, config, ignoredPaths);
 }
 function sameHashes(left, right) {
   const keys = /* @__PURE__ */ new Set([...Object.keys(left), ...Object.keys(right)]);
@@ -59,17 +53,13 @@ function snapshotsMatch(left, right) {
 }
 function withoutHashPaths(hashes, ignoredPaths) {
   if (ignoredPaths.size === 0) return hashes;
-  return Object.fromEntries(
-    Object.entries(hashes).filter(([filePath]) => !ignoredPaths.has(toPosix(filePath)))
-  );
+  return Object.fromEntries(Object.entries(hashes).filter(([filePath]) => !ignoredPaths.has(toPosix(filePath))));
 }
 function syncPolicyChanged(state, config) {
   return syncIncludeChanged(state, config);
 }
 function shouldRefreshSyncedState(remote, head, state, config, sameRevision) {
-  return remote.id !== state.lastAppliedSnapshot || Boolean(
-    head && (!state.lastRemoteRevision || !sameRevision(head.revision, state.lastRemoteRevision))
-  ) || syncPolicyChanged(state, config);
+  return remote.id !== state.lastAppliedSnapshot || Boolean(head && (!state.lastRemoteRevision || !sameRevision(head.revision, state.lastRemoteRevision))) || syncPolicyChanged(state, config);
 }
 function syncIncludeChanged(state, config) {
   const stored = state.include ? normalizeSyncInclude(state.include) : includeFromSelectionConfig(state);
@@ -87,25 +77,19 @@ function sessionHashMap(snapshot) {
   );
 }
 function settingsHashMapFromState(state) {
-  return Object.fromEntries(
-    Object.entries(state.lastFileHashes).filter(([filePath]) => !isSessionPath(filePath))
-  );
+  return Object.fromEntries(Object.entries(state.lastFileHashes).filter(([filePath]) => !isSessionPath(filePath)));
 }
 function settingsHashesMatchState(remote, state) {
   return sameHashes(settingsHashMap(remote), settingsHashMapFromState(state));
 }
 function canPullRemoteSettingsOnFirstSync(local, remote) {
   const remoteSettings = settingsHashMap(remote);
-  return Object.entries(settingsHashMap(local)).every(
-    ([filePath, hash]) => remoteSettings[filePath] === hash
-  );
+  return Object.entries(settingsHashMap(local)).every(([filePath, hash]) => remoteSettings[filePath] === hash);
 }
 function canPullRemoteSessionsOnFirstSync(local, remote) {
   const localSessions = sessionHashMap(local);
   const remoteSessions = sessionHashMap(remote);
-  return Object.entries(localSessions).every(
-    ([filePath, hash]) => remoteSessions[filePath] === hash
-  );
+  return Object.entries(localSessions).every(([filePath, hash]) => remoteSessions[filePath] === hash);
 }
 
 export {
@@ -125,4 +109,4 @@ export {
   canPullRemoteSettingsOnFirstSync,
   canPullRemoteSessionsOnFirstSync
 };
-//# sourceMappingURL=chunk-AUSDLD6F.ts.map
+//# sourceMappingURL=chunk-T56RNRZJ.ts.map

package/dist/chunks/chunk-T56RNRZJ.ts.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/sync/sync-state.ts"],
+  "sourcesContent": ["import type { RemoteHead } from \"../backends/sync-backend.js\";\nimport { toPosix } from \"../paths.js\";\nimport {\n  canonicalSnapshotPathForConfig,\n  filterSnapshotForConfigPolicy,\n  isConfiguredSnapshotPath,\n  isSessionPath,\n} from \"../snapshot/snapshot.js\";\nimport type { Snapshot } from \"../snapshot/snapshot-types.js\";\nimport type { SyncState } from \"../state/state-types.js\";\nimport {\n  customIncludePathsByLower,\n  includeFromSelectionConfig,\n  normalizeSyncInclude,\n  type SyncSelectionConfig,\n} from \"./sync-policy.js\";\n\ntype SyncPolicyConfig = SyncSelectionConfig;\n\nexport function hasLocalChanges(local: Snapshot, state: SyncState, config: SyncPolicyConfig) {\n  return !sameHashes(fileHashMap(local), stateHashMapForConfig(state, config));\n}\n\nexport function remoteChangedSinceState(\n  head: RemoteHead | undefined,\n  state: SyncState,\n  config: SyncPolicyConfig,\n  sameRevision: (left: string, right: string) => boolean,\n) {\n  if (!head) return Boolean(state.lastAppliedSnapshot);\n  if (head.snapshotId !== state.lastAppliedSnapshot) return true;\n  if (state.lastRemoteRevision && !sameRevision(head.revision, state.lastRemoteRevision)) return true;\n  if (syncIncludeChanged(state, config)) return true;\n  return (\n    includeFromSelectionConfig(config).includes(\"sessions\") && !state.include?.includes(\"sessions\") && head.syncSessions\n  );\n}\n\nexport function hasRemoteChanges(\n  remote: Snapshot,\n  state: SyncState,\n  config: SyncPolicyConfig,\n  ignoredPaths = new Set<string>(),\n) {\n  if (remote.id === state.lastAppliedSnapshot && !syncPolicyChanged(state, config)) return false;\n  return !snapshotHashesMatchState(filterSnapshotForConfigPolicy(remote, config), state, config, ignoredPaths);\n}\n\nexport function sameHashes(left: Record<string, string>, right: Record<string, string>) {\n  const keys = new Set([...Object.keys(left), ...Object.keys(right)]);\n  for (const key of keys) if (left[key] !== right[key]) return false;\n  return true;\n}\n\nexport function fileHashMap(snapshot: Snapshot) {\n  return Object.fromEntries(snapshot.files.map((file) => [file.path, file.sha256]));\n}\n\nfunction stateHashMapForConfig(state: SyncState, config: SyncPolicyConfig) {\n  const includePaths = customIncludePathsByLower(includeFromSelectionConfig(config));\n  return Object.fromEntries(\n    Object.entries(state.lastFileHashes)\n      .filter(([filePath]) => isConfiguredSnapshotPath(filePath, config))\n      .map(([filePath, hash]) => [canonicalSnapshotPathForConfig(filePath, includePaths), hash]),\n  );\n}\n\nexport function snapshotHashesMatchState(\n  snapshot: Snapshot,\n  state: SyncState,\n  config: SyncPolicyConfig,\n  ignoredPaths = new Set<string>(),\n) {\n  return sameHashes(\n    withoutHashPaths(fileHashMap(snapshot), ignoredPaths),\n    withoutHashPaths(stateHashMapForConfig(state, config), ignoredPaths),\n  );\n}\n\nexport function snapshotsMatch(left: Snapshot, right: Snapshot) {\n  return left.syncSessions === right.syncSessions && sameHashes(fileHashMap(left), fileHashMap(right));\n}\n\nfunction withoutHashPaths(hashes: Record<string, string>, ignoredPaths: Set<string>) {\n  if (ignoredPaths.size === 0) return hashes;\n  return Object.fromEntries(Object.entries(hashes).filter(([filePath]) => !ignoredPaths.has(toPosix(filePath))));\n}\n\nexport function syncPolicyChanged(state: SyncState, config: SyncPolicyConfig) {\n  return syncIncludeChanged(state, config);\n}\n\nexport function shouldRefreshSyncedState(\n  remote: Snapshot,\n  head: RemoteHead | undefined,\n  state: SyncState,\n  config: SyncPolicyConfig,\n  sameRevision: (left: string, right: string) => boolean,\n) {\n  return (\n    remote.id !== state.lastAppliedSnapshot ||\n    Boolean(head && (!state.lastRemoteRevision || !sameRevision(head.revision, state.lastRemoteRevision))) ||\n    syncPolicyChanged(state, config)\n  );\n}\n\nfunction syncIncludeChanged(state: SyncState, config: SyncPolicyConfig) {\n  const stored = state.include ? normalizeSyncInclude(state.include) : includeFromSelectionConfig(state);\n  const current = includeFromSelectionConfig(config);\n  return stored.length !== current.length || stored.some((item, index) => item !== current[index]);\n}\n\nexport function settingsHashMap(snapshot: Snapshot) {\n  return Object.fromEntries(\n    snapshot.files.filter((file) => !isSessionPath(file.path)).map((file) => [file.path, file.sha256]),\n  );\n}\n\nexport function sessionHashMap(snapshot: Snapshot) {\n  return Object.fromEntries(\n    snapshot.files.filter((file) => isSessionPath(file.path)).map((file) => [file.path, file.sha256]),\n  );\n}\n\nexport function settingsHashMapFromState(state: SyncState) {\n  return Object.fromEntries(Object.entries(state.lastFileHashes).filter(([filePath]) => !isSessionPath(filePath)));\n}\n\nexport function settingsHashesMatchState(remote: Snapshot, state: SyncState) {\n  return sameHashes(settingsHashMap(remote), settingsHashMapFromState(state));\n}\n\nexport function canPullRemoteSettingsOnFirstSync(local: Snapshot, remote: Snapshot) {\n  const remoteSettings = settingsHashMap(remote);\n  return Object.entries(settingsHashMap(local)).every(([filePath, hash]) => remoteSettings[filePath] === hash);\n}\n\nexport function canPullRemoteSessionsOnFirstSync(local: Snapshot, remote: Snapshot) {\n  const localSessions = sessionHashMap(local);\n  const remoteSessions = sessionHashMap(remote);\n  return Object.entries(localSessions).every(([filePath, hash]) => remoteSessions[filePath] === hash);\n}\n"],
+  "mappings": "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",
+  "names": []
+}

package/dist/chunks/{chunk-KW7YQEZN.ts → chunk-UA7RXOIT.ts}

@@ -2,20 +2,20 @@
 // @ts-nocheck -- generated JavaScript uses a .ts extension for Pi's Jiti loader.
 import {
   automaticSyncSummary
-} from "./chunk-Z4DQF6L3.ts";
+} from "./chunk-ECYCNZOE.ts";
 import {
   setSyncSetupCompletions
-} from "./chunk-CHH26D4F.ts";
+} from "./chunk-YFADF5ZQ.ts";
 import {
   safeTerminalText
-} from "./chunk-LTBWGSBV.ts";
+} from "./chunk-MSSW6F3R.ts";
 import {
   addStorageConnection,
   addSyncSetup,
   saveNewV3Settings,
   updateStorageConnection,
   updateSyncSetup
-} from "./chunk-LCRI3ABW.ts";
+} from "./chunk-2RZSQWBH.ts";
 import {
   configuredSyncSetupNames,
   effectiveSyncSetupRemoteIdentity,
@@ -26,26 +26,26 @@ import {
   readLocalConfigObject,
   requiredString,
   validateConfigName
-} from "./chunk-C7XY5NF5.ts";
+} from "./chunk-4MPIH46N.ts";
 import {
   normalizeWebDavPath,
   normalizeWebDavUrl,
   validateWebDavCredentials
-} from "./chunk-6LP3MCR2.ts";
+} from "./chunk-2JZFHNLM.ts";
 import {
   normalizeGitBranch,
   normalizeGitDirectory,
   normalizeGitRemote
-} from "./chunk-TEN2ZBJV.ts";
+} from "./chunk-T2SJD3N7.ts";
 import {
   syncErrorGuidance
-} from "./chunk-CPEHGXJV.ts";
+} from "./chunk-G4RUXRWZ.ts";
 import {
   errorMessage
-} from "./chunk-2B2ELUF5.ts";
+} from "./chunk-7D5SF7P3.ts";
 import {
   DEFAULT_SYNC_INCLUDE
-} from "./chunk-JAAKLL6M.ts";
+} from "./chunk-IVXEDPAD.ts";
 
 // src/commands/setup-completions.ts
 async function refreshTargetCompletions() {
@@ -103,8 +103,7 @@ async function chooseInitialRemoteLocation(ctx, _preset, setupName, signal) {
     { signal }
   );
   if (signal?.aborted || !choice || choice === "Cancel") return void 0;
-  if (choice === "Customize remote location")
-    return chooseCustomRemoteLocation(ctx, setupName, signal);
+  if (choice === "Customize remote location") return chooseCustomRemoteLocation(ctx, setupName, signal);
   const bucket = await requiredExistingBucket(ctx, "pi-sync", signal);
   return bucket ? { connectionName: setupName, bucket, path: "./" } : void 0;
 }
@@ -165,10 +164,7 @@ async function promptAvailableSetupStorage(ctx, initial, signal) {
     if (!settings || !connection) throw new Error("Storage connection changed; reopen setup.");
     const identity = setupPublicationIdentity(storage, connection);
     const occupied = Object.entries(settings.syncSetups).find(
-      ([, setup]) => setupPublicationIdentity(
-        setup.storage,
-        settings.storageConnections[setup.storage.connection]
-      ) === identity
+      ([, setup]) => setupPublicationIdentity(setup.storage, settings.storageConnections[setup.storage.connection]) === identity
     );
     if (!occupied) return storage;
     const git = connection.type === "git";
@@ -377,10 +373,7 @@ async function showGitSetup(ctx, targetName, signal) {
     signal
   );
   if (saved && !signal?.aborted)
-    ctx.ui.notify(
-      `Saved Git sync setup \u201C${safeTerminalText(targetName)}\u201D. Choose Sync now to start.`,
-      "info"
-    );
+    ctx.ui.notify(`Saved Git sync setup \u201C${safeTerminalText(targetName)}\u201D. Choose Sync now to start.`, "info");
   return saved;
 }
 async function showAddGitStorageProfile(ctx, signal) {
@@ -402,16 +395,11 @@ async function showAddGitStorageProfile(ctx, signal) {
     (saveSignal) => addStorageConnection(name, { type: "git", remote }, saveSignal),
     signal
   );
-  if (saved && !signal?.aborted)
-    ctx.ui.notify(`Added storage connection \u201C${safeTerminalText(name)}\u201D.`, "info");
+  if (saved && !signal?.aborted) ctx.ui.notify(`Added storage connection \u201C${safeTerminalText(name)}\u201D.`, "info");
   return saved;
 }
 async function showEditGitStorageProfile(ctx, name, profile, signal, affectedSetups) {
-  const remote = await promptGitRemote(
-    ctx,
-    signal,
-    typeof profile.remote === "string" ? profile.remote : void 0
-  );
+  const remote = await promptGitRemote(ctx, signal, typeof profile.remote === "string" ? profile.remote : void 0);
   if (!remote) return false;
   const saved = await saveReviewedDraft(
     ctx,
@@ -435,8 +423,7 @@ async function showEditGitStorageProfile(ctx, name, profile, signal, affectedSet
     ),
     signal
   );
-  if (saved && !signal?.aborted)
-    ctx.ui.notify(`Saved storage connection \u201C${safeTerminalText(name)}\u201D.`, "info");
+  if (saved && !signal?.aborted) ctx.ui.notify(`Saved storage connection \u201C${safeTerminalText(name)}\u201D.`, "info");
   return saved;
 }
 async function showAddGitTarget(ctx, name, profile, signal) {
@@ -471,8 +458,7 @@ async function showAddGitTarget(ctx, name, profile, signal) {
     (saveSignal) => addSyncSetup(name, { storage, sync: { include, automatic } }, saveSignal, connection),
     signal
   );
-  if (saved && !signal?.aborted)
-    ctx.ui.notify(`Added sync setup \u201C${safeTerminalText(name)}\u201D.`, "info");
+  if (saved && !signal?.aborted) ctx.ui.notify(`Added sync setup \u201C${safeTerminalText(name)}\u201D.`, "info");
   return saved;
 }
 async function showEditGitTarget(ctx, partial, signal) {
@@ -511,8 +497,7 @@ async function showEditGitTarget(ctx, partial, signal) {
     (saveSignal) => updateSyncSetup(
       partial.setupName,
       (setup) => {
-        if (typeof setup.storage.branch !== "string")
-          throw new Error("Sync setup storage type changed; reopen it.");
+        if (typeof setup.storage.branch !== "string") throw new Error("Sync setup storage type changed; reopen it.");
         return {
           ...setup,
           storage: { ...setup.storage, branch: chosen.branch, path: chosen.directory }
@@ -522,8 +507,7 @@ async function showEditGitTarget(ctx, partial, signal) {
     ),
     signal
   );
-  if (saved && !signal?.aborted)
-    ctx.ui.notify(`Saved sync setup \u201C${safeTerminalText(partial.setupName)}\u201D.`, "info");
+  if (saved && !signal?.aborted) ctx.ui.notify(`Saved sync setup \u201C${safeTerminalText(partial.setupName)}\u201D.`, "info");
   return saved;
 }
 async function promptGitRemote(ctx, signal, current) {
@@ -569,7 +553,7 @@ import {
   Text,
   truncateToWidth
 } from "@earendil-works/pi-tui";
-import { runCustomInteraction } from "@narumitw/pi-tui-kit";
+import { formatInteractionHints, runCustomInteraction } from "@narumitw/pi-tui-kit";
 var MASK = "\u2022";
 async function promptSecret(ctx, title, options = { required: true }) {
   if (ctx.mode !== "tui" || options.signal?.aborted) return void 0;
@@ -579,13 +563,19 @@ async function promptSecret(ctx, title, options = { required: true }) {
     create: ({ tui, theme, keybindings, complete }) => {
       const heading = new Text("", 0, 0);
       const hint = new Text("", 0, 0);
-      const submitKey = keybindingText(keybindings, "tui.input.submit", "enter");
-      const cancelKey = keybindingText(keybindings, "tui.select.cancel", "esc", ["ctrl+c"]);
+      const interactionHint = formatInteractionHints(keybindings, [
+        {
+          keys: keybindings.getKeys("tui.input.submit").filter((key) => !hasControlCharacter(key)),
+          label: "continue"
+        },
+        {
+          keys: [...keybindings.getKeys("tui.select.cancel").filter((key) => !hasControlCharacter(key)), "ctrl+c"],
+          label: "cancel"
+        }
+      ]);
       const applyTheme = () => {
         heading.setText(theme.fg("accent", theme.bold(title)));
-        hint.setText(
-          theme.fg("dim", `${submitKey} continue \u2022 ${cancelKey} cancel \u2022 Input is hidden`)
-        );
+        hint.setText(theme.fg("dim", `${interactionHint} \u2022 Input is hidden`));
       };
       applyTheme();
       const input = new MaskedInput(keybindings);
@@ -598,11 +588,9 @@ async function promptSecret(ctx, title, options = { required: true }) {
         },
         render(width) {
           const safeWidth = Math.max(1, width);
-          return [
-            ...heading.render(safeWidth),
-            ...input.render(safeWidth),
-            ...hint.render(safeWidth)
-          ].map((line) => truncateToWidth(line, safeWidth));
+          return [...heading.render(safeWidth), ...input.render(safeWidth), ...hint.render(safeWidth)].map(
+            (line) => truncateToWidth(line, safeWidth)
+          );
         },
         invalidate() {
           applyTheme();
@@ -722,10 +710,7 @@ var MaskedInput = class {
     const contentWidth = Math.max(0, available - 1);
     let start = 0;
     if (this.value.length > contentWidth) {
-      start = Math.max(
-        0,
-        Math.min(this.cursor - Math.floor(contentWidth / 2), this.value.length - contentWidth)
-      );
+      start = Math.max(0, Math.min(this.cursor - Math.floor(contentWidth / 2), this.value.length - contentWidth));
     }
     const end = Math.min(this.value.length, start + contentWidth);
     const visibleCursor = Math.max(0, Math.min(this.cursor - start, end - start));
@@ -752,14 +737,6 @@ var MaskedInput = class {
     this.cursor += characters.length;
   }
 };
-function keybindingText(keybindings, binding, fallback, additionalKeys = []) {
-  const keys = [.../* @__PURE__ */ new Set([...keybindings.getKeys(binding), ...additionalKeys])].map(String).map((key) => {
-    if (key === "return") return "enter";
-    if (key === "escape") return "esc";
-    return hasControlCharacter(key) ? "" : key;
-  }).filter(Boolean);
-  return keys.join("/") || fallback;
-}
 function hasControlCharacter(value) {
   return [...value].some((character) => {
     const code = character.codePointAt(0) ?? 0;
@@ -771,11 +748,9 @@ function hasControlCharacter(value) {
 async function chooseS3CredentialUpdate(ctx, profile, signal) {
   const hasStored = typeof profile.accessKeyId === "string" && profile.accessKeyId.length > 0 && typeof profile.secretAccessKey === "string" && profile.secretAccessKey.length > 0;
   if (hasStored) {
-    const action = await ctx.ui.select(
-      "Credentials",
-      ["Keep current credentials", "Replace credentials", "Cancel"],
-      { signal }
-    );
+    const action = await ctx.ui.select("Credentials", ["Keep current credentials", "Replace credentials", "Cancel"], {
+      signal
+    });
     throwIfAborted(signal);
     if (!action || action === "Cancel") return void 0;
     if (action === "Keep current credentials") {
@@ -895,20 +870,13 @@ async function showS3Setup(ctx, preset, targetName, signal) {
   if (!saved || signal?.aborted) return false;
   await refreshTargetCompletions();
   if (!signal?.aborted)
-    ctx.ui.notify(
-      `Sync setup \u201C${safeTerminalText(targetName)}\u201D saved. Choose Sync now to start.`,
-      "info"
-    );
+    ctx.ui.notify(`Sync setup \u201C${safeTerminalText(targetName)}\u201D saved. Choose Sync now to start.`, "info");
   return true;
 }
 async function showAddS3Target(ctx, raw, profile, name, signal) {
   const location = await chooseAdditionalRemoteLocation(ctx, raw, profile, name, signal);
   if (!location) return;
-  const storage = await promptAvailableSetupStorage(
-    ctx,
-    { connection: profile, ...location },
-    signal
-  );
+  const storage = await promptAvailableSetupStorage(ctx, { connection: profile, ...location }, signal);
   if (!storage) return;
   const include = await chooseSetupContent(ctx, signal);
   if (!include) return;
@@ -972,16 +940,14 @@ async function showEditS3Target(ctx, partial, signal) {
     (saveSignal) => updateSyncSetup(
       partial.setupName,
       (setup) => {
-        if (typeof setup.storage.bucket !== "string")
-          throw new Error("Sync setup storage type changed; reopen it.");
+        if (typeof setup.storage.bucket !== "string") throw new Error("Sync setup storage type changed; reopen it.");
         return { ...setup, storage: { ...setup.storage, bucket, path: storagePath } };
       },
       { expectedStorage: partial, expectedConnection: connection, signal: saveSignal }
     ),
     signal
   );
-  if (saved && !signal?.aborted)
-    ctx.ui.notify(`Saved sync setup \u201C${safeTerminalText(partial.setupName)}\u201D.`, "info");
+  if (saved && !signal?.aborted) ctx.ui.notify(`Saved sync setup \u201C${safeTerminalText(partial.setupName)}\u201D.`, "info");
 }
 
 // src/ui/setup/webdav-ui.ts
@@ -1037,11 +1003,7 @@ async function showWebDavSetup(ctx, targetName, signal) {
 async function showAddWebDavTarget(ctx, name, profile, signal) {
   const remotePath = await chooseDestination(ctx, signal);
   if (!remotePath) return false;
-  const storage = await promptAvailableSetupStorage(
-    ctx,
-    { connection: profile, path: remotePath },
-    signal
-  );
+  const storage = await promptAvailableSetupStorage(ctx, { connection: profile, path: remotePath }, signal);
   if (!storage) return false;
   const include = await chooseSetupContent(ctx, signal);
   if (!include) return false;
@@ -1094,8 +1056,7 @@ async function showEditWebDavTarget(ctx, partial, signal) {
     ),
     signal
   );
-  if (saved && !signal?.aborted)
-    ctx.ui.notify(`Saved sync setup \u201C${safeTerminalText(partial.setupName)}\u201D.`, "info");
+  if (saved && !signal?.aborted) ctx.ui.notify(`Saved sync setup \u201C${safeTerminalText(partial.setupName)}\u201D.`, "info");
   return saved;
 }
 async function showAddWebDavStorageProfile(ctx, signal) {
@@ -1119,32 +1080,19 @@ async function showAddWebDavStorageProfile(ctx, signal) {
       "Adding a connection does not contact the server or start syncing."
     ],
     "Add storage connection",
-    (saveSignal) => addStorageConnection(
-      name,
-      { type: "webdav", url, credentials: { username, password } },
-      saveSignal
-    ),
+    (saveSignal) => addStorageConnection(name, { type: "webdav", url, credentials: { username, password } }, saveSignal),
     signal
   );
   if (saved && !signal?.aborted) ctx.ui.notify(`Added storage connection \u201C${safeTerminalText(name)}\u201D.`, "info");
   return saved;
 }
 async function showEditWebDavStorageProfile(ctx, name, profile, signal, affectedSetups) {
-  const url = await promptWebDavUrl(
-    ctx,
-    signal,
-    typeof profile.url === "string" ? profile.url : void 0
-  );
+  const url = await promptWebDavUrl(ctx, signal, typeof profile.url === "string" ? profile.url : void 0);
   if (!url) return false;
   const username = await promptUsername(ctx, signal);
   if (!username) return false;
   const hasPassword = typeof profile.password === "string" && profile.password.length > 0;
-  const passwordAction = hasPassword ? await select(
-    ctx,
-    "WebDAV password",
-    ["Keep current password", "Replace password", "Cancel"],
-    signal
-  ) : "Replace password";
+  const passwordAction = hasPassword ? await select(ctx, "WebDAV password", ["Keep current password", "Replace password", "Cancel"], signal) : "Replace password";
   if (!passwordAction || passwordAction === "Cancel") return false;
   const replacePassword = passwordAction === "Replace password";
   const password = replacePassword ? await promptSecret(ctx, "New WebDAV password", { signal }) : void 0;
@@ -1252,4 +1200,4 @@ export {
   showAddWebDavStorageProfile,
   showEditWebDavStorageProfile
 };
-//# sourceMappingURL=chunk-KW7YQEZN.ts.map
+//# sourceMappingURL=chunk-UA7RXOIT.ts.map