@miller-tech/uap 1.152.0 → 1.154.0

package/dist/cli/deliver.d.ts.map

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

package/dist/cli/deliver.js

@@ -94,7 +94,7 @@ export function resolveAcceptanceVerdict(r, acceptancePrimary) {
 import { createAgenticExecutor, noopApplier, selectExecutorMode, lockContractFiles } from '../delivery/agentic-executor.js';
 import { createRepairEscalation } from '../delivery/repair-escalation.js';
 import { clearStop, isStopRequested, loadRunState, newRunId, saveRunState } from '../delivery/run-state.js';
-import { phaseInstruction, planDeliveryPhases, shouldDecompose } from '../delivery/decompose.js';
+import { planDeliveryPhases, shouldDecompose } from '../delivery/decompose.js';
 import { initLedger, markItem } from '../delivery/completion-ledger.js';
 import { loadUapConfigRaw } from '../utils/config-loader.js';
 import { buildUserPathsNote, createUserValidationRunner, resolveUserValidationMode, synthesizeUserValidationRung, } from '../delivery/user-validation.js';
@@ -120,6 +120,9 @@ import { autoMineHaloTraces, summarizeWeaknesses, weaknessGuidance, loadPersiste
 import { createGitWorktreeProvider } from '../delivery/candidate-workspace.js';
 import { createTaskWorkspaceManager, resolveParallelTasks } from '../delivery/task-workspace.js';
 import { runOrchestratedMission as runOrchestratedMissionCore } from '../delivery/orchestrated-mission.js';
+import { runCiReconverge } from '../delivery/ci-reconverge.js';
+import { runPhasedMission as runPhasedMissionCore } from '../delivery/phased-mission.js';
+import { changedFiles } from '../delivery/changed-files.js';
 import { runEpicMission as runEpicMissionCore } from '../delivery/epic-mission.js';
 import { createHaloDeliveryTracer } from '../delivery/halo-trace.js';
 import { haloTracePath, isHaloTracingEnabled } from '../observability/halo-exporter.js';
@@ -127,7 +130,7 @@ import { createRunCoordinator } from '../delivery/run-coordinator.js';
 import { readCuratedIdeas } from './ideate.js';
 import { createEscalationController, defaultEscalationLadder } from '../delivery/escalation.js';
 import { FilePracticeStore, defaultPracticePath, extractKeywords, retrievePracticesSemantic, } from '../delivery/practice.js';
-import { detectRungs, runLadder, runTieredLadder, tierOf, TIER_ORDER, demoteBaselineFailures } from '../delivery/verifier-ladder.js';
+import { detectRungs, mergeRedetectedRungs, runLadder, runTieredLadder, tierOf, TIER_ORDER, demoteBaselineFailures } from '../delivery/verifier-ladder.js';
 import { runDeployDevLadder } from '../delivery/deploy-dev-gate.js';
 import { commitPushAndWatch } from '../delivery/ci-watcher.js';
 import { snapshotTree, restoreTree, disposeSnapshot } from '../delivery/snapshot.js';
@@ -164,28 +167,6 @@ function currentBranch(projectRoot) {
  * agentic executor mutates the repo directly and returns an empty file set), so
  * the watcher stages a known list instead of a blanket `git add -A`.
  */
-function changedFiles(projectRoot) {
-    try {
-        const r = spawnSync('git', ['status', '--porcelain', '-z'], {
-            cwd: projectRoot,
-            encoding: 'utf-8',
-        });
-        if (r.status !== 0 || !r.stdout)
-            return [];
-        return r.stdout
-            .split('\0')
-            .filter(Boolean)
-            // porcelain lines are "XY <path>"; drop the 3-char status prefix.
-            .map((line) => line.slice(3))
-            .filter(Boolean)
-            // Harness-owned state (run checkpoints, traces, mined weaknesses) must
-            // never ride into the delivery commit on repos that don't ignore .uap/.
-            .filter((f) => !f.startsWith('.uap/') && !f.startsWith('.uap\\'));
-    }
-    catch {
-        return [];
-    }
-}
 function fail(message) {
     console.error(chalk.red(message));
     process.exitCode = 2;
@@ -1507,7 +1488,11 @@ async function runDeliver(instruction, options) {
             envDecompose: process.env.UAP_DELIVER_DECOMPOSE,
             heuristic: () => shouldDecompose(instruction, autoPlan?.complexity),
         });
-    if (!phases && decomposeWanted && !resumeState) {
+    // Skipped when the epic path owns the mission: runEpicMission re-plans via
+    // planEpics, so this call would burn an evaluator pass (+ thought
+    // experiment) on a phases array the dispatch never uses. Kept for resume
+    // and the --no-epics paths.
+    if (!phases && decomposeWanted && !resumeState && !epicsEnabled) {
         console.log(chalk.cyan('🧩 decompose: planning sequential delivery phases…'));
         // ExpertOrchestrator lifecycle chain → phase-shaping hints (fail-soft).
         let lifecycleHints;
@@ -1702,18 +1687,12 @@ async function runDeliver(instruction, options) {
             },
             isMergeBlocked: (f) => mergeProtected.has(f.toLowerCase()),
             verifyCombined: () => {
-                // Mirror the loop's redetect-merge: redetection REASSIGNS the loop's
-                // local rungs and never mutates this captured t0 array, so a
-                // from-scratch build's mid-mission gates must be re-merged here or
+                // Redetection REASSIGNS the loop's local rungs and never mutates this
+                // captured t0 array — re-merge (same pure policy the loop uses) or
                 // the combined tree is verified against stale t0 gates only.
                 let combinedRungs = rungs;
                 try {
-                    const detected = detectRungs(projectRoot);
-                    const have = new Set(rungs.map((r) => r.id));
-                    const allow = loopConfig.redetectFilter ?? ((r) => tierOf(r) === 'fast' || tierOf(r) === 'runtime');
-                    const added = detected.filter((r) => !have.has(r.id) && allow(r));
-                    if (added.length > 0)
-                        combinedRungs = [...rungs, ...added];
+                    combinedRungs = mergeRedetectedRungs(rungs, detectRungs(projectRoot), loopConfig.redetectFilter);
                 }
                 catch {
                     // detection unavailable - verify against the t0 rungs
@@ -1757,57 +1736,54 @@ async function runDeliver(instruction, options) {
         const parallelTasks = resolveParallelTasks(cfgRaw.deliver?.parallelTasks);
         return runOrchestratedMissionCore(buildOrchestratedDeps(instruction, phases, parallelTasks));
     };
+    /**
+     * Wire deliver's ambient context into the extracted phased runner
+     * (src/delivery/phased-mission.ts) — the cursor-honoring resume path and
+     * the fallback when orchestration is explicitly disabled.
+     */
     const runPhasedMission = async () => {
-        const all = {
-            success: true,
-            alreadyDelivered: false,
-            turns: 0,
-            bestScore: 0,
-            bestTurn: 0,
-            history: [],
-            finalFeedback: '',
-            finalOutput: '',
-            totalDurationMs: 0,
-        };
-        for (; phaseIndex < phases.length; phaseIndex++) {
-            runState.phaseIndex = phaseIndex;
-            saveRunState(runState);
-            const phase = phases[phaseIndex];
-            console.log(chalk.bold(`▶ phase ${phaseIndex + 1}/${phases.length}: ${phase.title}`));
-            const phaseTask = await openDeliveryTask(`${phase.title} — ${phase.goal.slice(0, 120)}`, projectRoot, missionTask?.id);
-            const phaseLoop = new ConvergenceLoop({
-                ...loopConfig,
-                baselineCheck: false,
-                resumeFrom: resumeCheckpoint,
-                onIteration: makeIterationHook(),
-            }, resumeCheckpoint ? runExecutor : executor, seams);
-            const resumedTurns = resumeCheckpoint?.history.length ?? 0;
-            resumeCheckpoint = undefined;
-            const phaseText = phaseInstruction(instruction, phases, phaseIndex, phaseSummaries);
-            // The acceptance judge grades THIS phase's goal, not the whole mission.
-            acceptanceSpec = phaseText;
-            specChangeEvidence.writes = 0;
-            const phaseResult = await phaseLoop.deliver(phaseText);
-            all.turns += phaseResult.turns - resumedTurns;
-            all.history.push(...phaseResult.history);
-            all.totalDurationMs += phaseResult.totalDurationMs;
-            if (phaseResult.bestScore > all.bestScore) {
-                all.bestScore = phaseResult.bestScore;
-                all.bestTurn = phaseResult.bestTurn;
-            }
-            all.finalFeedback = phaseResult.finalFeedback;
-            all.finalOutput = phaseResult.finalOutput;
-            completeDeliveryTask(phaseTask, phaseResult);
-            if (!phaseResult.success) {
-                all.success = false;
-                break;
-            }
-            phaseSummaries.push(`${phase.title}: ${phase.goal.slice(0, 140)} (delivered in ${phaseResult.turns} turn(s))`);
-            runState.phaseSummaries = [...phaseSummaries];
-            runState.checkpoint = undefined; // belongs to the finished phase
-            saveRunState(runState);
-        }
-        return all;
+        const startCheckpoint = resumeCheckpoint;
+        return runPhasedMissionCore({
+            instruction,
+            phases: phases,
+            startIndex: phaseIndex,
+            initialSummaries: [...phaseSummaries],
+            hasResumeCheckpoint: Boolean(startCheckpoint),
+            resumedTurns: startCheckpoint?.history.length ?? 0,
+            runPhaseLoop: async ({ prompt, resume }) => {
+                const loop = new ConvergenceLoop({
+                    ...loopConfig,
+                    baselineCheck: false,
+                    resumeFrom: resume ? startCheckpoint : undefined,
+                    onIteration: makeIterationHook(),
+                }, 
+                // The interrupted run may have escalated models; only the RESUMED
+                // loop re-binds the escalated executor (historic behavior).
+                resume && startCheckpoint ? runExecutor : executor, seams);
+                if (resume)
+                    resumeCheckpoint = undefined; // consumed by this loop
+                return loop.deliver(prompt);
+            },
+            setPhaseSpec: (spec) => {
+                acceptanceSpec = spec;
+                specChangeEvidence.writes = 0;
+            },
+            openTask: (title) => openDeliveryTask(title, projectRoot, missionTask?.id),
+            completeTask: (record, r) => completeDeliveryTask(record, r),
+            persistCursor: (index) => {
+                phaseIndex = index;
+                runState.phaseIndex = index;
+                saveRunState(runState);
+            },
+            persistCompleted: (summaries) => {
+                phaseSummaries.length = 0;
+                phaseSummaries.push(...summaries);
+                runState.phaseSummaries = [...summaries];
+                runState.checkpoint = undefined; // belongs to the finished phase
+                saveRunState(runState);
+            },
+            note: (line) => console.log(line.startsWith('▶') ? chalk.bold(line) : chalk.dim(line)),
+        });
     };
     /**
      * P7 — epic controller: run a massive mission as a SEQUENCE of epics. Each
@@ -1961,75 +1937,98 @@ async function runDeliver(instruction, options) {
                 console.log(chalk.dim('  lazy attempt did not pass — engaging the full convergence stack'));
             }
         }
+        // Resume downgrade warning: resumes always take a cursor-honoring
+        // sequential path — phased when a phase plan was persisted, otherwise the
+        // single flat loop — but the ORIGINAL run may have executed as epic or
+        // orchestrated: different prompts, no contract publication, DAG flattened
+        // to linear order. Loud, never silent — and NOT gated on the phases
+        // array, because epic runs never persist one and interrupted epic runs
+        // are the most common resume case.
+        if (resumeState?.runnerKind) {
+            const resumeTarget = phases && phases.length >= 2 ? 'phased' : 'single';
+            if (resumeState.runnerKind !== resumeTarget) {
+                const targetDesc = resumeTarget === 'phased'
+                    ? 'sequential phased path (the only cursor-honoring runner)'
+                    : 'single-loop path (no phase plan was persisted by the original run)';
+                console.log(chalk.yellow(`  ⚠ resume: the interrupted run executed as '${resumeState.runnerKind}'; resuming on the ${targetDesc} — prompts and per-phase context will differ from the original execution model.`));
+            }
+        }
         if (lazySolved) {
+            runState.runnerKind = 'single';
+            saveRunState(runState);
             result = result;
         }
         else if (epicsEnabled) {
+            runState.runnerKind = 'epic';
+            saveRunState(runState);
             result = await runEpicMission();
         }
-        else if (phases && phases.length >= 2 && orchestrateEnabled) {
+        else if (phases && phases.length >= 2 && orchestrateEnabled && !resumeState) {
+            // A RESUMED phased run must not route here: the orchestrated runner
+            // ignores phaseIndex/resumeCheckpoint and would restart the DAG from
+            // scratch. runPhasedMission below is the only cursor-honoring path.
+            runState.runnerKind = 'orchestrated';
+            saveRunState(runState);
             result = await runOrchestratedMission();
         }
         else if (phases && phases.length >= 2) {
+            runState.runnerKind = 'phased';
+            saveRunState(runState);
             result = await runPhasedMission();
         }
         else {
+            runState.runnerKind = 'single';
+            saveRunState(runState);
             if (resumeCheckpoint)
                 loopConfig.resumeFrom = resumeCheckpoint;
             const loop = new ConvergenceLoop(loopConfig, runExecutor, seams);
             result = await loop.deliver(instruction);
         }
         // CI watch boundary + re-converge: once local tiers are green, commit/push
-        // the worktree branch and watch the CI run. On CI/deploy failure, feed the
-        // sanitized failure back into a fresh convergence pass (baselineCheck off so
-        // turn 1 always runs the model — local gates already pass). Bounded by
-        // --ci-passes. Skipped when nothing changed (alreadyDelivered).
+        // the worktree branch and watch the CI run — extracted policy, see
+        // src/delivery/ci-reconverge.ts. Skipped when nothing changed.
         if (watchCi && result.success && !result.alreadyDelivered) {
+            // Re-point the judge at the MISSION: epic/phased runners leave
+            // acceptanceSpec on the LAST epic/phase spec, and a re-converge pass
+            // would otherwise be judged against that stale slice.
+            acceptanceSpec = instruction;
+            specChangeEvidence.writes = 0; // evidence resets wherever the spec re-points
             const branch = currentBranch(projectRoot) ?? undefined;
-            let pass = 0;
-            for (;;) {
-                // Prefer the loop's applied-file set; the agentic executor reports none
-                // (it mutates the repo directly), so fall back to an explicit
-                // git-status list rather than letting the watcher do `git add -A`.
-                let files = [...new Set(result.history.flatMap((h) => h.filesApplied ?? []))];
-                if (files.length === 0)
-                    files = changedFiles(projectRoot);
-                console.log(chalk.cyan(`☁ watch-ci: committing & pushing ${branch ?? 'current branch'}, watching CI…`));
-                const watch = await commitPushAndWatch({
-                    projectRoot,
-                    branch,
-                    commitMessage: `feat(delivery): ${instruction.slice(0, 72)}`,
-                    files,
-                    timeoutMs: ciTimeoutMs,
-                    watchEnvironments,
-                    onProgress: (m) => console.log(chalk.dim(`    ${m}`)),
-                });
-                if (watch.runUrl)
-                    console.log(chalk.dim(`    run: ${watch.runUrl}`));
-                if (watch.status === 'green') {
-                    console.log(chalk.green(`  ✓ CI green${watchEnvironments ? ` (${watchEnvironments.join('/')} deploy verified)` : ''}`));
-                    break;
-                }
-                if (watch.status === 'skipped' || watch.status === 'no-run') {
-                    console.log(chalk.yellow(`  ⚠ watch-ci ${watch.status}: ${watch.feedback ?? ''}`));
-                    break;
-                }
-                // failed | timeout
-                pass++;
-                console.log(chalk.yellow(`  ✗ CI ${watch.status} (re-converge pass ${pass}/${ciPasses})`));
-                if (pass >= ciPasses) {
-                    console.log(chalk.red(`  watch-ci: exhausted ${ciPasses} pass(es); CI still not green.`));
-                    result = { ...result, success: false, finalFeedback: watch.feedback ?? result.finalFeedback };
-                    break;
-                }
-                console.log(chalk.cyan('  ⟲ re-converging against CI feedback…'));
-                const reconvergeLoop = new ConvergenceLoop({ ...loopConfig, baselineCheck: false, resumeFrom: undefined, onCheckpoint: undefined }, executor, seams);
-                result = await reconvergeLoop.deliver(`${instruction}\n\n${watch.feedback ?? ''}`);
-                if (!result.success) {
-                    console.log(chalk.red('  re-converge did not reach local-green; stopping watch-ci.'));
-                    break;
-                }
-            }
+            result = await runCiReconverge({
+                instruction,
+                initial: result,
+                ciPasses,
+                changedFiles: () => changedFiles(projectRoot),
+                greenDetail: watchEnvironments ? ` (${watchEnvironments.join('/')} deploy verified)` : '',
+                commitAndWatch: async (files) => {
+                    console.log(chalk.cyan(`☁ watch-ci: committing & pushing ${branch ?? 'current branch'}, watching CI…`));
+                    const watch = await commitPushAndWatch({
+                        projectRoot,
+                        branch,
+                        commitMessage: `feat(delivery): ${instruction.slice(0, 72)}`,
+                        files,
+                        timeoutMs: ciTimeoutMs,
+                        watchEnvironments,
+                        onProgress: (m) => console.log(chalk.dim(`    ${m}`)),
+                    });
+                    if (watch.runUrl)
+                        console.log(chalk.dim(`    run: ${watch.runUrl}`));
+                    return watch;
+                },
+                reconverge: async (prompt) => {
+                    const reconvergeLoop = new ConvergenceLoop({ ...loopConfig, baselineCheck: false, resumeFrom: undefined, onCheckpoint: undefined }, executor, seams);
+                    return reconvergeLoop.deliver(prompt);
+                },
+                note: (line) => console.log(line.startsWith('  ✓')
+                    ? chalk.green(line)
+                    : line.startsWith('  ⚠') || line.startsWith('  ✗')
+                        ? chalk.yellow(line)
+                        : line.startsWith('  ⟲')
+                            ? chalk.cyan(line)
+                            : line.includes('exhausted') || line.includes('did not reach')
+                                ? chalk.red(line)
+                                : chalk.dim(line)),
+            });
         }
     }
     catch (err) {