@narumitw/pi-sync 0.50.3 → 0.51.1

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

@@ -6,87 +6,87 @@ import { safeTerminalText } from "../terminal-text.js";
 import { promptTextInput } from "./text-input.js";
 
 export async function readSetupConnection(name: string, signal?: AbortSignal) {
-	const connection = (await readLocalConfigObject())?.storageConnections[name];
-	signal?.throwIfAborted();
-	if (!connection) throw new Error("Storage connection changed; reopen setup.");
-	return connection;
+  const connection = (await readLocalConfigObject())?.storageConnections[name];
+  signal?.throwIfAborted();
+  if (!connection) throw new Error("Storage connection changed; reopen setup.");
+  return connection;
 }
 
 export const AUTOMATIC_SYNC_DESCRIPTION =
-	"Check the current setup in the background at startup; review changes in /sync before transferring. At shutdown, automatically push selected content only when sessions are included. No startup dialogs.";
+  "Check the current setup in the background at startup; review changes in /sync before transferring. At shutdown, automatically push selected content only when sessions are included. No startup dialogs.";
 
 export async function chooseSetupContent(ctx: ExtensionCommandContext, signal?: AbortSignal) {
-	const choice = await ctx.ui.select(
-		"Choose included content\n\nRecommended: Pi settings, instructions, skills, prompts, themes, and extensions.\nMinimal: settings.json and AGENTS.md.\nReview the exact paths before saving.",
-		["Recommended Pi settings", "Minimal settings", "Cancel"],
-		{ signal },
-	);
-	signal?.throwIfAborted();
-	if (!choice || choice === "Cancel") return undefined;
-	return choice === "Minimal settings" ? ["settings.json", "AGENTS.md"] : [...DEFAULT_SYNC_INCLUDE];
+  const choice = await ctx.ui.select(
+    "Choose included content\n\nRecommended: Pi settings, instructions, skills, prompts, themes, and extensions.\nMinimal: settings.json and AGENTS.md.\nReview the exact paths before saving.",
+    ["Recommended Pi settings", "Minimal settings", "Cancel"],
+    { signal },
+  );
+  signal?.throwIfAborted();
+  if (!choice || choice === "Cancel") return undefined;
+  return choice === "Minimal settings" ? ["settings.json", "AGENTS.md"] : [...DEFAULT_SYNC_INCLUDE];
 }
 
 export async function chooseAutomaticSync(ctx: ExtensionCommandContext, signal?: AbortSignal) {
-	const choice = await ctx.ui.select(
-		`Automatic sync for this setup\n\n${AUTOMATIC_SYNC_DESCRIPTION}`,
-		["Keep automatic sync off", "Enable automatic sync", "Cancel"],
-		{ signal },
-	);
-	signal?.throwIfAborted();
-	return !choice || choice === "Cancel" ? undefined : choice === "Enable automatic sync";
+  const choice = await ctx.ui.select(
+    `Automatic sync for this setup\n\n${AUTOMATIC_SYNC_DESCRIPTION}`,
+    ["Keep automatic sync off", "Enable automatic sync", "Cancel"],
+    { signal },
+  );
+  signal?.throwIfAborted();
+  return !choice || choice === "Cancel" ? undefined : choice === "Enable automatic sync";
 }
 
 export async function chooseSessions(ctx: ExtensionCommandContext, signal?: AbortSignal) {
-	const choice = await ctx.ui.select(
-		"Session conversations\n\nSessions can contain prompts, tool output, paths, screenshots, and secrets.",
-		["Keep sessions off (recommended)", "Include session conversations", "Cancel"],
-		{ signal },
-	);
-	signal?.throwIfAborted();
-	if (!choice || choice === "Cancel") return undefined;
-	if (choice !== "Include session conversations") return false;
-	const confirmed = await ctx.ui.confirm(
-		"Include session conversations?",
-		"I understand that session JSONL can contain prompts, tool output, paths, screenshots, and secrets.",
-		{ signal },
-	);
-	signal?.throwIfAborted();
-	return confirmed ? true : undefined;
+  const choice = await ctx.ui.select(
+    "Session conversations\n\nSessions can contain prompts, tool output, paths, screenshots, and secrets.",
+    ["Keep sessions off (recommended)", "Include session conversations", "Cancel"],
+    { signal },
+  );
+  signal?.throwIfAborted();
+  if (!choice || choice === "Cancel") return undefined;
+  if (choice !== "Include session conversations") return false;
+  const confirmed = await ctx.ui.confirm(
+    "Include session conversations?",
+    "I understand that session JSONL can contain prompts, tool output, paths, screenshots, and secrets.",
+    { signal },
+  );
+  signal?.throwIfAborted();
+  return confirmed ? true : undefined;
 }
 
 export function includedContentLines(include: readonly string[], sessions = false) {
-	const paths = [...include, ...(sessions && !include.includes("sessions") ? ["sessions"] : [])];
-	return [
-		`Included content: ${paths.length} paths`,
-		...paths.map((item) => `  ${safeTerminalText(item)}`),
-		`Sessions: ${sessions ? "On — privacy warning acknowledged" : "Off"}`,
-	];
+  const paths = [...include, ...(sessions && !include.includes("sessions") ? ["sessions"] : [])];
+  return [
+    `Included content: ${paths.length} paths`,
+    ...paths.map((item) => `  ${safeTerminalText(item)}`),
+    `Sessions: ${sessions ? "On — privacy warning acknowledged" : "Off"}`,
+  ];
 }
 
 export async function promptResourceName(
-	ctx: ExtensionCommandContext,
-	kind: "sync setup" | "storage connection",
-	defaultValue: string,
-	signal?: AbortSignal,
-	literalBrackets = false,
+  ctx: ExtensionCommandContext,
+  kind: "sync setup" | "storage connection",
+  defaultValue: string,
+  signal?: AbortSignal,
+  literalBrackets = false,
 ) {
-	return promptTextInput(
-		ctx,
-		`Name this ${kind}\n\nA local label, such as home or work.`,
-		{
-			defaultValue,
-			rejectPlaceholders: !literalBrackets,
-			validate: async (name) => {
-				validateConfigName(name, kind);
-				const settings = await readLocalConfigObject();
-				signal?.throwIfAborted();
-				const names = kind === "sync setup" ? settings?.syncSetups : settings?.storageConnections;
-				if (names && Object.hasOwn(names, name)) {
-					throw new Error(`A ${kind} with this name already exists. Choose a different name.`);
-				}
-				return name;
-			},
-		},
-		signal,
-	);
+  return promptTextInput(
+    ctx,
+    `Name this ${kind}\n\nA local label, such as home or work.`,
+    {
+      defaultValue,
+      rejectPlaceholders: !literalBrackets,
+      validate: async (name) => {
+        validateConfigName(name, kind);
+        const settings = await readLocalConfigObject();
+        signal?.throwIfAborted();
+        const names = kind === "sync setup" ? settings?.syncSetups : settings?.storageConnections;
+        if (names && Object.hasOwn(names, name)) {
+          throw new Error(`A ${kind} with this name already exists. Choose a different name.`);
+        }
+        return name;
+      },
+    },
+    signal,
+  );
 }

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

