spidersan 0.10.0 → 0.20.2

package/dist/lib/semantic-analysis.d.ts

@@ -0,0 +1,31 @@
+import { type SymbolConflict } from './ast.js';
+export interface SemanticTarget {
+    label: string;
+    files: string[];
+    /** Resolvable git ref for this target's head, or null when it isn't available locally. */
+    ref: string | null;
+}
+export interface SemanticResult {
+    conflicts: SymbolConflict[];
+    /** One human-readable line per file/target that could not be analyzed. */
+    skipped: string[];
+    /**
+     * Overlapping files of a type semantic analysis doesn't cover (.sql, .yaml, .md …). "No symbol
+     * conflicts" says nothing about them, so callers must not turn it into "safe to merge".
+     */
+    unsupported: string[];
+}
+/**
+ * A branch's tip for analysis: the LOCAL branch first (unpushed commits are the point), then
+ * origin's. resolveBranchRef alone prefers the remote and would read a stale tip.
+ */
+export declare function resolveBranchTip(name: string): string | null;
+/**
+ * A cross-machine label "<machine>/<branch>" names ANOTHER machine's branch, so it resolves only
+ * against origin — a same-named local branch would be the wrong tip. The caller must know the
+ * label is cross-machine (from where the entry came from); guessing from the label's shape is
+ * ambiguous for local branches like "feat/x".
+ */
+export declare function resolveCrossMachineRef(label: string): string | null;
+export declare function analyzeSemantic(currentLabel: string, currentRef: string | null, targets: SemanticTarget[], cwd?: string): SemanticResult;
+//# sourceMappingURL=semantic-analysis.d.ts.map

package/dist/lib/semantic-analysis.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"semantic-analysis.d.ts","sourceRoot":"","sources":["../../src/lib/semantic-analysis.ts"],"names":[],"mappings":"AAQA,OAAO,EAAa,KAAK,cAAc,EAAE,MAAM,UAAU,CAAC;AAI1D,MAAM,WAAW,cAAc;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,0FAA0F;IAC1F,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED,MAAM,WAAW,cAAc;IAC3B,SAAS,EAAE,cAAc,EAAE,CAAC;IAC5B,0EAA0E;IAC1E,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB;;;OAGG;IACH,WAAW,EAAE,MAAM,EAAE,CAAC;CACzB;AAqBD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAE5D;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAGnE;AAED,wBAAgB,eAAe,CAC3B,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,GAAG,IAAI,EACzB,OAAO,EAAE,cAAc,EAAE,EACzB,GAAG,CAAC,EAAE,MAAM,GACb,cAAc,CAyEhB"}

package/dist/lib/semantic-analysis.js

