@narumitw/pi-sync 0.50.3 → 0.51.1

package/src/ui/setup/setup-actions.ts

@@ -14,114 +14,104 @@ import { promptResourceName } from "./setup-prompts.js";
 import { showSetupSwitcher } from "./setup-switcher.js";
 import { showAddWebDavTarget, showEditWebDavTarget } from "./webdav-ui.js";
 
-export async function showSyncSetupManager(
-	ctx: ExtensionCommandContext,
-	runRoute: RunRoute,
-	signal?: AbortSignal,
-) {
-	return showSyncSetups(
-		ctx,
-		{
-			add: async (setupSignal) => {
-				await showAddTarget(ctx, setupSignal);
-			},
-			edit: async (name, setupSignal) => {
-				await showEditTarget(ctx, name, setupSignal);
-			},
-			makeCurrent: async (name, setupSignal) => {
-				const result = await showSetupSwitcher(ctx, runRoute, name, setupSignal);
-				return result === "pull-attempted" || result === "closed" ? "exit" : undefined;
-			},
-			remove: async (name, setupSignal) => {
-				await showRemoveTarget(ctx, name, setupSignal);
-			},
-		},
-		signal,
-	);
+export async function showSyncSetupManager(ctx: ExtensionCommandContext, runRoute: RunRoute, signal?: AbortSignal) {
+  return showSyncSetups(
+    ctx,
+    {
+      add: async (setupSignal) => {
+        await showAddTarget(ctx, setupSignal);
+      },
+      edit: async (name, setupSignal) => {
+        await showEditTarget(ctx, name, setupSignal);
+      },
+      makeCurrent: async (name, setupSignal) => {
+        const result = await showSetupSwitcher(ctx, runRoute, name, setupSignal);
+        return result === "pull-attempted" || result === "closed" ? "exit" : undefined;
+      },
+      remove: async (name, setupSignal) => {
+        await showRemoveTarget(ctx, name, setupSignal);
+      },
+    },
+    signal,
+  );
 }
 
 async function showAddTarget(ctx: ExtensionCommandContext, signal?: AbortSignal) {
-	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) {
-		ctx.ui.notify(
-			"Version 1 and version 2 settings are unsupported and are never migrated.",
-			"error",
-		);
-		return;
-	}
-	let profiles = ownRecord(raw.storageConnections) ?? {};
-	const name = await promptResourceName(ctx, "sync setup", "work", signal);
-	if (!name) return;
-	const createConnection = "Add a new storage connection…";
-	let profile = await ctx.ui.select(
-		"Choose a storage connection\n\nReuse a server address and sign-in details. A new connection is saved separately and remains if you cancel this setup.",
-		[...Object.keys(profiles).sort(), createConnection, "Cancel"],
-		{ signal },
-	);
-	if (signal?.aborted || !profile || profile === "Cancel") return;
-	if (profile === createConnection) {
-		const previousNames = new Set(Object.keys(profiles));
-		if (!(await showAddStorageConnection(ctx, signal))) return;
-		if (signal?.aborted) return;
-		raw = (await readLocalConfigObject()) ?? raw;
-		if (signal?.aborted) return;
-		profiles = ownRecord(raw.storageConnections) ?? {};
-		profile = Object.keys(profiles).find((candidate) => !previousNames.has(candidate));
-		if (!profile) return;
-		ctx.ui.notify(
-			`Connection “${safeTerminalText(profile)}” saved. Cancelling setup will keep this connection.`,
-			"info",
-		);
-	}
-	const storageKind = ownRecord(profiles[profile])?.type;
-	if (storageKind === "webdav") {
-		const saved = await showAddWebDavTarget(ctx, name, profile, signal);
-		if (signal?.aborted) return;
-		if (saved) await refreshTargetCompletions();
-		return;
-	}
-	if (storageKind === "git") {
-		const saved = await showAddGitTarget(ctx, name, profile, signal);
-		if (signal?.aborted) return;
-		if (saved) await refreshTargetCompletions();
-		return;
-	}
-	await showAddS3Target(ctx, raw, profile, name, signal);
+  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) {
+    ctx.ui.notify("Version 1 and version 2 settings are unsupported and are never migrated.", "error");
+    return;
+  }
+  let profiles = ownRecord(raw.storageConnections) ?? {};
+  const name = await promptResourceName(ctx, "sync setup", "work", signal);
+  if (!name) return;
+  const createConnection = "Add a new storage connection…";
+  let profile = await ctx.ui.select(
+    "Choose a storage connection\n\nReuse a server address and sign-in details. A new connection is saved separately and remains if you cancel this setup.",
+    [...Object.keys(profiles).sort(), createConnection, "Cancel"],
+    { signal },
+  );
+  if (signal?.aborted || !profile || profile === "Cancel") return;
+  if (profile === createConnection) {
+    const previousNames = new Set(Object.keys(profiles));
+    if (!(await showAddStorageConnection(ctx, signal))) return;
+    if (signal?.aborted) return;
+    raw = (await readLocalConfigObject()) ?? raw;
+    if (signal?.aborted) return;
+    profiles = ownRecord(raw.storageConnections) ?? {};
+    profile = Object.keys(profiles).find((candidate) => !previousNames.has(candidate));
+    if (!profile) return;
+    ctx.ui.notify(
+      `Connection “${safeTerminalText(profile)}” saved. Cancelling setup will keep this connection.`,
+      "info",
+    );
+  }
+  const storageKind = ownRecord(profiles[profile])?.type;
+  if (storageKind === "webdav") {
+    const saved = await showAddWebDavTarget(ctx, name, profile, signal);
+    if (signal?.aborted) return;
+    if (saved) await refreshTargetCompletions();
+    return;
+  }
+  if (storageKind === "git") {
+    const saved = await showAddGitTarget(ctx, name, profile, signal);
+    if (signal?.aborted) return;
+    if (saved) await refreshTargetCompletions();
+    return;
+  }
+  await showAddS3Target(ctx, raw, profile, name, signal);
 }
 
 async function showEditTarget(ctx: ExtensionCommandContext, name: string, signal?: AbortSignal) {
-	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");
-		return;
-	}
-	if (partial.storageKind === "webdav") {
-		await showEditWebDavTarget(ctx, partial, signal);
-		return;
-	}
-	if (partial.storageKind === "git") {
-		await showEditGitTarget(ctx, partial, signal);
-		return;
-	}
-	await showEditS3Target(ctx, partial, signal);
+  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");
+    return;
+  }
+  if (partial.storageKind === "webdav") {
+    await showEditWebDavTarget(ctx, partial, signal);
+    return;
+  }
+  if (partial.storageKind === "git") {
+    await showEditGitTarget(ctx, partial, signal);
+    return;
+  }
+  await showEditS3Target(ctx, partial, signal);
 }
 
 async function showRemoveTarget(ctx: ExtensionCommandContext, name: string, signal?: AbortSignal) {
-	const confirmed = await ctx.ui.confirm(
-		"Remove sync setup?",
-		`Remove local sync setup “${safeTerminalText(name)}”? Remote data and history are not deleted.`,
-		{ signal },
-	);
-	if (signal?.aborted || !confirmed) return;
-	await removeSyncSetup(name, signal);
-	if (signal?.aborted) return;
-	await refreshTargetCompletions();
-	if (signal?.aborted) return;
-	ctx.ui.notify(
-		`Removed sync setup “${safeTerminalText(name)}”; remote data was not deleted.`,
-		"info",
-	);
+  const confirmed = await ctx.ui.confirm(
+    "Remove sync setup?",
+    `Remove local sync setup “${safeTerminalText(name)}”? Remote data and history are not deleted.`,
+    { signal },
+  );
+  if (signal?.aborted || !confirmed) return;
+  await removeSyncSetup(name, signal);
+  if (signal?.aborted) return;
+  await refreshTargetCompletions();
+  if (signal?.aborted) return;
+  ctx.ui.notify(`Removed sync setup “${safeTerminalText(name)}”; remote data was not deleted.`, "info");
 }

