popeye-cli 2.1.0 → 2.7.0

package/dist/pipeline/command-resolver.js

@@ -26,14 +26,22 @@ export function resolveCommands(snapshot, overrides) {
         case 'python':
             resolved = resolvePythonCommands(snapshot);
             break;
-        case 'mixed':
+        case 'mixed': {
             // Prefer Node commands, augment with Python where Node is missing
             resolved = resolveNodeCommands(pm, scripts, snapshot);
+            const pyResolved = resolvePythonCommands(snapshot);
             if (!resolved.test) {
-                const pyResolved = resolvePythonCommands(snapshot);
                 resolved.test = pyResolved.test;
             }
+            // Chain both install commands for mixed projects
+            if (resolved.install && pyResolved.install) {
+                resolved.install = `${resolved.install} && ${pyResolved.install}`;
+            }
+            else if (!resolved.install) {
+                resolved.install = pyResolved.install;
+            }
             break;
+        }
         default:
             resolved = { resolved_from: 'none' };
     }
@@ -51,6 +59,10 @@ export function resolveCommands(snapshot, overrides) {
             resolved.migrations = overrides.migrations;
         if (overrides.start)
             resolved.start = overrides.start;
+        if (overrides.install)
+            resolved.install = overrides.install;
+        if (overrides.install_cwd)
+            resolved.install_cwd = overrides.install_cwd;
     }
     return resolved;
 }
@@ -98,6 +110,15 @@ function resolveNodeCommands(pm, scripts, snapshot) {
     else if (scripts.dev) {
         resolved.start = `${run} dev`;
     }
+    // Install — always resolve based on package manager
+    resolved.install = pm === 'yarn' ? 'yarn install' : `${pm} install`;
+    // Workspace detection: install must run at the workspace root
+    const rootPkg = snapshot.config_files.find((c) => c.type === 'package.json');
+    const hasWorkspaces = rootPkg?.key_fields?.workspaces !== undefined;
+    const hasPnpmWorkspace = snapshot.config_files.some((c) => c.type === 'pnpm-workspace.yaml');
+    if (hasWorkspaces || hasPnpmWorkspace) {
+        resolved.install_cwd = '.';
+    }
     return resolved;
 }
 // ─── Python Resolution ───────────────────────────────────
@@ -135,6 +156,16 @@ function resolvePythonCommands(snapshot) {
     }
     // Start
     resolved.start = 'uvicorn main:app --host 0.0.0.0 --port 8000';
+    // Install — conservative: only well-known safe patterns
+    const hasPoetryLock = snapshot.config_files.some((c) => c.type === 'poetry.lock');
+    const hasReqs = snapshot.config_files.some((c) => c.type === 'requirements.txt');
+    if (hasPoetryLock) {
+        resolved.install = 'poetry install';
+    }
+    else if (hasReqs) {
+        resolved.install = 'pip install -r requirements.txt';
+    }
+    // No install for pyproject.toml-only (may need build backends, system deps)
     return resolved;
 }
 //# sourceMappingURL=command-resolver.js.map

package/dist/pipeline/command-resolver.js.map

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

package/dist/pipeline/consensus/arbitrator-query.d.ts

@@ -0,0 +1,22 @@
+/**
+ * Generic AI provider query — shared between consensus arbitration
+ * and auto-recovery guidance (v2.6.0).
+ *
+ * Single source of truth for adapter wiring + timeout logic.
+ */
+export interface ProviderConfig {
+    provider: string;
+    model: string;
+    temperature: number;
+}
+/**
+ * Call any configured AI provider with an arbitrary prompt.
+ * Returns raw text response or null on timeout/error.
+ *
+ * @param prompt - The full prompt to send to the provider
+ * @param config - Provider configuration (provider name, model, temperature)
+ * @param timeoutMs - Maximum time to wait for a response (default: 120s)
+ * @returns Raw text response or null on timeout/error/empty
+ */
+export declare function queryProvider(prompt: string, config: ProviderConfig, timeoutMs?: number): Promise<string | null>;
+//# sourceMappingURL=arbitrator-query.d.ts.map

