aiwcli 0.15.5 → 0.17.0

package/dist/templates/cc-native/_cc-native/lib-ts/index.ts

@@ -3,114 +3,116 @@
  * Re-exports the public API from all modules.
  */
 
-// Artifacts
-export {
-  buildCombinedJson,
-  buildHighIssuesDocument,
-  buildInlineReviewSummary,
-  extractTopIssuesText,
-  formatCombinedMarkdown,
-  formatReviewMarkdown,
-  generateReviewIndex,
-  writeCombinedArtifacts,
-} from "../artifacts/lib/index.js";
-
-// Orchestrator
-export { buildOrchestratorSchema, runOrchestrator } from "../plan-review/lib/orchestrator.js";
-
-// Reviewers
-export {
-  AgentReviewer,
-  runAgentReview,
-} from "../plan-review/lib/reviewers/index.js";
-
-// Verdict aggregation
-export { computeReviewDecision, worstVerdict } from "../plan-review/lib/verdict.js";
-
-// Agent aggregation
-export {
-  aggregateAgents,
-  extractBody,
-  extractFrontmatter,
-} from "./aggregate-agents.js";
+// Types & schemas
+export type {
+  Verdict,
+  ReviewDecision,
+  ComplexityCategory,
+  ReviewIssue,
+  ReviewData,
+  ReviewerResult,
+  OrchestratorResult,
+  CombinedReviewResult,
+  ReviewDecisionResult,
+  AgentConfig,
+  OrchestratorConfig,
+  IterationState,
+  IterationEntry,
+  CcNativeState,
+  PlanReviewState,
+  QuestionsAskedState,
+  StuckDetectionState,
+  PlanReviewConfig,
+  DisplaySettings,
+  ReviewOptions,
+  Reviewer,
+} from "./types.js";
 
-// CC-native state
 export {
-  getCcNativeState,
-  isPlanAlreadyReviewed,
-  markPlanReviewed,
-  markQuestionsAsked,
-  saveCcNativeState,
-  wasPlanPreviouslyDenied,
-  wasQuestionsAsked,
-} from "./cc-native-state.js";
-
-// CLI output parsing
-export { parseCliOutput } from "./cli-output-parser.js";
-
-// Configuration
-export { getDisplaySettings, loadConfig } from "./config.js";
+  REVIEW_SCHEMA,
+  ORCHESTRATOR_SCHEMA,
+  REVIEW_PROMPT_PREFIX,
+  AGENT_REVIEW_PROMPT_PREFIX,
+  DEFAULT_DISPLAY,
+  DEFAULT_SANITIZATION,
+} from "./types.js";
 
 // Constants & security
 export {
-  ENABLE_PLAN_NOTIFICATIONS,
   ENABLE_ROBUST_PLAN_WRITES,
-  MAX_ERROR_FILE_SIZE,
+  ENABLE_PLAN_NOTIFICATIONS,
+  PLANS_DIR,
   MAX_PLAN_PATH_LENGTH,
+  MAX_ERROR_FILE_SIZE,
   MAX_RETRY_ATTEMPTS,
-  MAX_TOTAL_RETRY_TIME_MS,
-  PLANS_DIR,
   RETRY_BACKOFF_MS,
+  MAX_TOTAL_RETRY_TIME_MS,
   validatePlanPath,
 } from "./constants.js";
 
-// Debug logging
-export { cleanupDebugFolder, debugLog, debugRaw, getDebugDir } from "./debug.js";
+// Verdict aggregation
+export { worstVerdict, computeReviewDecision } from "./verdict.js";
 
 // JSON parsing
