spidersan 0.20.1 → 0.20.2

package/dist/lib/reconcile.d.ts

@@ -0,0 +1,100 @@
+/**
+ * Reconcile-on-read (tb-8sa.1 step 2)
+ *
+ * The registry's `status` field is only as fresh as the last `spidersan merged`
+ * / `sync` call — and a committed registry snapshot can carry an `active` entry
+ * for a branch that has since merged. Trusting that stale status is what
+ * produced the phantom-conflict incident (a fully-merged branch still flagged
+ * as conflicting from a stale worktree).
+ *
+ * Reconcile-on-read folds git truth in BEFORE conflicts / ready-check /
+ * merge-order answer:
+ *   - ref gone from local AND remote           → orphaned (drop)
+ *   - tip is an ancestor of trunk              → merged   (drop)
+ *   - trunk has a patch-id-equivalent squash   → merged   (drop, tb-tr1z)
+ *   - otherwise                                 → live    (keep)
+ *
+ * It only consults git for entries the registry still calls `active`; entries
+ * already marked `completed` / `abandoned` are honoured without a git probe.
+ */
+import type { Branch } from '../storage/adapter.js';
+export interface ReconcileResult {
+    /** Branches still genuinely in flight — the set readers should act on. */
+    live: Branch[];
+    /** Names detected as merged into trunk (by status or by is-ancestor). */
+    merged: string[];
+    /** Names whose ref is gone from both local and remote. */
+    orphaned: string[];
+}
+/**
+ * Injectable git probes so reconcile is unit-testable without a real repo.
+ * Defaults wire to the real `git.ts` helpers via {@link defaultReconcileDeps}.
+ */
+export interface ReconcileDeps {
+    /** Resolve a branch name to a usable ref, or `null` if no ref exists. */
+    resolveRef: (name: string) => string | null;
+    /**
+     * Resolve the LOCAL ref (`refs/heads/<name>`), or `null` if none. When the
+     * primary ref is the remote-tracking one, a stale `origin/<name>` can be an
+     * ancestor of trunk while fresh unpushed local commits are not — both must
+     * be merged before the branch is reconciled away. Optional for injectors.
+     */
+    resolveLocalRef?: (name: string) => string | null;
+    /** True if `ref` is fully merged into `trunkRef`. */
+    isMerged: (ref: string, trunkRef: string) => boolean;
+    /**
+     * True if `ref`'s content landed in trunk via a SQUASH merge (tb-tr1z) —
+     * consulted only when `isMerged` says no, since squash merges never make
+     * the tip an ancestor. Optional for injectors.
+     */
+    isSquashMerged?: (ref: string, trunkRef: string) => boolean;
+    /**
+     * Branch names that exist on the remote now, or `null` if it can't be asked.
+     * {@link activeBranches} drops an orphan only when this confirms it is gone.
+     * Absent (injectors) behaves like `null`: orphans are kept.
+     */
+    remoteHeads?: () => Set<string> | null;
+    /** Bare trunk branch name (e.g. `main`) — never reconciled away. */
+    trunkName: string;
+    /** Ref used as the merge target for is-ancestor (prefers `origin/main`). */
+    trunkRef: string;
+}
+export declare function defaultReconcileDeps(): ReconcileDeps;
+/**
+ * Partition registered branches into live / merged / orphaned using git truth.
+ *
+ * @param branches  the raw registry entries (e.g. `await storage.list()`)
+ * @param deps      git probes; defaults to the real repo
+ */
+export declare function reconcileBranches(branches: Branch[], deps?: ReconcileDeps): ReconcileResult;
+/**
+ * Read-path convenience for conflict detection: registered `active` branches
+ * minus those PROVEN merged into trunk (is-ancestor / squash-equivalent, or
+ * status `completed`) and those PROVEN deleted.
+ *
+ * An orphan (no local or tracking ref) is ambiguous: deleted, or live on
+ * another machine and never fetched here. A squash-merged, deleted branch is
+ * never an ancestor of trunk, so it only ever reads as orphaned — keeping every
+ * orphan made those phantom-conflict forever. So an orphan is dropped only when
+ * `git ls-remote` confirms the branch is gone from the remote; if the remote
+ * can't be asked, orphans are kept (a phantom beats a missed conflict). This
+ * matters most for ready-check, which gets no cross-machine registry pull.
+ *
+ * Read-side filter only — nothing is deleted. This is what conflicts /
+ * ready-check / merge-order should call; `sync` uses {@link reconcileBranches}
+ * directly to actually prune merged and orphaned entries.
+ */
+export declare function activeBranches(branches: Branch[], deps?: ReconcileDeps): Branch[];
+/**
+ * Split orphans (no local or tracking ref) into those the remote confirms are
+ * `gone` and those to `kept` — still on the remote (unfetched here), or every
+ * one of them when the remote can't be asked (`remoteChecked: false`). Shared by
+ * {@link activeBranches} (read side) and `sync` (which deletes `gone` only, sp-slemub).
+ * Only hits the network when there is an orphan to decide.
+ */
+export declare function splitOrphans(orphaned: string[], deps?: Pick<ReconcileDeps, 'remoteHeads'>): {
+    gone: string[];
+    kept: string[];
+    remoteChecked: boolean;
+};
+//# sourceMappingURL=reconcile.d.ts.map

