@narumitw/pi-sync 0.57.11 → 0.58.0

package/src/sync/startup-check.ts

@@ -84,7 +84,7 @@ export function createStartupCheck(
             const captured = config;
             const identity = syncCheckConfigFingerprint(captured);
             checking = true;
-            setSyncStatus(ctx, "sync ...");
+            setSyncStatus(ctx, "sync ...", { activity: "checking" });
             const { inspectSync } = await timings.measure("inspection import", () => loaders.inspection());
             throwIfAborted(signal);
             const currentConfig = await loadConfigForCheck();

package/src/sync/sync-mutations.ts

@@ -118,7 +118,7 @@ export async function push(
   const state = input?.state ?? (await readStateForConfig(config));
   validateMutation();
   requireResolvedDirectionalProgress(state, options);
-  setSyncStatus(ctx, `pushing ${config.setupName}`);
+  setSyncStatus(ctx, `pushing ${config.setupName}`, { activity: "pushing" });
   const backend = input?.backend ?? (await factory(config));
   throwIfAborted(options.signal);
   const localRaw =
@@ -272,7 +272,7 @@ export async function pull(
   const config = await loadConfig(options.setup);
   throwIfAborted(options.signal);
   await requireNoMergeJournal(config, options);
-  setSyncStatus(ctx, `pulling ${config.setupName}`);
+  setSyncStatus(ctx, `pulling ${config.setupName}`, { activity: "pulling" });
   const backend = await factory(config);
   const state = await readStateForConfig(config);
   validateMutation();
@@ -433,7 +433,7 @@ export async function syncBoth(
   options.background?.validate(config);
   if (options.agentRetryRefusal) {
     if (!config.agentMode || options.auto || options.background || !ctx.hasUI)
-      throw new Error("Enable Agent mode and use the foreground manager to retry a cached refusal.");
+      throw new Error("Enable Autonomous sync and use the foreground manager to retry a cached refusal.");
     const state = await readStateForConfig(config);
     validateMutation();
     const pending = await readMergeJournal(config);

package/src/sync/sync-queries.ts

@@ -27,7 +27,7 @@ export async function status(
 ) {
   const config = await loadConfig(options.setup);
   throwIfAborted(options.signal);
-  setSyncStatus(ctx, `checking ${config.setupName}`);
+  setSyncStatus(ctx, `checking ${config.setupName}`, { activity: "checking" });
   const { head, selectionState, localChanged, remoteChanged, localFiles, destination, capability } = await inspectSync(
     config,
     snapshotOptionsForContext(ctx, config),
@@ -70,7 +70,7 @@ export async function diff(
 ) {
   const config = await loadConfig(options.setup);
   throwIfAborted(options.signal);
-  setSyncStatus(ctx, `checking ${config.setupName}`);
+  setSyncStatus(ctx, `checking ${config.setupName}`, { activity: "checking" });
   const backend = await factory(config);
   const local = portableSnapshot(
     await createSnapshot(config.snapshotIdentity, snapshotOptionsForContext(ctx, config)),

package/src/sync-extension.ts

@@ -10,12 +10,13 @@ import { errorMessage } from "./sync/sync-errors.js";
 import { createSyncLoaders, type SyncDependencies } from "./sync/sync-loaders.js";
 import { registerStartupTimings } from "./ui/startup-timings-entry.js";
 import { createSyncAttentionController } from "./ui/sync-attention.js";
-import { setSyncStatus } from "./ui/sync-status.js";
+import { createSyncStatusPublisher, setSyncStatus } from "./ui/sync-status.js";
 import { safeTerminalText } from "./ui/terminal-text.js";
 
 export default function sync(pi: ExtensionAPI, dependencies: Partial<SyncDependencies> = {}) {
   const loaders = createSyncLoaders(dependencies);
   const attention = createSyncAttentionController();
+  const status = createSyncStatusPublisher(pi.events);
   const publishTimings = registerStartupTimings(pi);
   const check = createStartupCheck(loaders, attention, 30_000, publishTimings);
   let sessionAbort = new AbortController();
@@ -60,6 +61,7 @@ export default function sync(pi: ExtensionAPI, dependencies: Partial<SyncDepende
       if (!ctx.hasUI) {
         throw new Error("/sync requires TUI or RPC mode so results and safety prompts are observable.");
       }
+      status.bind(ctx);
       const signal = sessionAbort.signal;
       const manager = ctx.sessionManager;
       const command = splitArgs(args)[0];
@@ -104,39 +106,46 @@ export default function sync(pi: ExtensionAPI, dependencies: Partial<SyncDepende
   });
 
   pi.on("session_start", async (_event, ctx) => {
-    shutdownAbort?.abort(new DOMException("Session replaced", "AbortError"));
-    shutdownAbort = undefined;
-    sessionAbort.abort(new DOMException("Session replaced", "AbortError"));
-    sessionAbort = new AbortController();
-    const signal = sessionAbort.signal;
-    owner = ctx.sessionManager;
-    continuousPossible = false;
-    startupDebug = false;
-    attention.reset(ctx);
-    const previous = initialization;
-    initialization = (async () => {
-      await previous;
-      if (signal.aborted) return false;
-      await continuous?.stop();
-      if (signal.aborted) return false;
-      await check.stop();
-      if (signal.aborted) return false;
-      try {
-        const startup = await withStateDirectoryAccess(() => startSession(ctx, signal, publishTimings));
+    const releaseStatus = status.start(ctx);
+    try {
+      shutdownAbort?.abort(new DOMException("Session replaced", "AbortError"));
+      shutdownAbort = undefined;
+      sessionAbort.abort(new DOMException("Session replaced", "AbortError"));
+      sessionAbort = new AbortController();
+      const signal = sessionAbort.signal;
+      owner = ctx.sessionManager;
+      continuousPossible = false;
+      startupDebug = false;
+      attention.reset(ctx);
+      const previous = initialization;
+      initialization = (async () => {
+        await previous;
         if (signal.aborted) return false;
-        startupDebug = startup?.debug ?? false;
-        return startup?.config;
-      } catch (error) {
-        if (!signal.aborted && ctx.hasUI) {
-          ctx.ui.notify(`pi-sync recovery required: ${safeTerminalText(errorMessage(error))}`, "error");
+        await continuous?.stop();
+        if (signal.aborted) return false;
+        await check.stop();
+        if (signal.aborted) return false;
+        try {
+          const startup = await withStateDirectoryAccess(() => startSession(ctx, signal, publishTimings));
+          if (signal.aborted) return false;
+          startupDebug = startup?.debug ?? false;
+          return startup?.config;
+        } catch (error) {
+          if (!signal.aborted && ctx.hasUI) {
+            ctx.ui.notify(`pi-sync recovery required: ${safeTerminalText(errorMessage(error))}`, "error");
+          }
+          return false;
         }
-        return false;
+      })();
+      const ready = await initialization;
+      if (ready === false) releaseStatus();
+      if (ready && !signal.aborted) {
+        if (ready.continuous && ready.agentMode) await resumeContinuous(ctx, signal);
+        else if (ready.automatic || startupTransferEnabled(ready)) check.start(ctx, signal, ready);
       }
-    })();
-    const ready = await initialization;
-    if (ready && !signal.aborted) {
-      if (ready.continuous && ready.agentMode) await resumeContinuous(ctx, signal);
-      else if (ready.automatic || startupTransferEnabled(ready)) check.start(ctx, signal, ready);
+    } catch (error) {
+      releaseStatus();
+      throw error;
     }
   });
 
@@ -154,36 +163,41 @@ export default function sync(pi: ExtensionAPI, dependencies: Partial<SyncDepende
   });
 
   pi.on("session_shutdown", async (event, ctx) => {
-    if (continuous && owner && owner !== ctx.sessionManager) return;
-    sessionAbort.abort(new DOMException("Session shut down", "AbortError"));
-    attention.reset(ctx);
-    shutdownAbort?.abort(new DOMException("Session shut down again", "AbortError"));
-    const controller = new AbortController();
-    shutdownAbort = controller;
-    const signal = combineSignals(controller.signal, AbortSignal.timeout(30_000));
-    const reason = typeof event === "object" && event ? (event as { reason?: string }).reason : undefined;
+    const releaseStatus = status.cleanupFor(ctx);
     try {
-      const ready = await initialization;
-      if (signal.aborted) return;
-      await continuous?.stop(ctx.sessionManager);
-      if (signal.aborted) return;
-      await check.stop();
-      if (signal.aborted) return;
-      if (ready !== false && reason !== "reload") {
-        await withStateDirectoryAccess(async () => {
-          if (signal.aborted) return;
-          await autoPushSessions(ctx, signal, loaders);
-        });
-      }
-    } catch (error) {
-      if (!signal.aborted) {
-        ctx.ui.notify(`pi-sync session push skipped: ${errorMessage(error)}`, "warning");
+      if (continuous && owner && owner !== ctx.sessionManager) return;
+      sessionAbort.abort(new DOMException("Session shut down", "AbortError"));
+      attention.reset(ctx);
+      shutdownAbort?.abort(new DOMException("Session shut down again", "AbortError"));
+      const controller = new AbortController();
+      shutdownAbort = controller;
+      const signal = combineSignals(controller.signal, AbortSignal.timeout(30_000));
+      const reason = typeof event === "object" && event ? (event as { reason?: string }).reason : undefined;
+      try {
+        const ready = await initialization;
+        if (signal.aborted) return;
+        await continuous?.stop(ctx.sessionManager);
+        if (signal.aborted) return;
+        await check.stop();
+        if (signal.aborted) return;
+        if (ready !== false && reason !== "reload") {
+          await withStateDirectoryAccess(async () => {
+            if (signal.aborted) return;
+            await autoPushSessions(ctx, signal, loaders);
+          });
+        }
+      } catch (error) {
+        if (!signal.aborted) {
+          ctx.ui.notify(`pi-sync session push skipped: ${errorMessage(error)}`, "warning");
+        }
+      } finally {
+        if (shutdownAbort === controller) shutdownAbort = undefined;
       }
+      if (signal.aborted) return;
+      setSyncStatus(ctx, undefined);
     } finally {
-      if (shutdownAbort === controller) shutdownAbort = undefined;
+      releaseStatus();
     }
-    if (signal.aborted) return;
-    setSyncStatus(ctx, undefined);
   });
 }
 

package/src/ui/agent-mode-setting.ts

@@ -6,10 +6,10 @@ import { confirmMergeReview } from "./merge-review.js";
 import { safeTerminalText } from "./terminal-text.js";
 
 export const AGENT_MODE_DESCRIPTION =
-  "This setup, experimental: one autonomous merged sync next startup and on Sync now. Sends eligible conflict text to the selected Pi model; may incur costs and replace/delete selected local and remote content without transfer prompts. No automatic reload. Unsupported conflicts pause.";
+  "This setup: sync eligible changes at session startup and on Sync now without transfer confirmation. Use the selected Pi model to resolve supported text and settings conflicts. Eligible conflict content may be sent to its provider and incur costs. Selected local and remote content can be replaced or deleted. Unresolved conflicts pause unless partial sync permits independent progress. Continuous sync is a separate opt-in. No automatic reload.";
 
 export const CONTINUOUS_DESCRIPTION =
-  "This setup, experimental: recurring sync while Pi is open. Requires Agent mode. Watches selected files, checks the remote every 60–66 seconds, and retries temporary failures. Local changes and retries can cause extra requests between polls. May disclose conflict text and incur model/storage costs. No automatic reload.";
+  "This setup: recurring sync while Pi is open. Requires Autonomous sync. Watches selected files, checks the remote every 60–66 seconds, and retries temporary failures. Local changes and retries can cause extra requests between polls. May disclose conflict text and incur model/storage costs. No automatic reload.";
 
 export function saveContinuousMode(
   ctx: ExtensionCommandContext,
@@ -33,8 +33,8 @@ export async function saveAgentMode(
   const setup = settings.syncSetups[setupName];
   if (!setup || settings.activeSyncSetup !== setupName) throw new Error("Current sync setup changed; reopen Settings.");
   const continuous = preference === "continuous";
-  const label = continuous ? "Continuous sync" : "Agent mode";
-  if (enabled && continuous && !setup.sync.agentMode) throw new Error("Enable Agent mode before Continuous sync.");
+  const label = continuous ? "Continuous sync" : "Autonomous sync";
+  if (enabled && continuous && !setup.sync.agentMode) throw new Error("Enable Autonomous sync before Continuous sync.");
   if (Boolean(setup.sync[preference]) === enabled) return true;
   if (enabled) {
     const summary = [
@@ -59,7 +59,7 @@ export async function saveAgentMode(
     if (
       !(await confirmMergeReview(
         ctx,
-        `Enable experimental ${label}?`,
+        `Enable ${label}?`,
         summary,
         signal,
         () => !signal?.aborted,
@@ -80,7 +80,7 @@ export async function saveAgentMode(
         settings.storageConnections[setup.storage.connection],
       )
     )
-      throw new Error("Sync setup or connection changed during Agent mode review; reopen Settings.");
+      throw new Error("Sync setup or connection changed during Autonomous sync review; reopen Settings.");
     return {
       ...current,
       syncSetups: { ...current.syncSetups, [setupName]: { ...setup, sync: { ...setup.sync, [preference]: enabled } } },

package/src/ui/manager-state.ts

@@ -165,7 +165,7 @@ export async function describeManagerState(
       `Included: ${selection.builtIns.length} built-in group${selection.builtIns.length === 1 ? "" : "s"} · ${selection.custom.length} extra path${selection.custom.length === 1 ? "" : "s"} · Sessions ${selection.sessions ? "on" : "off"}`,
       `Automatic sync: ${automaticSyncSummary(config.automatic)}`,
       `Startup transfer: ${startupTransferSummary(config)}`,
-      `Agent mode: ${config.agentMode ? "On (experimental; autonomous merged sync)" : "Off"}`,
+      `Autonomous sync: ${config.agentMode ? "On (autonomous merged sync)" : "Off"}`,
       ...(config.continuous ? await (await import("../sync/continuous-record.js")).continuousStatusLines(config) : []),
       `Last applied: ${lastAppliedSnapshot}`,
       ...(noSyncedContent

package/src/ui/remote-selection-ui.ts

@@ -489,7 +489,7 @@ async function inspectConfiguredRemoteSelection(
   const config = await loadConfig(setupName);
   if (signal?.aborted) return undefined;
   validateOwner();
-  setSyncStatus(ctx, `checking synced content for ${safeTerminalText(config.setupName)}`);
+  setSyncStatus(ctx, `checking synced content for ${safeTerminalText(config.setupName)}`, { activity: "checking" });
   const backend = await factory(config);
   if (signal?.aborted) return undefined;
   validateOwner();

package/src/ui/settings-ui.ts

@@ -92,32 +92,20 @@ export async function showSyncSettings(
     | "storage-location"
     | "setups"
     | "connections";
-  type Group = "content" | "behavior" | "storage" | "advanced" | "all";
-  type Screen = "categories" | Group;
-  const groups: Record<Group, { label: string; ids: readonly string[] }> = {
-    content: { label: "Sync content", ids: ["include", "remoteInclude", "localFields"] },
-    behavior: {
-      label: "Sync behavior",
-      ids: ["automatic", "automaticTransfer", "agentMode", "continuous", "onSwitch"],
-    },
-    storage: { label: "Storage & setups", ids: ["storageLocation", "setups", "connections"] },
-    advanced: { label: "Advanced", ids: ["mergeSettings", "contentPolicy", "skipSecretScan", "showStatus", "debug"] },
-    all: { label: "All settings (search)", ids: [] },
-  };
   let saveStatus = "Simple choices save immediately. Back does not undo saved changes.";
   // Keep Kit's existing settings adapter: native SettingsList has no async save/rollback
   // contract or injected keybindings. Kit preserves these safety and accessibility behaviors.
-  // Categories use public navigation; All settings retains cross-category search.
-  const settingsScreen = (state: Awaited<ReturnType<typeof loadConfig>>, group: Group) =>
-    ({
-      kind: "settings",
-      title: `Pi Sync Settings · ${groups[group].label}`,
-      lines: [
-        `Setup: ${safeTerminalText(state.setupName)} · Connection: ${safeTerminalText(state.connectionName)}`,
-        saveStatus,
-      ],
-      items: (
-        [
+  const menu = defineMenu<Awaited<ReturnType<typeof loadConfig>>, "settings", Action, ExtensionCommandContext>({
+    start: "settings",
+    screens: {
+      settings: ({ state }) => ({
+        kind: "settings",
+        title: "Pi Sync Settings",
+        lines: [
+          `Setup: ${safeTerminalText(state.setupName)} · Connection: ${safeTerminalText(state.connectionName)}`,
+          saveStatus,
+        ],
+        items: [
           {
             id: "include",
             label: "Included paths",
@@ -188,7 +176,7 @@ export async function showSyncSettings(
           },
           {
             id: "agentMode",
-            label: "Agent mode (experimental)",
+            label: "Autonomous sync",
             description: AGENT_MODE_DESCRIPTION,
             currentValue: state.agentMode ? "On" : "Off",
             values: ["On", "Off"],
@@ -196,8 +184,8 @@ export async function showSyncSettings(
           },
           {
             id: "continuous",
-            label: "Continuous sync (experimental)",
-            description: `${CONTINUOUS_DESCRIPTION}${state.continuous && !state.agentMode ? " Saved On, but paused until Agent mode is enabled." : ""}`,
+            label: "Continuous sync",
+            description: `${CONTINUOUS_DESCRIPTION}${state.continuous && !state.agentMode ? " Saved On, but paused until Autonomous sync is enabled." : ""}`,
             currentValue: state.continuous ? "On" : "Off",
             values: ["On", "Off"],
             action: "continuous",
@@ -215,7 +203,7 @@ export async function showSyncSettings(
             id: "mergeSettings",
             label: "Merge settings fields",
             description:
-              "This setup, experimental opt-in: merge independent global settings.json root fields with a verified private ancestor. Arrays and nested objects remain atomic. Applies to subsequent sync; no reload.",
+              "This setup, opt-in: merge independent global settings.json root fields with a verified private ancestor. Arrays and nested objects remain atomic. Applies to subsequent sync; no reload.",
             currentValue: state.mergeSettings ? "On" : "Off",
             values: ["On", "Off"],
             action: "merge-settings",
@@ -224,7 +212,7 @@ export async function showSyncSettings(
             id: "contentPolicy",
             label: "Content merge / partial progress",
             description:
-              "This setup, experimental opt-in: review the version-5 upgrade before saving. Merge bounded text and prefix-only sessions; partial progress keeps withheld versions and baselines. Applies to subsequent sync; disabling does not clear recovery evidence.",
+              "This setup, opt-in: review the version-5 upgrade before saving. Merge bounded text and prefix-only sessions; partial progress keeps withheld versions and baselines. Applies to subsequent sync; disabling does not clear recovery evidence.",
             currentValue: state.mergeContent
               ? state.partialSync
                 ? "Merge + partial"
@@ -262,32 +250,8 @@ export async function showSyncSettings(
             values: ["On", "Off"],
             action: "debug",
           },
-        ] satisfies MenuSettingItem<Action>[]
-      ).filter((item) => group === "all" || groups[group].ids.includes(item.id)),
-    }) as const;
-  const menu = defineMenu<Awaited<ReturnType<typeof loadConfig>>, Screen, Action, ExtensionCommandContext>({
-    start: "categories",
-    screens: {
-      categories: ({ state }) => ({
-        kind: "actions",
-        title: "Pi Sync Settings",
-        lines: [
-          `Setup: ${safeTerminalText(state.setupName)} · Connection: ${safeTerminalText(state.connectionName)}`,
-          "Choose a task, or search all settings. Scope is shown in each setting's description.",
-          saveStatus,
-        ],
-        items: (Object.entries(groups) as [Group, (typeof groups)[Group]][]).map(([id, group]) => ({
-          id,
-          label: group.label,
-          to: id,
-        })),
-        hint: "back",
+        ] satisfies MenuSettingItem<Action>[],
       }),
-      content: ({ state }) => settingsScreen(state, "content"),
-      behavior: ({ state }) => settingsScreen(state, "behavior"),
-      storage: ({ state }) => settingsScreen(state, "storage"),
-      advanced: ({ state }) => settingsScreen(state, "advanced"),
-      all: ({ state }) => settingsScreen(state, "all"),
     },
     actions: {
       "storage-location": async ({ signal: actionSignal }) => {
@@ -315,7 +279,7 @@ export async function showSyncSettings(
           const partialSync = value === "Partial only" || value === "Merge + partial";
           if (
             !(await ctx.ui.confirm(
-              "Save experimental content policy?",
+              "Save content policy?",
               "This explicitly upgrades settings to version 5; partial snapshots use version 3 and older clients must refuse them. Text/session merge is conservative. Partial sync preserves withheld versions and old baselines. Disabling does not clear unresolved groups or recovery evidence. Review a directional migration first if portable policy changes.",
               { signal: mutationSignal },
             ))
@@ -450,7 +414,7 @@ export async function showSyncSettings(
           try {
             validate();
             ctx.ui.notify(
-              "Agent mode saved. Applies to subsequent sync and the next session start; no transfer started.",
+              "Autonomous sync saved. Applies to subsequent sync and the next session start; no transfer started.",
               "info",
             );
           } catch {

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

@@ -129,8 +129,8 @@ export async function showSetupSwitcher(
       `Included content: ${config.include.length} paths`,
       `Automatic sync: ${automaticSyncSummary(config.automatic)} · Sessions: ${config.include.includes("sessions") ? "On" : "Off"}`,
       `Automatic transfer at startup: ${config.automaticTransfer ? "On — may upload, replace, or delete selected files; no reload" : "Off"}`,
-      `Agent mode: ${config.agentMode ? "On (experimental; autonomous merged sync)" : "Off"}`,
-      `Continuous sync: ${config.continuous ? (config.agentMode ? "On (experimental; recurring requests and transfers)" : "Saved On; paused until Agent mode is enabled") : "Off"}`,
+      `Autonomous sync: ${config.agentMode ? "On (autonomous merged sync)" : "Off"}`,
+      `Continuous sync: ${config.continuous ? (config.agentMode ? "On (recurring requests and transfers)" : "Saved On; paused until Autonomous sync is enabled") : "Off"}`,
       "",
       switchEffect,
     ].join("\n"),

package/src/ui/sync-attention.ts

@@ -93,7 +93,9 @@ export function createSyncAttentionController(): SyncAttentionController {
       }
       if (!state && classification === "status") {
         ctx.ui.setWidget(WIDGET_KEY, undefined);
-        setSyncStatus(ctx, observation?.inspection.remoteChanged ? "sync ⇣" : "sync ⇡");
+        setSyncStatus(ctx, observation?.inspection.remoteChanged ? "sync ⇣" : "sync ⇡", {
+          activity: observation?.inspection.remoteChanged ? "remote-change" : "local-change",
+        });
         return;
       }
       const presentation = state
@@ -104,7 +106,7 @@ export function createSyncAttentionController(): SyncAttentionController {
           };
       if (ctx.mode !== "tui") {
         ctx.ui.setWidget(WIDGET_KEY, undefined);
-        setSyncStatus(ctx, presentation.status);
+        setSyncStatus(ctx, presentation.status, { activity: "review" });
         return;
       }
       // Keep Kit outside the eager startup graph; module loading owns no cancellable resources.
@@ -113,7 +115,7 @@ export function createSyncAttentionController(): SyncAttentionController {
         throw error;
       });
       if (generation !== currentGeneration || signal?.aborted) return;
-      setSyncStatus(ctx, presentation.status);
+      setSyncStatus(ctx, presentation.status, { activity: "review" });
       ctx.ui.setWidget(
         WIDGET_KEY,
         (_tui, theme) =>

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

@@ -193,8 +193,8 @@ async function loadSetupMenuState(selectedName: string | undefined, signal?: Abo
       `Sessions: ${selection.sessions ? "On — privacy-sensitive" : "Off"}`,
       `Automatic sync: ${config.automatic ? "On" : "Off"}`,
       `Automatic transfer at startup: ${config.automaticTransfer ? "On — may upload, replace, or delete selected files; no reload" : "Off"}`,
-      `Agent mode: ${config.agentMode ? "On (experimental; autonomous merged sync)" : "Off"}`,
-      `Continuous sync: ${config.continuous ? (config.agentMode ? "On (experimental; recurring requests and transfers)" : "Saved On; paused until Agent mode is enabled") : "Off"}`,
+      `Autonomous sync: ${config.agentMode ? "On (autonomous merged sync)" : "Off"}`,
+      `Continuous sync: ${config.continuous ? (config.agentMode ? "On (recurring requests and transfers)" : "Saved On; paused until Autonomous sync is enabled") : "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.",