@narumitw/pi-sync 0.57.9 → 0.57.11

package/dist/index.ts

@@ -1,566 +1,69 @@
 // @generated by scripts/build-runtime.mjs; do not edit.
 // @ts-nocheck -- generated JavaScript uses a .ts extension for Pi's Jiti loader.
 import {
-  withAgentSyncLock
-} from "./chunks/chunk-MKKF4IMY.ts";
-import "./chunks/chunk-3ST7RSYN.ts";
-import {
-  recoverSnapshotTransactionsOnStartup
-} from "./chunks/chunk-CRKTAPSL.ts";
+  createSyncAttentionController
+} from "./chunks/chunk-Q23JJW7E.ts";
 import {
   createStartupTimings
 } from "./chunks/chunk-M6VQJIOU.ts";
-import {
-  createSyncAttentionController,
-  observationMatchesConfig,
-  syncAttentionMatchesConfig
-} from "./chunks/chunk-GSNPASKB.ts";
-import {
-  automaticSyncSummary
-} from "./chunks/chunk-ECYCNZOE.ts";
-import {
-  configureSyncStatus,
-  setSyncStatus
-} from "./chunks/chunk-K3RIEL6J.ts";
 import {
   completeSyncArguments,
-  parseOptions,
-  resolveSyncCommand,
   setSyncSetupCompletions,
-  splitArgs,
-  startupTransferSummary,
-  usage,
-  validateCommandOptions
+  splitArgs
 } from "./chunks/chunk-NLWS55B6.ts";
 import {
   captureMutationOwner
-} from "./chunks/chunk-UOHR7LRO.ts";
+} from "./chunks/chunk-GNYGNHFF.ts";
 import {
   safeTerminalText
 } from "./chunks/chunk-AMJRUXFT.ts";
-import "./chunks/chunk-UBV24CG4.ts";
 import {
-  syncErrorGuidance
-} from "./chunks/chunk-G4RUXRWZ.ts";
+  configureSyncStatus,
+  setSyncStatus
+} from "./chunks/chunk-K3RIEL6J.ts";
 import {
-  SetupPullRequiresUiError,
-  errorMessage,
-  isSyncDecisionRequiredError
+  errorMessage
 } from "./chunks/chunk-7D5SF7P3.ts";
 import {
-  activeLocalConfigPath,
   consumeLocalConfigMigrationNotice,
-  createLocalConfigDocument,
   loadConfig,
   loadConfigForCheck,
   loadPartialConfig,
-  localConfigPath,
-  localConfigTemplate,
   readLocalConfigObject,
-  sessionTokenWarnings,
-  syncCheckConfigFingerprint,
-  syncSessionsWarnings
-} from "./chunks/chunk-QO333NM4.ts";
-import "./chunks/chunk-A6HU4ERM.ts";
+  syncCheckConfigFingerprint
+} from "./chunks/chunk-OVBAW7KV.ts";
+import "./chunks/chunk-X7R6DCVF.ts";
+import {
+  pendingTransactionEntries
+} from "./chunks/chunk-5SFMBY5P.ts";
 import {
-  unlock,
   withLock
-} from "./chunks/chunk-AAEEHR7H.ts";
-import "./chunks/chunk-DT7M4VQS.ts";
-import "./chunks/chunk-YDVQYUHE.ts";
+} from "./chunks/chunk-6O3EDBRL.ts";
 import {
   combineSignals,
   throwIfAborted
 } from "./chunks/chunk-PWMWOJP4.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";