package/dist/lib/reconcile.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"reconcile.d.ts","sourceRoot":"","sources":["../../src/lib/reconcile.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAIH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,MAAM,WAAW,eAAe;IAC5B,0EAA0E;IAC1E,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,yEAAyE;IACzE,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,0DAA0D;IAC1D,QAAQ,EAAE,MAAM,EAAE,CAAC;CACtB;AAED;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC1B,yEAAyE;IACzE,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;IAC5C;;;;;OAKG;IACH,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;IAClD,qDAAqD;IACrD,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;IACrD;;;;OAIG;IACH,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;IAC5D;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IACvC,oEAAoE;IACpE,SAAS,EAAE,MAAM,CAAC;IAClB,4EAA4E;IAC5E,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,wBAAgB,oBAAoB,IAAI,aAAa,CAapD;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC7B,QAAQ,EAAE,MAAM,EAAE,EAClB,IAAI,GAAE,aAAsC,GAC7C,eAAe,CA+CjB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,IAAI,GAAE,aAAsC,GAAG,MAAM,EAAE,CAIzG;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CACxB,QAAQ,EAAE,MAAM,EAAE,EAClB,IAAI,GAAE,IAAI,CAAC,aAAa,EAAE,aAAa,CAA4C,GACpF;IAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAC;IAAC,aAAa,EAAE,OAAO,CAAA;CAAE,CAK5D"}

package/dist/lib/reconcile.js