@@ -0,0 +1,120 @@
+/**
+ * semantic-analysis.ts — the `conflicts --semantic` engine.
+ *
+ * Takes targets that carry a REAL git ref (never a display label like
+ * "PR #303 (branch)") and returns symbol conflicts plus every file it could not
+ * analyze. Callers must not print "safe to merge" while `skipped` is non-empty.
+ */
+import { execFileSync } from 'child_process';
+import { ASTParser } from './ast.js';
+import { findOutlineConflicts } from './outline.js';
+import { resolveBranchRef, resolveLocalBranchRef } from './git.js';
+const TS_FILE = /\.(ts|js|tsx|jsx)$/;
+const PY_FILE = /\.py$/;
+const git = (args, cwd) => execFileSync('git', args, { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'ignore'], cwd, timeout: 30_000 }); // a hung object store must not hang the command
+/**
+ * File content at ref; null ONLY when the path genuinely doesn't exist there (a legitimate
+ * non-conflict). Any other git failure throws, so the caller records it as skipped instead of
+ * reading it as "absent".
+ *
+ * `ls-tree`, not `cat-file -e`: cat-file exits 128 for a missing path AND for a bad ref/repo, so it
+ * can't tell them apart. ls-tree exits 0 with empty output for an absent path and non-zero otherwise.
+ */
+function show(ref, file, cwd) {
+    if (!git(['ls-tree', '--name-only', ref, '--', file], cwd).trim())
+        return null;
+    return git(['show', `${ref}:${file}`], cwd);
+}
+/**
+ * A branch's tip for analysis: the LOCAL branch first (unpushed commits are the point), then
+ * origin's. resolveBranchRef alone prefers the remote and would read a stale tip.
+ */
+export function resolveBranchTip(name) {
+    return resolveLocalBranchRef(name) ?? resolveBranchRef(name);
+}
+/**
+ * A cross-machine label "<machine>/<branch>" names ANOTHER machine's branch, so it resolves only
+ * against origin — a same-named local branch would be the wrong tip. The caller must know the
+ * label is cross-machine (from where the entry came from); guessing from the label's shape is
+ * ambiguous for local branches like "feat/x".
+ */
+export function resolveCrossMachineRef(label) {
+    const remote = resolveBranchRef(label.slice(label.indexOf('/') + 1));
+    return remote?.startsWith('refs/remotes/') ? remote : null;
+}
+export function analyzeSemantic(currentLabel, currentRef, targets, cwd) {
+    const parser = new ASTParser();
+    const result = { conflicts: [], skipped: [], unsupported: [] };
+    for (const target of targets) {
+        for (const file of target.files) {
+            const isPython = PY_FILE.test(file);
+            if (!isPython && !TS_FILE.test(file)) {
+                if (!result.unsupported.includes(file))
+                    result.unsupported.push(file);
+                continue;
+            }
+            // An unresolvable ref is UNKNOWN, not "no conflict" — never swallow it.
+            if (!currentRef) {
+                result.skipped.push(`${file}: no local ref for ${currentLabel}`);
+                continue;
+            }
+            if (!target.ref) {
+                result.skipped.push(`${file}: no local ref for ${target.label} (not fetched?)`);
+                continue;
+            }
+            let current;
+            let other;
+            try {
+                current = show(currentRef, file, cwd);
+                other = show(target.ref, file, cwd);
+            }
+            catch {
+                result.skipped.push(`${file}: could not read from ${target.label}`);
+                continue;
+            }
+            // Absent on one side = added/deleted there. A delete/modify overlap is a real git conflict, and
+            // symbol comparison can't judge it, so it is unanalyzed (incomplete), never "nothing to conflict".
+            if (current === null || other === null) {
+                result.skipped.push(`${file}: absent on ${current === null ? currentLabel : target.label} (added or deleted) — not analyzed`);
+                continue;
+            }
+            // Three-way against the merge-base. Two-way ONLY when the histories are genuinely unrelated
+            // (merge-base exit 1); any other failure is unknown, not a reason to change comparison mode.
+            let base;
+            try {
+                let mb = null;
+                try {
+                    mb = git(['merge-base', currentRef, target.ref], cwd).trim();
+                }
+                catch (err) {
+                    if (err.status !== 1)
+                        throw err; // 1 = no common ancestor
+                }
+                base = mb ? show(mb, file, cwd) ?? undefined : undefined;
+            }
+            catch {
+                result.skipped.push(`${file}: could not compute merge-base with ${target.label}`);
+                continue;
+            }
+            let found;
+            try {
+                found = isPython
+                    ? findOutlineConflicts('.py', current, `${currentLabel}:${file}`, other, `${target.label}:${file}`, base)
+                    : parser.findSymbolConflicts(current, `${currentLabel}:${file}`, other, `${target.label}:${file}`, base);
+            }
+            catch {
+                // A parser failure is unknown, not "no conflicts". No caught message: it can carry
+                // internals and this line is printed.
+                result.skipped.push(`${file}: parse failed`);
+                continue;
+            }
+            if (!found) {
+                result.skipped.push(`${file}: semantic analysis unavailable (install ast-grep)`);
+                continue;
+            }
+            result.conflicts.push(...found);
+        }
+    }
+    return result;
+}
+//# sourceMappingURL=semantic-analysis.js.map

package/dist/lib/semantic-analysis.js.map

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

package/dist/lib/supabase-credentials.d.ts

@@ -0,0 +1,36 @@
+/**
+ * Single source of truth for resolving spidersan's Supabase credentials.
+ *
+ * Precedence: SPIDERSAN_SUPABASE_* → SUPABASE_* → config.storage.*
+ *
+ * SPIDERSAN_SUPABASE_* MUST come first. envoak's vault-inject guard drops any
+ * secret whose name carries a bare SUPABASE_ prefix, so vault-injected creds
+ * only ever arrive under the scoped names. Resolvers checking just the bare
+ * names silently no-op under `envoak vault inject` — the production hook path —
+ * and report "Supabase not configured" while a valid grant is present (fc8cf22,
+ * 29aa575, tb-efmm; tb-ly0b found 7 more copies with the same defect).
+ *
+ * This module exists so that stays fixed in ONE place. Do not re-derive these
+ * env names inline; call resolveSupabaseCredentials()/resolveSupabaseEnv().
+ *
+ * COLONY_SUPABASE_* is deliberately absent from the chain: colony points at a
+ * different Supabase project, so falling back to it would silently write
+ * spider_registries into the wrong database (tb-ly0b).
+ */
+export interface SupabaseCredentials {
+    url: string;
+    key: string;
+}
+/**
+ * Env-only resolution. For callers with no config file in scope (subscribers,
+ * activity logging) that need a synchronous answer.
+ */
+export declare function resolveSupabaseEnv(): {
+    url?: string;
+    key?: string;
+};
+/**
+ * Env → config.storage. The default for commands; null when unconfigured.
+ */
+export declare function resolveSupabaseCredentials(basePath?: string): Promise<SupabaseCredentials | null>;
+//# sourceMappingURL=supabase-credentials.d.ts.map