@@ -4,67 +4,66 @@ import { syncErrorGuidance } from "../../sync/sync-error-guidance.js";
 
 /** A settings draft is committed only after review; retryable I/O failures retain the same draft. */
 export async function saveReviewedDraft(
-	ctx: ExtensionCommandContext,
-	title: string,
-	lines: readonly string[],
-	label: string,
-	save: (signal: AbortSignal) => Promise<unknown>,
-	signal?: AbortSignal,
+  ctx: ExtensionCommandContext,
+  title: string,
+  lines: readonly string[],
+  label: string,
+  save: (signal: AbortSignal) => Promise<unknown>,
+  signal?: AbortSignal,
 ) {
-	let saved = false;
-	let failure: unknown;
-	let failureText: string | undefined;
-	const menu = defineMenu<undefined, "review", "save", ExtensionCommandContext>({
-		start: "review",
-		screens: {
-			review: () => ({
-				kind: "review",
-				title,
-				content: [...(failureText ? [failureText, ""] : []), ...lines].join("\n"),
-				lines: ["Review before saving. Back cancels this draft."],
-				format: { kind: "text" },
-				viewportSize: "adaptive",
-				confirm: { id: "save", label, action: "save" },
-				hint: "back",
-			}),
-		},
-		actions: {
-			save: async ({ signal: actionSignal }) => {
-				try {
-					actionSignal.throwIfAborted();
-					await save(actionSignal);
-					saved = true;
-					return { kind: "close" };
-				} catch (error) {
-					if (actionSignal.aborted) return { kind: "close" };
-					// Do not silently rebase a stale review or overwrite an invalid settings file.
-					// The caller must reopen current settings for those failures.
-					if (!retryableSettingsError(error)) {
-						failure = error;
-						return { kind: "close" };
-					}
-					failureText = `Not saved. ${syncErrorGuidance(error)}\nYour draft is retained. Fix the problem, then save again, or cancel.`;
-					ctx.ui.notify(failureText, "error");
-					return { kind: "stay" };
-				}
-			},
-		},
-	});
-	const result = await runMenu(ctx, menu, {
-		getState: () => undefined,
-		signal,
-		isCurrent: () => !signal?.aborted,
-	});
-	if (signal?.aborted) return false;
-	if (failure) throw failure;
-	if (result.kind === "error") throw result.error;
-	return saved;
+  let saved = false;
+  let failure: unknown;
+  let failureText: string | undefined;
+  const menu = defineMenu<undefined, "review", "save", ExtensionCommandContext>({
+    start: "review",
+    screens: {
+      review: () => ({
+        kind: "review",
+        title,
+        content: [...(failureText ? [failureText, ""] : []), ...lines].join("\n"),
+        lines: ["Review before saving. Back cancels this draft."],
+        format: { kind: "text" },
+        viewportSize: "adaptive",
+        confirm: { id: "save", label, action: "save" },
+        hint: "back",
+      }),
+    },
+    actions: {
+      save: async ({ signal: actionSignal }) => {
+        try {
+          actionSignal.throwIfAborted();
+          await save(actionSignal);
+          saved = true;
+          return { kind: "close" };
+        } catch (error) {
+          if (actionSignal.aborted) return { kind: "close" };
+          // Do not silently rebase a stale review or overwrite an invalid settings file.
+          // The caller must reopen current settings for those failures.
+          if (!retryableSettingsError(error)) {
+            failure = error;
+            return { kind: "close" };
+          }
+          failureText = `Not saved. ${syncErrorGuidance(error)}\nYour draft is retained. Fix the problem, then save again, or cancel.`;
+          ctx.ui.notify(failureText, "error");
+          return { kind: "stay" };
+        }
+      },
+    },
+  });
+  const result = await runMenu(ctx, menu, {
+    getState: () => undefined,
+    signal,
+    isCurrent: () => !signal?.aborted,
+  });
+  if (signal?.aborted) return false;
+  if (failure) throw failure;
+  if (result.kind === "error") throw result.error;
+  return saved;
 }
 
 function retryableSettingsError(error: unknown) {
-	const code = (error as NodeJS.ErrnoException | undefined)?.code;
-	return (
-		code !== undefined &&
-		["EACCES", "EPERM", "ENOSPC", "EBUSY", "EIO", "EMFILE", "ENFILE", "EROFS"].includes(code)
-	);
+  const code = (error as NodeJS.ErrnoException | undefined)?.code;
+  return (
+    code !== undefined && ["EACCES", "EPERM", "ENOSPC", "EBUSY", "EIO", "EMFILE", "ENFILE", "EROFS"].includes(code)
+  );
 }

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

