spidersan 0.20.1 → 0.20.2

package/dist/commands/log.js.map

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

package/dist/commands/merge-order.d.ts

@@ -0,0 +1,9 @@
+/**
+ * spidersan merge-order
+ *
+ * Get optimal merge order based on dependencies and conflicts.
+ * Supports --blocking-count to prioritize tasks that block others (rarest-first).
+ */
+import { Command } from 'commander';
+export declare const mergeOrderCommand: Command;
+//# sourceMappingURL=merge-order.d.ts.map

package/dist/commands/merge-order.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-order.d.ts","sourceRoot":"","sources":["../../src/commands/merge-order.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAUpC,eAAO,MAAM,iBAAiB,SA8FxB,CAAC"}

package/dist/commands/merge-order.js

@@ -0,0 +1,100 @@
+/**
+ * spidersan merge-order
+ *
+ * Get optimal merge order based on dependencies and conflicts.
+ * Supports --blocking-count to prioritize tasks that block others (rarest-first).
+ */
+import { Command } from 'commander';
+import { getStorage } from '../storage/index.js';
+import { addDependencyEdges, buildConflictGraph, calculateBlockingCounts, topologicalSort } from '../lib/graph.js';
+import { activeBranches } from '../lib/reconcile.js';
+export const mergeOrderCommand = new Command('merge-order')
+    .description('Get optimal merge order for all branches')
+    .option('--json', 'Output as JSON')
+    .option('--blocking-count', 'Show how many branches each task blocks (rarest-first priority)')
+    .action(async (options) => {
+    const storage = await getStorage();
+    if (!await storage.isInitialized()) {
+        console.error('❌ Spidersan not initialized. Run: spidersan init');
+        process.exit(1);
+    }
+    // Reconcile-on-read: don't order branches already merged into trunk —
+    // they drop out of the merge plan (tb-8sa.1).
+    const branches = activeBranches(await storage.list());
+    if (branches.length === 0) {
+        console.log('🕷️ No branches registered.');
+        return;
+    }
+    const branchNames = branches.map(branch => branch.name);
+    const branchByName = new Map(branches.map(branch => [branch.name, branch]));
+    // Build conflict graph, then fold in declared dependencies
+    // (`spidersan depends`) as directed dep-merges-first edges.
+    const conflictGraph = addDependencyEdges(buildConflictGraph(branches), branches);
+    // Calculate blocking counts (how many branches are blocked by each branch)
+    const blockingCounts = options.blockingCount
+        ? calculateBlockingCounts(branchNames, conflictGraph)
+        : undefined;
+    // Topological sort with conflict awareness (optionally prioritize by blocking count)
+    const order = topologicalSort(branchNames, conflictGraph, blockingCounts);
+    if (options.json) {
+        const result = order.map(name => ({
+            name,
+            blocksCount: blockingCounts?.get(name) || 0,
+            conflicts: conflictGraph.get(name) || []
+        }));
+        console.log(JSON.stringify({ order: result }, null, 2));
+        return;
+    }
+    if (options.blockingCount) {
+        console.log('🕷️ Merge Order (Rarest-First Priority)\n');
+        console.log('━'.repeat(40) + '\n');
+    }
+    else {
+        console.log('🕷️ Recommended Merge Order:\n');
+    }
+    order.forEach((branchName, i) => {
+        const branch = branchByName.get(branchName);
+        if (!branch) {
+            return;
+        }
+        const conflicts = conflictGraph.get(branch.name) || [];
+        const blocksCount = blockingCounts?.get(branch.name) || 0;
+        // Status indicator
+        let status = '✅';
+        let priorityTag = '';
+        if (options.blockingCount && blocksCount > 0) {
+            status = blocksCount >= 3 ? '🔴' : blocksCount >= 1 ? '🟠' : '✅';
+            priorityTag = blocksCount >= 3
+                ? ' ⚡ CRITICAL'
+                : blocksCount >= 1
+                    ? ` (blocks ${blocksCount})`
+                    : '';
+        }
+        else if (conflicts.length > 0) {
+            status = '⚠️';
+        }
+        console.log(`  ${i + 1}. ${status} ${branch.name}${priorityTag}`);
+        if (conflicts.length > 0 && !options.blockingCount) {
+            console.log(`     └─ After merging, rebase: ${conflicts.join(', ')}`);
+        }
+        else if (options.blockingCount && blocksCount > 0) {
+            // Show which branches this one blocks
+            const blockedBranches = getBlockedBranches(branch.name, conflictGraph);
+            if (blockedBranches.length > 0) {
+                console.log(`     └─ Blocks: ${blockedBranches.join(', ')}`);
+            }
+        }
+    });
+    if (options.blockingCount) {
+        console.log('\n' + '━'.repeat(40));
+        console.log('💡 Merge high-priority (🔴) branches first to unblock others.');
+    }
+});
+/**
+ * Get list of branch names that are blocked by a given branch.
+ */
+function getBlockedBranches(branchName, conflictGraph) {
+    // Return the branches that this branch conflicts with
+    return conflictGraph.get(branchName) || [];
+}
+//# sourceMappingURL=merge-order.js.map