-export { coerceToReview, parseJsonMaybe } from "./json-parser.js";
+export { parseJsonMaybe, coerceToReview } from "./json-parser.js";
+
+// CLI output parsing
+export { parseCliOutput } from "./cli-output-parser.js";
+
+// Configuration
+export { loadConfig, getDisplaySettings } from "./config.js";
+
+// Debug logging
+export { debugLog, debugRaw, getDebugDir, cleanupDebugFolder } from "./debug.js";
+
+// CC-native state
+export {
+  getCcNativeState,
+  saveCcNativeState,
+  isPlanAlreadyReviewed,
+  wasPlanPreviouslyDenied,
+  markPlanReviewed,
+  wasQuestionsAsked,
+  markQuestionsAsked,
+  getStuckDetectionState,
+  updateStuckDetectionState,
+} from "./cc-native-state.js";
 
 // Iteration state
 export {
-  DEFAULT_REVIEW_ITERATIONS,
-  deleteState,
-  getIterationState,
   getStateFilePath,
   loadState,
   saveStateToPlan,
-  shouldContinueIterating,
+  deleteState,
+  getIterationState,
   updateIterationState,
+  shouldContinueIterating,
 } from "./state.js";
 
-// Types & schemas
-export type {
-  AgentConfig,
-  CcNativeState,
-  CombinedReviewResult,
-  ComplexityCategory,
-  DisplaySettings,
-  IterationEntry,
-  IterationState,
-  OrchestratorConfig,
-  OrchestratorResult,
-  PlanReviewConfig,
-  PlanReviewState,
-  QuestionsAskedState,
-  ReviewData,
-  ReviewDecision,
-  ReviewDecisionResult,
-  Reviewer,
-  ReviewerResult,
-  ReviewIssue,
-  ReviewOptions,
-  Verdict,
-} from "./types.js";
+// Orchestrator
+export { runOrchestrator, buildOrchestratorSchema } from "./orchestrator.js";
 
+// Agent aggregation
 export {
-  AGENT_REVIEW_PROMPT_PREFIX,
-  DEFAULT_DISPLAY,
-  DEFAULT_SANITIZATION,
-  ORCHESTRATOR_SCHEMA,
-  REVIEW_PROMPT_PREFIX,
-  REVIEW_SCHEMA,
-} from "./types.js";
+  aggregateAgents,
+  extractFrontmatter,
+  extractBody,
+} from "./aggregate-agents.js";
+
+// Artifacts
+export {
+  formatReviewMarkdown,
+  formatCombinedMarkdown,
+  buildInlineReviewSummary,
+  extractTopIssuesText,
+  buildHighIssuesDocument,
+  generateReviewIndex,
+  buildCombinedJson,
+  writeCombinedArtifacts,
+} from "./artifacts.js";
+
+// Reviewers
+export {
+  AgentReviewer,
+  runAgentReview,
+} from "./reviewers/index.js";

package/dist/templates/cc-native/_cc-native/lib-ts/json-parser.ts

@@ -3,8 +3,8 @@
  * See cc-native-plan-review-spec.md §4.10-4.11
  */
 
+import { logDebug, logWarn } from "../../_core/lib-ts/runtime/logger.js";
 import type { ReviewData, Verdict } from "./types.js";
