@blockspool/cli 0.4.1 → 0.4.2

package/dist/lib/solo-config.d.ts

@@ -0,0 +1,155 @@
+/**
+ * Solo mode configuration
+ */
+import { type DatabaseAdapter } from '@blockspool/core/db';
+import type { ScoutDeps, ScoutProgress } from '@blockspool/core/services';
+import type { TicketProposal } from '@blockspool/core/scout';
+import type { SpindleConfig } from './spindle.js';
+/**
+ * Retention configuration — caps on unbounded state accumulation.
+ * All values are item counts (not time-based), except maxStaleBranchDays.
+ */
+export interface RetentionConfig {
+    /** Keep last N run folders in .blockspool/runs/ (default 50) */
+    maxRuns: number;
+    /** Keep last N lines in history.ndjson (default 100) */
+    maxHistoryEntries: number;
+    /** Keep newest N artifact files per run folder (default 20) */
+    maxArtifactsPerRun: number;
+    /** Keep last N archived spool files (default 5) */
+    maxSpoolArchives: number;
+    /** Max deferred proposals in run-state.json (default 20) */
+    maxDeferredProposals: number;
+    /** Hard-delete oldest completed tickets beyond this cap (default 200) */
+    maxCompletedTickets: number;
+    /** Cap file_edit_counts keys in spindle state (default 50) */
+    maxSpindleFileEditKeys: number;
+    /** Keep last N local blockspool/* branches (default 10) */
+    maxMergedBranches: number;
+}
+/**
+ * Default retention configuration — conservative values.
+ */
+export declare const DEFAULT_RETENTION_CONFIG: RetentionConfig;
+/**
+ * Auto configuration - the "trust ladder" settings
+ */
+export interface AutoConfig {
+    allowCategories: string[];
+    blockCategories: string[];
+    minConfidence: number;
+    maxPrs: number;
+    maxFilesPerTicket: number;
+    maxLinesPerTicket: number;
+    draftPrs: boolean;
+    defaultScope: string;
+    docsAudit: boolean;
+    docsAuditInterval: number;
+    /** Pull from origin every N cycles to stay current with team changes (0 = disabled, default 5) */
+    pullEveryNCycles: number;
+    /** What to do when pull fails due to divergence: "halt" stops the session, "warn" logs and continues (default "halt") */
+    pullPolicy: 'halt' | 'warn';
+    /** Re-read guidelines file every N cycles to pick up changes (default 10, 0 = disabled) */
+    guidelinesRefreshCycles: number;
+    /** Auto-create a baseline guidelines file (AGENTS.md or CLAUDE.md) if none exists (default true) */
+    autoCreateGuidelines: boolean;
+    /**
+     * Custom path to guidelines file, relative to repo root.
+     * Overrides the default CLAUDE.md / AGENTS.md search.
+     * Set to false to disable guidelines entirely.
+     * Examples: "docs/GUIDELINES.md", "CONVENTIONS.md", false
+     */
+    guidelinesPath: string | false | null;
+}
+/**
+ * Default auto config - conservative "safe demo" settings
+ */
+export declare const DEFAULT_AUTO_CONFIG: AutoConfig;
+/**
+ * Solo config file structure
+ */
+export interface SoloConfig {
+    version: number;
+    repoRoot: string;
+    createdAt: string;
+    dbPath: string;
+    qa?: {
+        commands: Array<{
+            name: string;
+            cmd: string;
+            cwd?: string;
+            timeoutSec?: number;
+            timeoutMs?: number;
+        }>;
+        retry?: {
+            enabled: boolean;
+            maxAttempts: number;
+        };
+        artifacts?: {
+            storeDir?: string;
+            maxLogBytes?: number;
+            tailBytes?: number;
+        };
+    };
+    allowedRemote?: string;
+    spindle?: Partial<SpindleConfig>;
+    auto?: Partial<AutoConfig>;
+    retention?: Partial<RetentionConfig>;
+    /** Max parallel tickets for plugin mode (default: 2, max: 5) */
+    pluginParallel?: number;
+}
+/**
+ * Detected QA command from project configuration
+ */
+export interface DetectedQaCommand {
+    name: string;
+    cmd: string;
+    source: 'package.json' | 'detected';
+}
+/**
+ * Get the .blockspool directory path (repo-local or global)
+ */
+export declare function getBlockspoolDir(repoRoot?: string): string;
+/**
+ * Get database path
+ */
+export declare function getDbPath(repoRoot?: string): string;
+/**
+ * Check if solo mode is initialized for a repo
+ */
+export declare function isInitialized(repoRoot: string): boolean;
+/**
+ * Detect QA commands from project configuration
+ */
+export declare function detectQaCommands(repoRoot: string): DetectedQaCommand[];
+/**
+ * Initialize solo mode for a repository
+ */
+export declare function initSolo(repoRoot: string): Promise<{
+    config: SoloConfig;
+    detectedQa: DetectedQaCommand[];
+}>;
+/**
+ * Load solo config
+ */
+export declare function loadConfig(repoRoot: string): SoloConfig | null;
+/**
+ * Get or create database adapter
+ */
+export declare function getAdapter(repoRoot?: string): Promise<DatabaseAdapter>;
+/**
+ * Create scout dependencies
+ */
+export declare function createScoutDeps(db: DatabaseAdapter, opts?: {
+    verbose?: boolean;
+    quiet?: boolean;
+}): ScoutDeps;
+/**
+ * Format progress for display
+ */
+export declare function formatProgress(progress: ScoutProgress): string;
+/**
+ * Display a proposal summary
+ */
+export declare function displayProposal(proposal: TicketProposal, index: number): void;
+//# sourceMappingURL=solo-config.d.ts.map