package/dist/commands/merge-order.js.map

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

package/dist/commands/merged.d.ts

@@ -0,0 +1,8 @@
+/**
+ * spidersan merged
+ *
+ * Mark a branch as merged.
+ */
+import { Command } from 'commander';
+export declare const mergedCommand: Command;
+//# sourceMappingURL=merged.d.ts.map

package/dist/commands/merged.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merged.d.ts","sourceRoot":"","sources":["../../src/commands/merged.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,eAAO,MAAM,aAAa,SA+BpB,CAAC"}

package/dist/commands/merged.js

@@ -0,0 +1,37 @@
+/**
+ * spidersan merged
+ *
+ * Mark a branch as merged.
+ */
+import { Command } from 'commander';
+import { getStorage } from '../storage/index.js';
+import { logActivity } from '../lib/activity.js';
+import { getCurrentBranch } from '../lib/git.js';
+export const mergedCommand = new Command('merged')
+    .description('Mark a branch as merged')
+    .argument('[branch]', 'Branch that was merged (default: current)')
+    .option('--pr <number>', 'PR number for tracking')
+    .action(async (branchArg, options) => {
+    const storage = await getStorage();
+    if (!await storage.isInitialized()) {
+        console.error('❌ Spidersan not initialized. Run: spidersan init');
+        process.exit(1);
+    }
+    const branchName = branchArg || getCurrentBranch();
+    const branch = await storage.get(branchName);
+    if (!branch) {
+        console.error(`❌ Branch "${branchName}" not found in registry.`);
+        process.exit(1);
+    }
+    const prNumber = options.pr ? parseInt(options.pr, 10) : undefined;
+    await storage.update(branchName, {
+        status: 'completed',
+        ...(Number.isFinite(prNumber) ? { prNumber } : {}),
+    });
+    logActivity({ event: 'merge', branch: branchName, agent: branch.agent ?? undefined, details: { pr_number: options.pr } });
+    console.log(`🕷️ Marked as merged: ${branchName}`);
+    if (options.pr) {
+        console.log(`   PR: #${options.pr}`);
+    }
+});
+//# sourceMappingURL=merged.js.map

package/dist/commands/merged.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merged.js","sourceRoot":"","sources":["../../src/commands/merged.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEjD,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC;KAC7C,WAAW,CAAC,yBAAyB,CAAC;KACtC,QAAQ,CAAC,UAAU,EAAE,2CAA2C,CAAC;KACjE,MAAM,CAAC,eAAe,EAAE,wBAAwB,CAAC;KACjD,MAAM,CAAC,KAAK,EAAE,SAA6B,EAAE,OAAO,EAAE,EAAE;IACrD,MAAM,OAAO,GAAG,MAAM,UAAU,EAAE,CAAC;IAEnC,IAAI,CAAC,MAAM,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC;QACjC,OAAO,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAC;QAClE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IAED,MAAM,UAAU,GAAG,SAAS,IAAI,gBAAgB,EAAE,CAAC;IACnD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAE7C,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,OAAO,CAAC,KAAK,CAAC,aAAa,UAAU,0BAA0B,CAAC,CAAC;QACjE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IAED,MAAM,QAAQ,GAAG,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACnE,MAAM,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE;QAC7B,MAAM,EAAE,WAAW;QACnB,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACrD,CAAC,CAAC;IACH,WAAW,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,SAAS,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAE1H,OAAO,CAAC,GAAG,CAAC,yBAAyB,UAAU,EAAE,CAAC,CAAC;IACnD,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;QACb,OAAO,CAAC,GAAG,CAAC,WAAW,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IACzC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/commands/pr-check.d.ts

