aiki-cli 0.3.2 → 0.3.3

package/dist/storage/runs.js

@@ -12,7 +12,7 @@
 //   an invalid payload throws and writes nothing.
 import { mkdir, rename, writeFile } from 'node:fs/promises';
 import { dirname, join } from 'node:path';
-import { ActionPlanArtifact, DecisionContractArtifact, DecisionGraph, DisagreementMap, IdeaRoleOutput, JudgeReport, PreflightArtifact, RebuttalEventSet, ReviewMap, RoleOutput, RunBrief, RunMeta, UrlSourceSet, VerificationArtifact } from '../schemas/index.js';
+import { ActionPlanArtifact, ChallengeDeltaSet, DecisionContractArtifact, DecisionGraph, DisagreementMap, IdeaRoleOutput, JudgeReport, PreflightArtifact, RebuttalEventSet, ReviewMap, RoleOutput, RunBrief, RunMeta, UrlSourceSet, VerificationArtifact } from '../schemas/index.js';
 export class OutOfOrderWriteError extends Error {
     constructor(slot, ord, maxOrd) {
         super(`out-of-order write: "${slot}" (stage ${ord}) after stage ${maxOrd} already written`);
@@ -33,6 +33,7 @@ const JSON_SLOTS = {
     'intent-contract': { ord: 1, path: '01-intent-contract.json', schema: DecisionContractArtifact },
     'preflight-readings': { ord: 2, path: '02-preflight-readings.json', schema: PreflightArtifact },
     'misunderstanding-guard': { ord: 2, path: '02-misunderstanding-guard.json', schema: null },
+    'challenge-deltas': { ord: 4.5, path: '04b-challenge-deltas.json', schema: ChallengeDeltaSet },
     'drift-report': { ord: 5, path: '05-drift-report.json', schema: null },
     positions: { ord: 6, path: '06-positions.json', schema: null },
     'coverage-fill': { ord: 6.5, path: '06b-coverage-fill.json', schema: IdeaRoleOutput },

package/dist/workflows/idea-refinement.js

@@ -7,15 +7,19 @@ import { s5Drift } from '../orchestration/stages/s5-drift.js';
 import { s6Positions } from '../orchestration/stages/s6-positions.js';
 import { s7DecisionGraph } from '../orchestration/stages/s7-decision-graph.js';
 import { s8Verify } from '../orchestration/stages/s8-verify.js';
+import { overlayClaimGroups } from '../orchestration/claim-groups.js';
 import { s8bRebuttal } from '../orchestration/stages/s8b-rebuttal.js';
 import { s9Judge } from '../orchestration/stages/s9-judge.js';
 import { s9bPlan } from '../orchestration/stages/s9b-plan.js';
 import { s10Render } from '../orchestration/stages/s10-render.js';
 import { loadSkill } from '../orchestration/skills.js';
 import { buildLanePrompts } from '../orchestration/idea-lanes.js';
-import { preflight, renderDecisionInput } from '../orchestration/preflight.js';
-import { buildQuickPrompt, quickActionPlan, quickJudgeReport, s4QuickAnalyze } from '../orchestration/quick-analysis.js';
-import { snapshotUrlSources } from '../orchestration/url-sources.js';
+import { deterministicContract, preflight, renderDecisionInput } from '../orchestration/preflight.js';
+import { buildAdaptivePrompt, buildQuickPrompt, quickActionPlan, quickJudgeReport, s4QuickAnalyze } from '../orchestration/quick-analysis.js';
+import { blockedSourceStop, snapshotUrlSources } from '../orchestration/url-sources.js';
+import { compileDecisionGraph } from '../orchestration/decision-graph.js';
+import { structuralEscalationGates } from '../orchestration/auto-profile.js';
+import { overlayChallengeDeltas, s4bChallenge } from '../orchestration/stages/s4b-challenge.js';
 /** Idea-vetting core rubric: 13 mandatory coverage items. S0 adds 3-5 domain dimensions per run.
  *  Inlined here (like the S4 template) while the skill/`rubric.json` loader (§11)
  *  is deferred; it moves to skills/idea-refinement/rubric.json when that loader lands. */
@@ -139,25 +143,96 @@ export function recordIdeaOutcomeFlags(ctx, contract, seats) {
 export async function runIdeaRefinement(ctx, input) {
     if (ctx.evidencePack)
         await ctx.writer.writeInput('evidence-pack.json', JSON.stringify(ctx.evidencePack, null, 2));
-    const urlSources = await snapshotUrlSources(input);
+    // v6 T10b: the CLI may have already snapshotted (and interactively cleared) the sources.
+    const urlSources = ctx.urlSources ?? await snapshotUrlSources(input);
     await ctx.writer.writeJson('url-sources', urlSources);
     const unreadableSources = urlSources.sources.filter((source) => source.status !== 'FETCHED');
     const needsSourceFallback = ctx.mode !== 'quick' && unreadableSources.length > 0;
-    const hasReadableResearch = Boolean(ctx.evidencePack?.files.length)
-        || urlSources.sources.some((source) => source.status === 'FETCHED');
-    const canSearch = ctx.roles.s4.includes('codex');
-    if (needsSourceFallback && !canSearch && !hasReadableResearch) {
-        const details = unreadableSources.map((source) => `${source.url} (${source.status}: ${source.error})`).join('; ');
-        throw new StageError('S0', 'SOURCE_UNREADABLE', `source investigation stopped before model calls because no source was readable and Codex search is unavailable${details ? `: ${details}` : ''}. Paste the relevant text, provide a public export, or enable Codex, then rerun.`);
+    // v6 T10: ANY unreadable supplied source stops the run before paid calls unless the user
+    // explicitly proceeds (--allow-blocked-sources). Codex search no longer silences the ask —
+    // it runs in addition, once the user has chosen to proceed.
+    const stop = blockedSourceStop(urlSources, ctx.mode, ctx.allowBlockedSources ?? false);
+    if (stop)
+        throw new StageError('S0', 'SOURCE_UNREADABLE', `source investigation stopped before model calls: ${stop}`);
+    let contract;
+    let grilledInput;
+    if (ctx.fastPath) {
+        contract = await runStage(ctx, 'S0', async () => {
+            return deterministicContract(input, IDEA_RUBRIC.map((item) => item.label));
+        });
+        ctx.addFlag('headless_intent');
+        grilledInput = input;
+    }
+    else {
+        const result = await runStage(ctx, 'S0', () => preflight(ctx, input, IDEA_RUBRIC.map((item) => item.label), urlSources));
+        contract = result.contract;
+        grilledInput = renderDecisionInput(input, result.brief, urlSources);
     }
-    const { contract, brief } = await runStage(ctx, 'S0', () => preflight(ctx, input, IDEA_RUBRIC.map((item) => item.label), urlSources));
-    const grilledInput = renderDecisionInput(input, brief, urlSources);
     // Persist the input as a file so S4's "read the file at {{INPUT_PATH}}" resolves (not a stage).
     await ctx.writer.writeInput('idea.md', input);
     await ctx.writer.writeInput('idea-brief.md', grilledInput);
     const inputPath = resolve(ctx.writer.dir, 'inputs', 'idea-brief.md');
     const rubric = buildIdeaRubric(contract.domain_dimensions);
     const analystSkill = loadSkill('idea-refinement', 'analyst');
+    if (ctx.isAuto) {
+        ctx.addFlag('single_model');
+        const startedFast = ctx.fastPath;
+        const primaryPrompt = startedFast
+            ? buildQuickPrompt(contract, inputPath, ctx.evidencePack, analystSkill)
+            : buildAdaptivePrompt(contract, inputPath, ctx.evidencePack, analystSkill);
+        if (!startedFast)
+            await ctx.writer.writePrompt('auto-primary.md', primaryPrompt);
+        const quick = await runStage(ctx, 'S4', () => s4QuickAnalyze(ctx, primaryPrompt, {
+            persist: !startedFast,
+            stage: startedFast ? 'Q1' : 'S4-auto-primary',
+        }));
+        const provisional = compileDecisionGraph([{ provider: quick.seat.provider, submission: quick.seat.output }], rubric);
+        const gates = structuralEscalationGates(provisional);
+        if (gates.length) {
+            ctx.markAutoEscalated(gates.map((gate) => gate.reason));
+            if (startedFast) {
+                const result = await runStage(ctx, 'S0-auto', () => preflight(ctx, input, IDEA_RUBRIC.map((item) => item.label), urlSources));
+                contract = result.contract;
+            }
+        }
+        if (startedFast) {
+            if (gates.length === 0)
+                await ctx.writer.writeJson('intent-contract', contract);
+            await ctx.writer.writePrompt('quick-analyst.md', primaryPrompt);
+            await ctx.writer.writeRoleOutput(quick.seat.provider, quick.seat.output);
+        }
+        const challenge = gates.length
+            ? await runStage(ctx, 'S4b', () => s4bChallenge(ctx, provisional, gates, quick.seat.provider))
+            : { deltas: [] };
+        const { kept } = await runStage(ctx, 'S5', () => s5Drift(ctx, contract, [quick.seat], 1));
+        if (ctx.mode !== 'quick')
+            recordIdeaOutcomeFlags(ctx, contract, kept);
+        const positions = await runStage(ctx, 'S6', () => s6Positions(ctx, kept));
+        const graph = await runStage(ctx, 'S7', () => s7DecisionGraph(ctx, positions, rubric, contract.task));
+        const challenged = overlayChallengeDeltas(graph, challenge.deltas);
+        const verifications = await runStage(ctx, 'S8', async () => {
+            const result = { verifications: [] };
+            await ctx.writer.writeJson('verifications', result);
+            return result;
+        });
+        const rebuttals = await runStage(ctx, 'S8b', async () => {
+            const result = { round: 1, selected_claim_ids: [], events: [], stop_reason: 'NO_ESCALATIONS' };
+            await ctx.writer.writeJson('rebuttals', result);
+            return result;
+        });
+        const judgeReport = await runStage(ctx, 'S9', async () => {
+            const report = quickJudgeReport(quick.decision, challenged);
+            await ctx.writer.writeJson('judge-report', report);
+            return report;
+        });
+        const actionPlan = await runStage(ctx, 'S9b', async () => {
+            const plan = quickActionPlan(ctx, quick.seat.provider, quick.decision, challenged, contract);
+            await ctx.writer.writeJson('action-plan', plan);
+            return plan;
+        });
+        await runStage(ctx, 'S10', () => s10Render(ctx, { contract, seats: kept, graph: challenged, verifications, rebuttals, judgeReport, actionPlan, rubric, original: input }));
+        return;
+    }
     if (ctx.mode === 'quick') {
         ctx.addFlag('single_model');
         const quickPrompt = buildQuickPrompt(contract, inputPath, ctx.evidencePack, analystSkill);
@@ -198,8 +273,11 @@ export async function runIdeaRefinement(ctx, input) {
     const positions = await runStage(ctx, 'S6', () => s6Positions(ctx, kept));
     const graph = await runStage(ctx, 'S7', () => s7DecisionGraph(ctx, positions, rubric, contract.task));
     const verifications = await runStage(ctx, 'S8', () => s8Verify(ctx, graph));
-    const rebuttals = await runStage(ctx, 'S8b', () => s8bRebuttal(ctx, graph, verifications, ctx.mode));
-    const judgeReport = await runStage(ctx, 'S9', () => s9Judge(ctx, contract, graph, verifications, rubric, rebuttals));
-    const actionPlan = await runStage(ctx, 'S9b', () => s9bPlan(ctx, contract, kept, graph, judgeReport, input));
-    await runStage(ctx, 'S10', () => s10Render(ctx, { contract, seats: kept, graph, verifications, rebuttals, judgeReport, actionPlan, rubric, original: input }));
+    // v6 semantic join: S8's validated claim_groups upgrade cross-provider paraphrase states
+    // (UNIQUE → CONSENSUS/DISAGREEMENT/…) on a derived copy; the stored 07 artifact stays original.
+    const joined = overlayClaimGroups(graph, verifications.claim_groups);
+    const rebuttals = await runStage(ctx, 'S8b', () => s8bRebuttal(ctx, joined, verifications, ctx.mode));
+    const judgeReport = await runStage(ctx, 'S9', () => s9Judge(ctx, contract, joined, verifications, rubric, rebuttals));
+    const actionPlan = await runStage(ctx, 'S9b', () => s9bPlan(ctx, contract, kept, joined, judgeReport, input));
+    await runStage(ctx, 'S10', () => s10Render(ctx, { contract, seats: kept, graph: joined, verifications, rebuttals, judgeReport, actionPlan, rubric, original: input }));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiki-cli",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Local-first AI model council for code review and idea stress-testing using Claude Code, Codex, and Gemini/Antigravity CLIs. No API keys.",
   "type": "module",
   "license": "MIT",
@@ -45,7 +45,7 @@
     "node": ">=20"
   },
   "scripts": {
-    "build": "node -e \"require('fs').rmSync('dist',{recursive:true,force:true})\" && tsc -p tsconfig.json && node -e \"require('fs').copyFileSync('src/providers/profiles.json','dist/providers/profiles.json')\" && node -e \"require('fs').cpSync('src/skills','dist/skills',{recursive:true})\"",
+    "build": "node -e \"require('fs').rmSync('dist',{recursive:true,force:true})\" && tsc -p tsconfig.json && node -e \"require('fs').copyFileSync('src/providers/profiles.json','dist/providers/profiles.json')\" && node -e \"require('fs').cpSync('src/skills','dist/skills',{recursive:true})\" && node -e \"require('fs').cpSync('serve-ui','dist/serve-ui',{recursive:true})\"",
     "typecheck": "tsc -p tsconfig.json --noEmit",
     "test": "vitest run",
     "test:watch": "vitest",