@@ -0,0 +1,121 @@
+/**
+ * Reconcile-on-read (tb-8sa.1 step 2)
+ *
+ * The registry's `status` field is only as fresh as the last `spidersan merged`
+ * / `sync` call — and a committed registry snapshot can carry an `active` entry
+ * for a branch that has since merged. Trusting that stale status is what
+ * produced the phantom-conflict incident (a fully-merged branch still flagged
+ * as conflicting from a stale worktree).
+ *
+ * Reconcile-on-read folds git truth in BEFORE conflicts / ready-check /
+ * merge-order answer:
+ *   - ref gone from local AND remote           → orphaned (drop)
+ *   - tip is an ancestor of trunk              → merged   (drop)
+ *   - trunk has a patch-id-equivalent squash   → merged   (drop, tb-tr1z)
+ *   - otherwise                                 → live    (keep)
+ *
+ * It only consults git for entries the registry still calls `active`; entries
+ * already marked `completed` / `abandoned` are honoured without a git probe.
+ */
+import { resolveBranchRef, resolveLocalBranchRef, isMergedInto, isSquashMergedInto, listRemoteHeads } from './git.js';
+import { getTrunkBranch } from './trunk.js';
+export function defaultReconcileDeps() {
+    const trunkName = getTrunkBranch();
+    // Prefer the remote trunk ref so a stale local `main` can't mask merges.
+    const trunkRef = resolveBranchRef(trunkName) ?? trunkName;
+    return {
+        resolveRef: (name) => resolveBranchRef(name),
+        resolveLocalRef: (name) => resolveLocalBranchRef(name),
+        isMerged: (ref, trunk) => isMergedInto(ref, trunk),
+        isSquashMerged: (ref, trunk) => isSquashMergedInto(ref, trunk),
+        remoteHeads: () => listRemoteHeads(),
+        trunkName,
+        trunkRef,
+    };
+}
+/**
+ * Partition registered branches into live / merged / orphaned using git truth.
+ *
+ * @param branches  the raw registry entries (e.g. `await storage.list()`)
+ * @param deps      git probes; defaults to the real repo
+ */
+export function reconcileBranches(branches, deps = defaultReconcileDeps()) {
+    const live = [];
+    const merged = [];
+    const orphaned = [];
+    for (const branch of branches) {
+        // The trunk itself is never "in flight" but also never reconciled away —
+        // pass it through unchanged so readers keep their existing handling.
+        if (branch.name === deps.trunkName) {
+            live.push(branch);
+            continue;
+        }
+        // Honour terminal registry status without a git probe.
+        if (branch.status === 'completed') {
+            merged.push(branch.name);
+            continue;
+        }
+        if (branch.status === 'abandoned') {
+            orphaned.push(branch.name);
+            continue;
+        }
+        // status === 'active' — fold in git truth. Squash merges never make
+        // the tip an ancestor, so fall back to patch-id equivalence (tb-tr1z).
+        const provenMerged = (r) => deps.isMerged(r, deps.trunkRef) || (deps.isSquashMerged?.(r, deps.trunkRef) ?? false);
+        const ref = deps.resolveRef(branch.name);
+        if (ref === null) {
+            orphaned.push(branch.name);
+            continue;
+        }
+        if (provenMerged(ref)) {
+            // The primary ref may be a stale origin/<name> while unpushed local
+            // commits exist — only reconcile away if the local tip (when it
+            // exists and differs) is merged too.
+            const localRef = deps.resolveLocalRef?.(branch.name) ?? null;
+            if (localRef === null || localRef === ref || provenMerged(localRef)) {
+                merged.push(branch.name);
+                continue;
+            }
+        }
+        live.push(branch);
+    }
+    return { live, merged, orphaned };
+}
+/**
+ * Read-path convenience for conflict detection: registered `active` branches
+ * minus those PROVEN merged into trunk (is-ancestor / squash-equivalent, or
+ * status `completed`) and those PROVEN deleted.
+ *
+ * An orphan (no local or tracking ref) is ambiguous: deleted, or live on
+ * another machine and never fetched here. A squash-merged, deleted branch is
+ * never an ancestor of trunk, so it only ever reads as orphaned — keeping every
+ * orphan made those phantom-conflict forever. So an orphan is dropped only when
+ * `git ls-remote` confirms the branch is gone from the remote; if the remote
+ * can't be asked, orphans are kept (a phantom beats a missed conflict). This
+ * matters most for ready-check, which gets no cross-machine registry pull.
+ *
+ * Read-side filter only — nothing is deleted. This is what conflicts /
+ * ready-check / merge-order should call; `sync` uses {@link reconcileBranches}
+ * directly to actually prune merged and orphaned entries.
+ */
+export function activeBranches(branches, deps = defaultReconcileDeps()) {
+    const { live, orphaned } = reconcileBranches(branches, deps);
+    const keep = new Set([...live.map(b => b.name), ...splitOrphans(orphaned, deps).kept]);
+    return branches.filter(b => b.status === 'active' && keep.has(b.name));
+}
+/**
+ * Split orphans (no local or tracking ref) into those the remote confirms are
+ * `gone` and those to `kept` — still on the remote (unfetched here), or every
+ * one of them when the remote can't be asked (`remoteChecked: false`). Shared by
+ * {@link activeBranches} (read side) and `sync` (which deletes `gone` only, sp-slemub).
+ * Only hits the network when there is an orphan to decide.
+ */
+export function splitOrphans(orphaned, deps = { remoteHeads: () => listRemoteHeads() }) {
+    if (orphaned.length === 0)
+        return { gone: [], kept: [], remoteChecked: true };
+    const heads = deps.remoteHeads?.() ?? null;
+    if (heads === null)
+        return { gone: [], kept: orphaned, remoteChecked: false };
+    return { gone: orphaned.filter(n => !heads.has(n)), kept: orphaned.filter(n => heads.has(n)), remoteChecked: true };
+}
+//# sourceMappingURL=reconcile.js.map

package/dist/lib/reconcile.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"reconcile.js","sourceRoot":"","sources":["../../src/lib/reconcile.ts"],"names":[],"mappings":"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"}

