@narumitw/pi-sync 0.57.10 → 0.57.12

package/src/sync/continuous-record.ts

@@ -210,7 +210,7 @@ function hasReservationCapacity(record: ContinuousRecord, now: number): boolean
 /** Read-only status: no directory creation, lease, mutation, request reservation or provider call. */
 export async function continuousStatusLines(config: AnySyncConfig, clock: () => number = Date.now): Promise<string[]> {
   if (!config.continuous) return ["Continuous sync: Off"];
-  if (!config.agentMode) return ["Continuous sync: paused; enable Agent mode first"];
+  if (!config.agentMode) return ["Continuous sync: paused; enable Autonomous sync first"];
   try {
     const binding = await continuousBinding(config);
     const document = await readContinuousPrivateDocument(`${binding}.json`);

package/src/sync/merge-apply.ts

@@ -5,6 +5,7 @@ import { withFileMutationQueue } from "@earendil-works/pi-coding-agent";
 import { agentDir } from "../snapshot/session-paths.js";
 import { createSnapshot, snapshotTarget } from "../snapshot/snapshot.js";
 import { preflightSnapshotApply, preflightSnapshotMutations } from "../snapshot/snapshot-apply.js";
+import { assertCanonicalMutationTargets } from "../snapshot/snapshot-mutation-queues.js";
 import { sessionStorageRoot } from "../snapshot/snapshot-paths.js";
 import type { Snapshot, SnapshotOptions } from "../snapshot/snapshot-types.js";
 import { syncDirectory } from "../state/json-file.js";
@@ -34,6 +35,10 @@ export async function preflightMergedTargets(
   for (const relative of paths) {
     if (changed.has(relative)) await assertFilesystemTarget(root, relative, options, removedTargets, beforeHashes);
   }
+  await assertCanonicalMutationTargets(
+    [...changed].map((relative) => snapshotTarget(root, relative, options.sessionDir)),
+    options,
+  );
 }
 
 function replacementPaths(removed: Set<string>, afterHashes: Readonly<Record<string, string>>) {
@@ -244,6 +249,7 @@ export async function applyMergedSnapshot(
     protectedTarget,
     new Set(Object.keys(afterHashes)),
   );
+  await assertCanonicalMutationTargets(targets, options);
   // Existing case aliases share Pi's non-reentrant realpath queue. Reserve the
   // missing destination separately only after deleting its reviewed preimage.
   const targetsByQueue = new Map<string, string[]>();

package/src/sync/merged-sync.ts

@@ -102,7 +102,7 @@ export async function mergeSync(
       options.agentRetryRefusal &&
       (!config.agentMode || options.auto || options.background || !ctx.hasUI || !["tui", "rpc"].includes(ctx.mode))
     )
-      throw new Error("Refused-candidate retry requires foreground Agent mode in TUI or RPC.");
+      throw new Error("Refused-candidate retry requires foreground Autonomous sync in TUI or RPC.");
   };
   const config = await loadConfig(options.setup);
   validateOwner(config);
@@ -131,7 +131,7 @@ export async function mergeSync(
           throw new Error("Session storage root changed during transfer; evidence retained for review.");
       }
       if (config.agentMode && JSON.stringify(ctx.model) !== modelToken)
-        throw new Error("Agent mode paused: selected model changed during transfer.");
+        throw new Error("Autonomous sync paused: selected model changed during transfer.");
       if (options.auto && (!startupTransferEnabled(latest) || !ctx.isIdle()))
         throw new Error("Automatic transfer is no longer authorized at this idle boundary.");
     });
