steroids-cli 0.9.30 → 0.9.32

package/dist/git/submission-resolution.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"submission-resolution.d.ts","sourceRoot":"","sources":["../../src/git/submission-resolution.ts"],"names":[],"mappings":"AAaA,KAAK,gBAAgB,GACjB,eAAe,GACf,eAAe,GACf,6BAA6B,CAAC;AAElC,MAAM,MAAM,wBAAwB,GAChC;IACA,MAAM,EAAE,UAAU,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,iBAAiB,GAAG,kBAAkB,CAAC;IACjD,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,GACC;IACA,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE,gBAAgB,CAAC;IACzB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAEJ,MAAM,WAAW,iCAAiC;IAChD,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,CAAC,EAAE,gBAAgB,CAAC;CAC3B;AAoHD;;;GAGG;AACH,wBAAgB,mCAAmC,CACjD,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EAAE,GACtB,wBAAwB,CAgB1B;AAED,wBAAgB,0CAA0C,CACxD,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EAAE,GACtB,iCAAiC,CA0FnC"}

package/dist/git/submission-resolution.js

@@ -0,0 +1,213 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveSubmissionCommitWithRecovery = resolveSubmissionCommitWithRecovery;
+exports.resolveSubmissionCommitHistoryWithRecovery = resolveSubmissionCommitHistoryWithRecovery;
+const node_child_process_1 = require("node:child_process");
+const node_crypto_1 = require("node:crypto");
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
+const global_db_js_1 = require("../runners/global-db.js");
+const status_js_1 = require("./status.js");
+function getProjectRepoId(projectPath) {
+    try {
+        return (0, node_fs_1.realpathSync)(projectPath);
+    }
+    catch {
+        return (0, node_path_1.resolve)(projectPath);
+    }
+}
+function getParallelWorkstreamSources(projectPath) {
+    const normalizedProjectPath = getProjectRepoId(projectPath);
+    const projectRepoId = getProjectRepoId(projectPath);
+    const { db, close } = (0, global_db_js_1.openGlobalDatabase)();
+    try {
+        const rows = db
+            .prepare(`
+        SELECT ws.clone_path, ws.branch_name
+        FROM workstreams ws
+        JOIN parallel_sessions ps ON ps.id = ws.session_id
+        WHERE (ps.project_path = ? OR ps.project_repo_id = ?)
+          AND ps.status NOT IN ('failed', 'aborted')
+          AND ws.clone_path IS NOT NULL
+        `)
+            .all(normalizedProjectPath, projectRepoId);
+        const seen = new Set();
+        const sources = [];
+        for (const row of rows) {
+            if (!row.clone_path)
+                continue;
+            const resolvedClonePath = (0, node_path_1.resolve)(row.clone_path);
+            if (resolvedClonePath === normalizedProjectPath)
+                continue;
+            if (!(0, node_fs_1.existsSync)(row.clone_path))
+                continue;
+            const key = `${row.clone_path}::${row.branch_name}`;
+            if (seen.has(key))
+                continue;
+            seen.add(key);
+            sources.push({
+                clonePath: row.clone_path,
+                branchName: row.branch_name,
+            });
+        }
+        return sources;
+    }
+    finally {
+        close();
+    }
+}
+function safeRecoveryRef(pathLike) {
+    return pathLike.replace(/[^\w.-]/g, '_');
+}
+function isGitRepoPath(pathValue) {
+    try {
+        (0, node_child_process_1.execSync)('git rev-parse --is-inside-work-tree', {
+            cwd: pathValue,
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+            timeout: 5_000,
+        });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+function cleanupRecoveryRefs(projectPath, refs) {
+    for (const ref of refs) {
+        try {
+            (0, node_child_process_1.execSync)(`git update-ref -d ${ref}`, {
+                cwd: projectPath,
+                encoding: 'utf-8',
+                stdio: ['pipe', 'pipe', 'pipe'],
+                timeout: 5_000,
+            });
+        }
+        catch {
+            // best effort
+        }
+    }
+}
+function fetchWorkstreamBranch(projectPath, clonePath, branchName, suffix, attempts) {
+    if (!(0, node_fs_1.existsSync)(clonePath) || !isGitRepoPath(clonePath)) {
+        attempts.push(`workstream_skip:${clonePath}:invalid_repo`);
+        return { success: false };
+    }
+    const fetchRef = `refs/steroids/recovery/${safeRecoveryRef(branchName)}-${suffix}`;
+    attempts.push(`workstream_fetch:${clonePath}:${branchName}`);
+    try {
+        (0, node_child_process_1.execSync)(`git fetch ${clonePath} +${branchName}:${fetchRef}`, {
+            cwd: projectPath,
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+            timeout: 30_000,
+        });
+        attempts.push(`workstream_fetch_ok:${clonePath}:${branchName}`);
+        return { success: true, recoveryRef: fetchRef };
+    }
+    catch {
+        attempts.push(`workstream_fetch_fail:${clonePath}:${branchName}`);
+        return { success: false };
+    }
+}
+/**
+ * Resolve the latest reachable commit among historical submission candidates.
+ * Falls back to parallel workstream clone fetches if the commit is missing locally.
+ */
+function resolveSubmissionCommitWithRecovery(projectPath, candidateShas) {
+    const history = resolveSubmissionCommitHistoryWithRecovery(projectPath, candidateShas);
+    if (history.latestReachableSha) {
+        return {
+            status: 'resolved',
+            sha: history.latestReachableSha,
+            strategy: history.unreachableShas.length > 0 ? 'workstream_fetch' : 'local_or_remote',
+            attempts: history.attempts,
+        };
+    }
+    return {
+        status: 'unresolved',
+        reason: history.reason ?? 'not_reachable',
+        attempts: history.attempts,
+    };
+}
+function resolveSubmissionCommitHistoryWithRecovery(projectPath, candidateShas) {
+    const normalizedShas = Array.from(new Set(candidateShas
+        .map(sha => sha.trim())
+        .filter(sha => sha.length > 0)));
+    const attempts = [];
+    if (normalizedShas.length === 0) {
+        return {
+            latestReachableSha: null,
+            reachableShasOldestFirst: [],
+            unreachableShas: [],
+            attempts,
+            reason: 'no_candidates',
+        };
+    }
+    const reachableSet = new Set();
+    let unreachableShas = [...normalizedShas];
+    for (const sha of normalizedShas) {
+        attempts.push(`local_or_remote_check:${sha}`);
+        if ((0, status_js_1.isCommitReachableWithFetch)(projectPath, sha, { forceFetch: true })) {
+            reachableSet.add(sha);
+        }
+    }
+    unreachableShas = normalizedShas.filter(sha => !reachableSet.has(sha));
+    if (unreachableShas.length === 0) {
+        const reachableShasOldestFirst = [...normalizedShas].reverse();
+        return {
+            latestReachableSha: normalizedShas[0],
+            reachableShasOldestFirst,
+            unreachableShas: [],
+            attempts,
+        };
+    }
+    let sources = [];
+    try {
+        sources = getParallelWorkstreamSources(projectPath);
+    }
+    catch {
+        return {
+            latestReachableSha: normalizedShas.find(sha => reachableSet.has(sha)) ?? null,
+            reachableShasOldestFirst: [...normalizedShas].reverse().filter(sha => reachableSet.has(sha)),
+            unreachableShas,
+            attempts,
+            reason: reachableSet.size > 0 ? undefined : 'workstream_discovery_failed',
+        };
+    }
+    if (sources.length === 0) {
+        return {
+            latestReachableSha: normalizedShas.find(sha => reachableSet.has(sha)) ?? null,
+            reachableShasOldestFirst: [...normalizedShas].reverse().filter(sha => reachableSet.has(sha)),
+            unreachableShas,
+            attempts,
+            reason: reachableSet.size > 0 ? undefined : 'not_reachable',
+        };
+    }
+    const nonce = (0, node_crypto_1.randomUUID)();
+    const createdRecoveryRefs = [];
+    for (const source of sources) {
+        const fetched = fetchWorkstreamBranch(projectPath, source.clonePath, source.branchName, nonce, attempts);
+        if (fetched.recoveryRef) {
+            createdRecoveryRefs.push(fetched.recoveryRef);
+        }
+    }
+    for (const sha of unreachableShas) {
+        attempts.push(`post_workstream_check:${sha}`);
+        if ((0, status_js_1.isCommitReachable)(projectPath, sha)) {
+            reachableSet.add(sha);
+        }
+    }
+    cleanupRecoveryRefs(projectPath, createdRecoveryRefs);
+    unreachableShas = normalizedShas.filter(sha => !reachableSet.has(sha));
+    const reachableShasOldestFirst = [...normalizedShas].reverse().filter(sha => reachableSet.has(sha));
+    const latestReachableSha = normalizedShas.find(sha => reachableSet.has(sha)) ?? null;
+    return {
+        latestReachableSha,
+        reachableShasOldestFirst,
+        unreachableShas,
+        attempts,
+        reason: latestReachableSha ? undefined : 'not_reachable',
+    };
+}
+//# sourceMappingURL=submission-resolution.js.map

package/dist/git/submission-resolution.js.map

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

package/dist/orchestrator/coordinator.d.ts

@@ -14,6 +14,8 @@ export interface CoordinatorContext {
     submissionNotes?: string | null;
     gitDiffSummary?: string;
     previousGuidance?: string;
+    lockedMustImplementGuidance?: string;
+    lockedMustImplementWatermark?: number;
 }
 export interface CoordinatorResult {
     success: boolean;

package/dist/orchestrator/coordinator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"coordinator.d.ts","sourceRoot":"","sources":["../../src/orchestrator/coordinator.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAMnE,MAAM,WAAW,kBAAkB;IACjC,YAAY,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC/D,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,aAAa,GAAG,mBAAmB,GAAG,cAAc,CAAC;CAChE;AAoMD;;;GAGG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,IAAI,EACV,gBAAgB,EAAE,cAAc,EAAE,EAClC,WAAW,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,kBAAkB,GACzB,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CA0EnC"}
+{"version":3,"file":"coordinator.d.ts","sourceRoot":"","sources":["../../src/orchestrator/coordinator.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAMnE,MAAM,WAAW,kBAAkB;IACjC,YAAY,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC/D,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,2BAA2B,CAAC,EAAE,MAAM,CAAC;IACrC,4BAA4B,CAAC,EAAE,MAAM,CAAC;CACvC;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,aAAa,GAAG,mBAAmB,GAAG,cAAc,CAAC;CAChE;AAqND;;;GAGG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,IAAI,EACV,gBAAgB,EAAE,cAAc,EAAE,EAClC,WAAW,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,kBAAkB,GACzB,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CA0EnC"}

package/dist/orchestrator/coordinator.js

@@ -69,6 +69,21 @@ You previously provided this guidance for this task:
 > ${extra.previousGuidance.substring(0, 500)}${extra.previousGuidance.length > 500 ? '...' : ''}
 
 **Do NOT repeat the same guidance.** If the previous guidance didn't work, provide a DIFFERENT approach.
+`
+        : '';
+    const lockedMustImplementSection = extra?.lockedMustImplementGuidance
+        ? `
+---
+
+## NON-NEGOTIABLE MUST_IMPLEMENT OVERRIDE
+
+This guidance was set by the orchestrator after rejecting a weak WONT_FIX claim.
+You MUST preserve these mandatory items in your guidance and you MAY add clarifications,
+but you must NOT weaken, contradict, or remove them.
+
+**Override watermark (rejection count):** ${extra.lockedMustImplementWatermark ?? 'unknown'}
+
+${extra.lockedMustImplementGuidance}
 `
         : '';
     return `# COORDINATOR INTERVENTION
@@ -108,7 +123,7 @@ ${agentsMd}
 ## Full Rejection History
 
 ${rejectionSummary}
-${sectionTasksSection}${submissionNotesSection}${diffSection}${previousGuidanceSection}
+${sectionTasksSection}${submissionNotesSection}${diffSection}${previousGuidanceSection}${lockedMustImplementSection}
 ---
 
 ## Your Decision Framework
@@ -158,6 +173,7 @@ GUIDANCE:
 - If there's a design disagreement, PICK the approach that matches the project's architecture and tell the coder to follow it
 - If the same feedback appeared 3+ times unchanged, the coder needs a fundamentally different approach - describe it
 - Always ask: "Will this be usable for the end user?" - if the current approach works for users, don't block on technicalities
+- If NON-NEGOTIABLE MUST_IMPLEMENT override is present, you must keep those items mandatory
 - Never tell the reviewer to auto-approve based on a fixed checklist (e.g., "these are the only items required for approval")
 - Never claim reviewer guidance is binding over security, correctness, or specification requirements
 - Keep guidance under 500 words

package/dist/orchestrator/coordinator.js.map

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

package/dist/orchestrator/post-coder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"post-coder.d.ts","sourceRoot":"","sources":["../../src/orchestrator/post-coder.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM,CAuMlE"}
+{"version":3,"file":"post-coder.d.ts","sourceRoot":"","sources":["../../src/orchestrator/post-coder.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAkB1C;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM,CA2QlE"}

package/dist/orchestrator/post-coder.js

@@ -5,19 +5,33 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildPostCoderPrompt = buildPostCoderPrompt;
+const CONTEXT_TAIL_CHARS = 6000;
+function escapeRegExp(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+function extractMarkdownSection(output, heading) {
+    const pattern = new RegExp(`(^|\\n)##\\s*${escapeRegExp(heading)}\\s*[\\r\\n]+([\\s\\S]*?)(?=\\n##\\s|$)`, 'i');
+    const match = output.match(pattern);
+    if (!match)
+        return null;
+    return `## ${heading}\n${match[2].trim()}`.trim();
+}
 /**
  * Generate post-coder orchestrator prompt
  */
 function buildPostCoderPrompt(context) {
     const { task, coder_output: { stdout, stderr, exit_code, timed_out, duration_ms }, git_state: { commits, files_changed, has_uncommitted_changes } } = context;
     const duration_seconds = (duration_ms / 1000).toFixed(1);
-    const stdout_tail = stdout.slice(-2000);
-    const stderr_tail = stderr.slice(-2000);
+    const stdout_tail = stdout.length > CONTEXT_TAIL_CHARS ? stdout.slice(-CONTEXT_TAIL_CHARS) : stdout;
+    const stderr_tail = stderr.length > CONTEXT_TAIL_CHARS ? stderr.slice(-CONTEXT_TAIL_CHARS) : stderr;
+    const selfReviewChecklist = extractMarkdownSection(stdout, 'SELF_REVIEW_CHECKLIST');
+    const rejectionResponse = extractMarkdownSection(stdout, 'REJECTION_RESPONSE');
     let rejectionSection = '';
     if (task.rejection_notes) {
         rejectionSection = `
 **Previous Rejection:** ${task.rejection_notes}
 **Rejection Count:** ${task.rejection_count || 0}
+**Open Rejection Items (latest):** ${task.rejection_item_count ?? 0}
 `;
     }
     let commitsSection = '';
@@ -31,12 +45,28 @@ function buildPostCoderPrompt(context) {
     let stderrSection = '';
     if (stderr) {
         stderrSection = `
-**Errors:**
+**Errors (tail ${CONTEXT_TAIL_CHARS} chars):**
 \`\`\`
 ${stderr_tail}
 \`\`\`
 `;
     }
+    const extractedBlocks = [];
+    if (selfReviewChecklist) {
+        extractedBlocks.push(`### Extracted SELF_REVIEW_CHECKLIST\n\`\`\`\n${selfReviewChecklist}\n\`\`\``);
+    }
+    if (rejectionResponse) {
+        extractedBlocks.push(`### Extracted REJECTION_RESPONSE\n\`\`\`\n${rejectionResponse}\n\`\`\``);
+    }
+    const extractedBlocksSection = extractedBlocks.length > 0
+        ? `
+---
+
+## Extracted Required Blocks (from full output)
+
+${extractedBlocks.join('\n\n')}
+`
+        : '';
     return `# POST-CODER ORCHESTRATOR
 
 You are a state machine that analyzes coder output and determines the next action.
@@ -59,11 +89,12 @@ ${rejectionSection}
 **Timed Out:** ${timed_out}
 **Duration:** ${duration_seconds}s
 
-**Output (last 2000 chars):**
+**Output (tail ${CONTEXT_TAIL_CHARS} chars):**
 \`\`\`
 ${stdout_tail}
 \`\`\`
 ${stderrSection}
+${extractedBlocksSection}
 ---
 
 ## Git State
@@ -98,7 +129,42 @@ ${filesSection}
 - Exit 0 + commits exist → \`submit\`
 - Most common happy path
 
-### 5. Uncertainty Default
+### 5. First-Submission Self-Checklist
+- If \`Rejection Count\` is 0, require a \`SELF_REVIEW_CHECKLIST\` block in coder output
+- Checklist must include a final self-review confirmation item
+- If missing, return:
+  - \`action: "retry"\`
+  - \`next_status: "in_progress"\`
+  - \`reasoning\` starting with \`CHECKLIST_REQUIRED:\` (short)
+  - \`contract_violation: "checklist_required"\`
+
+### 6. Rejection Response Contract (Required on Resubmissions)
+- If \`Rejection Count\` is > 0, require a \`REJECTION_RESPONSE\` block
+- The block must contain one line per rejection item using:
+  - \`ITEM-<n> | IMPLEMENTED | ...\`
+  - or \`ITEM-<n> | WONT_FIX | ...\`
+- If missing or clearly incomplete, return:
+  - \`action: "retry"\`
+  - \`next_status: "in_progress"\`
+  - \`reasoning\` starting with \`REJECTION_RESPONSE_REQUIRED:\` (short)
+  - \`contract_violation: "rejection_response_required"\`
+- \`REJECTION_RESPONSE\` completeness check must use \`Open Rejection Items (latest)\` from task context
+- Require sequential responses: \`ITEM-1\` through \`ITEM-N\`
+
+### 7. WONT_FIX Claims (High Priority on Rejected Tasks)
+- If task has prior rejections and coder output includes \`WONT_FIX\`, apply strict scrutiny
+- A \`WONT_FIX\` is acceptable ONLY when all are present:
+  - Clear technical reason (impossible/unsafe/out-of-scope conflict)
+  - Concrete evidence the task still works without that item
+  - No conflict with any mandatory override guidance
+- If any of the above is missing, return:
+  - \`action: "retry"\`
+  - \`next_status: "in_progress"\`
+  - \`reasoning\` that starts with \`WONT_FIX_OVERRIDE:\` (short)
+  - \`wont_fix_override_items\` containing specific mandatory fixes
+- If evidence is strong and functionality is complete, \`submit\` is allowed
+
+### 8. Uncertainty Default
 - When signals conflict → \`retry\` (safer than error)
 
 ---
@@ -111,6 +177,8 @@ ${filesSection}
   "reasoning": "One sentence why (max 100 chars)",
   "commits": ["sha1", "sha2"],
   "commit_message": "Only if stage_commit_submit",
+  "contract_violation": "checklist_required" | "rejection_response_required" | null,
+  "wont_fix_override_items": ["specific required fix", "another required fix"],
   "next_status": "review" | "in_progress" | "failed",
   "metadata": {
     "files_changed": 0,
@@ -129,6 +197,15 @@ ${filesSection}
 - \`stage_commit_submit\` → Work complete but not committed
 - \`error\` → Fatal issue, needs human intervention
 
+**contract_violation:**
+- \`checklist_required\` when first submission missing required self-checklist
+- \`rejection_response_required\` when resubmission misses required ITEM responses
+- \`null\` when no contract violation
+
+**wont_fix_override_items:**
+- Optional list of mandatory fixes when WONT_FIX is rejected by orchestrator
+- Use this field for detailed override items (do NOT put long detail in reasoning)
+
 **next_status:**
 - \`review\` for submit and stage_commit_submit
 - \`in_progress\` for retry

package/dist/orchestrator/post-coder.js.map

@@ -1 +1 @@
-{"version":3,"file":"post-coder.js","sourceRoot":"","sources":["../../src/orchestrator/post-coder.ts"],"names":[],"mappings":";AAAA;;;GAGG;;AAOH,oDAuMC;AA1MD;;GAEG;AACH,SAAgB,oBAAoB,CAAC,OAAqB;IACxD,MAAM,EACJ,IAAI,EACJ,YAAY,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,EACnE,SAAS,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,uBAAuB,EAAE,EAC/D,GAAG,OAAO,CAAC;IAEZ,MAAM,gBAAgB,GAAG,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACzD,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;IACxC,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;IAExC,IAAI,gBAAgB,GAAG,EAAE,CAAC;IAC1B,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;QACzB,gBAAgB,GAAG;0BACG,IAAI,CAAC,eAAe;uBACvB,IAAI,CAAC,eAAe,IAAI,CAAC;CAC/C,CAAC;IACA,CAAC;IAED,IAAI,cAAc,GAAG,EAAE,CAAC;IACxB,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5E,CAAC;IAED,IAAI,YAAY,GAAG,EAAE,CAAC;IACtB,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7B,YAAY,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,aAAa,GAAG,EAAE,CAAC;IACvB,IAAI,MAAM,EAAE,CAAC;QACX,aAAa,GAAG;;;EAGlB,WAAW;;CAEZ,CAAC;IACA,CAAC;IAED,OAAO;;;;;;;;;;eAUM,IAAI,CAAC,EAAE;kBACJ,IAAI,CAAC,KAAK;;EAE1B,gBAAgB;;;;;iBAKD,SAAS;iBACT,SAAS;gBACV,gBAAgB;;;;EAI9B,WAAW;;EAEX,aAAa;;;;;oBAKK,OAAO,CAAC,MAAM;EAChC,cAAc;;qBAEK,aAAa,CAAC,MAAM;EACvC,YAAY;;2BAEa,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iDA0HD,CAAC;AAClD,CAAC"}
+{"version":3,"file":"post-coder.js","sourceRoot":"","sources":["../../src/orchestrator/post-coder.ts"],"names":[],"mappings":"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"}

package/dist/orchestrator/reviewer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reviewer.d.ts","sourceRoot":"","sources":["../../src/orchestrator/reviewer.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAcnD,OAAO,EAAc,KAAK,cAAc,EAAE,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAI3F,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,CAAC;IACrD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAAC;AAElF;;GAEG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,cAAc,EAAE,GACxB;IAAE,QAAQ,EAAE,aAAa,CAAC;IAAC,UAAU,EAAE,OAAO,CAAA;CAAE,CAiClD;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,cAAc,GAAG,cAAc,EAAE,CAQ3E;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAEpE;AAED;;GAEG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,cAAc,EAAE,EACjC,mBAAmB,CAAC,EAAE,MAAM,EAC5B,mBAAmB,CAAC,EAAE,MAAM,GAC3B,OAAO,CAAC,cAAc,EAAE,CAAC,CAwB3B;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAiID;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,mBAAmB,CAAC,EAAE,MAAM,EAC5B,mBAAmB,CAAC,EAAE,MAAM,EAC5B,cAAc,CAAC,EAAE,cAAc,GAC9B,OAAO,CAAC,cAAc,CAAC,CAmJzB;AAED;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,IAAI,EAAE,EACb,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,cAAc,CAAC,EAAE,cAAc,GAC9B,OAAO,CAAC,mBAAmB,CAAC,CA6C9B"}
+{"version":3,"file":"reviewer.d.ts","sourceRoot":"","sources":["../../src/orchestrator/reviewer.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAkBnD,OAAO,EAAc,KAAK,cAAc,EAAE,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAK3F,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,CAAC;IACrD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAAC;AAElF;;GAEG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,cAAc,EAAE,GACxB;IAAE,QAAQ,EAAE,aAAa,CAAC;IAAC,UAAU,EAAE,OAAO,CAAA;CAAE,CAiClD;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,cAAc,GAAG,cAAc,EAAE,CAQ3E;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAEpE;AAED;;GAEG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,cAAc,EAAE,EACjC,mBAAmB,CAAC,EAAE,MAAM,EAC5B,mBAAmB,CAAC,EAAE,MAAM,GAC3B,OAAO,CAAC,cAAc,EAAE,CAAC,CAwB3B;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAiID;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,mBAAmB,CAAC,EAAE,MAAM,EAC5B,mBAAmB,CAAC,EAAE,MAAM,EAC5B,cAAc,CAAC,EAAE,cAAc,GAC9B,OAAO,CAAC,cAAc,CAAC,CAkKzB;AAED;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,IAAI,EAAE,EACb,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,cAAc,CAAC,EAAE,cAAc,GAC9B,OAAO,CAAC,mBAAmB,CAAC,CAgE9B"}

package/dist/orchestrator/reviewer.js

@@ -16,10 +16,10 @@ const node_path_1 = require("node:path");
 const queries_js_1 = require("../database/queries.js");
 const connection_js_1 = require("../database/connection.js");
 const reviewer_js_1 = require("../prompts/reviewer.js");
-const status_js_1 = require("../git/status.js");
 const loader_js_1 = require("../config/loader.js");
 const registry_js_1 = require("../providers/registry.js");
 const invocation_logger_js_1 = require("../providers/invocation-logger.js");
+const submission_resolution_js_1 = require("../git/submission-resolution.js");
 /**
  * Deterministic policy engine for multi-reviewer decisions
  */
@@ -204,51 +204,63 @@ async function invokeReviewer(task, projectPath, coordinatorGuidance, coordinato
     console.log(`Provider: ${effectiveReviewerConfig?.provider ?? 'not configured'}`);
     console.log(`Model: ${effectiveReviewerConfig?.model ?? 'not configured'}`);
     console.log(`${'='.repeat(60)}\n`);
-    const submissionCommitHash = (0, status_js_1.findTaskCommit)(projectPath, task.title);
-    const fallbackCommitHash = 'HEAD~1';
-    if (submissionCommitHash) {
-        console.log(`Found task commit: ${submissionCommitHash}`);
-    }
-    else {
-        console.log(`No matching commit found for task title. Reviewer will use fallback commit: ${fallbackCommitHash}`);
-    }
     // Fetch other tasks in the same section for context
     let sectionTasks = [];
     let rejectionHistory = [];
     let submissionNotes = null;
     let resumeSessionId = null;
+    let submissionCommitHash = null;
+    let submissionCommitHashes = [];
+    let unresolvedSubmissionCommits = [];
     try {
         const { db, close } = (0, connection_js_1.openDatabase)(projectPath);
-        // Get section tasks
-        if (task.section_id) {
-            const allSectionTasks = (0, queries_js_1.listTasks)(db, { sectionId: task.section_id });
-            sectionTasks = allSectionTasks.map(t => ({
-                id: t.id,
-                title: t.title,
-                status: t.status,
-            }));
-        }
-        // Get rejection history - ALWAYS fetch this so reviewer can see past attempts
-        rejectionHistory = (0, queries_js_1.getTaskRejections)(db, task.id);
-        if (rejectionHistory.length > 0) {
-            console.log(`Found ${rejectionHistory.length} previous rejection(s) for this task`);
-        }
-        // Get coder's submission notes (if any)
-        submissionNotes = (0, queries_js_1.getLatestSubmissionNotes)(db, task.id);
-        if (submissionNotes) {
-            console.log(`Coder included notes with submission`);
-        }
-        // Check for resumable session (same provider/model/role)
-        if (effectiveReviewerConfig?.provider && effectiveReviewerConfig?.model) {
-            resumeSessionId = (0, queries_js_1.findResumableSession)(db, task.id, 'reviewer', effectiveReviewerConfig.provider, effectiveReviewerConfig.model);
-            if (resumeSessionId) {
-                console.log(`Found resumable session: ${resumeSessionId.substring(0, 8)}... (resuming with delta prompt)`);
+        try {
+            // Get section tasks
+            if (task.section_id) {
+                const allSectionTasks = (0, queries_js_1.listTasks)(db, { sectionId: task.section_id });
+                sectionTasks = allSectionTasks.map(t => ({
+                    id: t.id,
+                    title: t.title,
+                    status: t.status,
+                }));
+            }
+            // Get rejection history - ALWAYS fetch this so reviewer can see past attempts
+            rejectionHistory = (0, queries_js_1.getTaskRejections)(db, task.id);
+            if (rejectionHistory.length > 0) {
+                console.log(`Found ${rejectionHistory.length} previous rejection(s) for this task`);
+            }
+            // Get coder's submission notes (if any)
+            submissionNotes = (0, queries_js_1.getLatestSubmissionNotes)(db, task.id);
+            if (submissionNotes) {
+                console.log(`Coder included notes with submission`);
+            }
+            const submissionHistory = (0, submission_resolution_js_1.resolveSubmissionCommitHistoryWithRecovery)(projectPath, (0, queries_js_1.getSubmissionCommitShas)(db, task.id));
+            if (!submissionHistory.latestReachableSha) {
+                const attemptsText = submissionHistory.attempts.join(' | ') || 'none';
+                throw new Error(`No reachable submission commit hash found for task ${task.id} (${submissionHistory.reason ?? 'not_reachable'}; attempts: ${attemptsText})`);
+            }
+            submissionCommitHash = submissionHistory.latestReachableSha;
+            submissionCommitHashes = submissionHistory.reachableShasOldestFirst;
+            unresolvedSubmissionCommits = submissionHistory.unreachableShas;
+            console.log(`Using submission commit chain (${submissionCommitHashes.length} reachable), latest: ${submissionCommitHash}`);
+            if (unresolvedSubmissionCommits.length > 0) {
+                console.log(`Warning: ${unresolvedSubmissionCommits.length} historical submission commit(s) unresolved`);
+            }
+            // Check for resumable session (same provider/model/role)
+            if (effectiveReviewerConfig?.provider && effectiveReviewerConfig?.model) {
+                resumeSessionId = (0, queries_js_1.findResumableSession)(db, task.id, 'reviewer', effectiveReviewerConfig.provider, effectiveReviewerConfig.model);
+                if (resumeSessionId) {
+                    console.log(`Found resumable session: ${resumeSessionId.substring(0, 8)}... (resuming with delta prompt)`);
+                }
             }
         }
-        close();
+        finally {
+            close();
+        }
     }
     catch (error) {
-        console.warn('Could not fetch task context:', error);
+        const message = error instanceof Error ? error.message : String(error);
+        throw new Error(`Could not fetch reviewer context: ${message}`);
     }
     // Reuse config loaded earlier, get reviewer model
     const reviewerModel = effectiveReviewerConfig?.model || 'unknown';
@@ -256,8 +268,9 @@ async function invokeReviewer(task, projectPath, coordinatorGuidance, coordinato
         task,
         projectPath,
         reviewerModel,
-        submissionCommitHash,
-        fallbackCommitHash,
+        submissionCommitHash: submissionCommitHash,
+        submissionCommitHashes,
+        unresolvedSubmissionCommits,
         sectionTasks,
         rejectionHistory,
         submissionNotes,
@@ -328,10 +341,25 @@ async function invokeReviewerBatch(tasks, sectionName, projectPath, reviewerConf
     console.log(`Provider: ${effectiveReviewerConfig?.provider ?? 'not configured'}`);
     console.log(`Model: ${effectiveReviewerConfig?.model ?? 'not configured'}`);
     console.log(`${'='.repeat(60)}\n`);
-    const taskCommits = tasks.map(task => ({
-        taskId: task.id,
-        commitHash: (0, status_js_1.findTaskCommit)(projectPath, task.title),
-    }));
+    const { db, close } = (0, connection_js_1.openDatabase)(projectPath);
+    let taskCommits = [];
+    try {
+        const unresolved = [];
+        taskCommits = tasks.map(task => {
+            const submissionResolution = (0, submission_resolution_js_1.resolveSubmissionCommitWithRecovery)(projectPath, (0, queries_js_1.getSubmissionCommitShas)(db, task.id));
+            if (submissionResolution.status !== 'resolved') {
+                const attemptsText = submissionResolution.attempts.join(' | ') || 'none';
+                unresolved.push(`${task.id} (${submissionResolution.reason}; attempts: ${attemptsText})`);
+            }
+            return { taskId: task.id, commitHash: submissionResolution.status === 'resolved' ? submissionResolution.sha : '' };
+        });
+        if (unresolved.length > 0) {
+            throw new Error(`Missing reachable submission commit hash for batch review tasks: ${unresolved.join(', ')}`);
+        }
+    }
+    finally {
+        close();
+    }
     const context = {
         tasks,
         projectPath,