@slope-dev/slope 1.17.0 → 1.20.0

package/dist/cli/loop/guard-runner.js

@@ -1,12 +1,83 @@
 import { execSync, execFileSync } from 'node:child_process';
 const SHA_PATTERN = /^[0-9a-f]{40}$/;
+/**
+ * Check if the diff since preSha is within the ticket's module scope.
+ * A file is in scope if it matches a module path, is under a module directory,
+ * or is a test file for an in-scope module.
+ */
+export function isDiffInScope(preSha, modules, cwd) {
+    if (modules.length === 0)
+        return { inScope: true, outOfScopeFiles: [] };
+    let changedFiles;
+    try {
+        const output = execFileSync('git', ['diff', '--name-only', preSha, 'HEAD'], {
+            cwd,
+            encoding: 'utf8',
+        });
+        changedFiles = output.split('\n').map(f => f.trim()).filter(Boolean);
+    }
+    catch {
+        // If diff fails, assume in scope (don't block on errors)
+        return { inScope: true, outOfScopeFiles: [] };
+    }
+    if (changedFiles.length === 0)
+        return { inScope: true, outOfScopeFiles: [] };
+    const outOfScopeFiles = [];
+    for (const file of changedFiles) {
+        const fileInScope = modules.some(mod => {
+            // Direct path match
+            if (file === mod)
+                return true;
+            // File is under a module directory
+            if (file.startsWith(mod.endsWith('/') ? mod : mod + '/'))
+                return true;
+            // Test file for an in-scope module: test path mirrors src path
+            // e.g., "tests/cli/loop/planner.test.ts" is in scope for "src/cli/loop/planner.ts"
+            if (file.includes('.test.')) {
+                const srcEquiv = file
+                    .replace(/^tests\//, 'src/')
+                    .replace(/\.test\.(ts|js)$/, '.$1');
+                if (srcEquiv === mod)
+                    return true;
+                if (srcEquiv.startsWith(mod + '/'))
+                    return true;
+                // Also check if the test is under a module directory in tests/
+                const testDir = mod.replace(/^src\//, 'tests/');
+                if (file.startsWith(testDir + '/') || file.startsWith(testDir))
+                    return true;
+            }
+            return false;
+        });
+        if (!fileInScope) {
+            outOfScopeFiles.push(file);
+        }
+    }
+    // Threshold: more than half of files must be out of scope to flag (warn-only)
+    const SCOPE_THRESHOLD = 0.5;
+    const inScope = outOfScopeFiles.length / changedFiles.length <= SCOPE_THRESHOLD;
+    return { inScope, outOfScopeFiles };
+}
 /**
  * Run post-ticket guards: typecheck + tests.
  * If either fails, auto-revert to preSha.
  *
  * @returns Guard result with pass/fail status
  */
-export function runGuards(preSha, config, cwd, log) {
+export function runGuards(preSha, config, cwd, log, ticket) {
+    // Guard 0a: Diff scope — warn if changes are outside ticket modules
+    if (ticket && ticket.modules.length > 0) {
+        const scopeResult = isDiffInScope(preSha, ticket.modules, cwd);
+        if (!scopeResult.inScope) {
+            log.warn(`Diff scope warning: ${scopeResult.outOfScopeFiles.length} file(s) outside ticket modules: ${scopeResult.outOfScopeFiles.join(', ')}`);
+            // Warn only — do NOT return failure
+        }
+    }
+    // Guard 0b: Substantiveness — detect stub/whitespace-only changes
+    if (!isSubstantive(preSha, cwd)) {
+        log.warn('Changes are not substantive (comments/whitespace only) — reverting');
+        revert(preSha, cwd);
+        return { passed: false, failedGuard: 'substantiveness' };
+    }
     // Guard 1: Typecheck
     try {
         execSync('pnpm typecheck', { cwd, stdio: 'pipe', timeout: 120_000 });
@@ -39,6 +110,42 @@ function revert(sha, cwd) {
     }
     catch { /* ok */ }
 }
+/**
+ * Check if changes since preSha are substantive (not just comments/whitespace).
+ * Uses `git diff --stat` to count insertions/deletions, then checks
+ * if the non-comment/non-whitespace diff is meaningful.
+ */
+export function isSubstantive(preSha, cwd) {
+    try {
+        // Get the actual code diff (ignore whitespace changes)
+        const diff = execFileSync('git', ['diff', '-w', '--no-color', preSha, 'HEAD'], {
+            cwd,
+            encoding: 'utf8',
+            maxBuffer: 1024 * 1024,
+        });
+        // Extract only added/removed lines (not diff headers)
+        const changedLines = diff.split('\n').filter(line => (line.startsWith('+') || line.startsWith('-')) &&
+            !line.startsWith('+++') && !line.startsWith('---'));
+        // Filter out comment-only and empty lines
+        const substantiveLines = changedLines.filter(line => {
+            const content = line.slice(1).trim(); // Remove +/- prefix
+            if (content === '')
+                return false;
+            // Skip pure comment lines
+            if (content.startsWith('//') || content.startsWith('/*') || content.startsWith('*') || content.startsWith('#'))
+                return false;
+            // Skip JSDoc-only lines
+            if (content.startsWith('/**') || content === '*/')
+                return false;
+            return true;
+        });
+        return substantiveLines.length >= 3;
+    }
+    catch {
+        // If diff fails, assume substantive (don't block on errors)
+        return true;
+    }
+}
 /** Count commits that would be reverted */
 function countRevertable(preSha, cwd) {
     try {

package/dist/cli/loop/guard-runner.js.map

@@ -1 +1 @@
-{"version":3,"file":"guard-runner.js","sourceRoot":"","sources":["../../../src/cli/loop/guard-runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAS5D,MAAM,WAAW,GAAG,gBAAgB,CAAC;AAErC;;;;;GAKG;AACH,MAAM,UAAU,SAAS,CACvB,MAAc,EACd,MAAkB,EAClB,GAAW,EACX,GAAW;IAEX,qBAAqB;IACrB,IAAI,CAAC;QACH,QAAQ,CAAC,gBAAgB,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;IACvE,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,WAAW,GAAG,eAAe,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACjD,GAAG,CAAC,KAAK,CAAC,yCAAyC,WAAW,YAAY,CAAC,CAAC;QAC5E,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACpB,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC;IACrD,CAAC;IAED,wCAAwC;IACxC,IAAI,CAAC;QACH,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;IACzE,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,WAAW,GAAG,eAAe,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACjD,GAAG,CAAC,KAAK,CAAC,qCAAqC,WAAW,YAAY,CAAC,CAAC;QACxE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACpB,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC;IACjD,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;AAC1B,CAAC;AAED,iDAAiD;AACjD,SAAS,MAAM,CAAC,GAAW,EAAE,GAAW;IACtC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,gBAAgB,GAAG,EAAE,CAAC,CAAC;IACnE,YAAY,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IACtE,IAAI,CAAC;QACH,YAAY,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IAChE,CAAC;IAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC;AACtB,CAAC;AAED,2CAA2C;AAC3C,SAAS,eAAe,CAAC,MAAc,EAAE,GAAW;IAClD,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC1F,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,MAAM,KAAK,IAAI,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACnH,OAAO,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,CAAC;IACX,CAAC;AACH,CAAC"}
+{"version":3,"file":"guard-runner.js","sourceRoot":"","sources":["../../../src/cli/loop/guard-runner.ts"],"names":[],"mappings":"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"}

package/dist/cli/loop/model-selector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-selector.d.ts","sourceRoot":"","sources":["../../../src/cli/loop/model-selector.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,UAAU,EAAe,aAAa,EAAE,MAAM,YAAY,CAAC;AAE/E;;;;;;;GAOG;AACH,wBAAgB,WAAW,CACzB,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,UAAU,EAClB,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,aAAa,CAAC,UAAU,CAAC,GACnC,MAAM,CA8BR;AAED,iDAAiD;AACjD,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,MAAM,CAEvE;AAED,+DAA+D;AAC/D,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAEnD"}
+{"version":3,"file":"model-selector.d.ts","sourceRoot":"","sources":["../../../src/cli/loop/model-selector.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,UAAU,EAAe,aAAa,EAAE,MAAM,YAAY,CAAC;AAE/E;;;;;;;GAOG;AACH,wBAAgB,WAAW,CACzB,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,UAAU,EAClB,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,aAAa,CAAC,UAAU,CAAC,GACnC,MAAM,CA+BR;AAED,iDAAiD;AACjD,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,MAAM,CAEvE;AAED,+DAA+D;AAC/D,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAEnD"}

package/dist/cli/loop/model-selector.js

@@ -15,8 +15,9 @@ export function selectModel(club, maxFiles, estTokens, config, cwd, strategy) {
     // 2. Multi-file routing: 2+ files → API
     if (maxFiles >= 2)
         return config.modelApi;
-    // 3. Strategy-based: documentation tickets need API model
-    if (strategy === 'documentation')
+    // 3. Strategy-based: documentation and roadmap tickets need API model
+    //    (local models struggle with prose; roadmap tickets are curated features)
+    if (strategy === 'documentation' || strategy === 'roadmap')
         return config.modelApi;
     // 4. Data-driven overrides from model-config.json
     const modelConfig = loadModelConfig(cwd);

package/dist/cli/loop/model-selector.js.map

@@ -1 +1 @@
-{"version":3,"file":"model-selector.js","sourceRoot":"","sources":["../../../src/cli/loop/model-selector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC;;;;;;;GAOG;AACH,MAAM,UAAU,WAAW,CACzB,IAAU,EACV,QAAgB,EAChB,SAAiB,EACjB,MAAkB,EAClB,GAAW,EACX,QAAoC;IAEpC,2DAA2D;IAC3D,IAAI,SAAS,GAAG,KAAK;QAAE,OAAO,MAAM,CAAC,QAAQ,CAAC;IAE9C,wCAAwC;IACxC,IAAI,QAAQ,IAAI,CAAC;QAAE,OAAO,MAAM,CAAC,QAAQ,CAAC;IAE1C,0DAA0D;IAC1D,IAAI,QAAQ,KAAK,eAAe;QAAE,OAAO,MAAM,CAAC,QAAQ,CAAC;IAEzD,kDAAkD;IAClD,MAAM,WAAW,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;IACzC,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,GAAG,GAAG,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAC9C,IAAI,GAAG,EAAE,KAAK,KAAK,KAAK;YAAE,OAAO,MAAM,CAAC,QAAQ,CAAC;QACjD,IAAI,GAAG,EAAE,KAAK,KAAK,OAAO;YAAE,OAAO,MAAM,CAAC,UAAU,CAAC;IACvD,CAAC;IAED,mBAAmB;IACnB,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,QAAQ,CAAC;QACd,KAAK,OAAO,CAAC;QACb,KAAK,YAAY;YACf,OAAO,MAAM,CAAC,UAAU,CAAC;QAC3B,KAAK,WAAW,CAAC;QACjB,KAAK,QAAQ;YACX,OAAO,MAAM,CAAC,QAAQ,CAAC;QACzB;YACE,OAAO,MAAM,CAAC,UAAU,CAAC;IAC7B,CAAC;AACH,CAAC;AAED,iDAAiD;AACjD,MAAM,UAAU,aAAa,CAAC,KAAa,EAAE,MAAkB;IAC7D,OAAO,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC;AACjF,CAAC;AAED,+DAA+D;AAC/D,MAAM,UAAU,YAAY,CAAC,KAAa;IACxC,OAAO,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAClC,CAAC;AAED,0CAA0C;AAC1C,SAAS,eAAe,CAAC,GAAW;IAClC,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,8BAA8B,CAAC,CAAC;IAC7D,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;QAAE,OAAO,IAAI,CAAC;IACzC,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAgB,CAAC;IACrE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}
+{"version":3,"file":"model-selector.js","sourceRoot":"","sources":["../../../src/cli/loop/model-selector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC;;;;;;;GAOG;AACH,MAAM,UAAU,WAAW,CACzB,IAAU,EACV,QAAgB,EAChB,SAAiB,EACjB,MAAkB,EAClB,GAAW,EACX,QAAoC;IAEpC,2DAA2D;IAC3D,IAAI,SAAS,GAAG,KAAK;QAAE,OAAO,MAAM,CAAC,QAAQ,CAAC;IAE9C,wCAAwC;IACxC,IAAI,QAAQ,IAAI,CAAC;QAAE,OAAO,MAAM,CAAC,QAAQ,CAAC;IAE1C,sEAAsE;IACtE,8EAA8E;IAC9E,IAAI,QAAQ,KAAK,eAAe,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,MAAM,CAAC,QAAQ,CAAC;IAEnF,kDAAkD;IAClD,MAAM,WAAW,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;IACzC,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,GAAG,GAAG,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAC9C,IAAI,GAAG,EAAE,KAAK,KAAK,KAAK;YAAE,OAAO,MAAM,CAAC,QAAQ,CAAC;QACjD,IAAI,GAAG,EAAE,KAAK,KAAK,OAAO;YAAE,OAAO,MAAM,CAAC,UAAU,CAAC;IACvD,CAAC;IAED,mBAAmB;IACnB,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,QAAQ,CAAC;QACd,KAAK,OAAO,CAAC;QACb,KAAK,YAAY;YACf,OAAO,MAAM,CAAC,UAAU,CAAC;QAC3B,KAAK,WAAW,CAAC;QACjB,KAAK,QAAQ;YACX,OAAO,MAAM,CAAC,QAAQ,CAAC;QACzB;YACE,OAAO,MAAM,CAAC,UAAU,CAAC;IAC7B,CAAC;AACH,CAAC;AAED,iDAAiD;AACjD,MAAM,UAAU,aAAa,CAAC,KAAa,EAAE,MAAkB;IAC7D,OAAO,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC;AACjF,CAAC;AAED,+DAA+D;AAC/D,MAAM,UAAU,YAAY,CAAC,KAAa;IACxC,OAAO,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAClC,CAAC;AAED,0CAA0C;AAC1C,SAAS,eAAe,CAAC,GAAW;IAClC,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,8BAA8B,CAAC,CAAC;IAC7D,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;QAAE,OAAO,IAAI,CAAC;IACzC,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAgB,CAAC;IACrE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}

package/dist/cli/loop/planner.d.ts

@@ -0,0 +1,21 @@
+import type { BacklogTicket, ExecutionPlan, PlanFileEntry } from './types.js';
+import type { Logger } from './logger.js';
+/**
+ * Extract top keywords from text for grep discovery.
+ */
+export declare function extractKeywords(text: string, max?: number): string[];
+/**
+ * Tier 1.5: Use ticket.modules for scoped file discovery.
+ * Includes module files themselves (if they exist on disk) plus grep within module paths.
+ */
+export declare function tier15Modules(ticket: BacklogTicket, cwd: string): PlanFileEntry[] | null;
+/**
+ * Generate a concrete execution plan for a ticket using 4-tier file discovery.
+ * No embeddings required.
+ */
+export declare function generatePlan(ticket: BacklogTicket, model: string, cwd: string, log: Logger): ExecutionPlan;
+/**
+ * Format an ExecutionPlan as a structured Aider --message prompt.
+ */
+export declare function formatPlanAsPrompt(plan: ExecutionPlan, ticket: BacklogTicket): string;
+//# sourceMappingURL=planner.d.ts.map

package/dist/cli/loop/planner.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"planner.d.ts","sourceRoot":"","sources":["../../../src/cli/loop/planner.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC9E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAY1C;;GAEG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,SAAI,GAAG,MAAM,EAAE,CAgB/D;AA8CD;;;GAGG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,aAAa,EAAE,GAAG,IAAI,CAoDxF;AA8ED;;;GAGG;AACH,wBAAgB,YAAY,CAC1B,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,GACV,aAAa,CAqDf;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,aAAa,GAAG,MAAM,CA2CrF"}

package/dist/cli/loop/planner.js

@@ -0,0 +1,298 @@
+// Planner — generates concrete execution plans for Aider without embeddings.
+// 4-tier file discovery: enriched → modules → grep → generic.
+import { execFileSync } from 'node:child_process';
+import { existsSync, readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { collectTestFiles } from '../../core/prep.js';
+import { isLocalModel } from './model-selector.js';
+// Stop words for keyword extraction
+const STOP_WORDS = new Set([
+    'the', 'a', 'an', 'and', 'or', 'but', 'in', 'on', 'at', 'to', 'for',
+    'of', 'with', 'by', 'from', 'is', 'are', 'was', 'were', 'be', 'been',
+    'has', 'have', 'had', 'do', 'does', 'did', 'will', 'would', 'could',
+    'should', 'may', 'might', 'can', 'this', 'that', 'these', 'those',
+    'it', 'its', 'as', 'if', 'not', 'no', 'so', 'up', 'out', 'all',
+    'add', 'update', 'fix', 'remove', 'change', 'make', 'use', 'new',
+]);
+/**
+ * Extract top keywords from text for grep discovery.
+ */
+export function extractKeywords(text, max = 3) {
+    const words = text.toLowerCase()
+        .replace(/[^a-z0-9\s_-]/g, ' ')
+        .split(/\s+/)
+        .filter(w => w.length > 2 && !STOP_WORDS.has(w));
+    // Count frequency
+    const freq = new Map();
+    for (const w of words) {
+        freq.set(w, (freq.get(w) ?? 0) + 1);
+    }
+    return [...freq.entries()]
+        .sort((a, b) => b[1] - a[1])
+        .slice(0, max)
+        .map(([w]) => w);
+}
+/**
+ * Read the first N lines of a file and match against acceptance criteria
+ * to produce a specific action description.
+ */
+function inferAction(filePath, ticket, cwd) {
+    const fullPath = join(cwd, filePath);
+    let header = '';
+    try {
+        const content = readFileSync(fullPath, 'utf8');
+        header = content.split('\n').slice(0, 50).join('\n');
+    }
+    catch {
+        return { action: 'Modify as described in ticket', reason: ticket.acceptance_criteria[0] ?? ticket.title };
+    }
+    // Try to match acceptance criteria keywords against file content
+    for (const ac of ticket.acceptance_criteria) {
+        const acWords = ac.toLowerCase().split(/\s+/).filter(w => w.length > 3);
+        for (const word of acWords) {
+            if (header.toLowerCase().includes(word)) {
+                return { action: `Modify to satisfy: ${ac}`, reason: ac };
+            }
+        }
+    }
+    // Fallback: use ticket description keywords
+    return { action: `Update per ticket requirements`, reason: ticket.acceptance_criteria[0] ?? ticket.title };
+}
+/**
+ * Tier 1: Use enriched primary files from the ticket.
+ */
+function tier1Enriched(ticket, cwd) {
+    if (!ticket.files?.primary || ticket.files.primary.length === 0)
+        return null;
+    const entries = [];
+    for (const f of ticket.files.primary) {
+        if (!f || !existsSync(join(cwd, f)))
+            continue;
+        const { action, reason } = inferAction(f, ticket, cwd);
+        entries.push({ path: f, action, reason });
+    }
+    return entries.length > 0 ? entries : null;
+}
+/**
+ * Tier 1.5: Use ticket.modules for scoped file discovery.
+ * Includes module files themselves (if they exist on disk) plus grep within module paths.
+ */
+export function tier15Modules(ticket, cwd) {
+    if (!ticket.modules || ticket.modules.length === 0)
+        return null;
+    const matchedFiles = new Set();
+    for (const mod of ticket.modules) {
+        const fullPath = join(cwd, mod);
+        // Include the module file itself if it exists
+        if (existsSync(fullPath) && !mod.endsWith('/')) {
+            matchedFiles.add(mod);
+        }
+        // Grep keywords within the module path (file's parent dir or directory itself)
+        const keywords = extractKeywords(`${ticket.title} ${ticket.description}`);
+        // Use relative path for grep so output is relative to cwd
+        const relSearchDir = existsSync(fullPath) && !mod.endsWith('/')
+            ? join(mod, '..') // parent dir of file (relative)
+            : mod; // directory itself (relative)
+        if (!existsSync(join(cwd, relSearchDir)))
+            continue;
+        for (const keyword of keywords) {
+            if (matchedFiles.size >= 5)
+                break;
+            try {
+                const output = execFileSync('grep', [
+                    '-rl', '--include=*.ts', '--include=*.js',
+                    keyword,
+                    relSearchDir,
+                ], { cwd, encoding: 'utf8', timeout: 5000 });
+                for (const line of output.split('\n')) {
+                    const trimmed = line.trim();
+                    if (!trimmed || trimmed.includes('.test.') || trimmed.includes('node_modules'))
+                        continue;
+                    matchedFiles.add(trimmed);
+                    if (matchedFiles.size >= 5)
+                        break;
+                }
+            }
+            catch {
+                // grep returns exit code 1 when no matches — not an error
+            }
+        }
+    }
+    if (matchedFiles.size === 0)
+        return null;
+    const entries = [];
+    for (const f of matchedFiles) {
+        const { action, reason } = inferAction(f, ticket, cwd);
+        entries.push({ path: f, action, reason });
+    }
+    return entries;
+}
+/**
+ * Tier 2: Grep for keywords from ticket title/description.
+ */
+function tier2Grep(ticket, cwd) {
+    const keywords = extractKeywords(`${ticket.title} ${ticket.description}`);
+    if (keywords.length === 0)
+        return null;
+    const matchedFiles = new Set();
+    for (const keyword of keywords) {
+        if (matchedFiles.size >= 5)
+            break;
+        try {
+            const output = execFileSync('grep', [
+                '-rl', '--include=*.ts', '--include=*.js',
+                keyword,
+                'src/', 'packages/',
+            ], { cwd, encoding: 'utf8', timeout: 5000 });
+            for (const line of output.split('\n')) {
+                const trimmed = line.trim();
+                if (trimmed && !trimmed.includes('.test.') && !trimmed.includes('node_modules')) {
+                    matchedFiles.add(trimmed);
+                }
+                if (matchedFiles.size >= 5)
+                    break;
+            }
+        }
+        catch {
+            // grep returns exit code 1 when no matches — not an error
+        }
+    }
+    if (matchedFiles.size === 0)
+        return null;
+    const entries = [];
+    for (const f of matchedFiles) {
+        const { action, reason } = inferAction(f, ticket, cwd);
+        entries.push({ path: f, action, reason });
+    }
+    return entries;
+}
+/**
+ * Tier 3: Generic fallback using modules or description.
+ */
+function tier3Generic(ticket) {
+    if (ticket.modules.length > 0) {
+        return ticket.modules.slice(0, 5).map(m => ({
+            path: m,
+            action: 'Identify and modify relevant files in this module',
+            reason: ticket.acceptance_criteria[0] ?? ticket.title,
+        }));
+    }
+    return [{
+            path: '(read description to identify target files)',
+            action: ticket.title,
+            reason: ticket.acceptance_criteria[0] ?? ticket.title,
+        }];
+}
+/**
+ * Build model-specific approach text.
+ */
+function buildApproach(model) {
+    if (isLocalModel(model)) {
+        return `## Approach (local model — keep it simple)
+- Focus on ONE file at a time
+- Make the smallest possible change that satisfies the criteria
+- Prefer editing existing code over adding new files`;
+    }
+    return `## Approach (plan then execute)
+1. List the specific changes needed per file
+2. For each file: read it, make the change, verify
+3. Run verification commands after all changes`;
+}
+/**
+ * Generate a concrete execution plan for a ticket using 4-tier file discovery.
+ * No embeddings required.
+ */
+export function generatePlan(ticket, model, cwd, log) {
+    // Tier 1: enriched files
+    const enriched = tier1Enriched(ticket, cwd);
+    if (enriched) {
+        log.info(`Plan tier: enriched (${enriched.length} files)`);
+        return {
+            ticket: ticket.key,
+            title: ticket.title,
+            files: enriched,
+            testFiles: collectTestFiles(enriched.map(e => e.path), cwd),
+            approach: buildApproach(model),
+            generated: 'enriched',
+        };
+    }
+    // Tier 1.5: module-scoped discovery
+    const modules = tier15Modules(ticket, cwd);
+    if (modules) {
+        log.info(`Plan tier: modules (${modules.length} files)`);
+        return {
+            ticket: ticket.key,
+            title: ticket.title,
+            files: modules,
+            testFiles: collectTestFiles(modules.map(e => e.path), cwd),
+            approach: buildApproach(model),
+            generated: 'modules',
+        };
+    }
+    // Tier 2: grep discovery
+    const grepped = tier2Grep(ticket, cwd);
+    if (grepped) {
+        log.info(`Plan tier: grep (${grepped.length} files)`);
+        return {
+            ticket: ticket.key,
+            title: ticket.title,
+            files: grepped,
+            testFiles: collectTestFiles(grepped.map(e => e.path), cwd),
+            approach: buildApproach(model),
+            generated: 'grep',
+        };
+    }
+    // Tier 3: generic
+    log.info('Plan tier: generic');
+    return {
+        ticket: ticket.key,
+        title: ticket.title,
+        files: tier3Generic(ticket),
+        testFiles: [],
+        approach: buildApproach(model),
+        generated: 'generic',
+    };
+}
+/**
+ * Format an ExecutionPlan as a structured Aider --message prompt.
+ */
+export function formatPlanAsPrompt(plan, ticket) {
+    const fileSection = plan.files.map(f => `### ${f.path}\n**Action:** ${f.action}\n**Reason:** ${f.reason}`).join('\n\n');
+    const testSection = plan.testFiles.length > 0
+        ? plan.testFiles.map(t => `- ${t}`).join('\n')
+        : '- (run full test suite)';
+    const acSection = ticket.acceptance_criteria
+        .map(ac => `  [ ] ${ac}`)
+        .join('\n');
+    return `You are working on the SLOPE project (TypeScript monorepo, pnpm, vitest).
+
+## Task
+${ticket.key}: ${ticket.title}
+
+## Description
+${ticket.description}
+
+## Execution Plan
+For each file below, make the specified change:
+
+${fileSection}
+
+## Test Files to Verify
+${testSection}
+
+## Acceptance Criteria (ALL must pass)
+${acSection}
+
+## Verification
+  1. pnpm typecheck
+  2. pnpm test
+
+## Rules
+- Read each file BEFORE modifying — understand existing patterns
+- Make real, substantive changes — no comment-only or whitespace edits
+- If a file already satisfies criteria, skip it
+- Commit: '${ticket.key}: <what you changed>'
+
+${plan.approach}`;
+}
+//# sourceMappingURL=planner.js.map

package/dist/cli/loop/planner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"planner.js","sourceRoot":"","sources":["../../../src/cli/loop/planner.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,8DAA8D;AAE9D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAInD,oCAAoC;AACpC,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC;IACzB,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK;IACnE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IACpE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;IACnE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;IACjE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK;IAC9D,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK;CACjE,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,IAAY,EAAE,GAAG,GAAG,CAAC;IACnD,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE;SAC7B,OAAO,CAAC,gBAAgB,EAAE,GAAG,CAAC;SAC9B,KAAK,CAAC,KAAK,CAAC;SACZ,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAEnD,kBAAkB;IAClB,MAAM,IAAI,GAAG,IAAI,GAAG,EAAkB,CAAC;IACvC,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;QACtB,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACtC,CAAC;IAED,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;SACvB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;SAC3B,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;SACb,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;AACrB,CAAC;AAED;;;GAGG;AACH,SAAS,WAAW,CAAC,QAAgB,EAAE,MAAqB,EAAE,GAAW;IACvE,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACrC,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC/C,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,MAAM,EAAE,+BAA+B,EAAE,MAAM,EAAE,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;IAC5G,CAAC;IAED,iEAAiE;IACjE,KAAK,MAAM,EAAE,IAAI,MAAM,CAAC,mBAAmB,EAAE,CAAC;QAC5C,MAAM,OAAO,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACxE,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;YAC3B,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBACxC,OAAO,EAAE,MAAM,EAAE,sBAAsB,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;YAC5D,CAAC;QACH,CAAC;IACH,CAAC;IAED,4CAA4C;IAC5C,OAAO,EAAE,MAAM,EAAE,gCAAgC,EAAE,MAAM,EAAE,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;AAC7G,CAAC;AAED;;GAEG;AACH,SAAS,aAAa,CAAC,MAAqB,EAAE,GAAW;IACvD,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAE7E,MAAM,OAAO,GAAoB,EAAE,CAAC;IACpC,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;QACrC,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;YAAE,SAAS;QAC9C,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QACvD,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;AAC7C,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,aAAa,CAAC,MAAqB,EAAE,GAAW;IAC9D,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAEhE,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;IAEvC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAEhC,8CAA8C;QAC9C,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/C,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACxB,CAAC;QAED,+EAA+E;QAC/E,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;QAC1E,0DAA0D;QAC1D,MAAM,YAAY,GAAG,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC;YAC7D,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAG,gCAAgC;YACpD,CAAC,CAAC,GAAG,CAAC,CAAc,8BAA8B;QAEpD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;YAAE,SAAS;QAEnD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,IAAI,YAAY,CAAC,IAAI,IAAI,CAAC;gBAAE,MAAM;YAClC,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,EAAE;oBAClC,KAAK,EAAE,gBAAgB,EAAE,gBAAgB;oBACzC,OAAO;oBACP,YAAY;iBACb,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;gBAE7C,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;oBACtC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;oBAC5B,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;wBAAE,SAAS;oBACzF,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;oBAC1B,IAAI,YAAY,CAAC,IAAI,IAAI,CAAC;wBAAE,MAAM;gBACpC,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,0DAA0D;YAC5D,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,YAAY,CAAC,IAAI,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAEzC,MAAM,OAAO,GAAoB,EAAE,CAAC;IACpC,KAAK,MAAM,CAAC,IAAI,YAAY,EAAE,CAAC;QAC7B,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QACvD,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;GAEG;AACH,SAAS,SAAS,CAAC,MAAqB,EAAE,GAAW;IACnD,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;IAC1E,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAEvC,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;IAEvC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,IAAI,YAAY,CAAC,IAAI,IAAI,CAAC;YAAE,MAAM;QAClC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,EAAE;gBAClC,KAAK,EAAE,gBAAgB,EAAE,gBAAgB;gBACzC,OAAO;gBACP,MAAM,EAAE,WAAW;aACpB,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YAE7C,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;gBACtC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;gBAC5B,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;oBAChF,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAC5B,CAAC;gBACD,IAAI,YAAY,CAAC,IAAI,IAAI,CAAC;oBAAE,MAAM;YACpC,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,0DAA0D;QAC5D,CAAC;IACH,CAAC;IAED,IAAI,YAAY,CAAC,IAAI,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAEzC,MAAM,OAAO,GAAoB,EAAE,CAAC;IACpC,KAAK,MAAM,CAAC,IAAI,YAAY,EAAE,CAAC;QAC7B,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QACvD,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;GAEG;AACH,SAAS,YAAY,CAAC,MAAqB;IACzC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC1C,IAAI,EAAE,CAAC;YACP,MAAM,EAAE,mDAAmD;YAC3D,MAAM,EAAE,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,KAAK;SACtD,CAAC,CAAC,CAAC;IACN,CAAC;IAED,OAAO,CAAC;YACN,IAAI,EAAE,6CAA6C;YACnD,MAAM,EAAE,MAAM,CAAC,KAAK;YACpB,MAAM,EAAE,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,KAAK;SACtD,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,SAAS,aAAa,CAAC,KAAa;IAClC,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO;;;qDAG0C,CAAC;IACpD,CAAC;IACD,OAAO;;;+CAGsC,CAAC;AAChD,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,YAAY,CAC1B,MAAqB,EACrB,KAAa,EACb,GAAW,EACX,GAAW;IAEX,yBAAyB;IACzB,MAAM,QAAQ,GAAG,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5C,IAAI,QAAQ,EAAE,CAAC;QACb,GAAG,CAAC,IAAI,CAAC,wBAAwB,QAAQ,CAAC,MAAM,SAAS,CAAC,CAAC;QAC3D,OAAO;YACL,MAAM,EAAE,MAAM,CAAC,GAAG;YAClB,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,KAAK,EAAE,QAAQ;YACf,SAAS,EAAE,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC;YAC3D,QAAQ,EAAE,aAAa,CAAC,KAAK,CAAC;YAC9B,SAAS,EAAE,UAAU;SACtB,CAAC;IACJ,CAAC;IAED,oCAAoC;IACpC,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3C,IAAI,OAAO,EAAE,CAAC;QACZ,GAAG,CAAC,IAAI,CAAC,uBAAuB,OAAO,CAAC,MAAM,SAAS,CAAC,CAAC;QACzD,OAAO;YACL,MAAM,EAAE,MAAM,CAAC,GAAG;YAClB,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,KAAK,EAAE,OAAO;YACd,SAAS,EAAE,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC;YAC1D,QAAQ,EAAE,aAAa,CAAC,KAAK,CAAC;YAC9B,SAAS,EAAE,SAAS;SACrB,CAAC;IACJ,CAAC;IAED,yBAAyB;IACzB,MAAM,OAAO,GAAG,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACvC,IAAI,OAAO,EAAE,CAAC;QACZ,GAAG,CAAC,IAAI,CAAC,oBAAoB,OAAO,CAAC,MAAM,SAAS,CAAC,CAAC;QACtD,OAAO;YACL,MAAM,EAAE,MAAM,CAAC,GAAG;YAClB,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,KAAK,EAAE,OAAO;YACd,SAAS,EAAE,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC;YAC1D,QAAQ,EAAE,aAAa,CAAC,KAAK,CAAC;YAC9B,SAAS,EAAE,MAAM;SAClB,CAAC;IACJ,CAAC;IAED,kBAAkB;IAClB,GAAG,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAC/B,OAAO;QACL,MAAM,EAAE,MAAM,CAAC,GAAG;QAClB,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC;QAC3B,SAAS,EAAE,EAAE;QACb,QAAQ,EAAE,aAAa,CAAC,KAAK,CAAC;QAC9B,SAAS,EAAE,SAAS;KACrB,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAAC,IAAmB,EAAE,MAAqB;IAC3E,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CACrC,OAAO,CAAC,CAAC,IAAI,iBAAiB,CAAC,CAAC,MAAM,iBAAiB,CAAC,CAAC,MAAM,EAAE,CAClE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEf,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;QAC3C,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;QAC9C,CAAC,CAAC,yBAAyB,CAAC;IAE9B,MAAM,SAAS,GAAG,MAAM,CAAC,mBAAmB;SACzC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC;SACxB,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,OAAO;;;EAGP,MAAM,CAAC,GAAG,KAAK,MAAM,CAAC,KAAK;;;EAG3B,MAAM,CAAC,WAAW;;;;;EAKlB,WAAW;;;EAGX,WAAW;;;EAGX,SAAS;;;;;;;;;;aAUE,MAAM,CAAC,GAAG;;EAErB,IAAI,CAAC,QAAQ,EAAE,CAAC;AAClB,CAAC"}

package/dist/cli/loop/pr-lifecycle.d.ts

@@ -10,10 +10,10 @@ export interface MergeResult {
 }
 /** Check if gh CLI is available and authenticated */
 export declare function checkGhCli(log: Logger): boolean;
-/** Check if branch has commits ahead of main */
-export declare function hasCommitsAhead(branch: string, cwd: string): boolean;
+/** Check if branch has commits ahead of base (default: main) */
+export declare function hasCommitsAhead(branch: string, cwd: string, baseBranch?: string): boolean;
 /** Create a PR for the sprint branch */
-export declare function createPr(branch: string, sprintId: string, title: string, strategy: string, ticketResults: TicketResult[], cwd: string, log: Logger): PrInfo | null;
+export declare function createPr(branch: string, sprintId: string, title: string, strategy: string, ticketResults: TicketResult[], cwd: string, log: Logger, baseBranch?: string): PrInfo | null;
 /**
  * Run structural review on a PR diff.
  * Returns number of findings added.
@@ -22,5 +22,7 @@ export declare function runStructuralReview(prNumber: number, sprintId: string,
 /**
  * Run auto-merge safeguards and merge if all pass.
  */
-export declare function autoMerge(prNumber: number, findingCount: number, passingCount: number, config: LoopConfig, cwd: string, log: Logger): MergeResult;
+export declare function autoMerge(prNumber: number, findingCount: number, passingCount: number, config: LoopConfig, cwd: string, log: Logger, opts?: {
+    isStagingMerge?: boolean;
+}): MergeResult;
 //# sourceMappingURL=pr-lifecycle.d.ts.map

package/dist/cli/loop/pr-lifecycle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pr-lifecycle.d.ts","sourceRoot":"","sources":["../../../src/cli/loop/pr-lifecycle.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C,MAAM,WAAW,MAAM;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,qDAAqD;AACrD,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAc/C;AAED,gDAAgD;AAChD,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAUpE;AAED,wCAAwC;AACxC,wBAAgB,QAAQ,CACtB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,YAAY,EAAE,EAC7B,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,GACV,MAAM,GAAG,IAAI,CAqCf;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,GACV,MAAM,CAqFR;AAyBD;;GAEG;AACH,wBAAgB,SAAS,CACvB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,UAAU,EAClB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,GACV,WAAW,CA8Db"}
+{"version":3,"file":"pr-lifecycle.d.ts","sourceRoot":"","sources":["../../../src/cli/loop/pr-lifecycle.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C,MAAM,WAAW,MAAM;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,qDAAqD;AACrD,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAc/C;AAED,gEAAgE;AAChE,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,SAAS,GAAG,OAAO,CAUzF;AAED,wCAAwC;AACxC,wBAAgB,QAAQ,CACtB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,YAAY,EAAE,EAC7B,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,EACX,UAAU,SAAS,GAClB,MAAM,GAAG,IAAI,CAqCf;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,GACV,MAAM,CAqFR;AAyBD;;GAEG;AACH,wBAAgB,SAAS,CACvB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,UAAU,EAClB,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE;IAAE,cAAc,CAAC,EAAE,OAAO,CAAA;CAAE,GAClC,WAAW,CAgEb"}

package/dist/cli/loop/pr-lifecycle.js

@@ -17,10 +17,10 @@ export function checkGhCli(log) {
     }
     return true;
 }
-/** Check if branch has commits ahead of main */
-export function hasCommitsAhead(branch, cwd) {
+/** Check if branch has commits ahead of base (default: main) */
+export function hasCommitsAhead(branch, cwd, baseBranch = 'main') {
     try {
-        const count = execFileSync('git', ['rev-list', '--count', `main..${branch}`], {
+        const count = execFileSync('git', ['rev-list', '--count', `${baseBranch}..${branch}`], {
             cwd,
             encoding: 'utf8',
         }).trim();
@@ -31,7 +31,7 @@ export function hasCommitsAhead(branch, cwd) {
     }
 }
 /** Create a PR for the sprint branch */
-export function createPr(branch, sprintId, title, strategy, ticketResults, cwd, log) {
+export function createPr(branch, sprintId, title, strategy, ticketResults, cwd, log, baseBranch = 'main') {
     const passingCount = ticketResults.filter(t => t.tests_passing && !t.noop).length;
     const noopCount = ticketResults.filter(t => t.noop).length;
     const totalCount = ticketResults.length;
@@ -53,7 +53,7 @@ ${ticketLines}
     try {
         const url = execFileSync('gh', [
             'pr', 'create',
-            '--base', 'main',
+            '--base', baseBranch,
             '--head', branch,
             '--title', `feat(${sprintId}): ${title}`,
             '--body', body,
@@ -167,7 +167,7 @@ function addFinding(type, sprintId, sprintNum, severity, description, cwd, log)
 /**
  * Run auto-merge safeguards and merge if all pass.
  */
-export function autoMerge(prNumber, findingCount, passingCount, config, cwd, log) {
+export function autoMerge(prNumber, findingCount, passingCount, config, cwd, log, opts) {
     // Safeguard 1: No critical/major findings
     if (findingCount > 0) {
         try {
@@ -199,19 +199,21 @@ export function autoMerge(prNumber, findingCount, passingCount, config, cwd, log
     catch {
         return block(prNumber, 'typecheck failing', cwd, log);
     }
-    // Safeguard 4: PR not too large (<20 files changed)
-    try {
-        const filesChanged = execFileSync('gh', [
-            'pr', 'view', String(prNumber),
-            '--json', 'changedFiles',
-            '--jq', '.changedFiles',
-        ], { cwd, encoding: 'utf8' }).trim();
-        const count = parseInt(filesChanged, 10) || 0;
-        if (count > 20) {
-            return block(prNumber, `${count} files changed (threshold: 20)`, cwd, log);
+    // Safeguard 4: PR not too large (<20 files changed) — skip for staging merges
+    if (!opts?.isStagingMerge) {
+        try {
+            const filesChanged = execFileSync('gh', [
+                'pr', 'view', String(prNumber),
+                '--json', 'changedFiles',
+                '--jq', '.changedFiles',
+            ], { cwd, encoding: 'utf8' }).trim();
+            const count = parseInt(filesChanged, 10) || 0;
+            if (count > 20) {
+                return block(prNumber, `${count} files changed (threshold: 20)`, cwd, log);
+            }
         }
+        catch { /* ok — proceed if check fails */ }
     }
-    catch { /* ok — proceed if check fails */ }
     // Safeguard 5: At least one passing non-noop ticket
     if (passingCount <= 0) {
         return block(prNumber, 'no passing tickets', cwd, log);