@@ -0,0 +1,24 @@
+/**
+ * spidersan pr-check <number>
+ *
+ * Check a PR's merge readiness: stacked-base detection and red/behind/conflict
+ * state, with the failing *required* checks surfaced. Advisory by default
+ * (exit 0); `--exit-code` makes it gate (so a Claude-Code pre-merge hook can
+ * shell out to this instead of re-implementing the logic in bash).
+ *
+ * Promotes the 2026-06-15 `spidersan-pre.sh` hook into a first-class command.
+ */
+import { Command } from 'commander';
+import { type PRMergeState } from '../lib/github.js';
+/**
+ * Build the advisory list for a PR's merge state against trunk.
+ * Pure — no I/O — so it is trivially unit-testable.
+ *
+ * @returns advisory strings (empty ⇒ looks clean) plus the derived `stacked` flag.
+ */
+export declare function buildPrCheckAdvisories(state: PRMergeState, trunk: string): {
+    advisories: string[];
+    stacked: boolean;
+};
+export declare const prCheckCommand: Command;
+//# sourceMappingURL=pr-check.d.ts.map

package/dist/commands/pr-check.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pr-check.d.ts","sourceRoot":"","sources":["../../src/commands/pr-check.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAmB,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAYtE;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAClC,KAAK,EAAE,YAAY,EACnB,KAAK,EAAE,MAAM,GACd;IAAE,UAAU,EAAE,MAAM,EAAE,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAqB5C;AAED,eAAO,MAAM,cAAc,SA+CrB,CAAC"}

package/dist/commands/pr-check.js

@@ -0,0 +1,85 @@
+/**
+ * spidersan pr-check <number>
+ *
+ * Check a PR's merge readiness: stacked-base detection and red/behind/conflict
+ * state, with the failing *required* checks surfaced. Advisory by default
+ * (exit 0); `--exit-code` makes it gate (so a Claude-Code pre-merge hook can
+ * shell out to this instead of re-implementing the logic in bash).
+ *
+ * Promotes the 2026-06-15 `spidersan-pre.sh` hook into a first-class command.
+ */
+import { Command } from 'commander';
+import { getPRMergeState } from '../lib/github.js';
+import { getTrunkBranch } from '../lib/trunk.js';
+/** Merge-state statuses that mean "don't merge yet" (red / behind / conflicts). */
+const RED_STATES = new Set(['UNSTABLE', 'DIRTY', 'BEHIND', 'BLOCKED']);
+/**
+ * Build the advisory list for a PR's merge state against trunk.
+ * Pure — no I/O — so it is trivially unit-testable.
+ *
+ * @returns advisory strings (empty ⇒ looks clean) plus the derived `stacked` flag.
+ */
+export function buildPrCheckAdvisories(state, trunk) {
+    const advisories = [];
+    const stacked = state.baseRefName !== trunk;
+    if (stacked) {
+        advisories.push(`STACKED PR: base=${state.baseRefName} (not trunk) — merging lands on ${state.baseRefName}, not ${trunk}.`);
+    }
+    if (RED_STATES.has(state.mergeStateStatus)) {
+        const failing = state.checkRollup.failingRequired;
+        const failingNote = failing.length > 0
+            ? ` Failing required checks: ${failing.join(', ')}.`
+            : '';
+        advisories.push(`state=${state.mergeStateStatus} — red/behind/conflicts; verify before merging.${failingNote}`);
+    }
+    return { advisories, stacked };
+}
+export const prCheckCommand = new Command('pr-check')
+    .description('Check a PR\'s merge readiness (stacked base, red/behind state)')
+    .argument('<number>', 'PR number to check')
+    .option('--json', 'Output as JSON')
+    .option('--exit-code', 'Exit 1 if any advisory fired (2 if PR/gh unavailable) — for hook gating')
+    .option('--repo <owner/name>', 'Target repository (defaults to the current repo)')
+    .action(async (numberArg, options) => {
+    const prNumber = Number.parseInt(numberArg, 10);
+    if (!Number.isInteger(prNumber) || prNumber <= 0) {
+        console.error(`❌ Invalid PR number: ${numberArg}`);
+        // Advisory by default (exit 0 = return cleanly); --exit-code → 2 (unusable input).
+        if (options.exitCode)
+            process.exit(2);
+        return;
+    }
+    const trunk = getTrunkBranch();
+    const state = await getPRMergeState(prNumber, options.repo ? { repo: options.repo } : undefined);
+    // gh unavailable / PR not found → friendly advisory message.
+    if (!state) {
+        const msg = `⚠️  Could not fetch PR #${prNumber} (gh unavailable or PR not found). Skipping merge-readiness check.`;
+        if (options.json) {
+            console.log(JSON.stringify({ error: msg, trunk, stacked: false, advisories: [] }, null, 2));
+        }
+        else {
+            console.log(msg);
+        }
+        // Advisory by default (exit 0 = return cleanly); --exit-code → 2.
+        if (options.exitCode)
+            process.exit(2);
+        return;
+    }
+    const { advisories, stacked } = buildPrCheckAdvisories(state, trunk);
+    if (options.json) {
+        console.log(JSON.stringify({ ...state, stacked, trunk, advisories }, null, 2));
+    }
+    else if (advisories.length === 0) {
+        console.log(`✅ PR #${state.number} base=${state.baseRefName} state=${state.mergeStateStatus} — looks clean.`);
+    }
+    else {
+        console.log(`🕷️  PR #${state.number} — merge readiness:`);
+        for (const advisory of advisories) {
+            console.log(`   ⚠️  ${advisory}`);
+        }
+    }
+    if (options.exitCode && advisories.length > 0) {
+        process.exit(1);
+    }
+});
+//# sourceMappingURL=pr-check.js.map