package/dist/lib/regex-utils.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Utility for combining multiple Regular Expressions into a single efficient RegExp.
+ * Consolidates patterns using the OR (|) operator to reduce matching complexity from O(N*M) to O(1).
+ */
+export declare function compilePatterns(patterns: RegExp[]): RegExp[];
+//# sourceMappingURL=regex-utils.d.ts.map

package/dist/lib/regex-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"regex-utils.d.ts","sourceRoot":"","sources":["../../src/lib/regex-utils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAqB5D"}

package/dist/lib/regex-utils.js

@@ -0,0 +1,24 @@
+/**
+ * Utility for combining multiple Regular Expressions into a single efficient RegExp.
+ * Consolidates patterns using the OR (|) operator to reduce matching complexity from O(N*M) to O(1).
+ */
+export function compilePatterns(patterns) {
+    if (!patterns || patterns.length === 0)
+        return [];
+    // Group patterns by their flags to preserve behavior (e.g., 'i', 'g', 'm')
+    const grouped = new Map();
+    for (const p of patterns) {
+        const flags = p.flags;
+        if (!grouped.has(flags)) {
+            grouped.set(flags, []);
+        }
+        // Use non-capturing groups to ensure OR logic applies correctly to the whole pattern
+        grouped.get(flags).push(`(?:${p.source})`);
+    }
+    const result = [];
+    for (const [flags, sources] of grouped.entries()) {
+        result.push(new RegExp(sources.join('|'), flags));
+    }
+    return result;
+}
+//# sourceMappingURL=regex-utils.js.map

package/dist/lib/regex-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"regex-utils.js","sourceRoot":"","sources":["../../src/lib/regex-utils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,UAAU,eAAe,CAAC,QAAkB;IAC9C,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAElD,2EAA2E;IAC3E,MAAM,OAAO,GAAG,IAAI,GAAG,EAAoB,CAAC;IAE5C,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;QACvB,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;QACtB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACtB,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC3B,CAAC;QACD,qFAAqF;QACrF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IAChD,CAAC;IAED,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,KAAK,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;QAC/C,MAAM,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;IACtD,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC"}

package/dist/lib/register-renderer.d.ts

@@ -0,0 +1,10 @@
+export interface RegisterRenderOptions {
+    branchName: string;
+    files: string[];
+    isUpdate: boolean;
+    autoDetected?: boolean;
+    autoDetectedFiles?: string[];
+}
+/** Pure. Returns terminal string for spidersan register success output. */
+export declare function renderRegisterResult(opts: RegisterRenderOptions): string;
+//# sourceMappingURL=register-renderer.d.ts.map

package/dist/lib/register-renderer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"register-renderer.d.ts","sourceRoot":"","sources":["../../src/lib/register-renderer.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,qBAAqB;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;CAChC;AAED,2EAA2E;AAC3E,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,qBAAqB,GAAG,MAAM,CAmBxE"}

package/dist/lib/register-renderer.js

@@ -0,0 +1,19 @@
+/** Pure. Returns terminal string for spidersan register success output. */
+export function renderRegisterResult(opts) {
+    const lines = [];
+    const detectedFiles = opts.autoDetectedFiles ?? opts.files;
+    if (opts.autoDetected && detectedFiles.length > 0) {
+        lines.push(`🕷️ Auto-detected ${detectedFiles.length} changed file(s)`);
+    }
+    if (opts.isUpdate) {
+        lines.push(`🕷️ Updated branch: ${opts.branchName}`);
+    }
+    else {
+        lines.push(`🕷️ Registered branch: ${opts.branchName}`);
+    }
+    if (opts.files.length > 0) {
+        lines.push(`   Files: ${opts.files.join(', ')}`);
+    }
+    return lines.join('\n').trimEnd();
+}
+//# sourceMappingURL=register-renderer.js.map

package/dist/lib/register-renderer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"register-renderer.js","sourceRoot":"","sources":["../../src/lib/register-renderer.ts"],"names":[],"mappings":"AAQA,2EAA2E;AAC3E,MAAM,UAAU,oBAAoB,CAAC,IAA2B;IAC5D,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,KAAK,CAAC;IAE3D,IAAI,IAAI,CAAC,YAAY,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChD,KAAK,CAAC,IAAI,CAAC,qBAAqB,aAAa,CAAC,MAAM,kBAAkB,CAAC,CAAC;IAC5E,CAAC;IAED,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;QAChB,KAAK,CAAC,IAAI,CAAC,uBAAuB,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;IACzD,CAAC;SAAM,CAAC;QACJ,KAAK,CAAC,IAAI,CAAC,0BAA0B,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;IAC5D,CAAC;IAED,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,KAAK,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;AACtC,CAAC"}