package/src/ui/setup/setup-location-ui.ts

@@ -1,167 +1,151 @@
 import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import { normalizeGitBranch } from "../../backends/git/git-config.js";
 import { readLocalConfigObject } from "../../settings/settings-store.js";
-import type {
-	StorageConnectionSettings,
-	SyncSetupSettings,
-} from "../../settings/settings-types.js";
+import type { StorageConnectionSettings, SyncSetupSettings } from "../../settings/settings-types.js";
 import {
-	effectiveSyncSetupRemoteIdentity,
-	normalizeStoragePath,
-	ownRecord,
+  effectiveSyncSetupRemoteIdentity,
+  normalizeStoragePath,
+  ownRecord,
 } from "../../settings/settings-validation.js";
 import { errorMessage } from "../../sync/sync-errors.js";
 import { safeTerminalText } from "../terminal-text.js";
-import {
-	promptTextInput,
-	requiredExistingBucket,
-	requiredInput,
-	requiredValueInput,
-} from "./text-input.js";
+import { promptTextInput, requiredExistingBucket, requiredInput, requiredValueInput } from "./text-input.js";
 
 interface ChosenRemoteLocation {
-	connectionName: string;
-	bucket: string;
-	path: string;
+  connectionName: string;
+  bucket: string;
+  path: string;
 }
 
 export async function chooseInitialRemoteLocation(
-	ctx: ExtensionCommandContext,
-	_preset: string,
-	setupName: string,
-	signal?: AbortSignal,
+  ctx: ExtensionCommandContext,
+  _preset: string,
+  setupName: string,
+  signal?: AbortSignal,
 ): Promise<ChosenRemoteLocation | undefined> {
-	const choice = await ctx.ui.select(
-		"Choose storage location\n\nUse an existing bucket. ./ stores snapshots at the bucket root; a custom path keeps them in a separate folder.",
-		["Use an existing bucket at ./", "Customize remote location", "Cancel"],
-		{ signal },
-	);
-	if (signal?.aborted || !choice || choice === "Cancel") return undefined;
-	if (choice === "Customize remote location")
-		return chooseCustomRemoteLocation(ctx, setupName, signal);
-	const bucket = await requiredExistingBucket(ctx, "pi-sync", signal);
-	return bucket ? { connectionName: setupName, bucket, path: "./" } : undefined;
+  const choice = await ctx.ui.select(
+    "Choose storage location\n\nUse an existing bucket. ./ stores snapshots at the bucket root; a custom path keeps them in a separate folder.",
+    ["Use an existing bucket at ./", "Customize remote location", "Cancel"],
+    { signal },
+  );
+  if (signal?.aborted || !choice || choice === "Cancel") return undefined;
+  if (choice === "Customize remote location") return chooseCustomRemoteLocation(ctx, setupName, signal);
+  const bucket = await requiredExistingBucket(ctx, "pi-sync", signal);
+  return bucket ? { connectionName: setupName, bucket, path: "./" } : undefined;
 }
 
 export async function chooseAdditionalRemoteLocation(
-	ctx: ExtensionCommandContext,
-	settings: Record<string, unknown>,
-	connectionName: string,
-	setupName: string,
-	signal?: AbortSignal,
+  ctx: ExtensionCommandContext,
+  settings: Record<string, unknown>,
+  connectionName: string,
+  setupName: string,
+  signal?: AbortSignal,
 ): Promise<Omit<ChosenRemoteLocation, "connectionName"> | undefined> {
-	const setups = ownRecord(settings.syncSetups) ?? {};
-	const currentSetup =
-		typeof settings.activeSyncSetup === "string" ? settings.activeSyncSetup : undefined;
-	const candidates = Object.entries(setups)
-		.map(([name, value]) => ({ name, storage: ownRecord(ownRecord(value)?.storage) }))
-		.filter(
-			(item): item is { name: string; storage: Record<string, unknown> } =>
-				item.storage?.connection === connectionName && typeof item.storage.bucket === "string",
-		);
-	const source =
-		candidates.find((item) => item.name === currentSetup) ??
-		candidates.sort((left, right) => left.name.localeCompare(right.name))[0];
-	if (source) {
-		const suggestedPath = "./";
-		const sameBucketLabel = `Same bucket as “${safeTerminalText(source.name)}”`;
-		const choice = await ctx.ui.select(
-			[
-				`Storage location for “${safeTerminalText(setupName)}”`,
-				"",
-				`Existing bucket: ${safeTerminalText(String(source.storage.bucket))}`,
-				`Remote path: ${safeTerminalText(suggestedPath)}`,
-				"./ uses the bucket root. Use a different path or bucket for independent setups.",
-			].join("\n"),
-			[sameBucketLabel, "Use a different bucket", "Customize remote location", "Cancel"],
-			{ signal },
-		);
-		if (signal?.aborted || !choice || choice === "Cancel") return undefined;
-		if (choice === sameBucketLabel) {
-			return { bucket: String(source.storage.bucket), path: suggestedPath };
-		}
-		if (choice === "Use a different bucket") {
-			const bucket = await requiredExistingBucket(ctx, "pi-sync", signal);
-			return bucket ? { bucket, path: "./" } : undefined;
-		}
-		const custom = await chooseCustomRemoteLocation(ctx, connectionName, signal);
-		return custom ? { bucket: custom.bucket, path: custom.path } : undefined;
-	}
+  const setups = ownRecord(settings.syncSetups) ?? {};
+  const currentSetup = typeof settings.activeSyncSetup === "string" ? settings.activeSyncSetup : undefined;
+  const candidates = Object.entries(setups)
+    .map(([name, value]) => ({ name, storage: ownRecord(ownRecord(value)?.storage) }))
+    .filter(
+      (item): item is { name: string; storage: Record<string, unknown> } =>
+        item.storage?.connection === connectionName && typeof item.storage.bucket === "string",
+    );
+  const source =
+    candidates.find((item) => item.name === currentSetup) ??
+    candidates.sort((left, right) => left.name.localeCompare(right.name))[0];
+  if (source) {
+    const suggestedPath = "./";
+    const sameBucketLabel = `Same bucket as “${safeTerminalText(source.name)}”`;
+    const choice = await ctx.ui.select(
+      [
+        `Storage location for “${safeTerminalText(setupName)}”`,
+        "",
+        `Existing bucket: ${safeTerminalText(String(source.storage.bucket))}`,
+        `Remote path: ${safeTerminalText(suggestedPath)}`,
+        "./ uses the bucket root. Use a different path or bucket for independent setups.",
+      ].join("\n"),
+      [sameBucketLabel, "Use a different bucket", "Customize remote location", "Cancel"],
+      { signal },
+    );
+    if (signal?.aborted || !choice || choice === "Cancel") return undefined;
+    if (choice === sameBucketLabel) {
+      return { bucket: String(source.storage.bucket), path: suggestedPath };
+    }
+    if (choice === "Use a different bucket") {
+      const bucket = await requiredExistingBucket(ctx, "pi-sync", signal);
+      return bucket ? { bucket, path: "./" } : undefined;
+    }
+    const custom = await chooseCustomRemoteLocation(ctx, connectionName, signal);
+    return custom ? { bucket: custom.bucket, path: custom.path } : undefined;
+  }
 
-	const location = await chooseInitialRemoteLocation(ctx, "S3", setupName, signal);
-	return location ? { bucket: location.bucket, path: location.path } : undefined;
+  const location = await chooseInitialRemoteLocation(ctx, "S3", setupName, signal);
+  return location ? { bucket: location.bucket, path: location.path } : undefined;
 }
 
 async function chooseCustomRemoteLocation(
-	ctx: ExtensionCommandContext,
-	connectionName: string,
-	signal?: AbortSignal,
+  ctx: ExtensionCommandContext,
+  connectionName: string,
+  signal?: AbortSignal,
 ): Promise<ChosenRemoteLocation | undefined> {
-	const bucket = await requiredExistingBucket(ctx, "pi-sync", signal);
-	if (!bucket) return undefined;
-	const storagePath = await requiredInput(
-		ctx,
-		"Storage path\n\nPath inside the bucket, not your local filesystem.\n./ uses the bucket root. Use different paths for independent setups.",
-		"./",
-		signal,
-		normalizeStoragePath,
-	);
-	if (!storagePath) return undefined;
-	return { connectionName, bucket, path: normalizeStoragePath(storagePath) };
+  const bucket = await requiredExistingBucket(ctx, "pi-sync", signal);
+  if (!bucket) return undefined;
+  const storagePath = await requiredInput(
+    ctx,
+    "Storage path\n\nPath inside the bucket, not your local filesystem.\n./ uses the bucket root. Use different paths for independent setups.",
+    "./",
+    signal,
+    normalizeStoragePath,
+  );
+  if (!storagePath) return undefined;
+  return { connectionName, bucket, path: normalizeStoragePath(storagePath) };
 }
 
 /** Early UI check only; the settings writer still validates uniqueness under its lock. */
 export async function promptAvailableSetupStorage<T extends SyncSetupSettings["storage"]>(
-	ctx: ExtensionCommandContext,
-	initial: T,
-	signal?: AbortSignal,
+  ctx: ExtensionCommandContext,
+  initial: T,
+  signal?: AbortSignal,
 ): Promise<T | undefined> {
-	let storage = initial;
-	while (!signal?.aborted) {
-		const settings = await readLocalConfigObject();
-		if (signal?.aborted) return undefined;
-		const connection = settings?.storageConnections[storage.connection];
-		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,
-		);
-		if (!occupied) return storage;
-		const git = connection.type === "git";
-		const message = `${git ? "Git branch" : "Storage location"} is already used by “${safeTerminalText(occupied[0])}”. ${git ? "Use a different branch; pi-sync owns the entire branch." : "Enter a different storage path, or cancel to choose another connection or bucket."}`;
-		ctx.ui.notify(message, "warning");
-		const title = `${git ? "Git branch for the new setup" : "Storage path for the new setup"}\n\n${message}`;
-		const example = git ? "pi-sync/work" : "backups/work";
-		const value =
-			connection.type === "webdav"
-				? await promptTextInput(ctx, title, { example }, signal)
-				: await requiredValueInput(ctx, title, example, signal);
-		if (signal?.aborted || value === undefined) return undefined;
-		try {
-			storage = git
-				? { ...storage, branch: normalizeGitBranch(value) }
-				: { ...storage, path: normalizeStoragePath(value) };
-		} catch (error) {
-			ctx.ui.notify(safeTerminalText(errorMessage(error)), "warning");
-		}
-	}
-	return undefined;
+  let storage = initial;
+  while (!signal?.aborted) {
+    const settings = await readLocalConfigObject();
+    if (signal?.aborted) return undefined;
+    const connection = settings?.storageConnections[storage.connection];
+    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,
+    );
+    if (!occupied) return storage;
+    const git = connection.type === "git";
+    const message = `${git ? "Git branch" : "Storage location"} is already used by “${safeTerminalText(occupied[0])}”. ${git ? "Use a different branch; pi-sync owns the entire branch." : "Enter a different storage path, or cancel to choose another connection or bucket."}`;
+    ctx.ui.notify(message, "warning");
+    const title = `${git ? "Git branch for the new setup" : "Storage path for the new setup"}\n\n${message}`;
+    const example = git ? "pi-sync/work" : "backups/work";
+    const value =
+      connection.type === "webdav"
+        ? await promptTextInput(ctx, title, { example }, signal)
+        : await requiredValueInput(ctx, title, example, signal);
+    if (signal?.aborted || value === undefined) return undefined;
+    try {
+      storage = git
+        ? { ...storage, branch: normalizeGitBranch(value) }
+        : { ...storage, path: normalizeStoragePath(value) };
+    } catch (error) {
+      ctx.ui.notify(safeTerminalText(errorMessage(error)), "warning");
+    }
+  }
+  return undefined;
 }
 