package/dist/commands/pr-check.js.map

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

package/dist/commands/ready-check.d.ts

@@ -0,0 +1,11 @@
+/**
+ * spidersan ready-check
+ *
+ * Verify branch is ready to merge (no WIP markers, no conflicts).
+ * Uses .spidersanrc config for customizable patterns.
+ */
+import { Command } from 'commander';
+import { Minimatch } from 'minimatch';
+export declare function shouldExcludeFile(file: string, excludePatterns: Minimatch[]): boolean;
+export declare const readyCheckCommand: Command;
+//# sourceMappingURL=ready-check.d.ts.map

package/dist/commands/ready-check.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ready-check.d.ts","sourceRoot":"","sources":["../../src/commands/ready-check.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAOpC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,GAAG,OAAO,CAErF;AAED,eAAO,MAAM,iBAAiB,SAoJxB,CAAC"}

package/dist/commands/ready-check.js

@@ -0,0 +1,150 @@
+/**
+ * spidersan ready-check
+ *
+ * Verify branch is ready to merge (no WIP markers, no conflicts).
+ * Uses .spidersanrc config for customizable patterns.
+ */
+import { Command } from 'commander';
+import { readFile } from 'fs/promises';
+import { getStorage } from '../storage/index.js';
+import { loadConfig, getWipPatterns } from '../lib/config.js';
+import { getChangedFiles, getCurrentBranch } from '../lib/git.js';
+import { getTrunkBranch } from '../lib/trunk.js';
+import { activeBranches } from '../lib/reconcile.js';
+import { Minimatch } from 'minimatch';
+export function shouldExcludeFile(file, excludePatterns) {
+    return excludePatterns.some(pattern => pattern.match(file));
+}
+export const readyCheckCommand = new Command('ready-check')
+    .description('Verify branch is ready to merge')
+    .option('--strict', 'Warn on WIP markers (kept for compatibility, no longer blocks)')
+    .option('--json', 'Output as JSON')
+    .option('--skip-wip', 'Skip WIP detection')
+    .action(async (options) => {
+    const storage = await getStorage();
+    const config = await loadConfig();
+    if (!await storage.isInitialized()) {
+        console.error('❌ Spidersan not initialized. Run: spidersan init');
+        process.exit(1);
+    }
+    const branchName = getCurrentBranch();
+    const branch = await storage.get(branchName);
+    const changedFiles = getChangedFiles({ base: getTrunkBranch() });
+    const issues = [];
+    // Check for WIP markers (if enabled and not skipped)
+    if (config.readyCheck.enableWipDetection && !options.skipWip) {
+        // Performance Optimization: Hoist RegExp creation outside the loop
+        // Note: RegExp instances here do not use the global 'g' flag, so they are stateless
+        // and safe to reuse across files and lines.
+        const wipRegexes = getWipPatterns(config);
+        // Performance Optimization: Compile minimatch patterns once outside the loop
+        const compiledExcludePatterns = config.readyCheck.excludeFiles.map(p => new Minimatch(p));
+        for (const file of changedFiles) {
+            // Skip excluded files
+            if (shouldExcludeFile(file, compiledExcludePatterns)) {
+                continue;
+            }
+            try {
+                const content = await readFile(file, 'utf-8');
+                const lines = content.split('\n');
+                lines.forEach((line, i) => {
+                    for (const regex of wipRegexes) {
+                        if (regex.test(line)) {
+                            issues.push({
+                                type: 'wip',
+                                file,
+                                line: i + 1,
+                                pattern: regex.source,
+                            });
+                        }
+                    }
+                });
+            }
+            catch {
+                // File might not exist (deleted)
+            }
+        }
+        // Check for experimental patterns — hoist combined regex as pre-filter (PR#79)
+        if (config.readyCheck.enableExperimentalDetection && config.readyCheck.experimentalPatterns.length > 0) {
+            const combinedRegex = new RegExp(config.readyCheck.experimentalPatterns.map(p => p.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')).join('|'));
+            for (const file of changedFiles) {
+                if (!combinedRegex.test(file))
+                    continue;
+                for (const pattern of config.readyCheck.experimentalPatterns) {
+                    if (file.includes(pattern)) {
+                        issues.push({
+                            type: 'experimental',
+                            file,
+                            pattern,
+                        });
+                    }
+                }
+            }
+        }
+    }
+    // Check for conflicts — reconcile-on-read drops branches already merged
+    // into trunk so a stale registry can't report a phantom conflict (tb-8sa.1).
+    const allBranches = activeBranches(await storage.list());
+    const conflicts = [];
+    if (branch) {
+        // Performance Optimization: Convert branch files to Set for O(1) lookup
+        const branchFilesSet = new Set(branch.files);
+        for (const other of allBranches) {
+            if (other.name === branchName)
+                continue;
+            if (other.files.some(f => branchFilesSet.has(f))) {
+                conflicts.push(other.name);
+            }
+        }
+    }
+    const result = {
+        branch: branchName,
+        ready: conflicts.length === 0, // WIP markers are advisory only — don't block merges
+        issues,
+        conflicts,
+        config: {
+            wipDetection: config.readyCheck.enableWipDetection,
+            patternsChecked: config.readyCheck.wipPatterns.length,
+        },
+    };
+    if (options.json) {
+        console.log(JSON.stringify(result, null, 2));
+        process.exit(result.ready ? 0 : 1); // only exits 1 on file conflicts
+    }
+    console.log(`🕷️ Ready Check: ${branchName}\n`);
+    if (issues.length > 0) {
+        const wipIssues = issues.filter(i => i.type === 'wip');
+        const expIssues = issues.filter(i => i.type === 'experimental');
+        if (wipIssues.length > 0) {
+            console.log(`⚠️  Found ${wipIssues.length} WIP marker(s):\n`);
+            for (const issue of wipIssues.slice(0, 10)) {
+                console.log(`   ${issue.file}:${issue.line} - ${issue.pattern}`);
+            }
+            if (wipIssues.length > 10) {
+                console.log(`   ... and ${wipIssues.length - 10} more`);
+            }
+            console.log('');
+        }
+        if (expIssues.length > 0) {
+            console.log(`ℹ️  Found ${expIssues.length} experimental file(s) (advisory):\n`);
+            for (const issue of expIssues) {
+                console.log(`   ${issue.file}`);
+            }
+            console.log('');
+        }
+    }
+    if (conflicts.length > 0) {
+        console.log(`⚠️  File conflicts with: ${conflicts.join(', ')}\n`);
+    }
+    if (result.ready) {
+        console.log('✅ Branch is ready to merge!');
+        if (issues.length > 0) {
+            console.log('   (WIP/XXX/experimental markers above are advisory — not blocking)');
+        }
+    }
+    else {
+        console.log('❌ Branch is NOT ready to merge (file conflicts with other branches).');
+        process.exit(1);
+    }
+});
+//# sourceMappingURL=ready-check.js.map

package/dist/commands/ready-check.js.map

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

package/dist/commands/rebase-helper.d.ts

@@ -0,0 +1,3 @@
+import { Command } from 'commander';
+export declare const rebaseHelperCommand: Command;
+//# sourceMappingURL=rebase-helper.d.ts.map

package/dist/commands/rebase-helper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rebase-helper.d.ts","sourceRoot":"","sources":["../../src/commands/rebase-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,eAAO,MAAM,mBAAmB,SAgD1B,CAAC"}

package/dist/commands/rebase-helper.js

@@ -0,0 +1,52 @@
+import { Command } from 'commander';
+import { existsSync } from 'fs';
+import { join } from 'path';
+import { execFileSync } from 'child_process';
+export const rebaseHelperCommand = new Command('rebase-helper')
+    .description('Detect and help resolve local git rebase states (non-interactive guidance)')
+    .option('--abort', 'Abort an in-progress rebase')
+    .option('--continue', 'Attempt to continue rebase (will skip editor prompts where possible)')
+    .action(async (options) => {
+    const repoRoot = process.cwd();
+    const rebaseMerge = join(repoRoot, '.git', 'rebase-merge');
+    const rebaseApply = join(repoRoot, '.git', 'rebase-apply');
+    const inMerge = existsSync(rebaseMerge) || existsSync(rebaseApply);
+    if (!inMerge) {
+        console.log('✅ No rebase in progress.');
+        return;
+    }
+    console.log('⚠️ Rebase state detected in this repository.');
+    console.log('Common fixes:');
+    console.log('  - To abort: git rebase --abort');
+    console.log('  - To continue: git rebase --continue');
+    console.log('If an editor opens during these commands, close it (ESC :q! for vim, Ctrl+X for nano).');
+    if (options.abort) {
+        try {
+            execFileSync('git', ['rebase', '--abort'], {
+                stdio: 'inherit',
+                env: { ...process.env, GIT_EDITOR: 'true', GIT_SEQUENCE_EDITOR: 'true' }
+            });
+            console.log('✅ Rebase aborted successfully');
+        }
+        catch {
+            console.error('❌ Failed to abort rebase non-interactively. Try aborting in your terminal.');
+            process.exit(1);
+        }
+        return;
+    }
+    if (options.continue) {
+        try {
+            execFileSync('git', ['rebase', '--continue'], {
+                stdio: 'inherit',
+                env: { ...process.env, GIT_EDITOR: 'true', GIT_SEQUENCE_EDITOR: 'true' }
+            });
+            console.log('✅ Rebase continued (or completed).');
+        }
+        catch {
+            console.error('❌ Failed to continue rebase non-interactively. Please resolve conflicts and run git rebase --continue');
+            process.exit(1);
+        }
+        return;
+    }
+});
+//# sourceMappingURL=rebase-helper.js.map

package/dist/commands/rebase-helper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rebase-helper.js","sourceRoot":"","sources":["../../src/commands/rebase-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,OAAO,CAAC,eAAe,CAAC;KAC1D,WAAW,CAAC,4EAA4E,CAAC;KACzF,MAAM,CAAC,SAAS,EAAE,6BAA6B,CAAC;KAChD,MAAM,CAAC,YAAY,EAAE,sEAAsE,CAAC;KAC5F,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;IACtB,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC/B,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;IAC3D,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;IAE3D,MAAM,OAAO,GAAG,UAAU,CAAC,WAAW,CAAC,IAAI,UAAU,CAAC,WAAW,CAAC,CAAC;IACnE,IAAI,CAAC,OAAO,EAAE,CAAC;QACX,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;QACxC,OAAO;IACX,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC;IAC5D,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IAC7B,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;IAChD,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;IACtD,OAAO,CAAC,GAAG,CAAC,wFAAwF,CAAC,CAAC;IAEtG,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;QAChB,IAAI,CAAC;YACD,YAAY,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE;gBACvC,KAAK,EAAE,SAAS;gBAChB,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE;aAC3E,CAAC,CAAC;YACH,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;QACjD,CAAC;QAAC,MAAM,CAAC;YACL,OAAO,CAAC,KAAK,CAAC,4EAA4E,CAAC,CAAC;YAC5F,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC;QACD,OAAO;IACX,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACnB,IAAI,CAAC;YACD,YAAY,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,YAAY,CAAC,EAAE;gBAC1C,KAAK,EAAE,SAAS;gBAChB,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE;aAC3E,CAAC,CAAC;YACH,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;QACtD,CAAC;QAAC,MAAM,CAAC;YACL,OAAO,CAAC,KAAK,CAAC,uGAAuG,CAAC,CAAC;YACvH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC;QACD,OAAO;IACX,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/commands/register.d.ts

@@ -0,0 +1,10 @@
+import { Command } from 'commander';
+export declare function isExcludedPath(file: string): boolean;
+/**
+ * The Claude Code session running this command, or undefined. The id is written to the
+ * registry and later printed into agent context, so accept only a plain UUID-ish token.
+ */
+export declare function resolveSessionId(env?: NodeJS.ProcessEnv): string | undefined;
+export declare function validateRegistrationFiles(files: string[]): void;
+export declare const registerCommand: Command;
+//# sourceMappingURL=register.d.ts.map

package/dist/commands/register.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../src/commands/register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAuBpC,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAIpD;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,GAAG,SAAS,CAGzF;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAI/D;AA+CD,eAAO,MAAM,eAAe,SA+FtB,CAAC"}