@narumitw/pi-sync 0.54.2 → 0.54.3

package/src/settings/config.ts

@@ -52,15 +52,18 @@ function configFromSettings(settings: PiSyncSettingsV3, setupName?: string): Any
       `Invalid pi-sync settings: sync setup “${selectedName}” references missing storage connection “${connectionName}”.`,
     );
   }
-  return resolveSyncConfig(
-    selectedName,
-    setup,
-    connectionName,
-    connection,
-    settings.onSwitch,
-    settings.skipSecretScan ?? false,
-    settings.showStatus ?? true,
-  );
+  return {
+    ...resolveSyncConfig(
+      selectedName,
+      setup,
+      connectionName,
+      connection,
+      settings.onSwitch,
+      settings.skipSecretScan ?? false,
+      settings.showStatus ?? true,
+    ),
+    debug: settings.debug ?? false,
+  };
 }
 
 export type SyncSetupStorageReview = Pick<
@@ -126,7 +129,7 @@ export function syncConfigReviewFingerprint(config: AnySyncConfig) {
 /** Internal freshness token, including credentials; never display or persist it. */
 export function syncCheckConfigFingerprint(config: AnySyncConfig) {
   return createHash("sha256")
-    .update(JSON.stringify({ ...config, showStatus: undefined }))
+    .update(JSON.stringify({ ...config, showStatus: undefined, debug: undefined }))
     .digest("hex");
 }
 

package/src/settings/settings-store.ts

@@ -30,6 +30,7 @@ export function localConfigTemplate(): PiSyncSettingsV3 {
     onSwitch: DEFAULT_ON_SWITCH,
     skipSecretScan: false,
     showStatus: true,
+    debug: false,
     storageConnections: {},
     syncSetups: {},
   };

package/src/settings/settings-types.ts

@@ -101,6 +101,7 @@ export interface PiSyncSettingsV3 {
   onSwitch: OnSwitchAction;
   skipSecretScan?: boolean;
   showStatus?: boolean;
+  debug?: boolean;
   storageConnections: Record<string, StorageConnectionSettings>;
   syncSetups: Record<string, SyncSetupSettings>;
   [key: string]: unknown;
@@ -122,6 +123,7 @@ export interface SyncConfig<Backend extends ResolvedSyncBackend = ResolvedS3Back
   onSwitch: OnSwitchAction;
   skipSecretScan: boolean;
   showStatus: boolean;
+  debug?: boolean;
   backend: Backend;
 }
 

package/src/settings/settings-validation.ts

@@ -68,6 +68,9 @@ export function validateSettingsDocument(value: Record<string, unknown>): PiSync
   if (value.showStatus !== undefined && typeof value.showStatus !== "boolean") {
     throw new Error("Invalid pi-sync settings: showStatus must be boolean.");
   }
+  if (value.debug !== undefined && typeof value.debug !== "boolean") {
+    throw new Error("Invalid pi-sync settings: debug must be boolean.");
+  }
   const storageConnections = requireNamedObjectMap(
     value.storageConnections,
     "storageConnections",

package/src/state/merge-baseline-store.ts

@@ -145,6 +145,24 @@ export async function readMergeAncestors(config: AnySyncConfig, state: SyncState
   }
   return record.files;
 }
+/** A no-op must not skip seeding or repairing ancestors required by later merges. */
+export async function hasCurrentMergeBaseline(config: AnySyncConfig, snapshot: Snapshot, state: SyncState) {
+  try {
+    const ancestors = await readMergeAncestors(config, state);
+    if (!ancestors) return false;
+    const hashes = new Map(ancestors.map((file) => [file.path, file.sha256]));
+    return snapshot.files.every(
+      (file) =>
+        !(file.path === "settings.json" || config.mergeContent) ||
+        !eligible(file) ||
+        hashes.get(file.path) === file.sha256,
+    );
+  } catch {
+    // Preserve the existing full path's validation and repair behavior for unknown evidence.
+    return false;
+  }
+}
+
 export async function readMergeAncestor(config: AnySyncConfig, state: SyncState, filePath: string) {
   const file = (await readMergeAncestors(config, state))?.find((file) => file.path === filePath);
   return file ? Buffer.from(file.contentBase64, "base64") : undefined;

package/src/sync/apply-review.ts

@@ -0,0 +1,63 @@
+import { createHash } from "node:crypto";
+import { constants } from "node:fs";
+import fs from "node:fs/promises";
+import path from "node:path";
+import { agentDir } from "../snapshot/session-paths.js";
+import { addTopLevelCaseVariantDeletes } from "../snapshot/snapshot-apply.js";
+import type { Snapshot } from "../snapshot/snapshot-types.js";
+import { throwIfAborted } from "./signals.js";
+
+export interface CaseCleanupReview {
+  path: string;
+  fingerprint: string;
+}
+
+/** Inspect the apply engine's additional alias removals, which logical snapshots omit. */
+export async function inspectCaseCleanup(snapshot: Snapshot, signal?: AbortSignal): Promise<CaseCleanupReview[]> {
+  throwIfAborted(signal);
+  const root = agentDir();
+  const plan = await addTopLevelCaseVariantDeletes(root, { writes: [], deletes: [] }, snapshot);
+  throwIfAborted(signal);
+  const review: CaseCleanupReview[] = [];
+  for (const target of plan.deletes.sort()) {
+    const stat = await fs.lstat(target);
+    throwIfAborted(signal);
+    const hash = createHash("sha256");
+    if (stat.isSymbolicLink()) hash.update(await fs.readlink(target));
+    else {
+      if (!stat.isFile()) throw new Error("Case-variant path is no longer a regular file or symlink.");
+      const handle = await fs.open(
+        target,
+        constants.O_RDONLY | (constants.O_NOFOLLOW ?? 0) | (constants.O_NONBLOCK ?? 0),
+      );
+      try {
+        throwIfAborted(signal);
+        const opened = await handle.stat();
+        if (!opened.isFile() || opened.dev !== stat.dev || opened.ino !== stat.ino)
+          throw new Error("Case-variant file changed while preparing review.");
+        for await (const bytes of handle.createReadStream({ autoClose: false, signal })) {
+          throwIfAborted(signal);
+          hash.update(bytes);
+        }
+      } finally {
+        await handle.close();
+      }
+    }
+    throwIfAborted(signal);
+    review.push({
+      path: path.basename(target),
+      fingerprint: `${stat.dev}:${stat.ino}:${stat.mode}:${hash.digest("hex")}`,
+    });
+  }
+  return review;
+}
+
+export async function revalidateCaseCleanup(
+  expected: readonly CaseCleanupReview[],
+  snapshot: Snapshot,
+  signal?: AbortSignal,
+) {
+  const current = await inspectCaseCleanup(snapshot, signal);
+  if (JSON.stringify(current) !== JSON.stringify(expected))
+    throw new Error("Case-variant paths changed during transfer review; reopen the preview.");
+}

package/src/sync/automatic-sync.ts

@@ -13,6 +13,7 @@ import { ensureStateDir, readStateForConfig } from "../state/sync-state-store.js
 import { configureSyncStatus, setSyncStatus } from "../ui/sync-status.js";
 import { safeTerminalText } from "../ui/terminal-text.js";
 import { throwIfAborted } from "./signals.js";
+import { createStartupTimings } from "./startup-timings.js";
 import { errorMessage } from "./sync-errors.js";
 import type { SyncLoaders } from "./sync-loaders.js";
 import { captureMutationOwner } from "./sync-local.js";
@@ -28,44 +29,55 @@ const AUTO_SYNC_OPTIONS: CommandOptions = {
 };
 
 export async function startSession(ctx: ExtensionContext, signal: AbortSignal) {
-  throwIfAborted(signal);
-  const stateNotice = stateDirectoryMigrationNotice();
-  if (stateNotice && ctx.hasUI) ctx.ui.notify(stateNotice, "warning");
-  // Recovery can restore managed files: finish it before Pi accepts user edits.
-  // Unlike remote inspection, it must never be detached behind startup.
-  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: "completed" | "stopped" = "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");
+    // Recovery can restore managed files: finish it before Pi accepts user edits.
+    // Unlike remote inspection, it must never be detached behind startup.
+    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 : undefined;
-  } 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 || config.automaticTransfer ? config : undefined;
+    } 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);
   }
 }