package/dist/lib/solo-config.d.ts.map

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

package/dist/lib/solo-config.js

@@ -0,0 +1,236 @@
+/**
+ * Solo mode configuration
+ */
+import * as path from 'node:path';
+import * as fs from 'node:fs';
+import chalk from 'chalk';
+import { createSQLiteAdapter } from '@blockspool/sqlite';
+import { getDefaultDatabaseUrl } from '@blockspool/core/db';
+import { createGitService } from './git.js';
+import { createLogger } from './logger.js';
+/**
+ * Default retention configuration — conservative values.
+ */
+export const DEFAULT_RETENTION_CONFIG = {
+    maxRuns: 50,
+    maxHistoryEntries: 100,
+    maxArtifactsPerRun: 20,
+    maxSpoolArchives: 5,
+    maxDeferredProposals: 20,
+    maxCompletedTickets: 200,
+    maxSpindleFileEditKeys: 50,
+    maxMergedBranches: 10,
+};
+/**
+ * Default auto config - conservative "safe demo" settings
+ */
+export const DEFAULT_AUTO_CONFIG = {
+    allowCategories: ['refactor', 'test', 'docs', 'types', 'perf'],
+    blockCategories: ['security', 'deps', 'auth', 'config', 'migration'],
+    minConfidence: 70,
+    maxPrs: 3,
+    maxFilesPerTicket: 10,
+    maxLinesPerTicket: 300,
+    draftPrs: true,
+    defaultScope: 'src',
+    docsAudit: true,
+    docsAuditInterval: 3,
+    pullEveryNCycles: 5,
+    pullPolicy: 'halt',
+    guidelinesRefreshCycles: 10,
+    autoCreateGuidelines: true,
+    guidelinesPath: null,
+};
+/**
+ * Get the .blockspool directory path (repo-local or global)
+ */
+export function getBlockspoolDir(repoRoot) {
+    if (repoRoot) {
+        return path.join(repoRoot, '.blockspool');
+    }
+    const home = process.env.HOME || process.env.USERPROFILE || '.';
+    return path.join(home, '.blockspool');
+}
+/**
+ * Get database path
+ */
+export function getDbPath(repoRoot) {
+    const dir = getBlockspoolDir(repoRoot);
+    return path.join(dir, 'state.sqlite');
+}
+/**
+ * Check if solo mode is initialized for a repo
+ */
+export function isInitialized(repoRoot) {
+    const configPath = path.join(getBlockspoolDir(repoRoot), 'config.json');
+    return fs.existsSync(configPath);
+}
+/**
+ * Detect QA commands from project configuration
+ */
+export function detectQaCommands(repoRoot) {
+    const commands = [];
+    const packageJsonPath = path.join(repoRoot, 'package.json');
+    if (!fs.existsSync(packageJsonPath)) {
+        return commands;
+    }
+    try {
+        const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
+        const scripts = packageJson.scripts || {};
+        const qaPatterns = [
+            { pattern: 'typecheck', priority: 1, name: 'typecheck' },
+            { pattern: 'type-check', priority: 1, name: 'typecheck' },
+            { pattern: 'check:types', priority: 1, name: 'typecheck' },
+            { pattern: 'lint', priority: 2, name: 'lint' },
+            { pattern: /^lint:.*/, priority: 2, name: 'lint' },
+            { pattern: 'check', priority: 3, name: 'check' },
+            { pattern: 'test', priority: 4, name: 'test' },
+            { pattern: 'test:unit', priority: 4, name: 'test:unit' },
+            { pattern: 'build', priority: 5, name: 'build' },
+        ];
+        const added = new Set();
+        for (const { pattern, name } of qaPatterns) {
+            for (const [scriptName, _scriptCmd] of Object.entries(scripts)) {
+                const matches = typeof pattern === 'string'
+                    ? scriptName === pattern
+                    : pattern.test(scriptName);
+                if (matches && !added.has(scriptName)) {
+                    added.add(scriptName);
+                    commands.push({
+                        name: scriptName === name ? name : `${name} (${scriptName})`,
+                        cmd: `npm run ${scriptName}`,
+                        source: 'package.json',
+                    });
+                }
+            }
+        }
+        const order = ['typecheck', 'lint', 'check', 'test', 'build'];
+        commands.sort((a, b) => {
+            const aIdx = order.findIndex(o => a.name.startsWith(o));
+            const bIdx = order.findIndex(o => b.name.startsWith(o));
+            return (aIdx === -1 ? 99 : aIdx) - (bIdx === -1 ? 99 : bIdx);
+        });
+    }
+    catch {
+        // Ignore JSON parse errors
+    }
+    return commands;
+}
+/**
+ * Initialize solo mode for a repository
+ */
+export async function initSolo(repoRoot) {
+    const dir = getBlockspoolDir(repoRoot);
+    const configPath = path.join(dir, 'config.json');
+    const dbPath = getDbPath(repoRoot);
+    if (!fs.existsSync(dir)) {
+        fs.mkdirSync(dir, { recursive: true });
+    }
+    const detectedQa = detectQaCommands(repoRoot);
+    // Capture origin remote URL for safety validation
+    let allowedRemote;
+    try {
+        const { execSync } = await import('child_process');
+        allowedRemote = execSync('git remote get-url origin', { cwd: repoRoot, encoding: 'utf-8' }).trim();
+    }
+    catch {
+        // No remote configured yet — that's fine
+    }
+    const config = {
+        version: 1,
+        repoRoot,
+        createdAt: new Date().toISOString(),
+        dbPath,
+        ...(allowedRemote ? { allowedRemote } : {}),
+    };
+    if (detectedQa.length > 0) {
+        config.qa = {
+            commands: detectedQa.map(c => ({
+                name: c.name,
+                cmd: c.cmd,
+            })),
+        };
+    }
+    fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
+    const gitignorePath = path.join(repoRoot, '.gitignore');
+    if (fs.existsSync(gitignorePath)) {
+        const content = fs.readFileSync(gitignorePath, 'utf-8');
+        if (!content.includes('.blockspool')) {
+            fs.appendFileSync(gitignorePath, '\n# BlockSpool local state\n.blockspool/\n');
+        }
+    }
+    return { config, detectedQa };
+}
+/**
+ * Load solo config
+ */
+export function loadConfig(repoRoot) {
+    const configPath = path.join(getBlockspoolDir(repoRoot), 'config.json');
+    if (!fs.existsSync(configPath)) {
+        return null;
+    }
+    return JSON.parse(fs.readFileSync(configPath, 'utf-8'));
+}
+/**
+ * Get or create database adapter
+ */
+export async function getAdapter(repoRoot) {
+    const dbPath = repoRoot ? getDbPath(repoRoot) : getDefaultDatabaseUrl();
+    return createSQLiteAdapter({ url: dbPath });
+}
+/**
+ * Create scout dependencies
+ */
+export function createScoutDeps(db, opts = {}) {
+    return {
+        db,
+        git: createGitService(),
+        logger: createLogger(opts),
+    };
+}
+/**
+ * Format progress for display
+ */
+export function formatProgress(progress) {
+    switch (progress.phase) {
+        case 'init':
+            return chalk.gray(progress.message || 'Initializing...');
+        case 'scanning':
+            return chalk.gray(progress.message || 'Scanning files...');
+        case 'analyzing':
+            return chalk.gray(`Analyzing (${progress.filesScanned}/${progress.totalFiles} files, ` +
+                `${progress.proposalsFound} proposals)`);
+        case 'storing':
+            return chalk.gray(progress.message || 'Storing results...');
+        case 'complete':
+            return chalk.green(`Complete: ${progress.proposalsFound} proposals, ` +
+                `${progress.ticketsCreated} tickets created`);
+        default:
+            return '';
+    }
+}
+/**
+ * Display a proposal summary
+ */
+export function displayProposal(proposal, index) {
+    const categoryColors = {
+        refactor: chalk.cyan,
+        docs: chalk.yellow,
+        test: chalk.green,
+        perf: chalk.magenta,
+        security: chalk.red,
+    };
+    const color = categoryColors[proposal.category] || chalk.white;
+    console.log();
+    console.log(chalk.bold(`${index + 1}. ${proposal.title}`));
+    const impactStr = proposal.impact_score !== null ? ` | impact ${proposal.impact_score}/10` : '';
+    console.log(`   ${color(proposal.category)} | ` +
+        `${proposal.estimated_complexity} | ` +
+        `${proposal.confidence}% confidence${impactStr}`);
+    console.log(`   ${chalk.gray(proposal.description.slice(0, 100))}` +
+        `${proposal.description.length > 100 ? '...' : ''}`);
+    console.log(`   ${chalk.gray('Files:')} ` +
+        `${proposal.files.slice(0, 3).join(', ')}` +
+        `${proposal.files.length > 3 ? ` +${proposal.files.length - 3} more` : ''}`);
+}
+//# sourceMappingURL=solo-config.js.map