@@ -171,7 +171,7 @@ export async function mergeSync(
   // Recovery above never publishes. This gate applies only to new autonomous transfers.
   if ((options.auto || config.agentMode) && backend.capability === "read-check-write-verify") {
     throw new Error(
-      "Automatic transfer requires conditional publication or a lease; this backend supports only read/check/write/verify. Disable Agent mode and use manual sync.",
+      "Automatic transfer requires conditional publication or a lease; this backend supports only read/check/write/verify. Disable Autonomous sync and use manual sync.",
     );
   }
   const textBudget = { remaining: TEXT_MERGE_WORK_LIMIT };
@@ -353,7 +353,7 @@ export async function mergeSync(
         if (plan.kind !== "planned" || (plan.conflicts.length && !config.partialSync))
           throw new ContinuousError(
             "unsafe",
-            "Agent mode paused: unsupported or refused conflict groups remain; no transfer was performed.",
+            "Autonomous sync paused: unsupported or refused conflict groups remain; no transfer was performed.",
           );
       }
       if (

package/src/sync/sync-mutations.ts

@@ -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/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/cancellable-operation.ts

@@ -28,6 +28,7 @@ interface CancellableOperationOptions {
   cancelledMessage?: string | null;
   target?: string;
   signal?: AbortSignal;
+  isCurrent?: () => boolean;
 }
 
 export async function runCancellableOperation(
@@ -37,21 +38,45 @@ export async function runCancellableOperation(
   runRoute: RunRoute,
   options: CancellableOperationOptions = {},
 ): Promise<CancellableOperationResult> {
+  const result = await runCancellableTask(
+    ctx,
+    message,
+    (signal, onCommit, onDialog) => runRoute(route, signal, onCommit, options.target, onDialog),
+    options,
+  );
+  return result.kind === "completed" ? (result.value ?? { kind: "failed" }) : result;
+}
+
+export type CancellableTaskResult<Value> =
+  | { kind: "completed"; value: Value }
+  | { kind: "closed" }
+  | { kind: "cancelled" };
+
+/** Keep non-route work under the same cancellation and drain owner as transfers. */
+export async function runCancellableTask<Value>(
+  ctx: ExtensionContext,
+  message: string,
+  task: (
+    signal: AbortSignal | undefined,
+    onCommit?: () => void,
+    onDialog?: (active: boolean) => void,
+  ) => Promise<Value>,
+  options: Omit<CancellableOperationOptions, "target"> = {},
+): Promise<CancellableTaskResult<Value>> {
   const {
     commitAware = false,
     cancelAcrossDialogs = false,
     cancelledMessage = "Check cancelled; no settings or files were changed.",
-    target,
     signal,
+    isCurrent = () => true,
   } = options;
-  if (ctx.mode !== "tui") {
-    return (await runRoute(route, signal, undefined, target)) ?? { kind: "failed" };
-  }
+  if (signal?.aborted || !isCurrent()) return { kind: "closed" };
+  if (ctx.mode !== "tui") return { kind: "completed", value: await task(signal) };
   let commitStarted = false;
-  let routeResult: RunRouteResult | undefined;
+  let taskResult!: Value;
   const interaction = await runCustomInteraction<{ cancelled?: boolean; error?: unknown }, ExtensionContext>(ctx, {
     signal,
-    isCurrent: () => !signal?.aborted,
+    isCurrent: () => !signal?.aborted && isCurrent(),
     create: ({ tui, theme, keybindings, signal: interactionSignal, complete }) => {
       const loader = new BorderedLoader(tui, theme, message, { cancellable: false });
       const cancelHint = formatInteractionHints(keybindings, [
@@ -80,13 +105,11 @@ export async function runCancellableOperation(
             return cancel(data) ? { consume: true } : undefined;
           })
         : undefined;
-      let pendingRoute: ReturnType<RunRoute>;
+      let pendingTask: Promise<Value>;
       try {
-        pendingRoute = runRoute(
-          route,
+        pendingTask = task(
           interactionSignal,
           commitAware ? () => (commitStarted = true) : undefined,
-          target,
           cancelAcrossDialogs
             ? (active) => {
                 activeDialogs += active ? 1 : -1;
@@ -98,9 +121,9 @@ export async function runCancellableOperation(
         loader.dispose();
         throw error;
       }
-      const operation = pendingRoute.then(
+      const operation = pendingTask.then(
         (result) => {
-          routeResult = result;
+          taskResult = result;
           complete({});
         },
         (error: unknown) => complete({ error }),
@@ -134,7 +157,7 @@ export async function runCancellableOperation(
     return { kind: "cancelled" };
   }
   if (interaction.value.error) throw interaction.value.error;
-  return routeResult ?? { kind: "failed" };
+  return { kind: "completed", value: taskResult };
 }
 
 function hasControlCharacter(value: string) {

package/src/ui/manager-state.ts

@@ -1,5 +1,5 @@
 import { truncateToWidth } from "@earendil-works/pi-tui";
-import { loadConfig } from "../settings/config.js";
+import { loadConfig, syncCheckConfigFingerprint } from "../settings/config.js";
 import { activeLocalConfigPath } from "../settings/config-file.js";
 import { readLocalConfigObject } from "../settings/settings-store.js";
 import type { AnySyncConfig } from "../settings/settings-types.js";
@@ -39,6 +39,7 @@ export const MAIN_MENU_ACTIONS = [
 export interface ManagerDescription {
   title: string;
   actions: string[];
+  configReview?: { setupName: string; fingerprint: string };
   operation?: OperationAvailability;
   attention?: SyncAttentionState;
   observation?: StartupObservation;
@@ -164,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
@@ -176,6 +177,7 @@ export async function describeManagerState(
     return {
       title: (changesBlocked ? ["Manage sync", ...operationStatusLines(operation)] : ordinaryTitle).join("\n"),
       actions: operationActions(operation, noSyncedContent, canSwitch, mainActions),
+      configReview: { setupName: config.setupName, fingerprint: syncCheckConfigFingerprint(config) },
       operation,
       ...(currentObservation ? { observation: currentObservation } : {}),
       ...(currentAttention

package/src/ui/manager-ui.ts

@@ -31,6 +31,15 @@ export async function showSyncManager(
     await runRoute("help");
     return;
   }
+  const validateOwner = captureMutationOwner(ctx, sessionSignal);
+  const isCurrent = () => {
+    try {
+      validateOwner();
+      return true;
+    } catch {
+      return false;
+    }
+  };
   type Screen = "main";
   type Action =
     | "review-attention"
@@ -77,10 +86,11 @@ export async function showSyncManager(
       },
     },
     actions: {
-      "review-attention": async () => {
-        const attention = options.getAttention?.();
+      "review-attention": async ({ state }) => {
+        const attention = state.manager.attention;
+        if (attention && options.getAttention?.() !== attention) return { kind: "stay" };
         if (!attention) {
-          const observation = options.getObservation?.();
+          const observation = state.manager.observation;
           if (!observation) return { kind: "stay" };
           // A head-only observation is not an authoritative decision. Load a fresh
           // snapshot only after the user activates the existing review flow.
@@ -113,24 +123,21 @@ export async function showSyncManager(
         );
         return { kind: disposition };
       },
-      sync: async () => {
+      sync: async ({ state }) => {
         const pendingAttention = options.getAttention?.();
-        if (pendingAttention) {
-          const activeConfig = await loadConfig();
-          if (sessionSignal?.aborted) return { kind: "close" };
-          if (pendingAttention.decision.setupName === activeConfig.setupName) {
-            ctx.ui.notify("Review synced content before starting Sync now.", "warning");
-            return { kind: "stay" };
-          }
+        if (pendingAttention?.decision.setupName === state.manager.configReview?.setupName) {
+          ctx.ui.notify("Review synced content before starting Sync now.", "warning");
+          return { kind: "stay" };
         }
         const result = await runCancellableOperation(ctx, "Checking current sync setup…", "sync", runRoute, {
           commitAware: true,
           signal: sessionSignal,
+          target: state.manager.configReview?.setupName,
         });
         const disposition = await dispatchManagerResult(ctx, result, "sync", runRoute, sessionSignal);
         return disposition.kind === "close" ? { kind: "close" } : { kind: "stay" };
       },
-      "retry-refusal": async ({ signal: actionSignal }) => {
+      "retry-refusal": async ({ state, signal: actionSignal }) => {
         const signal = sessionSignal ? AbortSignal.any([sessionSignal, actionSignal]) : actionSignal;
         const validate = captureMutationOwner(ctx, signal);
         validate();
@@ -140,6 +147,7 @@ export async function showSyncManager(
           commitAware: true,
           cancelAcrossDialogs: true,
           signal,
+          target: state.manager.configReview?.setupName,
           cancelledMessage: "Model retry cancelled. Submitted requests and committed writes cannot be undone.",
         });
         if (signal.aborted) return { kind: "close" };
@@ -155,23 +163,25 @@ export async function showSyncManager(
         const result = await showSetupSwitcher(ctx, runRoute, undefined, sessionSignal);
         return result === "pull-attempted" || result === "closed" ? { kind: "close" } : { kind: "stay" };
       },
-      settings: async () => {
-        const result = await showSyncSettings(ctx, runRoute, sessionSignal);
+      settings: async ({ state }) => {
+        const result = await showSyncSettings(ctx, runRoute, sessionSignal, state.manager.configReview?.setupName);
         return { kind: result === "exit" ? "close" : "stay" };
       },
-      pull: async () => {
+      pull: async ({ state }) => {
         const result = await runCancellableOperation(ctx, "Checking remote changes…", "pull", runRoute, {
           commitAware: true,
           cancelledMessage: "Pull check cancelled; no local files were changed.",
+          target: state.manager.configReview?.setupName,
           signal: sessionSignal,
         });
         const disposition = await dispatchManagerResult(ctx, result, "pull", runRoute, sessionSignal);
         return disposition.kind === "close" ? { kind: "close" } : { kind: "stay" };
       },
-      push: async () => {
+      push: async ({ state }) => {
         const result = await runCancellableOperation(ctx, "Preparing push preview…", "push", runRoute, {
           commitAware: true,
           cancelledMessage: "Push preparation cancelled; no remote files were changed.",
+          target: state.manager.configReview?.setupName,
           signal: sessionSignal,
         });
         const disposition = await dispatchManagerResult(ctx, result, "push", runRoute, sessionSignal);
@@ -185,31 +195,34 @@ export async function showSyncManager(
         await showStorageConnections(ctx, sessionSignal);
         return { kind: "stay" };
       },
-      history: async () => {
+      history: async ({ state }) => {
         const result = await runCancellableOperation(ctx, "Loading sync history…", "history", runRoute, {
           signal: sessionSignal,
           commitAware: true,
           cancelAcrossDialogs: true,
+          target: state.manager.configReview?.setupName,
           cancelledMessage: "History review cancelled; no files were changed.",
         });
         return { kind: result.kind === "closed" ? "close" : "stay" };
       },
-      diff: async () => {
+      diff: async ({ state }) => {
         const result = await runCancellableOperation(ctx, "Comparing local and remote…", "diff", runRoute, {
+          target: state.manager.configReview?.setupName,
           signal: sessionSignal,
         });
         return { kind: result.kind === "closed" ? "close" : "stay" };
       },
-      status: async () => {
+      status: async ({ state }) => {
         const result = await runCancellableOperation(ctx, "Checking remote status…", "status", runRoute, {
+          target: state.manager.configReview?.setupName,
           signal: sessionSignal,
         });
         return { kind: result.kind === "closed" ? "close" : "stay" };
       },
-      doctor: async ({ signal: actionSignal }) => {
+      doctor: async ({ state, signal: actionSignal }) => {
         const signal = sessionSignal ? AbortSignal.any([sessionSignal, actionSignal]) : actionSignal;
         const validate = captureMutationOwner(ctx, signal);
-        const config = await loadConfig();
+        const config = await loadConfig(state.manager.configReview?.setupName);
         validate();
         const confirmed = await ctx.ui.confirm(
           "Run diagnostics?",
@@ -241,11 +254,12 @@ export async function showSyncManager(
         return { kind: "close" };
       },
       init: async () => {
-        await runRoute("init");
+        await runRoute("init", sessionSignal);
         return { kind: "stay" };
       },
-      conflicts: async () => {
+      conflicts: async ({ state }) => {
         const result = await runCancellableOperation(ctx, "Reviewing private conflicts…", "conflicts", runRoute, {
+          target: state.manager.configReview?.setupName,
           commitAware: true,
           signal: sessionSignal,
         });
@@ -254,6 +268,44 @@ export async function showSyncManager(
       },
     },
   });
+  // Setup-specific actions must use the configuration shown by this screen, not
+  // an active setup selected by another process while the menu was open.
+  for (const action of [
+    "review-attention",
+    "sync",
+    "retry-refusal",
+    "settings",
+    "pull",
+    "push",
+    "history",
+    "diff",
+    "status",
+    "doctor",
+    "conflicts",
+  ] as const) {
+    const activate = menu.actions[action];
+    menu.actions[action] = async (invocation) => {
+      validateOwner();
+      const review = invocation.state.manager.configReview;
+      let current = false;
+      try {
+        const config = await loadConfig();
+        validateOwner();
+        invocation.signal.throwIfAborted();
+        current = review?.fingerprint === syncCheckConfigFingerprint(config);
+      } catch {
+        if (!isCurrent() || invocation.signal.aborted) return { kind: "close" };
+      }
+      if (!current) {
+        ctx.ui.notify(
+          "Sync setup changed while the manager was open. Review the refreshed setup before continuing.",
+          "warning",
+        );
+        return { kind: "stay" };
+      }
+      return activate(invocation);
+    };
+  }
   const menuContext: ExtensionCommandContext = {
     ...ctx,
     ui: {
@@ -293,7 +345,7 @@ export async function showSyncManager(
       return { manager };
     },
     signal: sessionSignal,
-    isCurrent: () => !sessionSignal?.aborted,
+    isCurrent,
   });
 }