@narumitw/pi-sync 0.50.2 → 0.51.0

package/src/ui/sync-setups-ui.ts

@@ -7,271 +7,251 @@ import { syncErrorGuidance } from "../sync/sync-error-guidance.js";
 import { syncIncludeSelection } from "../sync/sync-policy.js";
 import { safeTerminalText } from "./terminal-text.js";
 
-export async function countValidSyncSetups(
-	setups: Record<string, unknown> | undefined,
-	signal?: AbortSignal,
-) {
-	let count = 0;
-	for (const name of Object.keys(setups ?? {})) {
-		throwIfAborted(signal);
-		let valid = false;
-		try {
-			await loadConfig(name);
-			valid = true;
-		} catch {
-			// Invalid setups stay visible in management but are not switchable.
-		}
-		throwIfAborted(signal);
-		if (valid) count += 1;
-	}
-	return count;
+export async function countValidSyncSetups(setups: Record<string, unknown> | undefined, signal?: AbortSignal) {
+  let count = 0;
+  for (const name of Object.keys(setups ?? {})) {
+    throwIfAborted(signal);
+    let valid = false;
+    try {
+      await loadConfig(name);
+      valid = true;
+    } catch {
+      // Invalid setups stay visible in management but are not switchable.
+    }
+    throwIfAborted(signal);
+    if (valid) count += 1;
+  }
+  return count;
 }
 
 function throwIfAborted(signal?: AbortSignal) {
-	if (!signal?.aborted) return;
-	throw signal.reason instanceof Error
-		? signal.reason
-		: new DOMException("The operation was aborted", "AbortError");
+  if (!signal?.aborted) return;
+  throw signal.reason instanceof Error ? signal.reason : new DOMException("The operation was aborted", "AbortError");
 }
 
 type SyncSetupActions = {
-	add(signal?: AbortSignal): Promise<void>;
-	edit(name: string, signal?: AbortSignal): Promise<void>;
-	makeCurrent(name: string, signal?: AbortSignal): Promise<"exit" | undefined>;
-	remove(name: string, signal?: AbortSignal): Promise<void>;
+  add(signal?: AbortSignal): Promise<void>;
+  edit(name: string, signal?: AbortSignal): Promise<void>;
+  makeCurrent(name: string, signal?: AbortSignal): Promise<"exit" | undefined>;
+  remove(name: string, signal?: AbortSignal): Promise<void>;
 };
 
 interface SetupMenuState {
-	setups: Record<string, unknown>;
-	active?: string;
-	selected?: {
-		name: string;
-		detail: string[];
-		valid: boolean;
-		removeUnavailable: boolean;
-	};
+  setups: Record<string, unknown>;
+  active?: string;
+  selected?: {
+    name: string;
+    detail: string[];
+    valid: boolean;
+    removeUnavailable: boolean;
+  };
 }
 
 export async function showSyncSetups(
-	ctx: ExtensionCommandContext,
-	actions: SyncSetupActions,
-	signal?: AbortSignal,
+  ctx: ExtensionCommandContext,
+  actions: SyncSetupActions,
+  signal?: AbortSignal,
 ): Promise<"exit" | undefined> {
-	let selectedName: string | undefined;
-	let exit = false;
-	const nameById = new Map<string, string>();
-	type Screen = "list" | "detail";
-	type Action = "add" | "select" | "make-current" | "edit" | "remove" | "back";
-	const menu = defineMenu<SetupMenuState, Screen, Action, ExtensionCommandContext>({
-		start: "list",
-		screens: {
-			list: ({ state }) => {
-				nameById.clear();
-				const names = Object.keys(state.setups).sort((left, right) => left.localeCompare(right));
-				return {
-					kind: "actions",
-					title: "Sync setups",
-					lines: ["What to sync, where to store it, and when to sync."],
-					items: [
-						{ id: "add", label: "Add sync setup", action: "add" },
-						...names.map((name, index) => {
-							const id = `setup:${index}`;
-							nameById.set(id, name);
-							return {
-								id,
-								label: `${safeTerminalText(name)}${name === state.active ? " (current)" : ""}`,
-								description: setupSummary(state.setups[name]),
-								action: "select" as const,
-							};
-						}),
-					],
-					hint: "back",
-				};
-			},
-			detail: ({ state }) => ({
-				kind: "actions",
-				title: state.selected
-					? `Sync setup “${safeTerminalText(state.selected.name)}”`
-					: "Sync setup",
-				lines: state.selected?.detail ?? ["This sync setup no longer exists."],
-				items: state.selected
-					? [
-							...(!state.selected.name ||
-							state.selected.name === state.active ||
-							!state.selected.valid
-								? []
-								: [
-										{
-											id: "make-current",
-											label: "Make current…",
-											action: "make-current" as const,
-										},
-									]),
-							{ id: "edit", label: "Edit storage location…", action: "edit" },
-							...(state.selected.removeUnavailable
-								? []
-								: [
-										{
-											id: "remove",
-											label: "Remove sync setup…",
-											action: "remove" as const,
-										},
-									]),
-							{ id: "back", label: "Back", action: "back" },
-						]
-					: [{ id: "back", label: "Back", action: "back" }],
-				hint: "back",
-			}),
-		},
-		actions: {
-			add: async () => {
-				try {
-					await actions.add(signal);
-				} catch (error) {
-					if (!signal?.aborted) {
-						ctx.ui.notify(`Sync setup was not added: ${menuErrorMessage(error)}`, "error");
-					}
-				}
-				return { kind: "stay" };
-			},
-			select: async ({ itemId }) => {
-				selectedName = nameById.get(itemId);
-				return selectedName ? { kind: "to", screen: "detail" } : { kind: "rejected" };
-			},
-			"make-current": async () => {
-				if (!selectedName) return { kind: "rejected" };
-				try {
-					exit = (await actions.makeCurrent(selectedName, signal)) === "exit";
-					return exit ? { kind: "close" } : { kind: "stay" };
-				} catch (error) {
-					notifySetupChangeError(ctx, selectedName, error, signal);
-					return { kind: "stay" };
-				}
-			},
-			edit: async () => {
-				if (!selectedName) return { kind: "rejected" };
-				try {
-					await actions.edit(selectedName, signal);
-				} catch (error) {
-					notifySetupChangeError(ctx, selectedName, error, signal);
-				}
-				return { kind: "stay" };
-			},
-			remove: async () => {
-				if (!selectedName) return { kind: "rejected" };
-				const name = selectedName;
-				try {
-					await actions.remove(name, signal);
-					selectedName = undefined;
-					return { kind: "back" };
-				} catch (error) {
-					notifySetupChangeError(ctx, name, error, signal);
-					return { kind: "stay" };
-				}
-			},
-			back: async () => {
-				selectedName = undefined;
-				return { kind: "back" };
-			},
-		},
-	});
-	await runMenu(ctx, menu, {
-		getState: async () => loadSetupMenuState(selectedName, signal),
-		signal,
-		isCurrent: () => !signal?.aborted,
-	});
-	return exit ? "exit" : undefined;
+  let selectedName: string | undefined;
+  let exit = false;
+  const nameById = new Map<string, string>();
+  type Screen = "list" | "detail";
+  type Action = "add" | "select" | "make-current" | "edit" | "remove" | "back";
+  const menu = defineMenu<SetupMenuState, Screen, Action, ExtensionCommandContext>({
+    start: "list",
+    screens: {
+      list: ({ state }) => {
+        nameById.clear();
+        const names = Object.keys(state.setups).sort((left, right) => left.localeCompare(right));
+        return {
+          kind: "actions",
+          title: "Sync setups",
+          lines: ["What to sync, where to store it, and when to sync."],
+          items: [
+            { id: "add", label: "Add sync setup", action: "add" },
+            ...names.map((name, index) => {
+              const id = `setup:${index}`;
+              nameById.set(id, name);
+              return {
+                id,
+                label: `${safeTerminalText(name)}${name === state.active ? " (current)" : ""}`,
+                description: setupSummary(state.setups[name]),
+                action: "select" as const,
+              };
+            }),
+          ],
+          hint: "back",
+        };
+      },
+      detail: ({ state }) => ({
+        kind: "actions",
+        title: state.selected ? `Sync setup “${safeTerminalText(state.selected.name)}”` : "Sync setup",
+        lines: state.selected?.detail ?? ["This sync setup no longer exists."],
+        items: state.selected
+          ? [
+              ...(!state.selected.name || state.selected.name === state.active || !state.selected.valid
+                ? []
+                : [
+                    {
+                      id: "make-current",
+                      label: "Make current…",
+                      action: "make-current" as const,
+                    },
+                  ]),
+              { id: "edit", label: "Edit storage location…", action: "edit" },
+              ...(state.selected.removeUnavailable
+                ? []
+                : [
+                    {
+                      id: "remove",
+                      label: "Remove sync setup…",
+                      action: "remove" as const,
+                    },
+                  ]),
+              { id: "back", label: "Back", action: "back" },
+            ]
+          : [{ id: "back", label: "Back", action: "back" }],
+        hint: "back",
+      }),
+    },
+    actions: {
+      add: async () => {
+        try {
+          await actions.add(signal);
+        } catch (error) {
+          if (!signal?.aborted) {
+            ctx.ui.notify(`Sync setup was not added: ${menuErrorMessage(error)}`, "error");
+          }
+        }
+        return { kind: "stay" };
+      },
+      select: async ({ itemId }) => {
+        selectedName = nameById.get(itemId);
+        return selectedName ? { kind: "to", screen: "detail" } : { kind: "rejected" };
+      },
+      "make-current": async () => {
+        if (!selectedName) return { kind: "rejected" };
+        try {
+          exit = (await actions.makeCurrent(selectedName, signal)) === "exit";
+          return exit ? { kind: "close" } : { kind: "stay" };
+        } catch (error) {
+          notifySetupChangeError(ctx, selectedName, error, signal);
+          return { kind: "stay" };
+        }
+      },
+      edit: async () => {
+        if (!selectedName) return { kind: "rejected" };
+        try {
+          await actions.edit(selectedName, signal);
+        } catch (error) {
+          notifySetupChangeError(ctx, selectedName, error, signal);
+        }
+        return { kind: "stay" };
+      },
+      remove: async () => {
+        if (!selectedName) return { kind: "rejected" };
+        const name = selectedName;
+        try {
+          await actions.remove(name, signal);
+          selectedName = undefined;
+          return { kind: "back" };
+        } catch (error) {
+          notifySetupChangeError(ctx, name, error, signal);
+          return { kind: "stay" };
+        }
+      },
+      back: async () => {
+        selectedName = undefined;
+        return { kind: "back" };
+      },
+    },
+  });
+  await runMenu(ctx, menu, {
+    getState: async () => loadSetupMenuState(selectedName, signal),
+    signal,
+    isCurrent: () => !signal?.aborted,
+  });
+  return exit ? "exit" : undefined;
 }
 
-async function loadSetupMenuState(
-	selectedName: string | undefined,
-	signal?: AbortSignal,
-): Promise<SetupMenuState> {
-	const raw = await readLocalConfigObject();
-	throwIfAborted(signal);
-	const setups = ownRecord(raw?.syncSetups) ?? {};
-	const active = typeof raw?.activeSyncSetup === "string" ? raw.activeSyncSetup : undefined;
-	if (!selectedName || !ownRecord(setups[selectedName])) return { setups, active };
-	const setupCount = Object.keys(setups).length;
-	const isCurrent = selectedName === active;
-	let detail: string[];
-	let valid = true;
-	try {
-		const config = await loadConfig(selectedName);
-		throwIfAborted(signal);
-		const selection = syncIncludeSelection(config.include);
-		detail = [
-			`Status: ${isCurrent ? "Current" : "Not current"}`,
-			`Storage connection: ${safeTerminalText(config.connectionName)}`,
-			`Endpoint: ${storageEndpoint(config)}`,
-			`Storage location: ${storageLocation(config)}`,
-			`Included content: ${selection.builtIns.length} built-in groups · ${selection.custom.length} extra paths`,
-			`Sessions: ${selection.sessions ? "On — privacy-sensitive" : "Off"}`,
-			`Automatic sync: ${config.automatic ? "On" : "Off"}`,
-			isCurrent
-				? "Edit included content and automatic sync in /sync → Settings."
-				: "To edit included content or automatic sync, make this setup current, then open /sync → Settings.",
-		];
-	} catch (error) {
-		valid = false;
-		detail = [
-			`Status: Invalid${isCurrent ? " current setup" : ""}`,
-			`Reason: ${menuErrorMessage(error)}`,
-			"Make current and sync are unavailable until this setup is repaired.",
-		];
-	}
-	const removeUnavailable = isCurrent && setupCount > 1;
-	if (removeUnavailable) detail.push("Remove unavailable: switch to another setup first.");
-	return {
-		setups,
-		active,
-		selected: { name: selectedName, detail, valid, removeUnavailable },
-	};
+async function loadSetupMenuState(selectedName: string | undefined, signal?: AbortSignal): Promise<SetupMenuState> {
+  const raw = await readLocalConfigObject();
+  throwIfAborted(signal);
+  const setups = ownRecord(raw?.syncSetups) ?? {};
+  const active = typeof raw?.activeSyncSetup === "string" ? raw.activeSyncSetup : undefined;
+  if (!selectedName || !ownRecord(setups[selectedName])) return { setups, active };
+  const setupCount = Object.keys(setups).length;
+  const isCurrent = selectedName === active;
+  let detail: string[];
+  let valid = true;
+  try {
+    const config = await loadConfig(selectedName);
+    throwIfAborted(signal);
+    const selection = syncIncludeSelection(config.include);
+    detail = [
+      `Status: ${isCurrent ? "Current" : "Not current"}`,
+      `Storage connection: ${safeTerminalText(config.connectionName)}`,
+      `Endpoint: ${storageEndpoint(config)}`,
+      `Storage location: ${storageLocation(config)}`,
+      `Included content: ${selection.builtIns.length} built-in groups · ${selection.custom.length} extra paths`,
+      `Sessions: ${selection.sessions ? "On — privacy-sensitive" : "Off"}`,
+      `Automatic sync: ${config.automatic ? "On" : "Off"}`,
+      isCurrent
+        ? "Edit included content and automatic sync in /sync → Settings."
+        : "To edit included content or automatic sync, make this setup current, then open /sync → Settings.",
+    ];
+  } catch (error) {
+    valid = false;
+    detail = [
+      `Status: Invalid${isCurrent ? " current setup" : ""}`,
+      `Reason: ${menuErrorMessage(error)}`,
+      "Make current and sync are unavailable until this setup is repaired.",
+    ];
+  }
+  const removeUnavailable = isCurrent && setupCount > 1;
+  if (removeUnavailable) detail.push("Remove unavailable: switch to another setup first.");
+  return {
+    setups,
+    active,
+    selected: { name: selectedName, detail, valid, removeUnavailable },
+  };
 }
 
-function notifySetupChangeError(
-	ctx: ExtensionCommandContext,
-	name: string,
-	error: unknown,
-	signal?: AbortSignal,
-) {
-	if (signal?.aborted) return;
-	ctx.ui.notify(
-		`Sync setup “${safeTerminalText(name)}” was not changed: ${menuErrorMessage(error)}`,
-		"error",
-	);
+function notifySetupChangeError(ctx: ExtensionCommandContext, name: string, error: unknown, signal?: AbortSignal) {
+  if (signal?.aborted) return;
+  ctx.ui.notify(`Sync setup “${safeTerminalText(name)}” was not changed: ${menuErrorMessage(error)}`, "error");
 }
 
 function menuErrorMessage(error: unknown) {
-	return syncErrorGuidance(error);
+  return syncErrorGuidance(error);
 }
 
 function setupSummary(value: unknown) {
-	const storage = ownRecord(ownRecord(value)?.storage);
-	if (!storage || typeof storage.connection !== "string") return "Invalid storage reference";
-	return safeTerminalText(
-		`${storage.connection} · ${storage.bucket ?? storage.branch ?? "WebDAV"} · ${storage.path ?? "missing path"}`,
-	);
+  const storage = ownRecord(ownRecord(value)?.storage);
+  if (!storage || typeof storage.connection !== "string") return "Invalid storage reference";
+  return safeTerminalText(
+    `${storage.connection} · ${storage.bucket ?? storage.branch ?? "WebDAV"} · ${storage.path ?? "missing path"}`,
+  );
 }
 
 function storageEndpoint(config: Awaited<ReturnType<typeof loadConfig>>) {
-	switch (config.backend.type) {
-		case "s3":
-			return safeTerminalText(config.backend.profile.endpoint);
-		case "git":
-			return safeTerminalText(config.backend.profile.remote);
-		case "webdav":
-			return safeTerminalText(config.backend.profile.url);
-	}
+  switch (config.backend.type) {
+    case "s3":
+      return safeTerminalText(config.backend.profile.endpoint);
+    case "git":
+      return safeTerminalText(config.backend.profile.remote);
+    case "webdav":
+      return safeTerminalText(config.backend.profile.url);
+  }
 }
 
 function storageLocation(config: Awaited<ReturnType<typeof loadConfig>>) {
-	switch (config.backend.type) {
-		case "s3":
-			return safeTerminalText(`${config.backend.destination.bucket}/${config.storagePath}`);
-		case "git":
-			return safeTerminalText(`Git · ${config.backend.destination.branch}:${config.storagePath}`);
-		case "webdav":
-			return safeTerminalText(`WebDAV · ${config.storagePath}`);
-	}
+  switch (config.backend.type) {
+    case "s3":
+      return safeTerminalText(`${config.backend.destination.bucket}/${config.storagePath}`);
+    case "git":
+      return safeTerminalText(`Git · ${config.backend.destination.branch}:${config.storagePath}`);
+    case "webdav":
+      return safeTerminalText(`WebDAV · ${config.storagePath}`);
+  }
 }

package/src/ui/sync-status.ts

@@ -0,0 +1,17 @@
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+
+const STATUS_KEY = "sync";
+
+type SyncStatusContext = Pick<ExtensionContext, "hasUI" | "sessionManager" | "ui">;
+
+const enabledBySession = new WeakMap<ExtensionContext["sessionManager"], boolean>();
+
+export function configureSyncStatus(ctx: SyncStatusContext, enabled: boolean) {
+  enabledBySession.set(ctx.sessionManager, enabled);
+  if (!enabled && ctx.hasUI) ctx.ui.setStatus(STATUS_KEY, undefined);
+}
+
+export function setSyncStatus(ctx: SyncStatusContext, value: string | undefined) {
+  if (!ctx.hasUI || (value !== undefined && enabledBySession.get(ctx.sessionManager) === false)) return;
+  ctx.ui.setStatus(STATUS_KEY, value);
+}

package/src/ui/terminal-text.ts

@@ -1,4 +1,4 @@
 export function safeTerminalText(value: string) {
-	// biome-ignore lint/suspicious/noControlCharactersInRegex: Escape untrusted terminal controls.
-	return value.replace(/[\u0000-\u001f\u007f-\u009f]/gu, "?");
+  // biome-ignore lint/suspicious/noControlCharactersInRegex: Escape untrusted terminal controls.
+  return value.replace(/[\u0000-\u001f\u007f-\u009f]/gu, "?");
 }

package/dist/chunks/chunk-2B2ELUF5.ts.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../src/sync/sync-errors.ts"],
-  "sourcesContent": ["import type { SyncDecision } from \"./sync-decision.js\";\n\nexport class SetupPullRequiresUiError extends Error {}\n\nexport class SyncDecisionRequiredError extends Error {\n\treadonly decision: SyncDecision;\n\n\tconstructor(decision: SyncDecision) {\n\t\tsuper(decision.directMessage);\n\t\tthis.name = \"SyncDecisionRequiredError\";\n\t\tthis.decision = decision;\n\t}\n}\n\nexport function isSyncDecisionRequiredError(error: unknown): error is SyncDecisionRequiredError {\n\treturn error instanceof SyncDecisionRequiredError;\n}\n\nexport function errorMessage(error: unknown) {\n\tconst message = error instanceof Error ? error.message : String(error);\n\t// biome-ignore lint/suspicious/noControlCharactersInRegex: Escape untrusted terminal controls.\n\treturn message.replace(/[\\u0000-\\u001f\\u007f-\\u009f]/gu, \"?\");\n}\n"],
-  "mappings": ";;;;AAEO,IAAM,2BAAN,cAAuC,MAAM;AAAC;AAE9C,IAAM,4BAAN,cAAwC,MAAM;AAAA,EAC3C;AAAA,EAET,YAAY,UAAwB;AACnC,UAAM,SAAS,aAAa;AAC5B,SAAK,OAAO;AACZ,SAAK,WAAW;AAAA,EACjB;AACD;AAEO,SAAS,4BAA4B,OAAoD;AAC/F,SAAO,iBAAiB;AACzB;AAEO,SAAS,aAAa,OAAgB;AAC5C,QAAM,UAAU,iBAAiB,QAAQ,MAAM,UAAU,OAAO,KAAK;AAErE,SAAO,QAAQ,QAAQ,kCAAkC,GAAG;AAC7D;",
-  "names": []
-}