@openparachute/vault 0.4.8 → 0.4.9-rc.10

package/src/mirror-manager.ts

@@ -1,20 +1,30 @@
 /**
- * Mirror lifecycle manager — boot-time bootstrap + in-process watch loop.
+ * Mirror lifecycle manager — boot-time bootstrap + event-driven exports.
  *
  * This is the persistent counterpart to vault#346's CLI watch+commit mode.
+ * Post-event-driven shift (vault#382, this PR), the manager replaces the
+ * original `setInterval` polling loop with in-process hook subscriptions.
+ * Every note / tag / attachment mutation fires an event; the manager
+ * debounces them (~500ms) into a single export pass. A background
+ * safety-net poll runs once per `safety_net_seconds` (default 1h) to
+ * catch anything the event path missed — direct SQL writes, dropped
+ * hook dispatches, restart gaps.
+ *
  * Responsibilities:
  *
  *   - On vault server boot: read mirror config, resolve mirror path,
  *     bootstrap (mkdir + git init + initial commit) when internal + new,
  *     trigger an initial export to bring the mirror to current state,
- *     and — if `watch: true` — start an in-process polling loop.
+ *     and — if `sync_mode: events` — subscribe to hooks + arm the
+ *     safety-net poll.
  *
  *   - On config change (via `PUT /admin/mirror` or operator-triggered
- *     reload): stop the current watch loop cleanly, re-resolve, restart
- *     with the new shape.
+ *     reload): tear down all subscriptions + timers, re-resolve,
+ *     restart with the new shape.
  *
- *   - On vault server shutdown: drain in-flight export + cancel the
- *     interval timer cleanly.
+ *   - On vault server shutdown: unsubscribe, cancel any pending
+ *     debounce timer, cancel safety-net poll, let an in-flight export
+ *     finish via the soft settle window.
  *
  * Singleton per-process: one `MirrorManager` instance backs the vault
  * server's lifecycle. Tests instantiate `MirrorManager` directly with
@@ -27,11 +37,28 @@
  * `PARACHUTE_VAULT_NAME` / `default_vault`; the mirror config follows
  * suit. Multi-vault mirror routing is a future ripple (open question 2
  * in the design doc).
+ *
+ * ## Race-condition contract
+ *
+ * - **Burst collapse** — two events within DEBOUNCE_MS produce one
+ *   export pass. The first event arms the timer; subsequent events
+ *   re-arm it.
+ * - **Event during in-flight export** — flag `dirtyDuringFlush`; after
+ *   the in-flight pass completes, run another. No second concurrent
+ *   pass; no missed events.
+ * - **Stop() during in-flight** — like the legacy soft-settle window,
+ *   give the export ~250ms to finish before returning. Subscriptions
+ *   come down BEFORE the settle wait so no further events queue.
+ * - **Safety net during event-driven path** — the poll's tick first
+ *   checks the dirty bit. If clear, it runs a full sweep anyway (catches
+ *   missed events). If set, it skips — the debounce timer's already
+ *   coming.
  */
 
 import { existsSync, mkdirSync, readdirSync, statSync } from "fs";
 
 import {
+  DEFAULT_SAFETY_NET_SECONDS,
   defaultMirrorConfig,
   resolveMirrorPath,
   type MirrorConfig,
@@ -39,10 +66,25 @@ import {
 import {
   gitAddAll,
   gitCommit,
+  gitPush,
   isGitRepo,
+  redactToken,
   runGitCommitCycle,
 } from "./export-watch.ts";
 import { vaultDir } from "./config.ts";
+import {
+  applyToGitRemote,
+  readCredentials,
+} from "./mirror-credentials.ts";
+import type { HookRegistry } from "../core/src/hooks.ts";
+
+/**
+ * Debounce window between an event arrival and the export pass it
+ * triggers. 500ms is the sweet spot: long enough to collapse a burst
+ * (typing in a frontend, a batch import) into one export, short enough
+ * that the mirror feels live during normal editing.
+ */
+const DEBOUNCE_MS = 500;
 
 // ---------------------------------------------------------------------------
 // Types
@@ -56,11 +98,18 @@ import { vaultDir } from "./config.ts";
 export interface MirrorStatus {
   /** True iff `mirror.enabled` is true AND bootstrap succeeded. */
   enabled: boolean;
-  /** True iff a watch interval timer is currently armed. */
+  /**
+   * True iff hook subscriptions are currently active.
+   *
+   * Pre-event-driven this was named after the polling loop; we retain
+   * the name for SPA-shape stability — the SPA's "Watch loop" label
+   * now reflects "events subscribed + safety-net armed". The semantics
+   * shifted, not the API.
+   */
   watch_running: boolean;
   /** Resolved mirror path on disk, or null if disabled / unresolved. */
   mirror_path: string | null;
-  /** ISO timestamp of the most recent export pass (initial or watch). */
+  /** ISO timestamp of the most recent export pass (initial or event-driven or safety-net). */
   last_export_at: string | null;
   /** Notes touched by the most recent export pass. */
   last_export_notes_count: number | null;
@@ -68,6 +117,28 @@ export interface MirrorStatus {
   last_commit_sha: string | null;
   /** Last error message (if any). Cleared on the next successful pass. */
   last_error: string | null;
+  /**
+   * Cut 5: push observability — surfaced via GET /admin/mirror so the
+   * operator (and the SPA's Status card) can see whether pushes are
+   * actually landing without grepping `[git-commit]` log lines.
+   *
+   * - `last_push_at` — ISO timestamp of the most recent SUCCESSFUL push.
+   *   Null until the first successful push.
+   * - `last_push_sha` — sha that landed on the remote at `last_push_at`.
+   *   Null when last_push_at is null.
+   * - `last_push_error` — message from the most recent FAILED push.
+   *   Cleared (back to null) on the next successful push. Tokens are
+   *   redacted before this field is set (push paths use the
+   *   `gho_`/`ghp_`/userinfo regex to scrub).
+   * - `commits_unpushed` — count of local commits ahead of upstream
+   *   (`git rev-list --count @{u}..HEAD`). Null when no upstream tracking
+   *   exists yet (first push hasn't fired). 0 when the mirror is fully
+   *   synced; positive when commits are queued.
+   */
+  last_push_at: string | null;
+  last_push_sha: string | null;
+  last_push_error: string | null;
+  commits_unpushed: number | null;
 }
 
 /**
@@ -88,6 +159,18 @@ export interface MirrorDeps {
     outDir: string;
     sinceCursor?: string;
   }) => Promise<{ notes: number }>;
+  /**
+   * Run an orphan-prune sweep against the mirror dir. Returns counts so
+   * the manager can log + surface them in status. Optional — when
+   * undefined, the manager skips the prune step (test seam; production
+   * always wires it through `mirror-deps.ts`).
+   */
+  runPrune?: (opts: { outDir: string }) => Promise<{
+    notes_removed: number;
+    sidecars_removed: number;
+    schemas_removed: number;
+    attachment_dirs_removed: number;
+  }>;
   /**
    * Resolve the first-changed-note title since `cursor`, for the
    * `{{first_note_title}}` commit-template variable. Best-effort — empty
@@ -101,6 +184,14 @@ export interface MirrorDeps {
    * via the standard writer — used by `PUT /admin/mirror`.
    */
   writeMirrorConfig: (config: MirrorConfig) => void;
+  /**
+   * Shared in-process hook registry. The manager calls `.onNote()` /
+   * `.onTag()` / `.onAttachment()` on this registry to drive
+   * event-driven exports. Optional — when undefined the manager runs
+   * with only the safety-net poll (back-compat shape for tests that
+   * predate the event-driven path).
+   */
+  hooks?: HookRegistry;
 }
 
 // ---------------------------------------------------------------------------
@@ -221,19 +312,64 @@ export async function bootstrapInternalMirror(
 // Manager
 // ---------------------------------------------------------------------------
 
+/**
+ * Cut 5: count local commits ahead of upstream tracking. Implementation:
+ * `git rev-list --count @{u}..HEAD` returns N when N commits are ahead,
+ * 0 when synced, and exit-nonzero when no upstream tracking exists
+ * (the branch has never been pushed with `-u`). The non-zero case maps
+ * to `null` — distinct from "0 ahead" so the SPA can render "no remote
+ * tracking yet" vs "fully synced" differently if desired.
+ */
+async function readCommitsUnpushed(repoDir: string): Promise<number | null> {
+  const proc = Bun.spawn(
+    ["git", "rev-list", "--count", "@{u}..HEAD"],
+    {
+      cwd: repoDir,
+      stdout: "pipe",
+      stderr: "pipe",
+    },
+  );
+  const exitCode = await proc.exited;
+  if (exitCode !== 0) return null; // no upstream configured yet
+  const out = new TextDecoder()
+    .decode(await new Response(proc.stdout).arrayBuffer())
+    .trim();
+  const n = Number(out);
+  return Number.isFinite(n) ? n : null;
+}
+
+/**
+ * Read the current `origin` URL from a git repo's config, or null when no
+ * origin is set. Module-local helper for the credential-application path.
+ */
+async function readCurrentOrigin(repoDir: string): Promise<string | null> {
+  const proc = Bun.spawn(["git", "remote", "get-url", "origin"], {
+    cwd: repoDir,
+    stdout: "pipe",
+    stderr: "pipe",
+  });
+  const exitCode = await proc.exited;
+  if (exitCode !== 0) return null;
+  const url = new TextDecoder()
+    .decode(await new Response(proc.stdout).arrayBuffer())
+    .trim();
+  return url.length > 0 ? url : null;
+}
+
 /**
  * Singleton lifecycle controller. Holds the active mirror config, the
- * resolved path, the watch timer (when running), and the rolling status.
+ * resolved path, hook subscriptions (when sync_mode=events), the
+ * safety-net poll timer, the debounce timer, and the rolling status.
  *
  * State transitions:
  *
- *   constructed → start() → [enabled? bootstrap+initial-export+watch?]
+ *   constructed → start() → [enabled? bootstrap + initial-export +
+ *                            subscribe-to-hooks + arm-safety-net?]
  *     ↓                              ↓
- *     stop()                       reload() — stop current loop, re-evaluate
+ *     stop()                       reload() — tear down everything, re-evaluate
  *
- * Re-entrancy: the watch tick uses a `inFlight` guard like the CLI mode so
- * back-to-back ticks (e.g. when an export takes longer than the interval)
- * don't pile up.
+ * Re-entrancy: in-flight + dirtyDuringFlush guards collapse concurrent
+ * triggers into one pass + one follow-up (never two parallel exports).
  */
 export class MirrorManager {
   private deps: MirrorDeps;
@@ -245,10 +381,22 @@ export class MirrorManager {
     last_export_notes_count: null,
     last_commit_sha: null,
     last_error: null,
+    last_push_at: null,
+    last_push_sha: null,
+    last_push_error: null,
+    commits_unpushed: null,
   };
-  private timer: ReturnType<typeof setInterval> | null = null;
+  /** Safety-net poll timer (interval). Null while not armed. */
+  private safetyNetTimer: ReturnType<typeof setInterval> | null = null;
+  /** Debounce timer (single-shot setTimeout). Null when no events pending. */
+  private debounceTimer: ReturnType<typeof setTimeout> | null = null;
+  /** Unsubscribe handles returned by `hooks.on*()`. */
+  private unsubscribes: Array<() => void> = [];
   private stopping = false;
+  /** A flush is currently running. Other triggers should not start a new one. */
   private inFlight = false;
+  /** Set when an event/safety-net tick arrives during an in-flight flush. */
+  private dirtyDuringFlush = false;
   /** Most recent export cursor — passed as `--since` to the next pass. */
   private cursor: string | undefined = undefined;
   private currentConfig: MirrorConfig = defaultMirrorConfig();
@@ -302,6 +450,10 @@ export class MirrorManager {
         last_export_notes_count: null,
         last_commit_sha: null,
         last_error: null,
+        last_push_at: null,
+        last_push_sha: null,
+        last_push_error: null,
+        commits_unpushed: null,
       };
       return this.getStatus();
     }
@@ -352,31 +504,45 @@ export class MirrorManager {
     this.status.enabled = true;
     this.status.last_error = null;
 
+    // Apply UI-configured credentials to the mirror's git remote, if any.
+    // The PAT path stores the full authed URL; we set it as `origin`.
+    // The GitHub OAuth path only sets `origin` when the operator has
+    // picked a repo (handleAuthGithubSelectRepo writes it then); on a
+    // restart with credentials present but no repo picked yet, this is
+    // a no-op. Failures are non-fatal — the operator's mirror still
+    // exports; they get the original "push needs credentials" feedback
+    // when auto_push fires.
+    await this.applyCredentialsToRemote(path);
+
     // Initial export — full pass (no cursor) so the mirror starts
     // byte-equivalent to current vault state, regardless of when the
-    // previous mirror was last refreshed.
+    // previous mirror was last refreshed. Also prunes orphans because
+    // the initial pass writes the entire vault; anything left over
+    // from a prior mirror run that doesn't match a current note is by
+    // definition orphaned.
     try {
-      await this.runOneCycle({ isInitial: true });
+      await this.runOneCycle({ isInitial: true, prune: true });
     } catch (err) {
       const msg = (err as Error).message ?? String(err);
       this.status.last_error = `initial export failed: ${msg}`;
       console.warn(`[mirror] ${this.status.last_error}`);
       // Don't disable the manager — operator may want to retry without
-      // restarting the server. Keep status.enabled true so the watch
-      // loop attempts again if armed; the next successful pass clears
-      // last_error.
+      // restarting the server. Keep status.enabled true so the safety-
+      // net loop attempts again if armed; the next successful pass
+      // clears last_error.
     }
 
-    if (config.watch) {
-      this.armWatchTimer();
+    if (config.sync_mode === "events") {
+      this.subscribeToHooks();
+      this.armSafetyNetTimer();
       this.status.watch_running = true;
       console.log(
-        `[mirror] enabled (location: ${config.location}, watch: true) — initial export complete, watch loop running every ${config.interval_seconds}s`,
+        `[mirror] enabled (location: ${config.location}, sync_mode: events) — initial export complete, hooks subscribed, safety-net every ${config.safety_net_seconds}s`,
       );
     } else {
       this.status.watch_running = false;
       console.log(
-        `[mirror] enabled (location: ${config.location}, watch: false) — initial export complete, manual mode`,
+        `[mirror] enabled (location: ${config.location}, sync_mode: manual) — initial export complete, manual mode`,
       );
     }
 
@@ -384,21 +550,43 @@ export class MirrorManager {
   }
 
   /**
-   * Stop the watch loop cleanly. Awaits the in-flight cycle (if any) up to
-   * a soft timeout — don't hang shutdown forever, but give a running
-   * export a chance to finish + write a coherent commit.
+   * Stop the mirror lifecycle cleanly:
+   *   - Unsubscribe from hooks first so no new events queue.
+   *   - Cancel debounce + safety-net timers.
+   *   - Await the in-flight cycle (if any) up to a soft timeout.
    *
    * `preserveStatus: true` is the start()-internal path that keeps the
    * status fields around for the about-to-restart pass; default false
-   * blanks them.
+   * blanks the `watch_running` indicator.
    */
   async stop(opts: { preserveStatus?: boolean } = {}): Promise<void> {
     this.stopping = true;
-    if (this.timer) {
-      clearInterval(this.timer);
-      this.timer = null;
+
+    // Unsubscribe BEFORE waiting for in-flight — additional events
+    // arriving after we start the settle wait would re-arm the debounce
+    // timer and stretch the wait indefinitely.
+    for (const off of this.unsubscribes) {
+      try {
+        off();
+      } catch (err) {
+        // Unsubscribe should never throw; defensive log only.
+        console.warn(`[mirror] unsubscribe threw: ${(err as Error).message ?? err}`);
+      }
+    }
+    this.unsubscribes = [];
+
+    if (this.debounceTimer) {
+      clearTimeout(this.debounceTimer);
+      this.debounceTimer = null;
     }
-    // Brief settle window — match the CLI watch-loop convention.
+    if (this.safetyNetTimer) {
+      clearInterval(this.safetyNetTimer);
+      this.safetyNetTimer = null;
+    }
+
+    // Brief settle window — give an in-flight export ~250ms to complete
+    // + write a coherent commit. Don't hang shutdown indefinitely; the
+    // export's status will surface a half-finished state on next start.
     const settleMs = 250;
     const start = Date.now();
     while (this.inFlight && Date.now() - start < settleMs) {
@@ -408,6 +596,9 @@ export class MirrorManager {
       this.status.watch_running = false;
     }
     this.stopping = false;
+    // Discard any dirty bit from events that arrived during shutdown —
+    // they'll be picked up on the next start()'s initial export anyway.
+    this.dirtyDuringFlush = false;
   }
 
   /**
@@ -425,26 +616,178 @@ export class MirrorManager {
 
   /**
    * Force a one-shot export cycle right now. Useful for "force re-export"
-   * buttons (future hub UI) + tests that want a deterministic cycle
-   * without waiting on the timer.
+   * buttons (admin SPA) + tests that want a deterministic cycle without
+   * waiting on the debounce or safety-net timer.
+   *
+   * Always runs with prune=true: a manual trigger is an explicit "make
+   * the mirror match vault state right now" request; orphan sweeps are
+   * cheap on typical vaults and the operator probably wanted that
+   * effect anyway.
    */
   async runNow(): Promise<MirrorStatus> {
     if (!this.status.enabled) {
       return this.getStatus();
     }
-    await this.runOneCycle({ isInitial: false });
+    await this.runOneCycle({ isInitial: false, prune: true });
     return this.getStatus();
   }
 
   // Visible-for-test: number of `start()` calls so far.
   _startCount(): number { return this.startCount; }
 
+  // ---------------------------------------------------------------------
+  // Event-driven path
+  // ---------------------------------------------------------------------
+
+  /**
+   * Subscribe to note / tag / attachment hooks. Each event arms the
+   * debounce timer (or marks the dirty bit if a flush is already
+   * running). Stop() will call the unsubscribe handles in `unsubscribes`.
+   *
+   * Subscribes to every mutation event the mirror cares about:
+   *   - notes: created, updated, deleted
+   *   - tags: upserted, deleted
+   *   - attachments: created, deleted
+   */
+  private subscribeToHooks(): void {
+    const hooks = this.deps.hooks;
+    if (!hooks) {
+      // No hook registry wired — fall back to safety-net only. Logged
+      // once at start; tests that exercise this path inspect status,
+      // not logs.
+      console.warn(
+        `[mirror] sync_mode: events requested but no HookRegistry wired in deps — running with safety-net poll only`,
+      );
+      return;
+    }
+
+    const onMutation = () => {
+      // Cheap pulse — flag dirty + arm the debounce.
+      if (this.inFlight) {
+        this.dirtyDuringFlush = true;
+        return;
+      }
+      this.armDebounce();
+    };
+
+    this.unsubscribes.push(
+      hooks.onNote({
+        name: "mirror-note-mutation",
+        event: ["created", "updated", "deleted"],
+        handler: onMutation,
+      }),
+    );
+    this.unsubscribes.push(
+      hooks.onTag({
+        name: "mirror-tag-mutation",
+        event: ["upserted", "deleted"],
+        handler: onMutation,
+      }),
+    );
+    this.unsubscribes.push(
+      hooks.onAttachment({
+        name: "mirror-attachment-mutation",
+        event: ["created", "deleted"],
+        handler: onMutation,
+      }),
+    );
+  }
+
+  /**
+   * Arm or re-arm the debounce timer. Subsequent calls within
+   * DEBOUNCE_MS reset the timer (classic debounce). When the timer
+   * fires, run an export pass; if events arrived during the export,
+   * run again.
+   */
+  private armDebounce(): void {
+    if (this.stopping) return;
+    if (this.debounceTimer) {
+      clearTimeout(this.debounceTimer);
+    }
+    this.debounceTimer = setTimeout(() => {
+      this.debounceTimer = null;
+      void this.runFlush({ prune: false });
+    }, DEBOUNCE_MS);
+    this.debounceTimer.unref?.();
+  }
+
+  /**
+   * Run a single flush — guards against concurrent runs, follows up
+   * with another pass if events arrived mid-flight. The event-driven
+   * fast path uses prune=false (rely on the targeted "deleted" events
+   * for delete propagation; the safety-net + manual-run paths sweep).
+   *
+   * In practice deletions DO need pruning even on the fast path —
+   * `exportVaultToDir` only writes existing notes; the file the
+   * deletion event refers to has to be removed somewhere. The current
+   * implementation runs a full prune sweep on every flush so deletes
+   * propagate within the debounce window. (If profiling shows this is
+   * expensive for very large vaults, a targeted-deletion queue could
+   * replace the sweep on the fast path — recorded as a possible
+   * future optimization in the design doc.)
+   */
+  private async runFlush(opts: { prune: boolean }): Promise<void> {
+    if (this.stopping) return;
+    if (this.inFlight) {
+      // Shouldn't happen given the dirty-bit guards in armDebounce +
+      // safetyNet; defensive only.
+      this.dirtyDuringFlush = true;
+      return;
+    }
+    this.inFlight = true;
+    try {
+      // Event-driven flushes prune-on-flush so deletions actually
+      // propagate. Cost: O(mirror size) per flush — fine for typical
+      // vaults. See doc above on the targeted-queue optimization.
+      await this.runOneCycle({ isInitial: false, prune: true });
+    } catch (err) {
+      const msg = (err as Error).message ?? String(err);
+      this.status.last_error = `event-driven flush failed: ${msg}`;
+      console.warn(`[mirror] ${this.status.last_error}`);
+    } finally {
+      this.inFlight = false;
+    }
+
+    // If events arrived during the flush, run again (one follow-up,
+    // not a loop — armDebounce re-engages if events keep coming).
+    if (this.dirtyDuringFlush && !this.stopping) {
+      this.dirtyDuringFlush = false;
+      this.armDebounce();
+    }
+  }
+
+  /**
+   * Arm the safety-net poll. Runs once per `safety_net_seconds`. When
+   * it fires:
+   *   - If a flush is already pending (debounce armed) or in-flight,
+   *     skip (the event path will catch it).
+   *   - Otherwise, run a full prune+export sweep so anything missed by
+   *     the events (direct SQL writes, dropped dispatches, restart
+   *     gaps) lands in the mirror.
+   */
+  private armSafetyNetTimer(): void {
+    if (this.safetyNetTimer) return;
+    const intervalMs = (
+      this.currentConfig.safety_net_seconds || DEFAULT_SAFETY_NET_SECONDS
+    ) * 1000;
+    this.safetyNetTimer = setInterval(async () => {
+      if (this.stopping) return;
+      if (this.debounceTimer || this.inFlight) {
+        // Event path's already handling things; this poll is a no-op.
+        return;
+      }
+      await this.runFlush({ prune: true });
+    }, intervalMs);
+    this.safetyNetTimer.unref?.();
+  }
+
   /**
-   * Stage → export → commit pipeline for a single cycle. Updates status
-   * fields with the outcome. Errors logged + reflected in `last_error`
-   * but never rethrown out of the watch loop (the loop would die).
+   * Stage → export → prune (optional) → commit pipeline for a single
+   * cycle. Updates status fields with the outcome. Errors logged +
+   * reflected in `last_error` but never rethrown out of the event
+   * dispatcher (would kill the loop).
    */
-  private async runOneCycle(opts: { isInitial: boolean }): Promise<void> {
+  private async runOneCycle(opts: { isInitial: boolean; prune: boolean }): Promise<void> {
     const nextCursor = new Date().toISOString();
     const path = this.status.mirror_path!;
     const sinceCursor = opts.isInitial ? undefined : this.cursor;
@@ -459,6 +802,34 @@ export class MirrorManager {
       return;
     }
 
+    // Orphan sweep — removes files in the mirror that don't correspond
+    // to a current vault note/tag/attachment. Counts surface in logs;
+    // the count of removed files is folded into the commit's
+    // `notes_changed` so the commit message reflects the delete too.
+    let prunedNotes = 0;
+    if (opts.prune && this.deps.runPrune) {
+      try {
+        const pruneStats = await this.deps.runPrune({ outDir: path });
+        prunedNotes = pruneStats.notes_removed + pruneStats.sidecars_removed;
+        const removedTotal =
+          pruneStats.notes_removed +
+          pruneStats.sidecars_removed +
+          pruneStats.schemas_removed +
+          pruneStats.attachment_dirs_removed;
+        if (removedTotal > 0) {
+          console.log(
+            `[mirror] prune: removed ${pruneStats.notes_removed} note(s), ${pruneStats.sidecars_removed} sidecar(s), ${pruneStats.schemas_removed} schema(s), ${pruneStats.attachment_dirs_removed} attachment dir(s)`,
+          );
+        }
+      } catch (err) {
+        // Prune failure is non-fatal — the export already wrote the
+        // current state; the next sweep retries.
+        console.warn(
+          `[mirror] prune failed (non-fatal): ${(err as Error).message ?? err}`,
+        );
+      }
+    }
+
     this.cursor = nextCursor;
     this.status.last_export_at = nextCursor;
     this.status.last_export_notes_count = stats.notes;
@@ -471,11 +842,23 @@ export class MirrorManager {
       return;
     }
 
+    // Commit when EITHER notes changed OR orphans were pruned. The
+    // commit message's `notes_changed` reflects the union — operators
+    // reading a "deleted 3 notes" diff in their mirror should see that
+    // count in the commit. (Pre-event-driven this was strictly
+    // notes-from-export; orphan deletes weren't tracked.)
+    const totalChanged = stats.notes + prunedNotes;
+    if (totalChanged === 0) {
+      // Nothing to commit; runGitCommitCycle would no-op anyway, but
+      // skipping early avoids the firstNoteTitle DB lookup.
+      return;
+    }
+
     const firstNoteTitle = await this.deps.firstChangedNoteTitle(sinceCursor);
     const commitResult = await runGitCommitCycle({
       repoDir: path,
       template: this.currentConfig.commit_template,
-      notesChanged: stats.notes,
+      notesChanged: totalChanged,
       vaultName: this.deps.vaultName,
       firstNoteTitle,
       push: this.currentConfig.auto_push,
@@ -490,32 +873,166 @@ export class MirrorManager {
       const sha = new TextDecoder().decode(await new Response(shaProc.stdout).arrayBuffer()).trim();
       if (sha.length > 0) this.status.last_commit_sha = sha;
     }
+
+    // Cut 5: surface push outcome (success/failure + redacted error).
+    // runGitCommitCycle returns push info iff push was attempted; we
+    // mirror the same shape into status here.
+    if (commitResult.push) {
+      const now = new Date().toISOString();
+      if (commitResult.push.ok) {
+        this.status.last_push_at = now;
+        this.status.last_push_sha = this.status.last_commit_sha;
+        this.status.last_push_error = null;
+      } else if (commitResult.push.error) {
+        this.status.last_push_error = commitResult.push.error;
+      }
+    }
+
+    // Cut 5: track local-commits-ahead-of-upstream so the UI can render
+    // "<N> commits ready to push" subdued helper text.
+    this.status.commits_unpushed = await readCommitsUnpushed(path);
   }
 
   /**
-   * Arm the watch interval. Tick is in-flight-guarded so a slow export
-   * doesn't pile up parallel runs.
+   * Cut 6: fire a `git push` against the current mirror dir, capture
+   * the outcome into status, and return a struct the route handler can
+   * fold into its response.
+   *
+   * Distinguished from `runNow()` which exports + commits + pushes.
+   * `pushNow()` skips export + commit entirely and only pushes whatever
+   * has already been committed. Used by:
+   *   - the credential save path (auto-fire after `auth/pat` /
+   *     `auth/github/select-repo` lands) so the operator sees the
+   *     push happen rather than waiting for the next write
+   *   - the explicit POST /.parachute/mirror/push-now route the SPA's
+   *     "Push now" button hits
+   *
+   * Idempotent against a fully-synced mirror (git push reports "nothing
+   * to push" with exit 0). Failure paths set `last_push_error` for the
+   * status surface.
    */
-  private armWatchTimer(): void {
-    if (this.timer) return;
-    const intervalMs = this.currentConfig.interval_seconds * 1000;
-    this.timer = setInterval(async () => {
-      if (this.stopping || this.inFlight) return;
-      this.inFlight = true;
-      try {
-        await this.runOneCycle({ isInitial: false });
-      } catch (err) {
-        // Defensive — runOneCycle already swallows export errors, but
-        // commit/git errors might bubble. Never kill the loop.
-        const msg = (err as Error).message ?? String(err);
-        this.status.last_error = `watch tick failed: ${msg}`;
-        console.warn(`[mirror] ${this.status.last_error}`);
-      } finally {
-        this.inFlight = false;
+  async pushNow(): Promise<
+    | { fired: false; reason: "not_enabled" | "no_mirror_path" }
+    | { fired: true; pushed: boolean; sha?: string; error?: string }
+  > {
+    if (!this.status.enabled) return { fired: false, reason: "not_enabled" };
+    if (!this.status.mirror_path) return { fired: false, reason: "no_mirror_path" };
+    const path = this.status.mirror_path;
+    const pushResult = await gitPush(path);
+    const now = new Date().toISOString();
+    // Refresh commits_unpushed either way — a no-op push still reflects
+    // the current state (0 ahead if synced, N if push failed mid-way).
+    this.status.commits_unpushed = await readCommitsUnpushed(path);
+    if (pushResult.ok) {
+      // Capture HEAD sha at this point so the UI can show the operator
+      // exactly what landed.
+      const shaProc = Bun.spawn(["git", "rev-parse", "HEAD"], {
+        cwd: path,
+        stdout: "pipe",
+        stderr: "pipe",
+      });
+      await shaProc.exited;
+      const sha = new TextDecoder()
+        .decode(await new Response(shaProc.stdout).arrayBuffer())
+        .trim();
+      this.status.last_push_at = now;
+      if (sha.length > 0) this.status.last_push_sha = sha;
+      this.status.last_push_error = null;
+      return { fired: true, pushed: true, sha: sha.length > 0 ? sha : undefined };
+    }
+    const redacted = redactToken(pushResult.stderr);
+    this.status.last_push_error = redacted;
+    console.warn(`[mirror] push-now failed (non-fatal): ${redacted}`);
+    return { fired: true, pushed: false, error: redacted };
+  }
+
+  /**
+   * Apply UI-configured credentials to the mirror dir's `origin`. Called
+   * on every start()/reload() so credential rotations land without
+   * requiring a server restart. Idempotent:
+   *   - active_method=pat → set origin to the stored authed URL
+   *   - active_method=github_oauth + a picked repo → set origin (the
+   *     pick path stores the authed URL in the same flow)
+   *   - active_method=github_oauth + no repo picked → no-op (UI is mid-
+   *     flow)
+   *   - no credentials at all → leave whatever the operator wired by
+   *     hand alone (don't clobber a manually-set remote)
+   *
+   * Never throws — push failures will surface via the existing
+   * non-fatal-warn path in runGitCommitCycle.
+   */
+  private async applyCredentialsToRemote(repoDir: string): Promise<void> {
+    try {
+      const creds = readCredentials();
+      if (!creds || !creds.active_method) {
+        // No UI-configured credentials. Leave the remote alone — the
+        // operator may have set one up via `git remote add` manually.
+        return;
       }
-    }, intervalMs);
-    // Don't keep the server process alive purely on the timer; vault
-    // already has the HTTP server + various intervals doing that.
-    this.timer.unref?.();
+      if (creds.active_method === "pat" && creds.pat) {
+        const result = await applyToGitRemote(repoDir, creds.pat.remote_url);
+        if (!result.ok) {
+          console.warn(
+            `[mirror] could not apply PAT remote URL (non-fatal): ${result.error}`,
+          );
+        }
+        return;
+      }
+      // github_oauth: the active token is set, but a repo may not yet be
+      // picked. The select-repo route handler writes the URL; on a
+      // subsequent restart we can't reconstruct the URL without the
+      // owner/repo. Best-effort: if `origin` already points at a github.com
+      // URL, rewrite it with the stored token in case the token rotated.
+      if (creds.active_method === "github_oauth" && creds.github_oauth) {
+        const current = await readCurrentOrigin(repoDir);
+        if (current && current.includes("github.com")) {
+          // Parse owner/repo out of the current URL.
+          const match = current.match(
+            /github\.com[/:]([^/]+)\/([^/.]+?)(?:\.git)?$/,
+          );
+          if (match) {
+            const [, owner, repo] = match;
+            const { githubAuthedRemoteUrl } = await import("./mirror-credentials.ts");
+            const authed = githubAuthedRemoteUrl(
+              creds.github_oauth.access_token,
+              owner!,
+              repo!,
+            );
+            const result = await applyToGitRemote(repoDir, authed);
+            if (!result.ok) {
+              console.warn(
+                `[mirror] could not refresh github_oauth remote URL (non-fatal): ${result.error}`,
+              );
+            }
+          }
+        }
+      }
+    } catch (err) {
+      console.warn(
+        `[mirror] credential application failed (non-fatal): ${(err as Error).message ?? err}`,
+      );
+    }
+  }
+
+  // ---------------------------------------------------------------------
+  // Test seams
+  // ---------------------------------------------------------------------
+
+  /**
+   * Force the debounce timer to fire immediately (cancel + run flush).
+   * Used by mirror-manager.test.ts to avoid sleeping through 500ms in
+   * every event-driven test case. Not exposed via the public API.
+   */
+  async _flushDebounceForTest(): Promise<void> {
+    if (this.debounceTimer) {
+      clearTimeout(this.debounceTimer);
+      this.debounceTimer = null;
+    }
+    await this.runFlush({ prune: false });
+  }
+
+  /** Test seam: snapshot of the unsubscribe-handle count. */
+  _subscriptionCount(): number {
+    return this.unsubscribes.length;
   }
 }