package/dist/pipeline/consensus/arbitrator-query.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"arbitrator-query.d.ts","sourceRoot":"","sources":["../../../src/pipeline/consensus/arbitrator-query.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAUH,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACrB;AAID;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CACjC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,cAAc,EACtB,SAAS,SAAU,GAClB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA2BxB"}

package/dist/pipeline/consensus/arbitrator-query.js

@@ -0,0 +1,70 @@
+/**
+ * Generic AI provider query — shared between consensus arbitration
+ * and auto-recovery guidance (v2.6.0).
+ *
+ * Single source of truth for adapter wiring + timeout logic.
+ */
+import logging from 'node:console';
+const logger = logging;
+// ─── Provider Query ──────────────────────────────────────
+/**
+ * Call any configured AI provider with an arbitrary prompt.
+ * Returns raw text response or null on timeout/error.
+ *
+ * @param prompt - The full prompt to send to the provider
+ * @param config - Provider configuration (provider name, model, temperature)
+ * @param timeoutMs - Maximum time to wait for a response (default: 120s)
+ * @returns Raw text response or null on timeout/error/empty
+ */
+export async function queryProvider(prompt, config, timeoutMs = 120_000) {
+    try {
+        const resultPromise = callProviderAdapter(prompt, config);
+        const timeoutPromise = new Promise((resolve) => {
+            setTimeout(() => resolve(null), timeoutMs);
+        });
+        const raw = await Promise.race([resultPromise, timeoutPromise]);
+        if (!raw || raw.trim().length === 0) {
+            logger.warn(`[arbitrator-query] Empty response from ${config.provider}/${config.model}`);
+            return null;
+        }
+        logger.log(`[arbitrator-query] ${config.provider}/${config.model}: ${raw.length} chars`);
+        return raw;
+    }
+    catch (err) {
+        logger.warn(`[arbitrator-query] ${config.provider}/${config.model} failed: ${err instanceof Error ? err.message : 'unknown'}`);
+        return null;
+    }
+}
+// ─── Adapter Wiring ──────────────────────────────────────
+/**
+ * Route to the correct adapter based on provider name.
+ * Uses dynamic imports to avoid loading unused adapters.
+ */
+async function callProviderAdapter(prompt, config) {
+    switch (config.provider) {
+        case 'openai': {
+            const { requestRawReview } = await import('../../adapters/openai.js');
+            return requestRawReview(prompt, {
+                openaiModel: config.model,
+                temperature: config.temperature,
+            });
+        }
+        case 'gemini': {
+            const { requestRawReview } = await import('../../adapters/gemini.js');
+            return requestRawReview(prompt, {
+                model: config.model,
+                temperature: config.temperature,
+            });
+        }
+        case 'grok': {
+            const { requestRawReview } = await import('../../adapters/grok.js');
+            return requestRawReview(prompt, {
+                model: config.model,
+                temperature: config.temperature,
+            });
+        }
+        default:
+            throw new Error(`Unknown provider: ${config.provider}`);
+    }
+}
+//# sourceMappingURL=arbitrator-query.js.map