package/dist/lib/solo-config.js.map

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

package/dist/lib/solo-git.d.ts

@@ -0,0 +1,44 @@
+/**
+ * Solo mode git utilities
+ */
+export declare function withGitMutex<T>(fn: () => Promise<T>): Promise<T>;
+/**
+ * Async git command execution — does not block the event loop.
+ * Used instead of execSync to allow parallel ticket execution.
+ */
+export declare function gitExec(cmd: string, opts: {
+    cwd: string;
+    encoding?: 'utf-8';
+    maxBuffer?: number;
+    stdio?: 'ignore';
+}): Promise<string>;
+/**
+ * Clean up worktree safely
+ */
+export declare function cleanupWorktree(repoRoot: string, worktreePath: string): Promise<void>;
+/**
+ * Create a milestone branch and persistent worktree for batch merging.
+ * Returns the branch name and worktree path.
+ */
+export declare function createMilestoneBranch(repoRoot: string, baseBranch: string): Promise<{
+    milestoneBranch: string;
+    milestoneWorktreePath: string;
+}>;
+/**
+ * Merge a ticket branch into the milestone branch under git mutex.
+ * Returns success/conflict status.
+ */
+export declare function mergeTicketToMilestone(repoRoot: string, ticketBranch: string, milestoneWorktreePath: string): Promise<{
+    success: boolean;
+    conflicted: boolean;
+}>;
+/**
+ * Push milestone branch and create a squash-merge draft PR to the base branch.
+ * Returns the PR URL.
+ */
+export declare function pushAndPrMilestone(repoRoot: string, milestoneBranch: string, milestoneWorktreePath: string, milestoneNumber: number, ticketCount: number, summaries: string[]): Promise<string | undefined>;
+/**
+ * Clean up the milestone worktree (but not the branch, which may have a PR).
+ */
+export declare function cleanupMilestone(repoRoot: string): Promise<void>;
+//# sourceMappingURL=solo-git.d.ts.map

