@narumitw/pi-sync 0.54.2 → 0.56.0

package/dist/index.ts

@@ -1,22 +1,19 @@
 // @generated by scripts/build-runtime.mjs; do not edit.
 // @ts-nocheck -- generated JavaScript uses a .ts extension for Pi's Jiti loader.
 import {
-  createSyncAttentionController,
-  observationMatchesConfig,
-  syncAttentionMatchesConfig
-} from "./chunks/chunk-5RZPINUQ.ts";
+  withAgentSyncLock
+} from "./chunks/chunk-S2FMH5FT.ts";
 import {
   recoverSnapshotTransactionsOnStartup
-} from "./chunks/chunk-CL7BZRRQ.ts";
+} from "./chunks/chunk-CRKTAPSL.ts";
 import {
-  captureMutationOwner,
-  unlock,
-  withLock
-} from "./chunks/chunk-IJ6VV6FN.ts";
+  createSyncAttentionController,
+  observationMatchesConfig,
+  syncAttentionMatchesConfig
+} from "./chunks/chunk-GSNPASKB.ts";
 import {
-  combineSignals,
-  throwIfAborted
-} from "./chunks/chunk-PWMWOJP4.ts";
+  captureMutationOwner
+} from "./chunks/chunk-UOHR7LRO.ts";
 import {
   automaticSyncSummary
 } from "./chunks/chunk-ECYCNZOE.ts";
@@ -30,23 +27,26 @@ import {
   resolveSyncCommand,
   setSyncSetupCompletions,
   splitArgs,
+  startupTransferSummary,
   usage,
   validateCommandOptions
-} from "./chunks/chunk-2DI6PDZV.ts";
+} from "./chunks/chunk-NLWS55B6.ts";
 import {
   safeTerminalText
 } from "./chunks/chunk-AMJRUXFT.ts";
-import "./chunks/chunk-76NB4R7U.ts";
 import {
-  ensureStateDir,
-  readStateForConfig,
-  syncStateFingerprint
-} from "./chunks/chunk-4QVPTIZB.ts";
+  createStartupTimings
+} from "./chunks/chunk-UZPMDLTL.ts";
+import "./chunks/chunk-UBV24CG4.ts";
 import {
-  migrateLegacyStateDirectory,
-  stateDirectoryMigrationNotice,
-  withStateDirectoryAccess
-} from "./chunks/chunk-BVVP33U5.ts";
+  syncErrorGuidance
+} from "./chunks/chunk-G4RUXRWZ.ts";
+import {
+  SetupPullRequiresUiError,
+  errorMessage,
+  isSyncDecisionRequiredError
+} from "./chunks/chunk-7D5SF7P3.ts";
+import "./chunks/chunk-QGK445K7.ts";
 import {
   activeLocalConfigPath,
   consumeLocalConfigMigrationNotice,
@@ -60,26 +60,41 @@ import {
   sessionTokenWarnings,
   syncCheckConfigFingerprint,
   syncSessionsWarnings
-} from "./chunks/chunk-3B4Z2SKV.ts";
-import "./chunks/chunk-2JZFHNLM.ts";
-import "./chunks/chunk-T2SJD3N7.ts";
-import "./chunks/chunk-ZX2Q6THB.ts";
+} from "./chunks/chunk-QO333NM4.ts";
+import "./chunks/chunk-A6HU4ERM.ts";
 import {
-  syncErrorGuidance
-} from "./chunks/chunk-G4RUXRWZ.ts";
+  unlock,
+  withLock
+} from "./chunks/chunk-AAEEHR7H.ts";
 import {
-  SetupPullRequiresUiError,
-  errorMessage,
-  isSyncDecisionRequiredError
-} from "./chunks/chunk-7D5SF7P3.ts";
-import "./chunks/chunk-A6HU4ERM.ts";
+  combineSignals,
+  throwIfAborted
+} from "./chunks/chunk-PWMWOJP4.ts";
+import "./chunks/chunk-DT7M4VQS.ts";
+import "./chunks/chunk-YDVQYUHE.ts";
 import {
   RemoteSelectionMismatchError,
   formatRemoteSelectionMismatch,
   sessionDirFromContext,
   snapshotOptionsForContext
 } from "./chunks/chunk-QOFMXPM5.ts";