package/dist/lib/supabase-credentials.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"supabase-credentials.d.ts","sourceRoot":"","sources":["../../src/lib/supabase-credentials.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAIH,MAAM,WAAW,mBAAmB;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,IAAI;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,CAKnE;AAED;;GAEG;AACH,wBAAsB,0BAA0B,CAC5C,QAAQ,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAQrC"}

package/dist/lib/supabase-credentials.js

@@ -0,0 +1,43 @@
+/**
+ * Single source of truth for resolving spidersan's Supabase credentials.
+ *
+ * Precedence: SPIDERSAN_SUPABASE_* → SUPABASE_* → config.storage.*
+ *
+ * SPIDERSAN_SUPABASE_* MUST come first. envoak's vault-inject guard drops any
+ * secret whose name carries a bare SUPABASE_ prefix, so vault-injected creds
+ * only ever arrive under the scoped names. Resolvers checking just the bare
+ * names silently no-op under `envoak vault inject` — the production hook path —
+ * and report "Supabase not configured" while a valid grant is present (fc8cf22,
+ * 29aa575, tb-efmm; tb-ly0b found 7 more copies with the same defect).
+ *
+ * This module exists so that stays fixed in ONE place. Do not re-derive these
+ * env names inline; call resolveSupabaseCredentials()/resolveSupabaseEnv().
+ *
+ * COLONY_SUPABASE_* is deliberately absent from the chain: colony points at a
+ * different Supabase project, so falling back to it would silently write
+ * spider_registries into the wrong database (tb-ly0b).
+ */
+import { loadConfig } from './config.js';
+/**
+ * Env-only resolution. For callers with no config file in scope (subscribers,
+ * activity logging) that need a synchronous answer.
+ */
+export function resolveSupabaseEnv() {
+    return {
+        url: process.env.SPIDERSAN_SUPABASE_URL || process.env.SUPABASE_URL,
+        key: process.env.SPIDERSAN_SUPABASE_KEY || process.env.SUPABASE_KEY,
+    };
+}
+/**
+ * Env → config.storage. The default for commands; null when unconfigured.
+ */
+export async function resolveSupabaseCredentials(basePath) {
+    const env = resolveSupabaseEnv();
+    const config = await loadConfig(basePath);
+    const url = env.url || config.storage.supabaseUrl;
+    const key = env.key || config.storage.supabaseKey;
+    if (!url || !key)
+        return null;
+    return { url, key };
+}
+//# sourceMappingURL=supabase-credentials.js.map

package/dist/lib/supabase-credentials.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"supabase-credentials.js","sourceRoot":"","sources":["../../src/lib/supabase-credentials.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAOzC;;;GAGG;AACH,MAAM,UAAU,kBAAkB;IAC9B,OAAO;QACH,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY;QACnE,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY;KACtE,CAAC;AACN,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC5C,QAAiB;IAEjB,MAAM,GAAG,GAAG,kBAAkB,EAAE,CAAC;IACjC,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,CAAC;IAC1C,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;IAClD,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;IAElD,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IAC9B,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;AACxB,CAAC"}

package/dist/lib/trunk.d.ts

