@alexeiled/pi-fusion 0.6.2 → 0.8.0

package/src/run-builder.ts

@@ -1,3 +1,9 @@
+import {
+  callerOutputContractInstructions,
+  detectCallerOutputContract,
+} from "./caller-contract.js";
+import { FusionArgsError } from "./errors.js";
+import { resolveMinimumSuccessfulPanelists } from "./panel-quorum.js";
 import {
   PANEL_DECISION_CLOSE,
   PANEL_DECISION_OPEN,
@@ -8,6 +14,9 @@ import {
   memberLabel,
   panelItemLabel,
   resolveSynthesisMode,
+  type CallerOutputContract,
+  type EffectiveFusionTimeouts,
+  type FusionTimeoutOverrides,
   THINKING_LEVELS,
   type FailedPanelSummary,
   type FusionProfile,
@@ -25,6 +34,15 @@ export const FUSION_ACCEPTANCE_DISABLED = {
 
 export type FusionAcceptanceDisabled = typeof FUSION_ACCEPTANCE_DISABLED;
 
+const DEFAULT_STAGE_TIMEOUT_MS = 900_000;
+const DEFAULT_PANELIST_TIMEOUT_MS = 840_000;
+const DEFAULT_PANEL_GRACE_MS = 5_000;
+const DEFAULT_TOOL_BUDGET: ToolBudget = {
+  soft: 8,
+  hard: 12,
+  block: "*",
+};
+
 export interface PanelSubagentTaskParams {
   agent: string;
   task: string;
@@ -34,6 +52,10 @@ export interface PanelSubagentTaskParams {
   skill: false;
   acceptance: FusionAcceptanceDisabled;
   model?: string;
+  /** Per-task cap so a panelist finalises before the workflow timeout. */
+  toolBudget: ToolBudget;
+  /** Child deadline, always shorter than the enclosing panel workflow. */
+  timeoutMs?: number;
 }
 
 export interface PanelWorkflowTaskParams extends PanelSubagentTaskParams {
@@ -85,6 +107,10 @@ export interface BuildJudgeSpawnParamsInput {
    * and its position bias.
    */
   runId: string;
+  callerContract?: CallerOutputContract;
+  timeoutOverrides?: FusionTimeoutOverrides;
+  /** Persisted at panel start so restored fallback judges keep their deadline. */
+  effectiveTimeouts?: EffectiveFusionTimeouts;
 }
 
 const PANEL_OUTPUT_CONTRACT = [
@@ -152,7 +178,10 @@ export function appendThinkingSuffix(
 export function buildPanelSpawnParams(
   profile: FusionProfile,
   prompt: string,
+  callerContract?: CallerOutputContract,
+  timeoutOverrides?: FusionTimeoutOverrides,
 ): PanelSpawnParams {
+  const timeouts = resolveEffectiveTimeouts(profile, timeoutOverrides);
   const concurrency = profile.concurrency ?? profile.panel.length;
   const tasks: PanelWorkflowTaskParams[] = profile.panel.map(
     (member, index) => ({
@@ -161,24 +190,31 @@ export function buildPanelSpawnParams(
         member,
         prompt,
         profile.stopWhenPanelAgrees === true,
+        profile.panelToolBudget ?? DEFAULT_TOOL_BUDGET,
+        callerContract,
+        timeouts.panelistTimeoutMs,
       ),
     }),
   );
 
+  const requiredSuccessfulPanelists = resolveMinimumSuccessfulPanelists(
+    profile.minimumSuccessfulPanelists,
+    profile.panel.length,
+  );
+
   return {
     workflowScript: buildPanelWorkflowScript(
       tasks,
       concurrency,
       profile.stopWhenPanelAgrees === true,
+      requiredSuccessfulPanelists,
     ),
     async: true,
     context: profile.context ?? "fresh",
     output: true,
     outputMode: "inline",
     acceptance: FUSION_ACCEPTANCE_DISABLED,
-    ...(profile.timeoutMs !== undefined
-      ? { timeoutMs: profile.timeoutMs }
-      : {}),
+    timeoutMs: timeouts.panelTimeoutMs,
   };
 }
 
@@ -197,9 +233,7 @@ export function buildJudgeSpawnParams(
     skill: false,
     acceptance: FUSION_ACCEPTANCE_DISABLED,
     ...(model ? { model } : {}),
-    ...(input.profile.judgeToolBudget
-      ? { toolBudget: input.profile.judgeToolBudget }
-      : {}),
+    toolBudget: input.profile.judgeToolBudget ?? DEFAULT_TOOL_BUDGET,
   };
 
   return {
@@ -209,9 +243,9 @@ export function buildJudgeSpawnParams(
     output: true,
     outputMode: "inline",
     acceptance: FUSION_ACCEPTANCE_DISABLED,
-    ...(input.profile.timeoutMs !== undefined
-      ? { timeoutMs: input.profile.timeoutMs }
-      : {}),
+    timeoutMs:
+      input.effectiveTimeouts?.judgeTimeoutMs ??
+      resolveEffectiveTimeouts(input.profile, input.timeoutOverrides).judgeTimeoutMs,
   };
 }
 
@@ -219,13 +253,18 @@ function buildPanelWorkflowScript(
   tasks: readonly PanelWorkflowTaskParams[],
   concurrency: number,
   stopWhenAgrees: boolean,
+  requiredSuccessfulPanelists: number,
 ): string {
   const serializedTasks = JSON.stringify(tasks);
+  // Start no more work than the resolved quorum requires. This preserves the
+  // two-at-a-time majority behavior while allowing a larger configured quorum
+  // to be observed before agreement can stop the remaining panelists.
   const effectiveConcurrency = stopWhenAgrees
-    ? Math.min(concurrency, 2)
+    ? Math.min(concurrency, requiredSuccessfulPanelists)
     : concurrency;
   const stopLogic = stopWhenAgrees
     ? [
+        `const requiredSuccessfulPanelists = ${requiredSuccessfulPanelists};`,
         "const decisions = results",
         "  .filter((result) => result && result.ok === true)",
         "  .map((result) => {",
@@ -235,7 +274,7 @@ function buildPanelWorkflowScript(
         "    try { return JSON.parse(match[1]); } catch { return undefined; }",
         "  })",
         "  .filter((decision) => decision && typeof decision.recommendation === \"string\" && decision.confidence === \"high\" && decision.needsMoreEvidence === false);",
-        "if (decisions.length >= 2 && results.length < tasks.length) {",
+        "if (decisions.length >= requiredSuccessfulPanelists && results.length < tasks.length) {",
         "  const recommendation = decisions[0].recommendation.trim().toLocaleLowerCase().replace(/[^\\p{L}\\p{N}]+/gu, \" \" ).trim(),",
         "    agrees = recommendation && decisions.every((decision) => decision.recommendation.trim().toLocaleLowerCase().replace(/[^\\p{L}\\p{N}]+/gu, \" \" ).trim() === recommendation);",
         "  if (agrees) {",
@@ -260,20 +299,87 @@ function buildPanelWorkflowScript(
     .join("\n");
 }
 
+function resolveStageTimeout(
+  stageTimeoutMs: number | undefined,
+  legacyTimeoutMs: number | undefined,
+  defaultTimeoutMs = DEFAULT_STAGE_TIMEOUT_MS,
+): number {
+  return stageTimeoutMs ?? legacyTimeoutMs ?? defaultTimeoutMs;
+}
+
+/** Resolves and records the deadline precedence used for one start attempt. */
+export function resolveEffectiveTimeouts(
+  profile: FusionProfile,
+  overrides: FusionTimeoutOverrides | undefined = undefined,
+): EffectiveFusionTimeouts {
+  const panelTimeoutMs = resolveStageTimeout(
+    overrides?.panelTimeoutMs ?? profile.panelTimeoutMs,
+    profile.timeoutMs,
+  );
+  const panelGraceMs = resolveStageTimeout(
+    overrides?.panelGraceMs ?? profile.panelGraceMs,
+    undefined,
+    DEFAULT_PANEL_GRACE_MS,
+  );
+  const requestedPanelistTimeoutMs = resolveStageTimeout(
+    overrides?.panelistTimeoutMs ?? profile.panelistTimeoutMs,
+    profile.timeoutMs,
+    DEFAULT_PANELIST_TIMEOUT_MS,
+  );
+  if (panelGraceMs >= panelTimeoutMs) {
+    throw new FusionArgsError(
+      `panelGraceMs (${panelGraceMs}ms) must be shorter than panelTimeoutMs (${panelTimeoutMs}ms).`,
+    );
+  }
+  // A child must conclude before the enclosing workflow. The validated grace
+  // interval guarantees this cap remains a meaningful deadline.
+  const panelistTimeoutMs = Math.min(
+    requestedPanelistTimeoutMs,
+    panelTimeoutMs - panelGraceMs,
+  );
+  return {
+    panelistTimeoutMs,
+    panelTimeoutMs,
+    panelGraceMs,
+    judgeTimeoutMs: resolveStageTimeout(
+      overrides?.judgeTimeoutMs ?? profile.judgeTimeoutMs,
+      profile.timeoutMs,
+    ),
+    usesLegacyTimeout:
+      profile.timeoutMs !== undefined &&
+      (overrides?.panelistTimeoutMs === undefined &&
+        profile.panelistTimeoutMs === undefined ||
+        overrides?.panelTimeoutMs === undefined &&
+          profile.panelTimeoutMs === undefined ||
+        overrides?.judgeTimeoutMs === undefined &&
+          profile.judgeTimeoutMs === undefined),
+  };
+}
+
 function buildPanelTaskParams(
   member: PanelMemberConfig,
   prompt: string,
   includeDecisionRecord: boolean,
+  toolBudget: ToolBudget,
+  callerContract?: CallerOutputContract,
+  timeoutMs?: number,
 ): PanelSubagentTaskParams {
   const model = appendThinkingSuffix(member.model, member.thinking);
   return {
     agent: member.agent,
-    task: buildPanelTask(member, prompt, includeDecisionRecord),
+    task: buildPanelTask(
+      member,
+      prompt,
+      includeDecisionRecord,
+      callerContract,
+    ),
     output: true,
     outputMode: "inline",
     progress: true,
     skill: false,
     acceptance: FUSION_ACCEPTANCE_DISABLED,
+    toolBudget,
+    ...(timeoutMs ? { timeoutMs } : {}),
     ...(model ? { model } : {}),
   };
 }
@@ -282,8 +388,11 @@ function buildPanelTask(
   member: PanelMemberConfig,
   prompt: string,
   includeDecisionRecord: boolean,
+  callerContractOverride?: CallerOutputContract,
 ): string {
   const role = member.role?.trim() || "independent analysis and critique";
+  const callerContract =
+    callerContractForPrompt(prompt, callerContractOverride);
   return [
     `Panel member: ${memberLabel(member)} (${member.id})`,
     `Role: ${role}`,
@@ -299,8 +408,10 @@ function buildPanelTask(
     "- Be concise and cite evidence when you inspect files.",
     "",
     "Output contract:",
-    ...PANEL_OUTPUT_CONTRACT,
-    ...(includeDecisionRecord
+    ...(callerContract
+      ? callerOutputContractInstructions(callerContract)
+      : PANEL_OUTPUT_CONTRACT),
+    ...(includeDecisionRecord && !callerContract
       ? [
           "",
           "Decision record:",
@@ -356,6 +467,13 @@ function formatMemberTask(member: PanelMemberConfig, prompt: string): string[] {
   ];
 }
 
+function callerContractForPrompt(
+  prompt: string,
+  explicit?: CallerOutputContract,
+): CallerOutputContract | undefined {
+  return explicit ?? detectCallerOutputContract(prompt);
+}
+
 function buildJudgeTask(input: BuildJudgeSpawnParamsInput): string {
   const sortedOutputs = [...input.panelOutputs].sort(comparePanelItems);
   const sortedFailures = [...input.failedPanelists].sort(comparePanelItems);
@@ -366,6 +484,10 @@ function buildJudgeTask(input: BuildJudgeSpawnParamsInput): string {
     ? buildBlindLabelMap([...sortedOutputs, ...sortedFailures])
     : undefined;
   const merging = resolveSynthesisMode(input.profile) === "merge";
+  const callerContract = callerContractForPrompt(
+    input.prompt,
+    input.callerContract,
+  );
   return [
     ...(merging
       ? COMPOSER_INSTRUCTIONS
@@ -399,7 +521,11 @@ function buildJudgeTask(input: BuildJudgeSpawnParamsInput): string {
     // right" wording contradicts the composer's "do not rank panelists".
     ...(merging ? [] : [...CONTESTED_CLAIMS_INSTRUCTIONS, ""]),
     "Output contract:",
-    ...(merging ? COMPOSER_OUTPUT_CONTRACT : JUDGE_OUTPUT_CONTRACT),
+    ...(callerContract
+      ? callerOutputContractInstructions(callerContract)
+      : merging
+        ? COMPOSER_OUTPUT_CONTRACT
+        : JUDGE_OUTPUT_CONTRACT),
   ].join("\n");
 }