package/dist/pipeline/consensus/arbitrator-query.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"arbitrator-query.js","sourceRoot":"","sources":["../../../src/pipeline/consensus/arbitrator-query.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,OAAO,MAAM,cAAc,CAAC;AAInC,MAAM,MAAM,GAAG,OAAO,CAAC;AAUvB,4DAA4D;AAE5D;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,MAAc,EACd,MAAsB,EACtB,SAAS,GAAG,OAAO;IAEnB,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAE1D,MAAM,cAAc,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YACnD,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QAEH,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;QAEhE,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACpC,MAAM,CAAC,IAAI,CAAC,0CAA0C,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;YACzF,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,CAAC,GAAG,CACR,sBAAsB,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,KAAK,KAAK,GAAG,CAAC,MAAM,QAAQ,CAC7E,CAAC;QACF,OAAO,GAAG,CAAC;IACb,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,IAAI,CACT,sBAAsB,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,KAAK,YACnD,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,SACvC,EAAE,CACH,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,4DAA4D;AAE5D;;;GAGG;AACH,KAAK,UAAU,mBAAmB,CAChC,MAAc,EACd,MAAsB;IAEtB,QAAQ,MAAM,CAAC,QAAQ,EAAE,CAAC;QACxB,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC,0BAA0B,CAAC,CAAC;YACtE,OAAO,gBAAgB,CAAC,MAAM,EAAE;gBAC9B,WAAW,EAAE,MAAM,CAAC,KAAK;gBACzB,WAAW,EAAE,MAAM,CAAC,WAAW;aACJ,CAAC,CAAC;QACjC,CAAC;QACD,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC,0BAA0B,CAAC,CAAC;YACtE,OAAO,gBAAgB,CAAC,MAAM,EAAE;gBAC9B,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,WAAW,EAAE,MAAM,CAAC,WAAW;aAChC,CAAC,CAAC;QACL,CAAC;QACD,KAAK,MAAM,CAAC,CAAC,CAAC;YACZ,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,CAAC;YACpE,OAAO,gBAAgB,CAAC,MAAM,EAAE;gBAC9B,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,WAAW,EAAE,MAAM,CAAC,WAAW;aAChC,CAAC,CAAC;QACL,CAAC;QACD;YACE,MAAM,IAAI,KAAK,CAAC,qBAAqB,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC5D,CAAC;AACH,CAAC"}

package/dist/pipeline/consensus/consensus-runner.d.ts

@@ -6,10 +6,37 @@
  * 1. Independent Review (DEFAULT): N reviewers review simultaneously,
  *    no reviewer sees other reviewers' output.
  * 2. Iterative Consensus (optional): for recovery plan iteration.
+ *
+ * v2.1: Vote normalization pipeline, tag reclassification, hard-blocker
+ *       detection, config-driven arbitration, reviewer rubric.
  */
 import type { PlanPacket, ConsensusPacket, ReviewerVote } from '../types.js';
 import type { GateDefinition } from '../gate-engine.js';
+import type { NormalizationSummary } from '../packets/consensus-packet-builder.js';
 import type { ConsensusConfig } from '../../types/consensus.js';