package/dist/lib/solo-git.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"solo-git.d.ts","sourceRoot":"","sources":["../../src/lib/solo-git.ts"],"names":[],"mappings":"AAAA;;GAEG;AAYH,wBAAgB,YAAY,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAKhE;AAED;;;GAGG;AACH,wBAAsB,OAAO,CAC3B,GAAG,EAAE,MAAM,EACX,IAAI,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,QAAQ,CAAA;CAAE,GAC9E,OAAO,CAAC,MAAM,CAAC,CAUjB;AAED;;GAEG;AACH,wBAAsB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,iBAQ3E;AAED;;;GAGG;AACH,wBAAsB,qBAAqB,CACzC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC;IAAE,eAAe,EAAE,MAAM,CAAC;IAAC,qBAAqB,EAAE,MAAM,CAAA;CAAE,CAAC,CAmCrE;AAED;;;GAGG;AACH,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,qBAAqB,EAAE,MAAM,GAC5B,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,OAAO,CAAA;CAAE,CAAC,CAqCpD;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE,MAAM,EACvB,qBAAqB,EAAE,MAAM,EAC7B,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EAAE,GAClB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAoC7B;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAGtE"}

package/dist/lib/solo-git.js

@@ -0,0 +1,174 @@
+/**
+ * Solo mode git utilities
+ */
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+/**
+ * Mutex for serializing git operations on the main repo.
+ * Git doesn't support concurrent index operations on the same repo,
+ * so worktree setup (fetch, branch, worktree add) must be serialized.
+ * Once worktrees are created, per-worktree git ops are safe in parallel.
+ */
+let gitMutexPromise = Promise.resolve();
+export function withGitMutex(fn) {
+    const prev = gitMutexPromise;
+    let resolve;
+    gitMutexPromise = new Promise((r) => { resolve = r; });
+    return prev.then(fn).finally(() => resolve());
+}
+/**
+ * Async git command execution — does not block the event loop.
+ * Used instead of execSync to allow parallel ticket execution.
+ */
+export async function gitExec(cmd, opts) {
+    const { exec } = await import('child_process');
+    const { promisify } = await import('util');
+    const execPromise = promisify(exec);
+    const result = await execPromise(cmd, {
+        cwd: opts.cwd,
+        encoding: opts.encoding || 'utf-8',
+        maxBuffer: opts.maxBuffer || 10 * 1024 * 1024,
+    });
+    return result.stdout;
+}
+/**
+ * Clean up worktree safely
+ */
+export async function cleanupWorktree(repoRoot, worktreePath) {
+    try {
+        if (fs.existsSync(worktreePath)) {
+            await gitExec(`git worktree remove --force "${worktreePath}"`, { cwd: repoRoot });
+        }
+    }
+    catch {
+        // Ignore cleanup errors
+    }
+}
+/**
+ * Create a milestone branch and persistent worktree for batch merging.
+ * Returns the branch name and worktree path.
+ */
+export async function createMilestoneBranch(repoRoot, baseBranch) {
+    const ts = Date.now().toString(36);
+    const milestoneBranch = `blockspool/milestone-${ts}`;
+    const milestoneWorktreePath = path.join(repoRoot, '.blockspool', 'worktrees', '_milestone');
+    await withGitMutex(async () => {
+        // Ensure worktrees dir exists
+        const worktreesDir = path.join(repoRoot, '.blockspool', 'worktrees');
+        if (!fs.existsSync(worktreesDir)) {
+            fs.mkdirSync(worktreesDir, { recursive: true });
+        }
+        // Clean up any existing milestone worktree
+        if (fs.existsSync(milestoneWorktreePath)) {
+            await gitExec(`git worktree remove --force "${milestoneWorktreePath}"`, { cwd: repoRoot });
+        }
+        // Fetch latest
+        try {
+            await gitExec(`git fetch origin ${baseBranch}`, { cwd: repoRoot });
+        }
+        catch {
+            // Continue with what we have
+        }
+        // Create milestone branch from origin/baseBranch
+        try {
+            await gitExec(`git branch "${milestoneBranch}" "origin/${baseBranch}"`, { cwd: repoRoot });
+        }
+        catch {
+            // Branch may already exist
+        }
+        await gitExec(`git worktree add "${milestoneWorktreePath}" "${milestoneBranch}"`, { cwd: repoRoot });
+    });
+    return { milestoneBranch, milestoneWorktreePath };
+}
+/**
+ * Merge a ticket branch into the milestone branch under git mutex.
+ * Returns success/conflict status.
+ */
+export async function mergeTicketToMilestone(repoRoot, ticketBranch, milestoneWorktreePath) {
+    return withGitMutex(async () => {
+        try {
+            await gitExec(`git merge --no-ff "${ticketBranch}" -m "Merge ${ticketBranch}"`, {
+                cwd: milestoneWorktreePath,
+            });
+            return { success: true, conflicted: false };
+        }
+        catch {
+            // Abort the failed merge
+            try {
+                await gitExec('git merge --abort', { cwd: milestoneWorktreePath });
+            }
+            catch {
+                // Ignore abort errors
+            }
+            // Retry: rebase ticket branch onto milestone, then merge
+            try {
+                const milestoneBranchName = (await gitExec('git rev-parse --abbrev-ref HEAD', {
+                    cwd: milestoneWorktreePath,
+                })).trim();
+                // Rebase the ticket branch onto the current milestone tip
+                await gitExec(`git rebase "${milestoneBranchName}" "${ticketBranch}"`, {
+                    cwd: repoRoot,
+                });
+                // Try merge again
+                await gitExec(`git merge --no-ff "${ticketBranch}" -m "Merge ${ticketBranch}"`, {
+                    cwd: milestoneWorktreePath,
+                });
+                return { success: true, conflicted: false };
+            }
+            catch {
+                // Abort any in-progress rebase or merge
+                try {
+                    await gitExec('git rebase --abort', { cwd: repoRoot });
+                }
+                catch { /* ignore */ }
+                try {
+                    await gitExec('git merge --abort', { cwd: milestoneWorktreePath });
+                }
+                catch { /* ignore */ }
+                return { success: false, conflicted: true };
+            }
+        }
+    });
+}
+/**
+ * Push milestone branch and create a squash-merge draft PR to the base branch.
+ * Returns the PR URL.
+ */
+export async function pushAndPrMilestone(repoRoot, milestoneBranch, milestoneWorktreePath, milestoneNumber, ticketCount, summaries) {
+    // Push safety: validate origin matches allowed remote
+    const { assertPushSafe } = await import('./solo-remote.js');
+    const { loadConfig } = await import('./solo-config.js');
+    const config = loadConfig(repoRoot);
+    await assertPushSafe(milestoneWorktreePath, config?.allowedRemote);
+    // Push the milestone branch
+    await gitExec(`git push -u origin "${milestoneBranch}"`, { cwd: milestoneWorktreePath });
+    // Build PR body
+    const bulletList = summaries.map(s => `- ${s}`).join('\n');
+    const title = `Milestone #${milestoneNumber}: ${ticketCount} improvements`;
+    const body = `## Milestone #${milestoneNumber}\n\n${ticketCount} tickets merged:\n\n${bulletList}\n\n---\n_Created by BlockSpool (milestone mode)_`;
+    try {
+        const prOutput = (await gitExec(`gh pr create --title "${title.replace(/"/g, '\\"')}" --body "${body.replace(/"/g, '\\"')}" --head "${milestoneBranch}" --draft`, { cwd: milestoneWorktreePath })).trim();
+        const urlMatch = prOutput.match(/https:\/\/github\.com\/[^\s]+/);
+        return urlMatch ? urlMatch[0] : undefined;
+    }
+    catch {
+        // PR might already exist for this branch — try to find it
+        try {
+            const existing = (await gitExec(`gh pr view "${milestoneBranch}" --json url --jq .url`, { cwd: milestoneWorktreePath })).trim();
+            if (existing.startsWith('https://'))
+                return existing;
+        }
+        catch {
+            // ignore
+        }
+        return undefined;
+    }
+}
+/**
+ * Clean up the milestone worktree (but not the branch, which may have a PR).
+ */
+export async function cleanupMilestone(repoRoot) {
+    const milestoneWorktreePath = path.join(repoRoot, '.blockspool', 'worktrees', '_milestone');
+    await cleanupWorktree(repoRoot, milestoneWorktreePath);
+}
+//# sourceMappingURL=solo-git.js.map

package/dist/lib/solo-git.js.map

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