-import { logDebug, logWarn } from "../../_shared/lib-ts/base/logger.js";
 
 /**
  * Try strict JSON parse. If that fails, attempt to extract the first {...} block.
@@ -16,12 +16,12 @@ import { logDebug, logWarn } from "../../_shared/lib-ts/base/logger.js";
 export function parseJsonMaybe(
   text: string,
   requireFields?: string[],
-): null | Record<string, unknown> {
+): Record<string, unknown> | null {
   const trimmed = text.trim();
   if (!trimmed) return null;
 
-  let obj: null | Record<string, unknown> = null;
-  let parseMethod: null | string = null;
+  let obj: Record<string, unknown> | null = null;
+  let parseMethod: string | null = null;
 
   // Strict parse
   try {
@@ -93,7 +93,7 @@ export function parseJsonMaybe(
  * @returns Tuple of [ok, verdict, normalizedData]
  */
 export function coerceToReview(
-  obj: null | Record<string, unknown>,
+  obj: Record<string, unknown> | null,
   defaultFixMsg = "Retry or check configuration.",
 ): [boolean, Verdict, ReviewData] {
   if (!obj) {
@@ -144,7 +144,6 @@ export function coerceToReview(
       `verdict=${obj.verdict}, issues_count=${Array.isArray(obj.issues) ? (obj.issues as unknown[]).length : 0}`,
     );
   }
-
   if (!obj.issues) {
     logDebug("coerce", "issues array empty or missing");
   }

package/dist/templates/cc-native/_cc-native/{plan-review/lib → lib-ts}/orchestrator.ts

@@ -1,70 +1,70 @@
-/**
- * Plan orchestrator — analyzes complexity and selects reviewer agents.
- * Uses OrchestratorClaudeAgent (BaseCliAgent framework) for subprocess execution.
- * See cc-native-plan-review-spec.md §4.8
- */
-
-import { OrchestratorClaudeAgent } from "./reviewers/providers/orchestrator-claude-agent.js";
-import { logInfo, logWarn } from "../../../_shared/lib-ts/base/logger.js";
-import type { AgentConfig, AgentReviewSettings, OrchestratorConfig, OrchestratorResult } from "../../lib-ts/types.js";
-
-// Re-export for backward compatibility (moved to reviewers/schemas.ts)
-export { buildOrchestratorSchema } from "./reviewers/schemas.js";
-
-// ---------------------------------------------------------------------------
-// Orchestrator
-// ---------------------------------------------------------------------------
-
-/**
- * Run the orchestrator agent to analyze plan complexity and select reviewers.
- * Never throws — returns fallback OrchestratorResult on failure.
- */
-export async function runOrchestrator(
-  plan: string,
-  agentLibrary: AgentConfig[],
-  config: OrchestratorConfig,
-  settings: AgentReviewSettings,
-  mandatoryNames?: Set<string>,
-): Promise<OrchestratorResult> {
-  logInfo("orchestrator", "Starting plan analysis...");
-
-  const mandatory = mandatoryNames ?? new Set<string>();
-
-  // Create a synthetic AgentConfig for the orchestrator
-  const orchestratorAgent: AgentConfig = {
-    name: "orchestrator",
-    model: config.model,
-    provider: config.provider ?? "claude",
-    focus: "plan analysis and agent selection",
-    categories: [],
-    description: "Plan orchestrator",
-    system_prompt: "",
-  };
-
-  try {
-    const agent = new OrchestratorClaudeAgent(
-      orchestratorAgent,
-      agentLibrary,
-      mandatory,
-      settings,
-      config.timeout,
-    );
-
-    const result = await agent.review(plan);
-
-    logInfo("orchestrator", `Result: complexity=${result.complexity}, category=${result.category}, agents=${JSON.stringify(result.selected_agents)}`);
-
-    return result;
-  } catch (error) {
-    logWarn("orchestrator", `Unexpected error: ${error}`);
-    const nonMandatory = agentLibrary.filter((a) => !mandatory.has(a.name));
-    const fallbackCount = settings.agentSelection?.fallbackCount ?? 2;
-    return {
-      complexity: "medium",
-      category: "code",
-      selected_agents: nonMandatory.slice(0, fallbackCount).map((a) => a.name),
-      reasoning: `Orchestrator failed: ${error}`,
-      error: String(error),
-    };
-  }
-}
+/**
+ * Plan orchestrator — analyzes complexity and selects reviewer agents.
+ * Uses OrchestratorClaudeAgent (BaseCliAgent framework) for subprocess execution.
+ * See cc-native-plan-review-spec.md §4.8
+ */
+
+import { logInfo, logWarn } from "../../_core/lib-ts/runtime/logger.js";
+import type { AgentConfig, OrchestratorConfig, OrchestratorResult } from "./types.js";
+import { OrchestratorClaudeAgent } from "./reviewers/providers/orchestrator-claude-agent.js";
+
+// Re-export for backward compatibility (moved to reviewers/schemas.ts)
+export { buildOrchestratorSchema } from "./reviewers/schemas.js";
+
+// ---------------------------------------------------------------------------
+// Orchestrator
+// ---------------------------------------------------------------------------
+
+/**
+ * Run the orchestrator agent to analyze plan complexity and select reviewers.
+ * Never throws — returns fallback OrchestratorResult on failure.
+ */
+export async function runOrchestrator(
+  plan: string,
+  agentLibrary: AgentConfig[],
+  config: OrchestratorConfig,
+  settings: Record<string, unknown>,
+  mandatoryNames?: Set<string>,
+): Promise<OrchestratorResult> {
+  logInfo("orchestrator", "Starting plan analysis...");
+
+  const mandatory = mandatoryNames ?? new Set<string>();
+
+  // Create a synthetic AgentConfig for the orchestrator
+  const orchestratorAgent: AgentConfig = {
+    name: "orchestrator",
+    model: config.model,
+    provider: "claude",
+    focus: "plan analysis and agent selection",
+    categories: [],
+    description: "Plan orchestrator",
+    system_prompt: "",
+  };
+
+  try {
+    const agent = new OrchestratorClaudeAgent(
+      orchestratorAgent,
+      agentLibrary,
+      mandatory,
+      settings,
+      config.timeout,
+    );
+
+    const result = await agent.review(plan);
+
+    logInfo("orchestrator", `Result: complexity=${result.complexity}, category=${result.category}, agents=${JSON.stringify(result.selected_agents)}`);
+
+    return result;
+  } catch (e) {
+    logWarn("orchestrator", `Unexpected error: ${e}`);
+    const nonMandatory = agentLibrary.filter((a) => !mandatory.has(a.name));
+    const fallbackCount = ((settings.agentSelection as Record<string, unknown>)?.fallbackCount as number) ?? 2;
+    return {
+      complexity: "medium",
+      category: "code",
+      selected_agents: nonMandatory.slice(0, fallbackCount).map((a) => a.name),
+      reasoning: `Orchestrator failed: ${e}`,
+      error: String(e),
+    };
+  }
+}

package/dist/templates/cc-native/_cc-native/{plan-review/lib → lib-ts}/output-builder.ts

@@ -1,121 +1,130 @@
-/**
- * Output construction: issue truncation, verdict override, message building.
- * Extracted from cc-native-plan-review.ts.
- */
-
-import { logInfo } from "../../../_shared/lib-ts/base/logger.js";
-import {
-  buildInlineReviewSummary,
-  extractTopIssuesText,
-} from "../../artifacts/lib/format.js";
-import type {
-  ReviewerResult,
-  CombinedReviewResult,
-  CorroborationResult,
-  IterationState,
-} from "../../lib-ts/types.js";
-
-const HOOK = "output-builder";
-
-const REVIEWER_CAVEAT = "Reviewers have limited context compared to your full session — use your judgment to adopt valid points and dismiss genuine false positives. However, treat false positives as a clarity signal: if a reviewer misunderstood your plan, an agent executing it will likely hit the same confusion. Revise those sections to be unambiguous so no future reader — human or AI — makes the same mistake.";
-const RESUBMIT_INSTRUCTION = "IMPORTANT: After revising the plan file, you MUST call ExitPlanMode again to trigger re-review. Do not end your turn or ask the user without calling ExitPlanMode.";
-
-// ---------------------------------------------------------------------------
-// Issue Truncation
-// ---------------------------------------------------------------------------
-
-/**
- * Truncate per-agent issues to top N by severity.
- * Mutates agentResults[name].data.issues in place.
- */
-export function truncateAgentIssues(
-  agentResults: Record<string, ReviewerResult>,
-  maxPerAgent: number,
-): void {
-  for (const r of Object.values(agentResults)) {
-    if (!Array.isArray(r.data?.issues)) continue;
-    const issues = r.data.issues as Array<{ severity?: string }>;
-    if (issues.length <= maxPerAgent) continue;
-    const severityOrder: Record<string, number> = { high: 0, medium: 1, low: 2 };
-    issues.sort((a, b) => (severityOrder[a.severity ?? "low"] ?? 2) - (severityOrder[b.severity ?? "low"] ?? 2));
-    const originalCount = issues.length;
-    r.data.issues = issues.slice(0, maxPerAgent);
-    logInfo(HOOK, `${r.name}: truncated issues ${originalCount} → ${maxPerAgent}`);
-  }
-}
-
-// ---------------------------------------------------------------------------
-// Verdict Override
-// ---------------------------------------------------------------------------
-
-/**
- * Override verdict to "fail" for agents exceeding high-issue threshold.
- * Mutates agentResults[name].verdict in place.
- */
-export function overrideVerdictsByThreshold(
-  agentResults: Record<string, ReviewerResult>,
-  threshold: number,
-): void {
-  for (const r of Object.values(agentResults)) {
-    if (!r.verdict || r.verdict === "skip" || r.verdict === "error") continue;
-    const issues = Array.isArray(r.data?.issues) ? r.data.issues as Array<{ severity?: string }> : [];
-    const agentHigh = issues.filter(i => i.severity === "high").length;
-    if (agentHigh >= threshold) {
-      logInfo(HOOK, `${r.name}: verdict overridden to 'fail' (${agentHigh} high issues >= ${threshold})`);
-      r.verdict = "fail";
-    }
-  }
-}
-
-// ---------------------------------------------------------------------------
-// Output Building
-// ---------------------------------------------------------------------------
-
-export interface ReviewOutputParams {
-  combinedResult: CombinedReviewResult;
-  corroborationResult: CorroborationResult;
-  iterationState: IterationState;
-  reviewFile: string;
-  highIssuesPath: string;
-}
-
-export interface ReviewOutput {
-  contextText: string;
-  blockReason: string;
-  shouldDeny: boolean;
-}
-
-/**
- * Build the final review output: context text and block reason.
- */
-export function buildReviewOutput(params: ReviewOutputParams): ReviewOutput {
-  const { combinedResult, corroborationResult, iterationState } = params;
-
-  const shouldDeny = corroborationResult.blocking.length > 0;
-  const reviewScore = shouldDeny ? 1 : 0;
-  const overall = corroborationResult.verdict;
-
-  // Build inline summary (no individual issues — those go in blockReason)
-  const inlineSummary = buildInlineReviewSummary(combinedResult, 0, 800, corroborationResult);
-  const contextParts = [inlineSummary];
-  contextParts.push(`\nFull review: \`${params.reviewFile}\`\n`);
-
-  const contextText = contextParts.join("");
-  const iterInfo = ` (iteration ${iterationState.current}/${iterationState.max}, score=${reviewScore.toFixed(2)})`;
-
-  let blockReason: string;
-  if (shouldDeny) {
-    const topIssuesText = extractTopIssuesText(combinedResult, 15, "high");
-    blockReason = `Plan review FAILED${iterInfo}. ` +
-      `High-severity issues:\n${topIssuesText}\n\n` +
-      `Full details: \`${params.highIssuesPath}\`\n` +
-      `${REVIEWER_CAVEAT} ` +
-      `Revise the plan to address these issues, then call ExitPlanMode again. ` +
-      RESUBMIT_INSTRUCTION;
-  } else {
-    blockReason = `Plan review ${overall.toUpperCase()}${iterInfo}. Review complete. ${REVIEWER_CAVEAT}`;
-  }
-
-  return { contextText, blockReason, shouldDeny };
-}
-
+/**
+ * Output construction: issue truncation, verdict override, message building.
+ * Extracted from cc-native-plan-review.ts.
+ */
+
+import { logInfo } from "../../_core/lib-ts/runtime/logger.js";
+
+import type {
+  ReviewerResult,
+  CombinedReviewResult,
+  CorroborationResult,
+  IterationState,
+} from "./types.js";
+import {
+  buildInlineReviewSummary,
+  extractTopIssuesText,
+} from "./artifacts/format.js";
+import { extractTopIssuesForTracker } from "./graduation.js";
+
+const HOOK = "output-builder";
+
+const REVIEWER_CAVEAT = "Reviewers have limited context compared to your full session — use your judgment to adopt valid points and dismiss genuine false positives. However, treat false positives as a clarity signal: if a reviewer misunderstood your plan, an agent executing it will likely hit the same confusion. Revise those sections to be unambiguous so no future reader — human or AI — makes the same mistake.";
+const RESUBMIT_INSTRUCTION = "IMPORTANT: After revising the plan file, you MUST call ExitPlanMode again to trigger re-review. Do not end your turn or ask the user without calling ExitPlanMode.";
+
+// ---------------------------------------------------------------------------
+// Issue Truncation
+// ---------------------------------------------------------------------------
+
+/**
+ * Truncate per-agent issues to top N by severity.
+ * @mutates agentResults[name].data.issues in place.
+ */
+export function truncateAgentIssues(
+  agentResults: Record<string, ReviewerResult>,
+  maxPerAgent: number,
+): void {
+  for (const r of Object.values(agentResults)) {
+    if (!Array.isArray(r.data?.issues)) continue;
+    const issues = r.data.issues as Array<{ severity?: string }>;
+    if (issues.length <= maxPerAgent) continue;
+    const severityOrder: Record<string, number> = { high: 0, medium: 1, low: 2 };
+    issues.sort((a, b) => (severityOrder[a.severity ?? "low"] ?? 2) - (severityOrder[b.severity ?? "low"] ?? 2));
+    const originalCount = issues.length;
+    r.data.issues = issues.slice(0, maxPerAgent);
+    logInfo(HOOK, `${r.name}: truncated issues ${originalCount} → ${maxPerAgent}`);
+  }
+}
+
+// ---------------------------------------------------------------------------
+// Verdict Override
+// ---------------------------------------------------------------------------
+
+/**
+ * Override verdict to "fail" for agents exceeding high-issue threshold.
+ * @mutates agentResults[name].verdict in place.
+ */
+export function overrideVerdictsByThreshold(
+  agentResults: Record<string, ReviewerResult>,
+  threshold: number,
+): void {
+  for (const r of Object.values(agentResults)) {
+    if (!r.verdict || r.verdict === "skip" || r.verdict === "error") continue;
+    const issues = Array.isArray(r.data?.issues) ? r.data.issues as Array<{ severity?: string }> : [];
+    const agentHigh = issues.filter(i => i.severity === "high").length;
+    if (agentHigh >= threshold) {
+      logInfo(HOOK, `${r.name}: verdict overridden to 'fail' (${agentHigh} high issues >= ${threshold})`);
+      r.verdict = "fail";
+    }
+  }
+}
+
+// ---------------------------------------------------------------------------
+// Output Building
+// ---------------------------------------------------------------------------
+
+export interface ReviewOutputParams {
+  combinedResult: CombinedReviewResult;
+  corroborationResult: CorroborationResult;
+  iterationState: IterationState;
+  reviewFile: string;
+  highIssuesPath: string;
+}
+
+export interface ReviewOutput {
+  contextText: string;
+  blockReason: string;
+  shouldDeny: boolean;
+}
+
+/**
+ * Build the final review output: context text and block reason.
+ */
+export function buildReviewOutput(params: ReviewOutputParams): ReviewOutput {
+  const { combinedResult, corroborationResult, iterationState } = params;
+
+  const shouldDeny = corroborationResult.blocking.length > 0;
+  const reviewScore = shouldDeny ? 1.0 : 0.0;
+  const overall = corroborationResult.verdict;
+
+  // Build inline summary
+  const inlineSummary = buildInlineReviewSummary(combinedResult, 5, 800, corroborationResult);
+  const contextParts = [inlineSummary];
+
+  // Top issues
+  const topIssuesList = extractTopIssuesForTracker(combinedResult, 5);
+  if (topIssuesList.length > 0) {
+    contextParts.push(`\nTop high-severity issues:\n${topIssuesList.map(i => `- ${i}`).join("\n")}`);
+  }
+  contextParts.push(`\nFull review: \`${params.reviewFile}\`\n`);
+
+  const contextText = contextParts.join("");
+  const iterInfo = ` (iteration ${iterationState.current}/${iterationState.max}, score=${reviewScore.toFixed(2)})`;
+
+  let blockReason: string;
+  if (shouldDeny) {
+    const topIssuesText = extractTopIssuesText(combinedResult, 3, "high");
+    blockReason = `Plan review FAILED${iterInfo}. ` +
+      `Critical issues: ${topIssuesText}. ` +
+      `IMPORTANT: Read \`${params.highIssuesPath}\` for ALL high-severity issues — ` +
+      `this file contains only the most critical findings, no noise. ` +
+      `${REVIEWER_CAVEAT} ` +
+      `Revise the plan to address these issues, then call ExitPlanMode again. ` +
+      RESUBMIT_INSTRUCTION;
+  } else {
+    blockReason = `Plan review ${overall.toUpperCase()}${iterInfo}. Review complete. ${REVIEWER_CAVEAT}`;
+  }
+
+  return { contextText, blockReason, shouldDeny };
+}
+