+import "./chunks/chunk-76NB4R7U.ts";
 import "./chunks/chunk-ZW5ZLGBI.ts";
+import {
+  startupTransferEnabled
+} from "./chunks/chunk-PRUEIIK7.ts";
+import {
+  ensureStateDir,
+  readStateForConfig,
+  syncStateFingerprint
+} from "./chunks/chunk-UPNVIUBN.ts";
+import {
+  migrateLegacyStateDirectory,
+  stateDirectoryMigrationNotice,
+  withStateDirectoryAccess
+} from "./chunks/chunk-SWRVXVFD.ts";
+import "./chunks/chunk-2JZFHNLM.ts";
+import "./chunks/chunk-T2SJD3N7.ts";
 import "./chunks/chunk-HUZ5CR4W.ts";
 
 // src/ui/operation-dialogs.ts
@@ -129,7 +144,7 @@ async function executeRecoveryCommand(rawArgs, ctx, signal, loaders, onCommit, s
       const outcome = await withLock("pull", () => operations.pull(ctx, options));
       return { kind: "completed", ...outcome ? { outcome } : {} };
     }
-    await withLock("sync", () => operations.syncBoth(ctx, options));
+    await withAgentSyncLock(ctx, options, (current) => operations.syncBoth(ctx, current));
     return { kind: "completed" };
   } catch (error) {
     if (signal?.aborted) return { kind: "failed" };
@@ -182,7 +197,7 @@ async function executeCommand(rawArgs, ctx, signal, loaders, onCommit, setup, on
         await showConfig(ctx, options);
         return { kind: "completed" };
       case "files": {
-        const { showFileSelection } = await import("./chunks/file-selection-WZX7HAY2.ts");
+        const { showFileSelection } = await import("./chunks/file-selection-3JJYOVNR.ts");
         throwIfAborted(options.signal);
         await showFileSelection(ctx, options.setup, options.signal);
         return { kind: "completed" };
@@ -200,7 +215,7 @@ async function executeCommand(rawArgs, ctx, signal, loaders, onCommit, setup, on
         return { kind: "completed" };
       }
       case "conflicts": {
-        const { showConflicts } = await import("./chunks/conflict-review-4PLVLMRO.ts");
+        const { showConflicts } = await import("./chunks/conflict-review-6WIEQLXW.ts");
         throwIfAborted(options.signal);
         await withLock("sync", () => showConflicts(ctx, options));
         return { kind: "completed" };
@@ -226,7 +241,7 @@ async function executeCommand(rawArgs, ctx, signal, loaders, onCommit, setup, on
       case "sync": {
         const operations = await loaders.operations();
         throwIfAborted(options.signal);
-        await withLock("sync", () => operations.syncBoth(ctx, options));
+        await withAgentSyncLock(ctx, options, (current) => operations.syncBoth(ctx, current));
         return { kind: "completed" };
       }
       case "history": {
@@ -297,7 +312,7 @@ async function initConfig(ctx, signal) {
     return;
   }
   if (ctx.mode === "tui") {
-    const { showSetupWizard } = await import("./chunks/setup-wizard-GSDPDFC4.ts");
+    const { showSetupWizard } = await import("./chunks/setup-wizard-65DROCIJ.ts");
     throwIfAborted(signal);
     await showSetupWizard(ctx, signal);
     return;
@@ -322,7 +337,9 @@ async function showConfig(ctx, options) {
       `automatic sync: ${automaticSyncSummary(config.automatic)}`,
       `settings field merge: ${config.mergeSettings ? "On (experimental)" : "Off"}`,
       `machine-local settings.json fields: ${(config.localFields ?? []).map(safeTerminalText).join(", ") || "none"}`,
-      `automatic transfer at startup: ${config.automaticTransfer ? "On \u2014 selected-file upload/replace/delete; no reload" : "Off"}`,
+      `startup transfer: ${startupTransferSummary(config)}`,
+      `agent mode: ${config.agentMode ? "On (experimental)" : "Off"}`,
+      `continuous sync: ${config.continuous ? config.agentMode ? "On (experimental)" : "paused; Agent mode is Off" : "Off"}`,
       `included content: ${config.include.join(", ") || "none"}`,
       `sessions: ${config.include.includes("sessions") ? "included" : "not included"}`,
       `settings file: ${localConfigPath()}`,
@@ -387,21 +404,32 @@ function displayWebDavUrl(value, username) {
 }
 
 // src/commands/command-handler.ts
-async function handleCommand(rawArgs, ctx, sessionSignal, loaders, attention) {
+async function handleCommand(rawArgs, ctx, sessionSignal, loaders, attention, onExplicitSync) {
   await reconcileObservation(attention, sessionSignal);
   if (sessionSignal.aborted) return;
-  const run = (route, signal, onCommit, target, onDialog) => executeCommand(
-    route,
-    ctx,
-    combineSignals(sessionSignal, signal),
-    loaders,
-    observationCommitCallback(attention, sessionSignal, onCommit),
-    target,
-    onDialog
-  );
+  const run = (route, signal, onCommit, target, onDialog) => {
+    const [command, ...args] = splitArgs(route);
+    if (command === "sync") {
+      try {
+        const options = parseOptions(args);
+        validateCommandOptions("sync", options);
+        onExplicitSync?.(target ?? options.setup);
+      } catch {
+      }
+    }
+    return executeCommand(
+      route,
+      ctx,
+      combineSignals(sessionSignal, signal),
+      loaders,
+      observationCommitCallback(attention, sessionSignal, onCommit),
+      target,
+      onDialog
+    );
+  };
   if (!rawArgs.trim()) {
     try {
-      const { showSyncManager } = await import("./chunks/manager-ui-IURS4WXY.ts");
+      const { showSyncManager } = await import("./chunks/manager-ui-KRAW3NE2.ts");
       if (sessionSignal.aborted) return;
       await showSyncManager(ctx, run, sessionSignal, {
         getAttention: () => attention.current(),
@@ -501,7 +529,7 @@ function directSelectionOrigin(rawArgs) {
 async function resolveSelectionAttention(ctx, attention, signal, loaders, options = {}) {
   const current = attention.current();
   if (!current || signal.aborted) return;
-  const { dispatchManagerResult } = await import("./chunks/manager-result-dispatcher-6MQKFCWB.ts");
+  const { dispatchManagerResult } = await import("./chunks/manager-result-dispatcher-AGBBVDDS.ts");
   if (signal.aborted || attention.current() !== current) return;
   await dispatchManagerResult(
     ctx,
@@ -545,42 +573,54 @@ var AUTO_SYNC_OPTIONS = {
   args: []
 };
 async function startSession(ctx, signal) {
-  throwIfAborted(signal);
-  const stateNotice = stateDirectoryMigrationNotice();
-  if (stateNotice && ctx.hasUI) ctx.ui.notify(stateNotice, "warning");
-  const validateMutation = captureMutationOwner(ctx, signal);
-  const currentFile = ctx.sessionManager.getSessionFile?.();
-  await recoverSnapshotTransactionsOnStartup({
-    signal,
-    sessionDir: sessionDirFromContext(ctx),
-    protectedTargets: currentFile ? [currentFile] : [],
-    validateMutation
-  });
-  throwIfAborted(signal);
+  const timings = createStartupTimings();
+  let debug = false;
+  let outcome = "stopped";
   try {
-    const settings = await readLocalConfigObject();
     throwIfAborted(signal);
-    const names = settings ? Object.keys(settings.syncSetups).sort((left, right) => left.localeCompare(right)) : [];
-    setSyncSetupCompletions(names);
-    configureSyncStatus(ctx, settings?.showStatus ?? true);
-  } catch {
-    if (signal.aborted) return;
-    setSyncSetupCompletions([]);
-  }
-  const migrationNotice = consumeLocalConfigMigrationNotice();
-  if (migrationNotice && ctx.hasUI) ctx.ui.notify(migrationNotice, "warning");
-  throwIfAborted(signal);
-  if (!ctx.hasUI) return;
-  try {
-    const config = await loadConfig();
+    const stateNotice = stateDirectoryMigrationNotice();
+    if (stateNotice && ctx.hasUI) ctx.ui.notify(stateNotice, "warning");
+    const validateMutation = captureMutationOwner(ctx, signal);
+    const currentFile = ctx.sessionManager.getSessionFile?.();
+    await timings.measure(
+      "transaction recovery",
+      () => recoverSnapshotTransactionsOnStartup({
+        signal,
+        sessionDir: sessionDirFromContext(ctx),
+        protectedTargets: currentFile ? [currentFile] : [],
+        validateMutation
+      })
+    );
     throwIfAborted(signal);
-    configureSyncStatus(ctx, config.showStatus);
-    return config.automatic || config.automaticTransfer ? config : void 0;
-  } catch (error) {
+    try {
+      const settings = await timings.measure("settings read", () => readLocalConfigObject());
+      throwIfAborted(signal);
+      debug = settings?.debug ?? false;
+      const names = settings ? Object.keys(settings.syncSetups).sort((left, right) => left.localeCompare(right)) : [];
+      setSyncSetupCompletions(names);
+      configureSyncStatus(ctx, settings?.showStatus ?? true);
+    } catch {
+      if (signal.aborted) return;
+      setSyncSetupCompletions([]);
+    }
+    const migrationNotice = consumeLocalConfigMigrationNotice();
+    if (migrationNotice && ctx.hasUI) ctx.ui.notify(migrationNotice, "warning");
     throwIfAborted(signal);
-    if (!isMissingConfigError(error)) {
-      ctx.ui.notify(`pi-sync startup check skipped: ${safeTerminalText(errorMessage(error))}`, "warning");
+    if (!ctx.hasUI) return;
+    try {
+      const config = await timings.measure("config resolution", () => loadConfig());
+      throwIfAborted(signal);
+      configureSyncStatus(ctx, config.showStatus);
+      outcome = "completed";
+      return config.automatic || startupTransferEnabled(config) ? config : void 0;
+    } catch (error) {
+      throwIfAborted(signal);
+      if (!isMissingConfigError(error)) {
+        ctx.ui.notify(`pi-sync startup check skipped: ${safeTerminalText(errorMessage(error))}`, "warning");
+      }
     }
+  } finally {
+    timings.publish(ctx, debug, signal, "local initialization", outcome);
   }
 }
 async function autoPushSessions(ctx, signal, loaders) {
@@ -638,18 +678,19 @@ function createStartupCheck(loaders, attention, timeoutMs = 3e4) {
     },
     start(ctx, sessionSignal, initialConfig) {
       if (!ctx.hasUI || sessionSignal.aborted) return;
-      if (initialConfig?.automaticTransfer && !ctx.isIdle()) {
+      if (initialConfig && startupTransferEnabled(initialConfig) && !ctx.isIdle()) {
         pending = { ctx, signal: sessionSignal, config: initialConfig };
         return;
       }
       if (active) throw new Error("Previous startup check has not been drained.");
+      const timings = createStartupTimings();
       const controller = new AbortController();
       const signal = combineSignals(sessionSignal, controller.signal);
       const task = {
         controller,
         owner: ctx.sessionManager,
         promise: Promise.resolve(),
-        transfer: Boolean(initialConfig?.automaticTransfer)
+        transfer: Boolean(initialConfig && startupTransferEnabled(initialConfig))
       };
       active = task;
       const isCurrent = () => !sessionSignal.aborted && active === task && task.owner === ctx.sessionManager;
@@ -659,29 +700,33 @@ function createStartupCheck(loaders, attention, timeoutMs = 3e4) {
       );
       let config;
       let checking = false;
+      let stopped = false;
       task.promise = Promise.resolve().then(async () => {
         try {
           throwIfAborted(signal);
           config = initialConfig ?? await loadConfigForCheck();
-          task.transfer = Boolean(config.automaticTransfer);
+          task.transfer = startupTransferEnabled(config);
           throwIfAborted(signal);
-          if (!config.automatic && !config.automaticTransfer) return;
+          if (!config.automatic && !startupTransferEnabled(config)) return;
           const captured = config;
           const identity = syncCheckConfigFingerprint(captured);
           checking = true;
           setSyncStatus(ctx, "sync ...");
-          const { inspectSync } = await loaders.inspection();
+          const { inspectSync } = await timings.measure("inspection import", () => loaders.inspection());
           throwIfAborted(signal);
           const currentConfig = await loadConfigForCheck();
           throwIfAborted(signal);
           if (syncCheckConfigFingerprint(currentConfig) !== identity) return;
-          const inspection = await withStateDirectoryAccess(() => {
-            throwIfAborted(signal);
-            return withLock("startup-check", () => {
+          const inspection = await timings.measure(
+            "inspection and guards",
+            () => withStateDirectoryAccess(() => {
               throwIfAborted(signal);
-              return inspectSync(captured, snapshotOptionsForContext(ctx, captured), signal);
-            });
-          });
+              return withLock("startup-check", () => {
+                throwIfAborted(signal);
+                return inspectSync(captured, snapshotOptionsForContext(ctx, captured), signal, void 0, timings);
+              });
+            })
+          );
           throwIfAborted(signal);
           const latest = await loadConfigForCheck();
           throwIfAborted(signal);
@@ -694,30 +739,35 @@ function createStartupCheck(loaders, attention, timeoutMs = 3e4) {
             configIdentity: identity,
             checkedAt: (/* @__PURE__ */ new Date()).toISOString(),
             inspection,
-            automaticTransfer: captured.automaticTransfer
+            automaticTransfer: startupTransferEnabled(captured)
           });
-          if (captured.automaticTransfer && !inspection.firstSync && inspection.head && inspection.selectionState?.kind === "same") {
-            const operations = await loaders.operations();
+          if (startupTransferEnabled(captured) && !inspection.firstSync && inspection.head && inspection.selectionState?.kind === "same") {
+            const operations = await timings.measure("operations import", () => loaders.operations());
             throwIfAborted(signal);
             if (!isCurrent()) return;
             if (!ctx.isIdle()) {
               pending = { ctx, signal: sessionSignal, config: captured };
               return;
             }
-            await withStateDirectoryAccess(
-              () => withLock(
-                "startup-transfer",
-                () => operations.syncBoth(ctx, {
-                  args: [],
-                  yes: true,
-                  force: false,
-                  stale: false,
-                  silent: true,
-                  reload: false,
-                  auto: true,
-                  signal,
-                  onCommit: () => attention.clearObservation()
-                })
+            await timings.measure(
+              "automatic transfer",
+              () => withStateDirectoryAccess(
+                () => withAgentSyncLock(
+                  ctx,
+                  {
+                    args: [],
+                    yes: true,
+                    force: false,
+                    stale: false,
+                    silent: true,
+                    reload: false,
+                    auto: true,
+                    signal,
+                    startupTimings: timings,
+                    onCommit: () => attention.clearObservation()
+                  },
+                  (options) => operations.syncBoth(ctx, options)
+                )
               )
             );
             throwIfAborted(signal);
@@ -730,10 +780,11 @@ function createStartupCheck(loaders, attention, timeoutMs = 3e4) {
             configIdentity: identity,
             checkedAt: (/* @__PURE__ */ new Date()).toISOString(),
             inspection,
-            automaticTransfer: captured.automaticTransfer
+            automaticTransfer: startupTransferEnabled(captured)
           });
           if (ctx.mode === "rpc") attention.notifyObservation(ctx);
         } catch (error) {
+          stopped = true;
           if (!isCurrent() || sessionSignal.aborted || isMissingConfigError(error)) return;
           if (signal.aborted && controller.signal.reason?.name !== "TimeoutError") return;
           if (config) {
@@ -742,7 +793,7 @@ function createStartupCheck(loaders, attention, timeoutMs = 3e4) {
             if (!latest || syncCheckConfigFingerprint(latest) !== syncCheckConfigFingerprint(config)) return;
           }
           ctx.ui.notify(
-            config?.automaticTransfer ? `pi-sync automatic transfer stopped: ${safeTerminalText(errorMessage(error))}. Run /sync to review or reconcile retained recovery evidence. No resources were reloaded.` : `pi-sync startup check skipped: ${safeTerminalText(errorMessage(error))}. Run /sync status to retry. No startup transfer was performed.`,
+            config && startupTransferEnabled(config) ? `pi-sync automatic transfer stopped: ${safeTerminalText(errorMessage(error))}. Run /sync to review or reconcile retained recovery evidence. No resources were reloaded.` : `pi-sync startup check skipped: ${safeTerminalText(errorMessage(error))}. Run /sync status to retry. No startup transfer was performed.`,
             "warning"
           );
         } finally {
@@ -759,6 +810,15 @@ function createStartupCheck(loaders, attention, timeoutMs = 3e4) {
               }
             } else setSyncStatus(ctx, void 0);
           }
+          if (isCurrent()) {
+            timings.publish(
+              ctx,
+              config?.debug ?? false,
+              sessionSignal,
+              "background startup",
+              signal.aborted || stopped ? "stopped" : "completed"
+            );
+          }
           if (active === task) active = void 0;
         }
       }).catch(() => {
@@ -780,11 +840,11 @@ function createStartupCheck(loaders, attention, timeoutMs = 3e4) {
 // src/sync/sync-loaders.ts
 function createSyncLoaders(dependencies) {
   const loaders = {
-    inspection: cachedModuleLoader(dependencies.loadSyncInspection ?? (() => import("./chunks/sync-inspection-K45QVLHB.ts"))),
-    setupSwitch: cachedModuleLoader(dependencies.loadSetupSwitch ?? (() => import("./chunks/setup-switch-KTUWL6DE.ts"))),
+    inspection: cachedModuleLoader(dependencies.loadSyncInspection ?? (() => import("./chunks/sync-inspection-XFJOAMJD.ts"))),
+    setupSwitch: cachedModuleLoader(dependencies.loadSetupSwitch ?? (() => import("./chunks/setup-switch-E7PHKI6J.ts"))),
     snapshot: cachedModuleLoader(dependencies.loadSnapshot ?? (() => import("./chunks/snapshot-THS5EY2L.ts"))),
     syncState: cachedModuleLoader(dependencies.loadSyncState ?? (() => import("./chunks/sync-state-CFL4RRRB.ts"))),
-    operations: cachedModuleLoader(dependencies.loadSyncOperations ?? (() => import("./chunks/sync-operations-47OUX76C.ts")))
+    operations: cachedModuleLoader(dependencies.loadSyncOperations ?? (() => import("./chunks/sync-operations-HDUDT5PD.ts")))
   };
   return loaders;
 }
@@ -809,6 +869,30 @@ function sync(pi, dependencies = {}) {
   let sessionAbort = new AbortController();
   let shutdownAbort;
   let initialization = Promise.resolve(void 0);
+  let continuous;
+  let owner;
+  let continuousPossible = false;
+  const foreground = /* @__PURE__ */ new Map();
+  async function resumeContinuous(ctx, signal, retry) {
+    const isCurrent = () => !signal.aborted && !foreground.has(ctx.sessionManager) && owner === ctx.sessionManager;
+    if (!isCurrent() || !ctx.hasUI) return;
+    try {
+      const { loadConfigForCheck: loadConfigForCheck2 } = await import("./chunks/config-KGIYTTXQ.ts");
+      if (!isCurrent()) return;
+      const config = await loadConfigForCheck2();
+      if (!isCurrent()) return;
+      continuousPossible = Boolean(config.continuous && config.agentMode);
+      if (!continuousPossible) {
+        await continuous?.stop(ctx.sessionManager);
+        return;
+      }
+      const { createContinuousSync } = await import("./chunks/continuous-sync-AWAAOXK2.ts");
+      if (!isCurrent()) return;
+      continuous ??= createContinuousSync(loaders);
+      continuous.start(ctx, signal, Boolean(retry && (retry.setup === void 0 || retry.setup === config.setupName)));
+    } catch {
+    }
+  }
   pi.registerCommand("sync", {
     description: "Sync Pi settings through Git, WebDAV, R2, or S3-compatible storage",
     getArgumentCompletions: completeSyncArguments,
@@ -817,21 +901,37 @@ function sync(pi, dependencies = {}) {
         throw new Error("/sync requires TUI or RPC mode so results and safety prompts are observable.");
       }
       const signal = sessionAbort.signal;
-      const ready = await initialization;
-      if (signal.aborted) return;
-      await check.stop();
-      if (signal.aborted) return;
+      const manager = ctx.sessionManager;
       const command = splitArgs(args)[0];
-      if (ready === false && command !== "help" && command !== "unlock" && command !== "migrate-state") {
-        ctx.ui.notify(
-          "pi-sync recovery required. Repair the startup error, then /reload before syncing. Use /sync help for recovery guidance.",
-          "error"
-        );
-        return;
+      let retry;
+      let mayResume = false;
+      foreground.set(manager, (foreground.get(manager) ?? 0) + 1);
+      try {
+        const ready = await initialization;
+        mayResume = ready !== false;
+        if (signal.aborted) return;
+        await continuous?.stop(manager);
+        if (signal.aborted) return;
+        await check.stop();
+        if (signal.aborted) return;
+        if (ready === false && command !== "help" && command !== "unlock" && command !== "migrate-state") {
+          ctx.ui.notify(
+            "pi-sync recovery required. Repair the startup error, then /reload before syncing. Use /sync help for recovery guidance.",
+            "error"
+          );
+          return;
+        }
+        const run = () => handleCommand(args, ctx, signal, loaders, attention, (setup) => {
+          retry = { setup };
+        });
+        if (command === "migrate-state" || command === "help") await run();
+        else await withStateDirectoryAccess(run);
+      } finally {
+        const count = (foreground.get(manager) ?? 1) - 1;
+        if (count) foreground.set(manager, count);
+        else foreground.delete(manager);
+        if (mayResume) await resumeContinuous(ctx, signal, retry);
       }
-      const run = () => handleCommand(args, ctx, signal, loaders, attention);
-      if (command === "migrate-state" || command === "help") await run();
-      else await withStateDirectoryAccess(run);
     }
   });
   pi.on("session_start", async (_event, ctx) => {
@@ -840,11 +940,15 @@ function sync(pi, dependencies = {}) {
     sessionAbort.abort(new DOMException("Session replaced", "AbortError"));
     sessionAbort = new AbortController();
     const signal = sessionAbort.signal;
+    owner = ctx.sessionManager;
+    continuousPossible = 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 {
@@ -858,15 +962,24 @@ function sync(pi, dependencies = {}) {
       }
     })();
     const ready = await initialization;
-    if (ready && !signal.aborted) check.start(ctx, signal, ready);
+    if (ready && !signal.aborted) {
+      if (ready.continuous && ready.agentMode) await resumeContinuous(ctx, signal);
+      else check.start(ctx, signal, ready);
+    }
   });
   pi.on("agent_start", async (_event, ctx) => {
+    await continuous?.stop(ctx.sessionManager);
     await check.interrupt(ctx);
   });
-  pi.on("agent_settled", (_event, ctx) => {
-    if (!sessionAbort.signal.aborted) check.settled(ctx);
+  pi.on("agent_settled", async (_event, ctx) => {
+    const signal = sessionAbort.signal;
+    if (!signal.aborted) {
+      check.settled(ctx);
+      if (continuousPossible) await resumeContinuous(ctx, signal);
+    }
   });
   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"));
@@ -877,6 +990,8 @@ function sync(pi, dependencies = {}) {
     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") {