@@ -0,0 +1,39 @@
+/**
+ * Trunk branch detection.
+ *
+ * Centralizes the "which branch is trunk?" question that was previously
+ * hardcoded as `main`/`master` in several places.
+ *
+ * Resolution order (first hit wins):
+ *   1. `git symbolic-ref refs/remotes/origin/HEAD` (strip the `origin/` prefix)
+ *   2. `.spidersanrc` `trunk` key
+ *   3. `main`   — if that branch exists
+ *   4. `master` — if that branch exists
+ *   5. `'main'` — default fallback
+ *
+ * Pure + cached per `cwd` within a process. Tolerates a missing
+ * `origin/HEAD` (fresh clones throw — we catch and fall through).
+ */
+/**
+ * Resolve the repo's trunk branch name.
+ *
+ * @param opts.cwd - Repo directory (defaults to `process.cwd()`).
+ * @returns The trunk branch name (e.g. `'main'`, `'master'`, `'develop'`).
+ */
+export declare function getTrunkBranch(opts?: {
+    cwd?: string;
+}): string;
+/**
+ * True if `branch` is the repo's trunk.
+ *
+ * @param branch - Branch name to test.
+ * @param opts.cwd - Repo directory (defaults to `process.cwd()`).
+ */
+export declare function isTrunk(branch: string, opts?: {
+    cwd?: string;
+}): boolean;
+/**
+ * Clear the per-cwd trunk cache. Intended for tests; harmless in production.
+ */
+export declare function _clearTrunkCache(): void;
+//# sourceMappingURL=trunk.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"trunk.d.ts","sourceRoot":"","sources":["../../src/lib/trunk.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AA0EH;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,IAAI,CAAC,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAQ9D;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAExE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,IAAI,CAEvC"}

package/dist/lib/trunk.js