package/dist/lib/remote-drift.d.ts

@@ -0,0 +1,61 @@
+/**
+ * remote-drift.ts
+ *
+ * Detects whether origin/main has advanced past local HEAD and cross-references
+ * the drift zone against (a) the registered file list and (b) unstaged tracked
+ * files in the working tree.
+ *
+ * Core primitives (getDriftZone, getUnstagedTrackedFiles, classifyDriftZone)
+ * are exported so that watch --fetch-poll can reuse them without importing
+ * from the command layer.
+ */
+export interface DriftEntry {
+    file: string;
+    registered: boolean;
+    tier: 1 | 2 | 3 | null;
+    unstaged: boolean;
+}
+export interface DriftResult {
+    branch: string;
+    remote: string;
+    localAhead: number;
+    remoteAhead: number;
+    state: 'synced' | 'local_ahead' | 'remote_ahead' | 'diverged';
+    driftZone: string[];
+    registeredInDrift: DriftEntry[];
+    unstagedInDrift: DriftEntry[];
+    safeToPush: boolean;
+    rebaseContinueRisk: boolean;
+    recommendation: 'synced' | 'push_clean' | 'pull_rebase' | 'rebase_clean' | 'rebase_with_conflict_prep';
+}
+export interface DriftSkipped {
+    skipped: true;
+    reason: string;
+}
+export declare function isOfflineError(error: unknown): boolean;
+/**
+ * Returns the union of files touched by commits that origin/<branch> has but
+ * local HEAD does not. Requires a prior `git fetch origin`.
+ */
+export declare function getDriftZone(remote: string, branch: string): string[];
+/**
+ * Returns tracked files that have unstaged modifications (working tree vs index).
+ */
+export declare function getUnstagedTrackedFiles(): string[];
+/**
+ * Cross-references driftFiles against registeredFiles + unstagedFiles.
+ * Returns a DriftEntry for each file in the drift zone.
+ */
+export declare function classifyDriftZone(driftFiles: string[], registeredFiles: string[], unstagedFiles: string[], tierOptions?: {
+    extraTier3?: RegExp[];
+    extraTier2?: RegExp[];
+}): DriftEntry[];
+/**
+ * Main entry point. Fetches origin, computes drift, classifies against registry
+ * and working tree. Returns DriftSkipped for graceful-degradation cases.
+ */
+export declare function computeDriftResult(registeredFiles: string[], options?: {
+    remote?: string;
+    branch?: string;
+}): Promise<DriftResult | DriftSkipped>;
+//# sourceMappingURL=remote-drift.d.ts.map

package/dist/lib/remote-drift.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"remote-drift.d.ts","sourceRoot":"","sources":["../../src/lib/remote-drift.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AASH,MAAM,WAAW,UAAU;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;IACpB,IAAI,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,QAAQ,GAAG,aAAa,GAAG,cAAc,GAAG,UAAU,CAAC;IAC9D,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,iBAAiB,EAAE,UAAU,EAAE,CAAC;IAChC,eAAe,EAAE,UAAU,EAAE,CAAC;IAC9B,UAAU,EAAE,OAAO,CAAC;IACpB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,cAAc,EAAE,QAAQ,GAAG,YAAY,GAAG,aAAa,GAAG,cAAc,GAAG,2BAA2B,CAAC;CAC1G;AAED,MAAM,WAAW,YAAY;IACzB,OAAO,EAAE,IAAI,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAClB;AAYD,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAGtD;AAcD;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAgCrE;AAED;;GAEG;AACH,wBAAgB,uBAAuB,IAAI,MAAM,EAAE,CAOlD;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC7B,UAAU,EAAE,MAAM,EAAE,EACpB,eAAe,EAAE,MAAM,EAAE,EACzB,aAAa,EAAE,MAAM,EAAE,EACvB,WAAW,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,GAC/D,UAAU,EAAE,CAgBd;AAuBD;;;GAGG;AACH,wBAAsB,kBAAkB,CACpC,eAAe,EAAE,MAAM,EAAE,EACzB,OAAO,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAC/C,OAAO,CAAC,WAAW,GAAG,YAAY,CAAC,CAuGrC"}