@@ -13,169 +13,165 @@ import { backendStorageDescription } from "../manager-state.js";
 import { safeTerminalText } from "../terminal-text.js";
 
 async function selectSetupForSwitch(
-	ctx: ExtensionCommandContext,
-	raw: Record<string, unknown>,
-	targets: Record<string, unknown>,
-	active: string | undefined,
-	signal?: AbortSignal,
+  ctx: ExtensionCommandContext,
+  raw: Record<string, unknown>,
+  targets: Record<string, unknown>,
+  active: string | undefined,
+  signal?: AbortSignal,
 ) {
-	let selectedName: string | undefined;
-	const nameById = new Map<string, string>();
-	const profiles = ownRecord(raw.storageConnections);
-	const menu = defineMenu<undefined, "setups", "select", ExtensionCommandContext>({
-		start: "setups",
-		screens: {
-			setups: () => ({
-				kind: "actions",
-				title: "Switch sync setup",
-				lines: [`Current sync setup: ${safeTerminalText(active ?? "none")}`],
-				items: Object.keys(targets)
-					.sort((left, right) => left.localeCompare(right))
-					.map((candidate, index) => {
-						const target = ownRecord(targets[candidate]);
-						const storage = ownRecord(target?.storage);
-						const profileName =
-							typeof storage?.connection === "string" ? storage.connection : undefined;
-						const profile = profileName && profiles ? ownRecord(profiles[profileName]) : undefined;
-						const location = profile
-							? profile.type === "git"
-								? `${String(storage?.branch ?? "missing branch")}:${String(storage?.path ?? "missing path")}`
-								: profile.type === "s3"
-									? `${String(storage?.bucket ?? "missing bucket")}/${String(storage?.path ?? "missing path")}`
-									: String(storage?.path ?? "missing path")
-							: `invalid: missing connection ${profileName ?? "reference"}`;
-						const id = `setup:${index}`;
-						nameById.set(id, candidate);
-						return {
-							id,
-							label: `${safeTerminalText(candidate)}${candidate === active ? " (current)" : ""}`,
-							description: `${safeTerminalText(profileName ?? "unknown")} · ${safeTerminalText(location)}`,
-							action: "select" as const,
-						};
-					}),
-				hint: "close",
-			}),
-		},
-		actions: {
-			select: async ({ itemId }) => {
-				selectedName = nameById.get(itemId);
-				return { kind: "close" };
-			},
-		},
-	});
-	await runMenu(ctx, menu, {
-		getState: () => undefined,
-		signal,
-		isCurrent: () => !signal?.aborted,
-	});
-	return selectedName;
+  let selectedName: string | undefined;
+  const nameById = new Map<string, string>();
+  const profiles = ownRecord(raw.storageConnections);
+  const menu = defineMenu<undefined, "setups", "select", ExtensionCommandContext>({
+    start: "setups",
+    screens: {
+      setups: () => ({
+        kind: "actions",
+        title: "Switch sync setup",
+        lines: [`Current sync setup: ${safeTerminalText(active ?? "none")}`],
+        items: Object.keys(targets)
+          .sort((left, right) => left.localeCompare(right))
+          .map((candidate, index) => {
+            const target = ownRecord(targets[candidate]);
+            const storage = ownRecord(target?.storage);
+            const profileName = typeof storage?.connection === "string" ? storage.connection : undefined;
+            const profile = profileName && profiles ? ownRecord(profiles[profileName]) : undefined;
+            const location = profile
+              ? profile.type === "git"
+                ? `${String(storage?.branch ?? "missing branch")}:${String(storage?.path ?? "missing path")}`
+                : profile.type === "s3"
+                  ? `${String(storage?.bucket ?? "missing bucket")}/${String(storage?.path ?? "missing path")}`
+                  : String(storage?.path ?? "missing path")
+              : `invalid: missing connection ${profileName ?? "reference"}`;
+            const id = `setup:${index}`;
+            nameById.set(id, candidate);
+            return {
+              id,
+              label: `${safeTerminalText(candidate)}${candidate === active ? " (current)" : ""}`,
+              description: `${safeTerminalText(profileName ?? "unknown")} · ${safeTerminalText(location)}`,
+              action: "select" as const,
+            };
+          }),
+        hint: "close",
+      }),
+    },
+    actions: {
+      select: async ({ itemId }) => {
+        selectedName = nameById.get(itemId);
+        return { kind: "close" };
+      },
+    },
+  });
+  await runMenu(ctx, menu, {
+    getState: () => undefined,
+    signal,
+    isCurrent: () => !signal?.aborted,
+  });
+  return selectedName;
 }
 
 export async function showSetupSwitcher(
-	ctx: ExtensionCommandContext,
-	runRoute: RunRoute,
-	selectedName?: string,
-	signal?: AbortSignal,
+  ctx: ExtensionCommandContext,
+  runRoute: RunRoute,
+  selectedName?: string,
+  signal?: AbortSignal,
 ) {
-	const raw = await readLocalConfigObject();
-	if (signal?.aborted) return false;
-	if (raw?.version !== 3) {
-		ctx.ui.notify("Add a second sync setup before switching setups.", "info");
-		return false;
-	}
-	const targets = ownRecord(raw.syncSetups);
-	if (!targets) {
-		ctx.ui.notify("No sync setups are configured.", "warning");
-		return false;
-	}
-	const active = typeof raw.activeSyncSetup === "string" ? raw.activeSyncSetup : undefined;
-	let name = selectedName;
-	if (!name) {
-		name = await selectSetupForSwitch(ctx, raw, targets, active, signal);
-		if (!name) return false;
-	}
-	if (!name || !Object.hasOwn(targets, name)) {
-		ctx.ui.notify(
-			`Sync setup “${safeTerminalText(name ?? "unknown")}” no longer exists.`,
-			"warning",
-		);
-		return false;
-	}
-	if (name === active) {
-		ctx.ui.notify(`Sync setup “${safeTerminalText(name)}” is already current.`, "info");
-		return false;
-	}
-	let config: AnySyncConfig;
-	try {
-		config = await loadConfig(name);
-		if (signal?.aborted) return false;
-	} catch (error) {
-		ctx.ui.notify(
-			`Cannot use sync setup “${safeTerminalText(name)}”: ${safeTerminalText(errorMessage(error))}`,
-			"error",
-		);
-		return false;
-	}
-	const onSwitch = await loadOnSwitch();
-	if (signal?.aborted) return false;
-	const switchEffect =
-		onSwitch === "ask-before-pull"
-			? "After switching, pi-sync will ask whether to review a pull for this setup."
-			: onSwitch === "pull-after-switch"
-				? "After switching, pi-sync will check this setup and show exact changes before applying them."
-				: "After switching, pi-sync will not pull or modify synced files.";
-	const confirmed = await ctx.ui.confirm(
-		"Switch sync setup?",
-		[
-			`From: ${safeTerminalText(active ?? "none")}`,
-			`To: ${safeTerminalText(name)}`,
-			`Storage: ${backendStorageDescription(config)}`,
-			`Included content: ${config.include.length} paths`,
-			`Automatic sync: ${automaticSyncSummary(config.automatic)} · Sessions: ${config.include.includes("sessions") ? "On" : "Off"}`,
-			"",
-			switchEffect,
-		].join("\n"),
-		{ signal },
-	);
-	if (signal?.aborted || !confirmed) return false;
-	try {
-		let pullClosed = false;
-		const result = await useSyncSetup(
-			ctx,
-			name,
-			async (selectedTarget) => {
-				const pullResult = await runCancellableOperation(
-					ctx,
-					`Pulling sync setup “${safeTerminalText(name)}”…`,
-					"pull",
-					runRoute,
-					{
-						commitAware: true,
-						cancelledMessage: null,
-						target: selectedTarget,
-						signal,
-					},
-				);
-				const disposition = await dispatchManagerResult(ctx, pullResult, "pull", runRoute, signal);
-				if (pullResult.kind === "closed" || pullResult.kind.endsWith("required")) {
-					pullClosed = disposition.kind === "close";
-				}
-				if (disposition.appliedRoute === "pull") return "applied";
-				if (pullResult.kind === "completed") return pullResult.outcome;
-				return pullResult.kind === "cancelled" ? "cancelled" : undefined;
-			},
-			onSwitch,
-			signal,
-			syncConfigReviewIdentity(config),
-		);
-		if (pullClosed) return "closed";
-		return result.pullApplied ? "pull-attempted" : "switched";
-	} catch (error) {
-		if (signal?.aborted) return false;
-		ctx.ui.notify(
-			`Sync setup “${safeTerminalText(name)}” was not switched: ${safeTerminalText(errorMessage(error))}`,
-			"error",
-		);
-		return false;
-	}
+  const raw = await readLocalConfigObject();
+  if (signal?.aborted) return false;
+  if (raw?.version !== 3) {
+    ctx.ui.notify("Add a second sync setup before switching setups.", "info");
+    return false;
+  }
+  const targets = ownRecord(raw.syncSetups);
+  if (!targets) {
+    ctx.ui.notify("No sync setups are configured.", "warning");
+    return false;
+  }
+  const active = typeof raw.activeSyncSetup === "string" ? raw.activeSyncSetup : undefined;
+  let name = selectedName;
+  if (!name) {
+    name = await selectSetupForSwitch(ctx, raw, targets, active, signal);
+    if (!name) return false;
+  }
+  if (!name || !Object.hasOwn(targets, name)) {
+    ctx.ui.notify(`Sync setup “${safeTerminalText(name ?? "unknown")}” no longer exists.`, "warning");
+    return false;
+  }
+  if (name === active) {
+    ctx.ui.notify(`Sync setup “${safeTerminalText(name)}” is already current.`, "info");
+    return false;
+  }
+  let config: AnySyncConfig;
+  try {
+    config = await loadConfig(name);
+    if (signal?.aborted) return false;
+  } catch (error) {
+    ctx.ui.notify(
+      `Cannot use sync setup “${safeTerminalText(name)}”: ${safeTerminalText(errorMessage(error))}`,
+      "error",
+    );
+    return false;
+  }
+  const onSwitch = await loadOnSwitch();
+  if (signal?.aborted) return false;
+  const switchEffect =
+    onSwitch === "ask-before-pull"
+      ? "After switching, pi-sync will ask whether to review a pull for this setup."
+      : onSwitch === "pull-after-switch"
+        ? "After switching, pi-sync will check this setup and show exact changes before applying them."
+        : "After switching, pi-sync will not pull or modify synced files.";
+  const confirmed = await ctx.ui.confirm(
+    "Switch sync setup?",
+    [
+      `From: ${safeTerminalText(active ?? "none")}`,
+      `To: ${safeTerminalText(name)}`,
+      `Storage: ${backendStorageDescription(config)}`,
+      `Included content: ${config.include.length} paths`,
+      `Automatic sync: ${automaticSyncSummary(config.automatic)} · Sessions: ${config.include.includes("sessions") ? "On" : "Off"}`,
+      "",
+      switchEffect,
+    ].join("\n"),
+    { signal },
+  );
+  if (signal?.aborted || !confirmed) return false;
+  try {
+    let pullClosed = false;
+    const result = await useSyncSetup(
+      ctx,
+      name,
+      async (selectedTarget) => {
+        const pullResult = await runCancellableOperation(
+          ctx,
+          `Pulling sync setup “${safeTerminalText(name)}”…`,
+          "pull",
+          runRoute,
+          {
+            commitAware: true,
+            cancelledMessage: null,
+            target: selectedTarget,
+            signal,
+          },
+        );
+        const disposition = await dispatchManagerResult(ctx, pullResult, "pull", runRoute, signal);
+        if (pullResult.kind === "closed" || pullResult.kind.endsWith("required")) {
+          pullClosed = disposition.kind === "close";
+        }
+        if (disposition.appliedRoute === "pull") return "applied";
+        if (pullResult.kind === "completed") return pullResult.outcome;
+        return pullResult.kind === "cancelled" ? "cancelled" : undefined;
+      },
+      onSwitch,
+      signal,
+      syncConfigReviewIdentity(config),
+    );
+    if (pullClosed) return "closed";
+    return result.pullApplied ? "pull-attempted" : "switched";
+  } catch (error) {
+    if (signal?.aborted) return false;
+    ctx.ui.notify(
+      `Sync setup “${safeTerminalText(name)}” was not switched: ${safeTerminalText(errorMessage(error))}`,
+      "error",
+    );
+    return false;
+  }
 }