-function setupPublicationIdentity(
-	storage: SyncSetupSettings["storage"],
-	connection: StorageConnectionSettings,
-) {
-	// Git publications own a complete branch tree; changing only its directory is not isolation.
-	return effectiveSyncSetupRemoteIdentity(
-		{
-			storage: connection.type === "git" ? { ...storage, path: "./" } : storage,
-			sync: { include: [], automatic: false },
-		},
-		connection,
-	);
+function setupPublicationIdentity(storage: SyncSetupSettings["storage"], connection: StorageConnectionSettings) {
+  // Git publications own a complete branch tree; changing only its directory is not isolation.
+  return effectiveSyncSetupRemoteIdentity(
+    {
+      storage: connection.type === "git" ? { ...storage, path: "./" } : storage,
+      sync: { include: [], automatic: false },
+    },
+    connection,
+  );
 }

package/src/ui/setup/setup-name-ui.ts

@@ -4,31 +4,31 @@ import { errorMessage } from "../../sync/sync-errors.js";
 import { safeTerminalText } from "../terminal-text.js";
 
 export async function promptInitialSetupName(ctx: ExtensionCommandContext, signal?: AbortSignal) {
-	while (!signal?.aborted) {
-		const hint = "For example: home or work. Leave blank for default.";
-		// Pi styles the whole input title as accent; give only the guidance a muted role.
-		const guidance = ctx.mode === "tui" ? ctx.ui.theme.fg("muted", hint) : hint;
-		// This compact prompt owns its default hint; the general helper would repeat it.
-		const value = await ctx.ui.input(`Sync setup name\n${guidance}`, undefined, { signal });
-		if (signal?.aborted) {
-			throw signal.reason instanceof Error
-				? signal.reason
-				: new DOMException("The operation was aborted", "AbortError");
-		}
-		if (value === undefined) return undefined;
-		const name = value.trim() || "default";
-		try {
-			if (name.includes("<") || name.includes(">")) {
-				throw new Error("Replace example placeholders with your own name.");
-			}
-			validateConfigName(name, "sync setup");
-			return name;
-		} catch (error) {
-			ctx.ui.notify(
-				`This name cannot be used for the sync setup. ${safeTerminalText(errorMessage(error))} Enter another name (for example, default).`,
-				"warning",
-			);
-		}
-	}
-	return undefined;
+  while (!signal?.aborted) {
+    const hint = "For example: home or work. Leave blank for default.";
+    // Pi styles the whole input title as accent; give only the guidance a muted role.
+    const guidance = ctx.mode === "tui" ? ctx.ui.theme.fg("muted", hint) : hint;
+    // This compact prompt owns its default hint; the general helper would repeat it.
+    const value = await ctx.ui.input(`Sync setup name\n${guidance}`, undefined, { signal });
+    if (signal?.aborted) {
+      throw signal.reason instanceof Error
+        ? signal.reason
+        : new DOMException("The operation was aborted", "AbortError");
+    }
+    if (value === undefined) return undefined;
+    const name = value.trim() || "default";
+    try {
+      if (name.includes("<") || name.includes(">")) {
+        throw new Error("Replace example placeholders with your own name.");
+      }
+      validateConfigName(name, "sync setup");
+      return name;
+    } catch (error) {
+      ctx.ui.notify(
+        `This name cannot be used for the sync setup. ${safeTerminalText(errorMessage(error))} Enter another name (for example, default).`,
+        "warning",
+      );
+    }
+  }
+  return undefined;
 }