package/dist/lib/remote-drift.js

@@ -0,0 +1,227 @@
+/**
+ * remote-drift.ts
+ *
+ * Detects whether origin/main has advanced past local HEAD and cross-references
+ * the drift zone against (a) the registered file list and (b) unstaged tracked
+ * files in the working tree.
+ *
+ * Core primitives (getDriftZone, getUnstagedTrackedFiles, classifyDriftZone)
+ * are exported so that watch --fetch-poll can reuse them without importing
+ * from the command layer.
+ */
+import { execFileSync } from 'child_process';
+import * as fs from 'fs';
+import * as path from 'path';
+import { getCurrentBranch, getAheadBehind } from './git.js';
+import { classifyTier } from './conflict-tier.js';
+import { validateBranchName } from './security.js';
+const GIT_TIMEOUT_MS = 15_000;
+function execGit(args) {
+    return execFileSync('git', args, {
+        encoding: 'utf-8',
+        env: { ...process.env },
+        timeout: GIT_TIMEOUT_MS,
+    });
+}
+export function isOfflineError(error) {
+    const msg = String(error instanceof Error ? error.message : error);
+    return /ENOTFOUND|ETIMEDOUT|ECONNREFUSED|network|Could not resolve host|unable to connect|cannot access/i.test(msg);
+}
+function isInRebase() {
+    try {
+        const gitDir = execGit(['rev-parse', '--git-dir']).trim();
+        return (fs.existsSync(path.join(gitDir, 'rebase-merge')) ||
+            fs.existsSync(path.join(gitDir, 'rebase-apply')));
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Returns the union of files touched by commits that origin/<branch> has but
+ * local HEAD does not. Requires a prior `git fetch origin`.
+ */
+export function getDriftZone(remote, branch) {
+    const safeBranch = validateBranchName(branch);
+    const upstreamRef = `${remote}/${safeBranch}`;
+    let commitList;
+    try {
+        commitList = execGit(['rev-list', `HEAD..${upstreamRef}`]).trim();
+    }
+    catch {
+        return [];
+    }
+    if (!commitList)
+        return [];
+    const shas = commitList.split('\n').filter(Boolean);
+    const files = new Set();
+    for (const sha of shas) {
+        try {
+            const stat = execGit(['show', '--stat', '--format=', sha]);
+            for (const line of stat.split('\n')) {
+                // Lines like: " src/lib/git.ts | 10 ++--"
+                const match = /^\s+(.+?)\s+\|/.exec(line);
+                if (match && match[1]) {
+                    files.add(match[1].trim());
+                }
+            }
+        }
+        catch {
+            // skip unparseable commit
+        }
+    }
+    return [...files];
+}
+/**
+ * Returns tracked files that have unstaged modifications (working tree vs index).
+ */
+export function getUnstagedTrackedFiles() {
+    try {
+        const output = execGit(['diff', '--name-only']).trim();
+        return output ? output.split('\n').filter(Boolean) : [];
+    }
+    catch {
+        return [];
+    }
+}
+/**
+ * Cross-references driftFiles against registeredFiles + unstagedFiles.
+ * Returns a DriftEntry for each file in the drift zone.
+ */
+export function classifyDriftZone(driftFiles, registeredFiles, unstagedFiles, tierOptions) {
+    const registeredSet = new Set(registeredFiles);
+    const unstagedSet = new Set(unstagedFiles);
+    return driftFiles.map((file) => {
+        const registered = registeredSet.has(file);
+        const unstaged = unstagedSet.has(file);
+        const tier = registered
+            ? classifyTier(file, {
+                extraTier3: tierOptions?.extraTier3 ?? [],
+                extraTier2: tierOptions?.extraTier2 ?? [],
+            })
+            : null;
+        return { file, registered, tier, unstaged };
+    });
+}
+function deriveState(localAhead, remoteAhead) {
+    if (localAhead === 0 && remoteAhead === 0)
+        return 'synced';
+    if (localAhead > 0 && remoteAhead === 0)
+        return 'local_ahead';
+    if (localAhead === 0 && remoteAhead > 0)
+        return 'remote_ahead';
+    return 'diverged';
+}
+function deriveRecommendation(state, registeredInDrift, unstagedInDrift) {
+    if (state === 'synced')
+        return 'synced';
+    if (state === 'local_ahead')
+        return 'push_clean';
+    // remote_ahead or diverged
+    if (registeredInDrift.length > 0 || unstagedInDrift.length > 0) {
+        return 'rebase_with_conflict_prep';
+    }
+    return state === 'diverged' ? 'rebase_clean' : 'pull_rebase';
+}
+/**
+ * Main entry point. Fetches origin, computes drift, classifies against registry
+ * and working tree. Returns DriftSkipped for graceful-degradation cases.
+ */
+export async function computeDriftResult(registeredFiles, options) {
+    const remote = options?.remote ?? 'origin';
+    // Detect mid-rebase
+    if (isInRebase()) {
+        return { skipped: true, reason: 'Rebase in progress — run after completing or aborting rebase' };
+    }
+    // Determine branch
+    let branch;
+    try {
+        branch = options?.branch ?? getCurrentBranch();
+    }
+    catch {
+        return { skipped: true, reason: 'Not in a git repository' };
+    }
+    if (branch === 'HEAD') {
+        return { skipped: true, reason: 'Detached HEAD — cannot determine branch' };
+    }
+    // Fetch
+    try {
+        execGit(['fetch', remote]);
+    }
+    catch (error) {
+        if (isOfflineError(error)) {
+            return { skipped: true, reason: '⚠ Remote unreachable — drift check skipped' };
+        }
+        const msg = error instanceof Error ? error.message : String(error);
+        if (/No such remote|remote .* not found/i.test(msg)) {
+            return { skipped: true, reason: `No remote '${remote}' found` };
+        }
+        // Unknown fetch error — still skip gracefully
+        return { skipped: true, reason: `Fetch failed: ${msg}` };
+    }
+    // Check if remote branch exists
+    const safeBranch = validateBranchName(branch);
+    const upstreamRef = `${remote}/${safeBranch}`;
+    try {
+        execGit(['rev-parse', '--verify', upstreamRef]);
+    }
+    catch {
+        // Remote branch doesn't exist yet (first push)
+        return {
+            branch,
+            remote: upstreamRef,
+            localAhead: 0,
+            remoteAhead: 0,
+            state: 'synced',
+            driftZone: [],
+            registeredInDrift: [],
+            unstagedInDrift: [],
+            safeToPush: true,
+            rebaseContinueRisk: false,
+            recommendation: 'push_clean',
+        };
+    }
+    // Ahead/behind
+    let localAhead;
+    let remoteAhead;
+    try {
+        const ab = getAheadBehind(remote, branch);
+        localAhead = ab.ahead;
+        remoteAhead = ab.behind; // getAheadBehind returns { ahead: local, behind: remote }
+    }
+    catch (error) {
+        const msg = error instanceof Error ? error.message : String(error);
+        if (/not a git repository/i.test(msg)) {
+            return { skipped: true, reason: 'Not in a git repository' };
+        }
+        return { skipped: true, reason: `Could not compute ahead/behind: ${msg}` };
+    }
+    const state = deriveState(localAhead, remoteAhead);
+    // Only compute drift zone when remote has new commits
+    let driftZone = [];
+    let entries = [];
+    if (remoteAhead > 0) {
+        driftZone = getDriftZone(remote, branch);
+        const unstagedFiles = getUnstagedTrackedFiles();
+        entries = classifyDriftZone(driftZone, registeredFiles, unstagedFiles);
+    }
+    const registeredInDrift = entries.filter(e => e.registered);
+    const unstagedInDrift = entries.filter(e => e.unstaged);
+    const rebaseContinueRisk = unstagedInDrift.length > 0;
+    const safeToPush = remoteAhead === 0;
+    const recommendation = deriveRecommendation(state, registeredInDrift, unstagedInDrift);
+    return {
+        branch,
+        remote: upstreamRef,
+        localAhead,
+        remoteAhead,
+        state,
+        driftZone,
+        registeredInDrift,
+        unstagedInDrift,
+        safeToPush,
+        rebaseContinueRisk,
+        recommendation,
+    };
+}
+//# sourceMappingURL=remote-drift.js.map

package/dist/lib/remote-drift.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"remote-drift.js","sourceRoot":"","sources":["../../src/lib/remote-drift.ts"],"names":[],"mappings":"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"}