@@ -0,0 +1,116 @@
+/**
+ * Trunk branch detection.
+ *
+ * Centralizes the "which branch is trunk?" question that was previously
+ * hardcoded as `main`/`master` in several places.
+ *
+ * Resolution order (first hit wins):
+ *   1. `git symbolic-ref refs/remotes/origin/HEAD` (strip the `origin/` prefix)
+ *   2. `.spidersanrc` `trunk` key
+ *   3. `main`   — if that branch exists
+ *   4. `master` — if that branch exists
+ *   5. `'main'` — default fallback
+ *
+ * Pure + cached per `cwd` within a process. Tolerates a missing
+ * `origin/HEAD` (fresh clones throw — we catch and fall through).
+ */
+import { existsSync, readFileSync } from 'fs';
+import { join } from 'path';
+import { execGit } from './git.js';
+const CONFIG_FILES = ['.spidersanrc', '.spidersanrc.json', '.spidersan.config.json'];
+// Per-cwd cache so repeated calls within a process don't re-shell out to git.
+const cache = new Map();
+function resolveCwd(opts) {
+    return opts?.cwd ?? process.cwd();
+}
+/** origin/HEAD symbolic-ref → branch name, or null if unset / fresh clone. */
+function fromOriginHead(cwd) {
+    try {
+        const out = execGit(['-C', cwd, 'symbolic-ref', 'refs/remotes/origin/HEAD'], {
+            stdio: ['pipe', 'pipe', 'ignore'],
+        }).trim();
+        // e.g. "refs/remotes/origin/develop" → "develop"
+        const prefix = 'refs/remotes/origin/';
+        const ref = out.startsWith(prefix) ? out.slice(prefix.length) : out.replace(/^origin\//, '');
+        return ref || null;
+    }
+    catch {
+        // Fresh clones / no origin/HEAD set: throws — fall through.
+        return null;
+    }
+}
+/** `.spidersanrc` `trunk` key (project-local), or null if absent/unreadable. */
+function fromConfig(cwd) {
+    for (const filename of CONFIG_FILES) {
+        const path = join(cwd, filename);
+        if (!existsSync(path))
+            continue;
+        try {
+            const parsed = JSON.parse(readFileSync(path, 'utf-8'));
+            const trunk = parsed?.trunk;
+            if (typeof trunk === 'string' && trunk.trim()) {
+                return trunk.trim();
+            }
+        }
+        catch {
+            // Malformed config — ignore and keep looking.
+        }
+    }
+    return null;
+}
+/** True if a local branch ref exists. */
+function branchExists(cwd, branch) {
+    try {
+        execGit(['-C', cwd, 'rev-parse', '--verify', `refs/heads/${branch}`], {
+            stdio: ['pipe', 'pipe', 'ignore'],
+        });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+function resolveTrunk(cwd) {
+    const fromHead = fromOriginHead(cwd);
+    if (fromHead)
+        return fromHead;
+    const fromCfg = fromConfig(cwd);
+    if (fromCfg)
+        return fromCfg;
+    if (branchExists(cwd, 'main'))
+        return 'main';
+    if (branchExists(cwd, 'master'))
+        return 'master';
+    return 'main';
+}
+/**
+ * Resolve the repo's trunk branch name.
+ *
+ * @param opts.cwd - Repo directory (defaults to `process.cwd()`).
+ * @returns The trunk branch name (e.g. `'main'`, `'master'`, `'develop'`).
+ */
+export function getTrunkBranch(opts) {
+    const cwd = resolveCwd(opts);
+    const cached = cache.get(cwd);
+    if (cached !== undefined)
+        return cached;
+    const trunk = resolveTrunk(cwd);
+    cache.set(cwd, trunk);
+    return trunk;
+}
+/**
+ * True if `branch` is the repo's trunk.
+ *
+ * @param branch - Branch name to test.
+ * @param opts.cwd - Repo directory (defaults to `process.cwd()`).
+ */
+export function isTrunk(branch, opts) {
+    return branch === getTrunkBranch(opts);
+}
+/**
+ * Clear the per-cwd trunk cache. Intended for tests; harmless in production.
+ */
+export function _clearTrunkCache() {
+    cache.clear();
+}
+//# sourceMappingURL=trunk.js.map

package/dist/lib/trunk.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"trunk.js","sourceRoot":"","sources":["../../src/lib/trunk.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAEnC,MAAM,YAAY,GAAG,CAAC,cAAc,EAAE,mBAAmB,EAAE,wBAAwB,CAAC,CAAC;AAErF,8EAA8E;AAC9E,MAAM,KAAK,GAAG,IAAI,GAAG,EAAkB,CAAC;AAExC,SAAS,UAAU,CAAC,IAAuB;IACvC,OAAO,IAAI,EAAE,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;AACtC,CAAC;AAED,8EAA8E;AAC9E,SAAS,cAAc,CAAC,GAAW;IAC/B,IAAI,CAAC;QACD,MAAM,GAAG,GAAG,OAAO,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,cAAc,EAAE,0BAA0B,CAAC,EAAE;YACzE,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC;SACpC,CAAC,CAAC,IAAI,EAAE,CAAC;QACV,iDAAiD;QACjD,MAAM,MAAM,GAAG,sBAAsB,CAAC;QACtC,MAAM,GAAG,GAAG,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QAC7F,OAAO,GAAG,IAAI,IAAI,CAAC;IACvB,CAAC;IAAC,MAAM,CAAC;QACL,4DAA4D;QAC5D,OAAO,IAAI,CAAC;IAChB,CAAC;AACL,CAAC;AAED,gFAAgF;AAChF,SAAS,UAAU,CAAC,GAAW;IAC3B,KAAK,MAAM,QAAQ,IAAI,YAAY,EAAE,CAAC;QAClC,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACjC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YAAE,SAAS;QAChC,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAA4B,CAAC;YAClF,MAAM,KAAK,GAAG,MAAM,EAAE,KAAK,CAAC;YAC5B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;gBAC5C,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;YACxB,CAAC;QACL,CAAC;QAAC,MAAM,CAAC;YACL,8CAA8C;QAClD,CAAC;IACL,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,yCAAyC;AACzC,SAAS,YAAY,CAAC,GAAW,EAAE,MAAc;IAC7C,IAAI,CAAC;QACD,OAAO,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,UAAU,EAAE,cAAc,MAAM,EAAE,CAAC,EAAE;YAClE,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC;SACpC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IAChB,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,KAAK,CAAC;IACjB,CAAC;AACL,CAAC;AAED,SAAS,YAAY,CAAC,GAAW;IAC7B,MAAM,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;IACrC,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAE9B,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;IAChC,IAAI,OAAO;QAAE,OAAO,OAAO,CAAC;IAE5B,IAAI,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC;QAAE,OAAO,MAAM,CAAC;IAC7C,IAAI,YAAY,CAAC,GAAG,EAAE,QAAQ,CAAC;QAAE,OAAO,QAAQ,CAAC;IAEjD,OAAO,MAAM,CAAC;AAClB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAAC,IAAuB;IAClD,MAAM,GAAG,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAC7B,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC9B,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,MAAM,CAAC;IAExC,MAAM,KAAK,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;IAChC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACtB,OAAO,KAAK,CAAC;AACjB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,OAAO,CAAC,MAAc,EAAE,IAAuB;IAC3D,OAAO,MAAM,KAAK,cAAc,CAAC,IAAI,CAAC,CAAC;AAC3C,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,gBAAgB;IAC5B,KAAK,CAAC,KAAK,EAAE,CAAC;AAClB,CAAC"}

package/dist/storage/adapter.d.ts

@@ -9,8 +9,27 @@ export interface Branch {
     files: string[];
     registeredAt: Date;
     agent?: string;
+    /**
+     * Claude Code session (the id `tbe`/ccsessions lists) that last registered this
+     * branch, so a conflict can say WHICH session to resume. Local registry only:
+     * meaningless off the machine that owns the session, and not synced to Supabase.
+     */
+    sessionId?: string;
     status: 'active' | 'completed' | 'abandoned';
     description?: string;
+    /** Branches that must merge BEFORE this one (`spidersan depends`). */
+    dependsOn?: string[];
+    /** PR that merged this branch (`spidersan merged --pr`). */
+    prNumber?: number;
+    /**
+     * Per-file claims from before 0.20.0, when `watch` and `spidersan
+     * claim`/`release` wrote them. Nothing writes this any more; it stays
+     * so registries that still carry it keep parsing.
+     */
+    claims?: Record<string, {
+        agent: string;
+        at: string;
+    }>;
 }
 export interface BranchRegistry {
     branches: Record<string, Branch>;
@@ -57,6 +76,6 @@ export interface StorageAdapter {
     /**
      * Clean up old branches
      */
-    cleanup(olderThan: Date): Promise<string[]>;
+    cleanup(olderThan: Date, includeActive?: boolean): Promise<string[]>;
 }
 //# sourceMappingURL=adapter.d.ts.map

package/dist/storage/adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/storage/adapter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,WAAW,MAAM;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,YAAY,EAAE,IAAI,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,QAAQ,GAAG,WAAW,GAAG,WAAW,CAAC;IAC7C,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,cAAc;IAC3B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC3B;;OAEG;IACH,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtB;;OAEG;IACH,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAElC;;OAEG;IACH,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAE1B;;OAEG;IACH,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAEhE;;OAEG;IACH,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAEvE;;OAEG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAE3C;;OAEG;IACH,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAE1C;;OAEG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAEhD;;OAEG;IACH,OAAO,CAAC,SAAS,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CAC/C"}
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/storage/adapter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,WAAW,MAAM;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,YAAY,EAAE,IAAI,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,QAAQ,GAAG,WAAW,GAAG,WAAW,CAAC;IAC7C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,sEAAsE;IACtE,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,4DAA4D;IAC5D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC1D;AAED,MAAM,WAAW,cAAc;IAC3B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC3B;;OAEG;IACH,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtB;;OAEG;IACH,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAElC;;OAEG;IACH,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAE1B;;OAEG;IACH,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAEhE;;OAEG;IACH,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAEvE;;OAEG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAE3C;;OAEG;IACH,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAE1C;;OAEG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAEhD;;OAEG;IACH,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,aAAa,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CACxE"}

package/dist/storage/branch-registry-store.d.ts

@@ -8,6 +8,6 @@ export interface BranchRegistryStore {
     unregister(name: string): Promise<boolean>;
     get(name: string): Promise<Branch | null>;
     findByFiles(files: string[]): Promise<Branch[]>;
-    cleanup(olderThan: Date): Promise<string[]>;
+    cleanup(olderThan: Date, includeActive?: boolean): Promise<string[]>;
 }
 //# sourceMappingURL=branch-registry-store.d.ts.map

package/dist/storage/branch-registry-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"branch-registry-store.d.ts","sourceRoot":"","sources":["../../src/storage/branch-registry-store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C,MAAM,WAAW,mBAAmB;IAChC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAClC,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAChE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACvE,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3C,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC1C,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAChD,OAAO,CAAC,SAAS,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CAC/C"}
+{"version":3,"file":"branch-registry-store.d.ts","sourceRoot":"","sources":["../../src/storage/branch-registry-store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C,MAAM,WAAW,mBAAmB;IAChC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAClC,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAChE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACvE,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3C,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC1C,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAChD,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,aAAa,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CACxE"}

package/dist/storage/factory.d.ts

@@ -2,9 +2,5 @@
  * Storage factory - selects the right storage backend
  */
 import type { StorageAdapter } from './adapter.js';
-import type { BranchRegistryStore } from './branch-registry-store.js';
-import type { SupabaseRegistrySyncClient } from './supabase-registry-sync-client.js';
-export declare function getBranchRegistryStore(basePath?: string): Promise<BranchRegistryStore>;
-export declare function getSupabaseRegistrySyncClient(): Promise<SupabaseRegistrySyncClient | null>;
 export declare function getStorage(): Promise<StorageAdapter>;
 //# sourceMappingURL=factory.d.ts.map

package/dist/storage/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/storage/factory.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAwBrF,wBAAsB,sBAAsB,CAAC,QAAQ,GAAE,MAAsB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAE3G;AAED,wBAAsB,6BAA6B,IAAI,OAAO,CAAC,0BAA0B,GAAG,IAAI,CAAC,CAOhG;AAED,wBAAsB,UAAU,IAAI,OAAO,CAAC,cAAc,CAAC,CAQ1D"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/storage/factory.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAGnD,wBAAsB,UAAU,IAAI,OAAO,CAAC,cAAc,CAAC,CAQ1D"}

package/dist/storage/factory.js

@@ -1,35 +1,11 @@
 /**
  * Storage factory - selects the right storage backend
  */
-import { JsonBranchRegistryStore } from './json-branch-registry-store.js';
 import { LocalStorage } from './local.js';
 import { SupabaseStorage } from './supabase.js';
-import { SupabaseRegistrySyncClientImpl } from './supabase-registry-sync-client-impl.js';
-import { loadConfig } from '../lib/config.js';
-async function getSupabaseConfig() {
-    const config = await loadConfig();
-    const supabaseUrl = process.env.SUPABASE_URL || config.storage.supabaseUrl;
-    const supabaseKey = process.env.SUPABASE_KEY || config.storage.supabaseKey;
-    if (!supabaseUrl || !supabaseKey) {
-        return null;
-    }
-    return {
-        url: supabaseUrl,
-        key: supabaseKey,
-    };
-}
-export async function getBranchRegistryStore(basePath = process.cwd()) {
-    return new JsonBranchRegistryStore(basePath);
-}
-export async function getSupabaseRegistrySyncClient() {
-    const config = await getSupabaseConfig();
-    if (!config) {
-        return null;
-    }
-    return new SupabaseRegistrySyncClientImpl(config);
-}
+import { resolveSupabaseCredentials } from '../lib/supabase-credentials.js';
 export async function getStorage() {
-    const supabaseConfig = await getSupabaseConfig();
+    const supabaseConfig = await resolveSupabaseCredentials();
     if (supabaseConfig) {
         return new SupabaseStorage(supabaseConfig);
     }

package/dist/storage/factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../src/storage/factory.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAIhD,OAAO,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC;AACzF,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAO9C,KAAK,UAAU,iBAAiB;IAC5B,MAAM,MAAM,GAAG,MAAM,UAAU,EAAE,CAAC;IAClC,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;IAC3E,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;IAE3E,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,EAAE,CAAC;QAC/B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO;QACH,GAAG,EAAE,WAAW;QAChB,GAAG,EAAE,WAAW;KACnB,CAAC;AACN,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,WAAmB,OAAO,CAAC,GAAG,EAAE;IACzE,OAAO,IAAI,uBAAuB,CAAC,QAAQ,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,6BAA6B;IAC/C,MAAM,MAAM,GAAG,MAAM,iBAAiB,EAAE,CAAC;IACzC,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,IAAI,8BAA8B,CAAC,MAAM,CAAC,CAAC;AACtD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU;IAC5B,MAAM,cAAc,GAAG,MAAM,iBAAiB,EAAE,CAAC;IAEjD,IAAI,cAAc,EAAE,CAAC;QACjB,OAAO,IAAI,eAAe,CAAC,cAAc,CAAC,CAAC;IAC/C,CAAC;IAED,OAAO,IAAI,YAAY,EAAE,CAAC;AAC9B,CAAC"}
+{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../src/storage/factory.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEhD,OAAO,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAE5E,MAAM,CAAC,KAAK,UAAU,UAAU;IAC5B,MAAM,cAAc,GAAG,MAAM,0BAA0B,EAAE,CAAC;IAE1D,IAAI,cAAc,EAAE,CAAC;QACjB,OAAO,IAAI,eAAe,CAAC,cAAc,CAAC,CAAC;IAC/C,CAAC;IAED,OAAO,IAAI,YAAY,EAAE,CAAC;AAC9B,CAAC"}

package/dist/storage/json-branch-registry-store.d.ts

@@ -12,7 +12,7 @@ export declare class JsonBranchRegistryStore implements BranchRegistryStore {
     unregister(name: string): Promise<boolean>;
     get(name: string): Promise<Branch | null>;
     findByFiles(files: string[]): Promise<Branch[]>;
-    cleanup(olderThan: Date): Promise<string[]>;
+    cleanup(olderThan: Date, includeActive?: boolean): Promise<string[]>;
     private load;
     private save;
 }

package/dist/storage/json-branch-registry-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"json-branch-registry-store.d.ts","sourceRoot":"","sources":["../../src/storage/json-branch-registry-store.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAkB,MAAM,cAAc,CAAC;AAC3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AA6BtE,qBAAa,uBAAwB,YAAW,mBAAmB;IAC/D,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,YAAY,CAAS;gBAEjB,QAAQ,GAAE,MAAsB;IAKtC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAWrB,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC;IAIjC,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAKzB,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAY/D,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAetE,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAW1C,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAKzC,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAM/C,OAAO,CAAC,SAAS,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;YAkBnC,IAAI;YASJ,IAAI;CAGrB"}
+{"version":3,"file":"json-branch-registry-store.d.ts","sourceRoot":"","sources":["../../src/storage/json-branch-registry-store.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAkB,MAAM,cAAc,CAAC;AAC3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AA6BtE,qBAAa,uBAAwB,YAAW,mBAAmB;IAC/D,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,YAAY,CAAS;gBAEjB,QAAQ,GAAE,MAAsB;IAKtC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAWrB,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC;IAIjC,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAKzB,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAY/D,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAetE,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAW1C,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAKzC,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAM/C,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,aAAa,UAAQ,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;YAuB1D,IAAI;YA+BJ,IAAI;CAMrB"}

package/dist/storage/json-branch-registry-store.js

@@ -1,5 +1,5 @@
 import { existsSync } from 'fs';
-import { mkdir, readFile, writeFile } from 'fs/promises';
+import { mkdir, readFile, writeFile, rename } from 'fs/promises';
 import { join } from 'path';
 const SPIDERSAN_DIR = '.spidersan';
 const REGISTRY_FILE = 'registry.json';
@@ -82,10 +82,15 @@ export class JsonBranchRegistryStore {
         const fileSet = new Set(files);
         return branches.filter((branch) => branch.files.some((file) => fileSet.has(file)));
     }
-    async cleanup(olderThan) {
+    async cleanup(olderThan, includeActive = false) {
         const registry = await this.load();
         const removedNames = [];
         for (const [name, branch] of Object.entries(registry.branches)) {
+            // registeredAt is never refreshed, so an old ACTIVE registration
+            // usually means in-flight work — skip unless explicitly included.
+            if (!includeActive && branch.status === 'active') {
+                continue;
+            }
             if (branch.registeredAt < olderThan) {
                 delete registry.branches[name];
                 removedNames.push(name);
@@ -97,16 +102,37 @@ export class JsonBranchRegistryStore {
         return removedNames;
     }
     async load() {
+        let data;
         try {
-            const data = await readFile(this.registryPath, 'utf-8');
-            return normalizeRegistry(JSON.parse(data));
+            data = await readFile(this.registryPath, 'utf-8');
+        }
+        catch (err) {
+            if (err.code === 'ENOENT') {
+                return { branches: {}, version: REGISTRY_VERSION };
+            }
+            throw err;
         }
-        catch {
-            return { branches: {}, version: REGISTRY_VERSION };
+        // A file that EXISTS but doesn't parse must fail loudly — returning an
+        // empty registry here would let the next save() wipe every agent's
+        // registration.
+        const parsed = JSON.parse(data);
+        // Same loudness for a WRONG SHAPE: `branches` must be a name-keyed
+        // plain object. An array (e.g. from a stray `jq map()` edit) parses
+        // fine but breaks every keyed lookup — register/update/unregister all
+        // silently miss while list() keeps working (tb-orpt).
+        if (parsed === null || typeof parsed !== 'object' ||
+            parsed.branches === null || typeof parsed.branches !== 'object' ||
+            Array.isArray(parsed.branches)) {
+            throw new Error(`Corrupt registry at ${this.registryPath}: "branches" must be an object keyed by branch name. ` +
+                'Restore it or re-init; refusing to operate on it.');
         }
+        return normalizeRegistry(parsed);
     }
     async save(registry) {
-        await writeFile(this.registryPath, JSON.stringify(registry, null, 2));
+        // Write-then-rename so a crash mid-write can't truncate registry.json.
+        const tmp = `${this.registryPath}.${process.pid}.tmp`;
+        await writeFile(tmp, JSON.stringify(registry, null, 2));
+        await rename(tmp, this.registryPath);
     }
 }
 //# sourceMappingURL=json-branch-registry-store.js.map