+/**
+ * Normalize votes: pool → classify by tag → detect hard blockers → route by vote → dedup.
+ * Called after collecting votes, before buildConsensusPacket().
+ * Idempotent: running twice produces the same result.
+ */
+export declare function normalizeVoteBlockers(votes: ReviewerVote[]): {
+    votes: ReviewerVote[];
+    summary: NormalizationSummary;
+};
+/**
+ * Floor confidence score for CONDITIONAL votes.
+ * Matches adapter rubric: 80-94% = "minor revisions needed".
+ */
+export declare const DEFAULT_CONDITIONAL_FLOOR = 0.8;
+/**
+ * Map a reviewer's confidence score (0-1) to a structured vote.
+ * Threshold-aware: APPROVE = meets gate bar, CONDITIONAL = iterate, REJECT = major rework.
+ */
+export declare function mapVote(confidence: number, threshold: number, conditionalFloor?: number): 'APPROVE' | 'CONDITIONAL' | 'REJECT';
+/**
+ * Check if votes have meaningful disagreement (not unanimous).
+ */
+export declare function hasVoteDisagreement(votes: ReviewerVote[]): boolean;
 export interface ConsensusRunnerConfig {
     mode: 'independent' | 'iterative';
     minReviewers: number;
@@ -19,26 +46,123 @@ export interface ConsensusRunnerConfig {
     consensusConfig?: Partial<ConsensusConfig>;
     /** Provider configurations for multi-LLM review */
     reviewerProviders?: ReviewerProviderConfig[];
+    /** Arbitrator provider configuration (v2.1) */
+    arbitratorProvider?: ReviewerProviderConfig;
+    /** Enable arbitration for deadlocked votes (v2.1) */
+    enableArbitration?: boolean;
+    /** Skill loader for injecting reviewer/arbitrator skills (v2.2.1) */
+    skillLoader?: import('../skill-loader.js').SkillLoader;
+    /** Skill usage registry for recording usage events (v2.2.1) */
+    skillUsageRegistry?: import('../skills/usage-registry.js').SkillUsageRegistry;
 }
 export interface ReviewerProviderConfig {
     provider: string;
     model: string;
     temperature: number;
 }
+/**
+ * Safely load plan content from disk.
+ * - Path traversal guard: resolved path must start with projectDir.
+ * - Size cap: truncates with marker if content exceeds MAX_PLAN_CONTENT_CHARS.
+ */
+export declare function loadPlanContent(projectDir: string, artifactPath: string | undefined): {
+    content: string;
+    truncated: boolean;
+};
+export type ArbitrationTrigger = 'DISAGREEMENT' | 'BORDERLINE_SCORE' | 'ALL_CONDITIONAL' | 'NONE';
+/**
+ * Determine whether arbitration should be triggered and why.
+ * Pure function — no side effects, easily unit-testable.
+ */
+export declare function getArbitrationTrigger(votes: ReviewerVote[], weightedScore: number, threshold: number): ArbitrationTrigger;
 export declare class ConsensusRunner {
     private readonly config;
+    private arbitrationAttempted;
     constructor(config: ConsensusRunnerConfig);
     /** Run structured consensus on a plan packet */
-    runStructuredConsensus(planPacket: PlanPacket, gateDefinition: GateDefinition): Promise<ConsensusPacket>;
+    runStructuredConsensus(planPacket: PlanPacket, gateDefinition: GateDefinition, options?: {
+        revisionDirective?: string;
+    }): Promise<ConsensusPacket>;
     /** Independent review: spawn N reviewers, each reviews independently */
-    runIndependentReview(planPacket: PlanPacket): Promise<ReviewerVote[]>;
+    runIndependentReview(planPacket: PlanPacket, planContent: string, revisionDirective?: string): Promise<ReviewerVote[]>;
     /** Iterative review: wraps existing iterateUntilConsensus */
-    runIterativeReview(planPacket: PlanPacket): Promise<ReviewerVote[]>;
-    /** Spawn a single independent reviewer */
+    runIterativeReview(planPacket: PlanPacket, planContent: string, revisionDirective?: string): Promise<ReviewerVote[]>;
+    /**
+     * Spawn a single independent reviewer.
+     * Governance rule: vote is ALWAYS derived from confidence via mapVote().
+     * The LLM's explicit vote is advisory only — logged for debugging.
+     */
     private spawnSingleReviewer;
-    /** Call the appropriate provider adapter for a review */
+    /**
+     * Call the appropriate provider adapter for a review.
+     * Uses requestRawReview() to bypass adapter prompt wrapping/parsing —
+     * the runner owns the prompt and parses the raw LLM response itself.
+     */
     private callProviderForReview;
+    /**
+     * Call arbitrator provider for tie-breaking (v2.1).
+     * v2.4.2: Rotates arbitrator away from dissenting reviewers to prevent
+     * systematic failure (e.g., Gemini rejects as reviewer + as arbitrator).
+     */
+    private callArbitrator;
+}
+export interface ProviderReviewResult {
+    confidence: number;
+    blockingIssues: string[];
+    suggestions: string[];
+    requiredChanges?: string[];
+    /** LLM's explicit vote — advisory only, never used for gate decisions */
+    modelVote?: 'APPROVE' | 'REJECT' | 'CONDITIONAL' | null;
 }
-export declare function buildReviewPrompt(planPacket: PlanPacket): string;
-export declare function createConsensusRunner(projectDir: string, consensusConfig?: Partial<ConsensusConfig>): ConsensusRunner;
+/**
+ * Parse raw LLM response text into a ProviderReviewResult.
+ * Strategy 1: Try JSON parse first (expected format).
+ * Strategy 2: Regex fallback for free-form text responses.
+ *
+ * @param raw - Raw text from the LLM
+ * @returns Parsed review result with confidence, issues, and advisory vote
+ */
+export declare function parseRawReviewResponse(raw: string): ProviderReviewResult;
+/**
+ * Correct confidence when it contradicts the model's explicit vote.
+ *
+ * The prompt defines confidence as "plan quality score" (0-1) and
+ * assigns ranges: REJECT < 0.80, CONDITIONAL 0.80-0.94, APPROVE >= 0.95.
+ * Some models confuse this with "assessment certainty" and return e.g.
+ * REJECT + 0.99 ("99% sure it's bad"). This function inverts such
+ * contradictions so mapVote() receives a semantically correct input.
+ *
+ * Correction is SYMMETRIC across all three bands:
+ * - REJECT + conf >= 0.80  -> invert: min(0.79, 1 - conf)
+ * - CONDITIONAL + conf >= 0.95 -> snap to midpoint 0.87
+ * - CONDITIONAL + conf < 0.80  -> snap to midpoint 0.87
+ * - APPROVE + conf < 0.80 -> invert: max(0.95, 1 - conf)
+ * - APPROVE + conf in [0.80, 0.95) -> snap to 0.95
+ *
+ * If modelVote is null (regex fallback couldn't find a vote), no correction.
+ */
+export declare function correctConfidenceContradiction(modelVote: 'APPROVE' | 'REJECT' | 'CONDITIONAL' | null, rawConfidence: number): {
+    confidence: number;
+    wasContradiction: boolean;
+    original: number;
+};
+/**
+ * Parse raw arbitrator response into a structured result.
+ * Strategy 1: JSON parse (optionally wrapped in code fences).
+ * Strategy 2: Regex fallback for free-form text.
+ *
+ * @param raw - Raw text from the arbitrator LLM
+ * @returns Parsed result with approved boolean, reasoning, and suggested changes
+ */
+export declare function parseArbitratorResponse(raw: string): {
+    approved: boolean;
+    reasoning: string;
+    suggestedChanges: string[];
+};
+export declare function buildReviewPrompt(planPacket: PlanPacket, planContent?: string, revisionDirective?: string): string;
+/**
+ * Helper to resolve model string for a given provider from consensus config.
+ */
+export declare function getModelForProvider(config: Partial<ConsensusConfig> | undefined, provider: string): string;
+export declare function createConsensusRunner(projectDir: string, consensusConfig?: Partial<ConsensusConfig>, skillLoader?: import('../skill-loader.js').SkillLoader, skillUsageRegistry?: import('../skills/usage-registry.js').SkillUsageRegistry): ConsensusRunner;
 //# sourceMappingURL=consensus-runner.d.ts.map

package/dist/pipeline/consensus/consensus-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"consensus-runner.d.ts","sourceRoot":"","sources":["../../../src/pipeline/consensus/consensus-runner.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,KAAK,EACV,UAAU,EACV,eAAe,EACf,YAAY,EACb,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAMxD,OAAO,KAAK,EAAE,eAAe,EAAmB,MAAM,0BAA0B,CAAC;AAIjF,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,aAAa,GAAG,WAAW,CAAC;IAClC,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IAC3C,mDAAmD;IACnD,iBAAiB,CAAC,EAAE,sBAAsB,EAAE,CAAC;CAC9C;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACrB;AASD,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwB;gBAEnC,MAAM,EAAE,qBAAqB;IAIzC,gDAAgD;IAC1C,sBAAsB,CAC1B,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,cAAc,GAC7B,OAAO,CAAC,eAAe,CAAC;IA+B3B,wEAAwE;IAClE,oBAAoB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IA4B3E,6DAA6D;IACvD,kBAAkB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IA4CzE,0CAA0C;YAC5B,mBAAmB;IAqCjC,yDAAyD;YAC3C,qBAAqB;CAiCpC;AAsBD,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAuChE;AAID,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,MAAM,EAClB,eAAe,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,GACzC,eAAe,CASjB"}
+{"version":3,"file":"consensus-runner.d.ts","sourceRoot":"","sources":["../../../src/pipeline/consensus/consensus-runner.ts"],"names":[],"mappings":"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"}