+} from "./chunks/chunk-DN4IA7MR.ts";
+import "./chunks/chunk-AR2DGDUI.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
-function trackOperationDialogs(ctx, onDialog) {
-  if (!onDialog) return ctx;
-  const runDialog = async (task) => {
-    onDialog(true);
-    try {
-      return await task();
-    } finally {
-      onDialog(false);
-    }
-  };
-  const ui = {
-    ...ctx.ui,
-    select: (...args) => runDialog(() => ctx.ui.select(...args)),
-    confirm: (...args) => runDialog(() => ctx.ui.confirm(...args))
-  };
-  return new Proxy(ctx, {
-    get(target, key, receiver) {
-      return key === "ui" ? ui : Reflect.get(target, key, receiver);
-    }
-  });
-}
-
-// src/commands/command-execution.ts
-async function executeRecoveryCommand(rawArgs, ctx, signal, loaders, onCommit, setup) {
-  try {
-    const [subcommand, ...rest] = splitArgs(rawArgs);
-    if (subcommand !== "sync" && subcommand !== "pull" && subcommand !== "push") {
-      throw new Error(`Unsupported sync recovery route: ${subcommand ?? "missing"}`);
-    }
-    const options = parseOptions(rest);
-    if (setup !== void 0) options.setup = setup;
-    if (signal) options.signal = signal;
-    if (onCommit) options.onCommit = onCommit;
-    options.reload = false;
-    options.auto = false;
-    validateCommandOptions(subcommand, options);
-    const operations = await loaders.operations();
-    throwIfAborted(options.signal);
-    if (subcommand === "push") {
-      const outcome = await withLock("push", () => operations.push(ctx, options));
-      return { kind: "completed", ...outcome ? { outcome } : {} };
-    }
-    if (subcommand === "pull") {
-      const outcome = await withLock("pull", () => operations.pull(ctx, options));
-      return { kind: "completed", ...outcome ? { outcome } : {} };
-    }
-    await withAgentSyncLock(ctx, options, (current) => operations.syncBoth(ctx, current));
-    return { kind: "completed" };
-  } catch (error) {
-    if (signal?.aborted) return { kind: "failed" };
-    setSyncStatus(ctx, void 0);
-    if (error instanceof RemoteSelectionMismatchError) {
-      return { kind: "remote-selection-required", decision: error.decision };
-    }
-    if (isSyncDecisionRequiredError(error)) {
-      return { kind: "decision-required", decision: error.decision };
-    }
-    ctx.ui.notify(syncErrorGuidance(error), "error");
-    return { kind: "failed" };
-  }
-}
-async function executeCommand(rawArgs, ctx, signal, loaders, onCommit, setup, onDialog, retryRefusal = false) {
-  ctx = trackOperationDialogs(ctx, onDialog);
-  try {
-    const command = await resolveSyncCommand(rawArgs, ctx);
-    if (signal?.aborted || !command) return { kind: "completed" };
-    const { subcommand, rest } = command;
-    const options = parseOptions(rest);
-    if (setup !== void 0) options.setup = setup;
-    if (signal) options.signal = signal;
-    if (onCommit) options.onCommit = onCommit;
-    validateCommandOptions(subcommand, options);
-    if (retryRefusal) {
-      if (subcommand !== "sync") throw new Error("A refused-model retry is available only for merged sync.");
-      options.agentRetryRefusal = true;
-    }
-    switch (subcommand) {
-      case "help":
-        ctx.ui.notify(usage(), "info");
-        return { kind: "completed" };
-      case "use": {
-        const { useSyncSetup } = await loaders.setupSwitch();
-        throwIfAborted(options.signal);
-        await useSyncSetup(
-          ctx,
-          options.args[0] ?? "",
-          async (selectedSetup) => {
-            const operations = await loaders.operations();
-            throwIfAborted(options.signal);
-            return withLock("pull", () => operations.pull(ctx, { ...options, setup: selectedSetup }));
-          },
-          void 0,
-          options.signal
-        );
-        return { kind: "completed" };
-      }
-      case "init":
-        await initConfig(ctx, signal);
-        return { kind: "completed" };
-      case "config":
-        await showConfig(ctx, options);
-        return { kind: "completed" };
-      case "files": {
-        const { showFileSelection } = await import("./chunks/file-selection-3JJYOVNR.ts");
-        throwIfAborted(options.signal);
-        await showFileSelection(ctx, options.setup, options.signal);
-        return { kind: "completed" };
-      }
-      case "status": {
-        const operations = await loaders.operations();
-        throwIfAborted(options.signal);
-        await operations.status(ctx, options);
-        return { kind: "completed" };
-      }
-      case "diff": {
-        const operations = await loaders.operations();
-        throwIfAborted(options.signal);
-        await operations.diff(ctx, options);
-        return { kind: "completed" };
-      }
-      case "conflicts": {
-        const { showConflicts } = await import("./chunks/conflict-review-3X37QEIT.ts");
-        throwIfAborted(options.signal);
-        await withLock("sync", () => showConflicts(ctx, options));
-        return { kind: "completed" };
-      }
-      case "doctor": {
-        const operations = await loaders.operations();
-        throwIfAborted(options.signal);
-        await operations.doctor(ctx, options);
-        return { kind: "completed" };
-      }
-      case "push": {
-        const operations = await loaders.operations();
-        throwIfAborted(options.signal);
-        const outcome = await withLock("push", () => operations.push(ctx, options));
-        return { kind: "completed", ...outcome ? { outcome } : {} };
-      }
-      case "pull": {
-        const operations = await loaders.operations();
-        throwIfAborted(options.signal);
-        const outcome = await withLock("pull", () => operations.pull(ctx, options));
-        return { kind: "completed", ...outcome ? { outcome } : {} };
-      }
-      case "sync": {
-        const operations = await loaders.operations();
-        throwIfAborted(options.signal);
-        const outcome = await withAgentSyncLock(ctx, options, (current) => operations.syncBoth(ctx, current));
-        return { kind: "completed", ...retryRefusal && outcome ? { outcome } : {} };
-      }
-      case "history": {
-        const operations = await loaders.operations();
-        throwIfAborted(options.signal);
-        await operations.history(ctx, options);
-        return { kind: "completed" };
-      }
-      case "rollback": {
-        const operations = await loaders.operations();
-        throwIfAborted(options.signal);
-        await withLock("rollback", () => operations.rollback(ctx, options));
-        return { kind: "completed" };
-      }
-      case "migrate-state":
-        await migrateStateDirectory(ctx, options);
-        return { kind: "completed" };
-      case "unlock":
-        await unlock(ctx, options);
-        return { kind: "completed" };
-      default:
-        ctx.ui.notify(`Unknown /sync command: ${subcommand}
-
-${usage()}`, "warning");
-        return { kind: "failed" };
-    }
-  } catch (error) {
-    if (signal?.aborted) return { kind: "failed" };
-    setSyncStatus(ctx, void 0);
-    if (error instanceof SetupPullRequiresUiError) throw error;
-    if (error instanceof RemoteSelectionMismatchError) {
-      return { kind: "remote-selection-required", decision: error.decision };
-    }
-    if (isSyncDecisionRequiredError(error)) {
-      return { kind: "decision-required", decision: error.decision };
-    }
-    ctx.ui.notify(syncErrorGuidance(error), "error");
-    return { kind: "failed" };
-  }
-}
-async function migrateStateDirectory(ctx, options) {
-  const notice = stateDirectoryMigrationNotice();
-  if (!notice) {
-    ctx.ui.notify("pi-sync already uses the canonical pi-sync/ state directory.", "info");
-    return;
-  }
-  if (!options.yes && !await ctx.ui.confirm(
-    "Migrate pi-sync state directory",
-    "Confirm that every other Pi process is closed. pi-sync will atomically rename .pisync/ to pi-sync/ without merging or deleting either root.",
-    { signal: options.signal }
-  )) {
-    ctx.ui.notify("pi-sync state migration cancelled.", "info");
-    return;
-  }
-  throwIfAborted(options.signal);
-  const result = await migrateLegacyStateDirectory();
-  throwIfAborted(options.signal);
-  if (result.status === "ready") {
-    ctx.ui.notify("pi-sync already uses the canonical pi-sync/ state directory.", "info");
-    return;
-  }
-  ctx.ui.notify(result.message, result.status === "migrated" ? "info" : "warning");
-}
-async function initConfig(ctx, signal) {
-  const configPath = localConfigPath();
-  if (await readLocalConfigObject()) {
-    ctx.ui.notify(`Config already exists: ${await activeLocalConfigPath()}`, "info");
-    return;
-  }
-  if (ctx.mode === "tui") {
-    const { showSetupWizard } = await import("./chunks/setup-wizard-OVHZYXNW.ts");
-    throwIfAborted(signal);
-    await showSetupWizard(ctx, signal);
-    return;
-  }
-  await createLocalConfigDocument(localConfigTemplate());
-  ctx.ui.notify(`Created ${configPath}. Add a storage connection and sync setup before syncing.`, "info");
-}
-async function showConfig(ctx, options) {
-  const config = await loadConfig(options.setup);
-  const warnings = [
-    ...config.backend.type === "s3" ? sessionTokenWarnings(config.backend.profile) : [],
-    ...syncSessionsWarnings(config)
-  ];
-  const storageLines = configStorageLines(config);
-  ctx.ui.notify(
-    [
-      "pi-sync config:",
-      `sync setup: ${config.setupName}`,
-      `storage connection: ${config.connectionName}`,
-      ...storageLines,
-      `storage path: ${config.storagePath}`,
-      `automatic sync: ${automaticSyncSummary(config.automatic)}`,
-      `settings field merge: ${config.mergeSettings ? "On (experimental)" : "Off"}`,
-      `machine-local settings.json fields: ${(config.localFields ?? []).map(safeTerminalText).join(", ") || "none"}`,
-      `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()}`,
-      ...warnings
-    ].join("\n"),
-    warnings.length > 0 ? "warning" : "info"
-  );
-}
-function configStorageLines(config) {
-  switch (config.backend.type) {
-    case "git":
-      return [
-        "kind: git",
-        `remote: ${displayGitRemote(config.backend.profile.remote)}`,
-        "authentication: existing Git/SSH credentials (not stored)",
-        `branch: ${config.backend.destination.branch}`
-      ];
-    case "webdav":
-      return [
-        "kind: webdav",
-        `url: ${displayWebDavUrl(config.backend.profile.url, config.backend.profile.username)}`,
-        "username: configured (value hidden)",
-        "password: configured"
-      ];
-    case "s3":
-      return [
-        "kind: s3",
-        `endpoint: ${config.backend.profile.endpoint}`,
-        `bucket: ${config.backend.destination.bucket}`,
-        `region: ${config.backend.profile.region}`,
-        "access key id: configured",
-        "secret access key: configured",
-        `session token: ${config.backend.profile.sessionToken ? "configured" : "not configured"}`
-      ];
-  }
-}
-function displayGitRemote(value) {
-  if (!value) return "missing";
-  try {
-    const url = new URL(value);
-    url.username = "";
-    url.password = "";
-    url.search = "";
-    url.hash = "";
-    return url.toString();
-  } catch {
-    return value.replace(/^(?:[^@\s]+@)?(?<host>[^:]+):.+$/u, "$<host>:\u2026");
-  }
-}
-function displayWebDavUrl(value, username) {
-  if (!value) return "missing";
-  try {
-    const url = new URL(value);
-    url.username = "";
-    url.password = "";
-    url.search = "";
-    url.hash = "";
-    return username ? `${url.origin}/\u2026` : `${url.origin}${url.pathname}`;
-  } catch {
-    return "invalid (value hidden)";
-  }
-}
-
-// src/commands/command-handler.ts
-async function handleCommand(rawArgs, ctx, sessionSignal, loaders, attention, onExplicitSync) {
-  await reconcileObservation(attention, sessionSignal);
-  if (sessionSignal.aborted) return;
-  const run = (route, signal, onCommit, target, onDialog, retryRefusal = false) => {
-    const [command, ...args] = splitArgs(route);
-    if (command === "sync" && !retryRefusal) {
-      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,
-      retryRefusal
-    );
-  };
-  if (!rawArgs.trim()) {
-    try {
-      const { showSyncManager } = await import("./chunks/manager-ui-ZH6DEC2G.ts");
-      if (sessionSignal.aborted) return;
-      await showSyncManager(ctx, run, sessionSignal, {
-        getAttention: () => attention.current(),
-        getObservation: () => attention.observation(),
-        onObservationInvalidated: () => attention.clearObservation(),
-        onSelectionResolved: (expected) => {
-          if (attention.current() === expected) attention.clear(ctx);
-        }
-      });
-    } catch (error) {
-      if (sessionSignal.aborted) return;
-      setSyncStatus(ctx, void 0);
-      ctx.ui.notify(errorMessage(error), "error");
-    }
-    await reconcileObservation(attention, sessionSignal);
-    if (!sessionSignal.aborted) await attention.publish(ctx, sessionSignal);
-    return;
-  }
-  const result = await run(rawArgs);
-  if (result.kind === "decision-required") {
-    ctx.ui.notify(result.decision.directMessage, "error");
-  } else if (result.kind === "remote-selection-required") {
-    const origin = directSelectionOrigin(rawArgs);
-    if (origin) attention.set(result.decision, origin);
-    const deterministic = splitArgs(rawArgs).some((arg) => arg === "--yes" || arg === "-y");
-    if (origin && ctx.mode === "tui" && !deterministic) {
-      await resolveSelectionAttention(ctx, attention, sessionSignal, loaders);
-    } else {
-      ctx.ui.notify(
-        formatRemoteSelectionMismatch(
-          result.decision.setupName,
-          result.decision.localInclude,
-          result.decision.remoteInclude
-        ),
-        "error"
-      );
-    }
-  }
-  await clearAttentionAfterCompletedOperation(rawArgs, result, ctx, attention, sessionSignal);
-  await reconcileSelectionAttention(ctx, attention, sessionSignal);
-  await reconcileObservation(attention, sessionSignal);
-  if (!sessionSignal.aborted) await attention.publish(ctx, sessionSignal);
-}
-function observationCommitCallback(attention, sessionSignal, onCommit) {
-  const observed = attention.observation();
-  return () => {
-    if (!sessionSignal.aborted && attention.observation() === observed) attention.clearObservation();
-    onCommit?.();
-  };
-}
-async function reconcileObservation(attention, signal) {
-  const observed = attention.observation();
-  if (!observed || signal.aborted) return;
-  try {
-    const config = await loadConfig();
-    if (signal.aborted || attention.observation() !== observed) return;
-    if (!observationMatchesConfig(observed, config)) {
-      attention.clearObservation();
-      return;
-    }
-    const state = await readStateForConfig(config);
-    if (signal.aborted || attention.observation() !== observed) return;
-    if (syncStateFingerprint(state) !== observed.inspection.stateIdentity) attention.clearObservation();
-  } catch {
-    if (!signal.aborted && attention.observation() === observed) attention.clearObservation();
-  }
-}
-async function clearAttentionAfterCompletedOperation(rawArgs, result, ctx, attention, signal) {
-  if (result.kind !== "completed" || result.outcome === "cancelled" || signal.aborted) return;
-  const [command, ...rest] = splitArgs(rawArgs);
-  if (command !== "sync" && command !== "pull" && command !== "push") return;
-  const current = attention.current();
-  if (!current) return;
-  try {
-    const options = parseOptions(rest);
-    const setupName = options.setup ?? (await loadConfig()).setupName;
-    if (signal.aborted || attention.current() !== current) return;
-    if (current.decision.setupName === setupName) attention.clear(ctx);
-  } catch {
-  }
-}
-async function reconcileSelectionAttention(ctx, attention, signal) {
-  const current = attention.current();
-  if (!current || signal.aborted) return;
-  try {
-    const config = await loadConfig(current.decision.setupName);
-    if (signal.aborted || attention.current() !== current) return;
-    if (!syncAttentionMatchesConfig(current, config)) attention.clear(ctx);
-  } catch {
-    if (!signal.aborted && attention.current() === current) attention.clear(ctx);
-  }
-}
-function directSelectionOrigin(rawArgs) {
-  const command = splitArgs(rawArgs)[0];
-  return command === "sync" || command === "pull" || command === "push" ? command : void 0;
-}
-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-HOCM2GDA.ts");
-  if (signal.aborted || attention.current() !== current) return;
-  await dispatchManagerResult(
-    ctx,
-    { kind: "remote-selection-required", decision: current.decision },
-    current.origin,
-    (route, actionSignal, onCommit, target) => {
-      const execute = () => executeRecoveryCommand(
-        route,
-        ctx,
-        combineSignals(signal, actionSignal),
-        loaders,
-        observationCommitCallback(attention, signal, onCommit),
-        target
-      );
-      return options.withStateAccess ? options.withStateAccess(execute) : execute();
-    },
-    signal,
-    {
-      cancelLabel: options.cancelLabel,
-      withStateAccess: options.withStateAccess,
-      onSelectionResolved: () => {
-        if (attention.current() === current) attention.clear(ctx);
-      }
-    }
-  );
-}
+import "./chunks/chunk-KYTT7KV4.ts";
+import {
+  sessionDirFromContext,
+  snapshotOptionsForContext
+} from "./chunks/chunk-CBLTWXAU.ts";
+import "./chunks/chunk-FHE2DCA2.ts";
+import {
+  startupTransferEnabled
+} from "./chunks/chunk-PRUEIIK7.ts";
 
 // src/settings/config-errors.ts
 function isMissingConfigError(error) {
@@ -587,15 +90,19 @@ async function startSession(ctx, signal, publish) {
     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({
+    await timings.measure("transaction recovery", async () => {
+      const pending = await pendingTransactionEntries();
+      validateMutation();
+      if (!pending.some((entry) => entry.isDirectory())) return;
+      const { recoverSnapshotTransactionsOnStartup } = await import("./chunks/snapshot-transaction-26BQO36S.ts");
+      validateMutation();
+      await recoverSnapshotTransactionsOnStartup({
         signal,
         sessionDir: sessionDirFromContext(ctx),
         protectedTargets: currentFile ? [currentFile] : [],
         validateMutation
-      })
-    );
+      });
+    });
     throwIfAborted(signal);
     try {
       const settings = await timings.measure("settings read", () => readLocalConfigObject());
@@ -749,7 +256,10 @@ function createStartupCheck(loaders, attention, timeoutMs = 3e4, publish) {
             automaticTransfer: startupTransferEnabled(captured)
           });
           if (startupTransferEnabled(captured) && !inspection.firstSync && inspection.head && inspection.selectionState?.kind === "same") {
-            const operations = await timings.measure("operations import", () => loaders.operations());
+            const [operations, { withAgentSyncLock }] = await timings.measure(
+              "operations import",
+              () => Promise.all([loaders.operations(), import("./chunks/agent-sync-EUK2CPSS.ts")])
+            );
             throwIfAborted(signal);
             if (!isCurrent()) return;
             if (!ctx.isIdle()) {
@@ -847,11 +357,12 @@ function createStartupCheck(loaders, attention, timeoutMs = 3e4, publish) {
 // src/sync/sync-loaders.ts
 function createSyncLoaders(dependencies) {
   const loaders = {
-    inspection: cachedModuleLoader(dependencies.loadSyncInspection ?? (() => import("./chunks/sync-inspection-J25EEKZK.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-Y72GNIQ2.ts")))
+    commands: cachedModuleLoader(dependencies.loadCommandHandler ?? (() => import("./chunks/command-handler-F2E7A5T5.ts"))),
+    inspection: cachedModuleLoader(dependencies.loadSyncInspection ?? (() => import("./chunks/sync-inspection-MOMLGUTD.ts"))),
+    setupSwitch: cachedModuleLoader(dependencies.loadSetupSwitch ?? (() => import("./chunks/setup-switch-PIPXYPCW.ts"))),
+    snapshot: cachedModuleLoader(dependencies.loadSnapshot ?? (() => import("./chunks/snapshot-RGNDYT6A.ts"))),
+    syncState: cachedModuleLoader(dependencies.loadSyncState ?? (() => import("./chunks/sync-state-7L4NT7W2.ts"))),
+    operations: cachedModuleLoader(dependencies.loadSyncOperations ?? (() => import("./chunks/sync-operations-CV3TULLD.ts")))
   };
   return loaders;
 }
@@ -909,7 +420,7 @@ function sync(pi, dependencies = {}) {
     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");
+      const { loadConfigForCheck: loadConfigForCheck2 } = await import("./chunks/config-HYG7G5EM.ts");
       if (!isCurrent()) return;
       const config = await loadConfigForCheck2();
       if (!isCurrent()) return;
@@ -918,7 +429,7 @@ function sync(pi, dependencies = {}) {
         await continuous?.stop(ctx.sessionManager);
         return;
       }
-      const { createContinuousSync } = await import("./chunks/continuous-sync-Q6QUD6TY.ts");
+      const { createContinuousSync } = await import("./chunks/continuous-sync-VRMXCA5X.ts");
       if (!isCurrent()) return;
       continuous ??= createContinuousSync(loaders, void 0, publishTimings);
       continuous.start(
@@ -958,7 +469,13 @@ function sync(pi, dependencies = {}) {
           );
           return;
         }
-        const run = () => handleCommand(args, ctx, signal, loaders, attention, (setup) => {
+        const commands = await loaders.commands().catch((error) => {
+          if (!signal.aborted) {
+            ctx.ui.notify(`pi-sync command unavailable: ${safeTerminalText(errorMessage(error))}`, "error");
+          }
+        });
+        if (signal.aborted || !commands) return;
+        const run = () => commands.handleCommand(args, ctx, signal, loaders, attention, (setup) => {
           retry = { setup };
         });
         if (command === "migrate-state" || command === "help") await run();