@alexeiled/pi-fusion 0.5.1 → 0.6.0

package/src/orchestrator.ts

@@ -1,4 +1,6 @@
+import { applyClaudeAliasShorthand } from "./claude-aliases.js";
 import {
+  buildInlinePanelProfile,
   loadFusionConfig,
   resolveProfile as resolveFusionProfile,
   type ResolvedFusionProfile,
@@ -21,6 +23,7 @@ import {
   clearFusionUi,
   extractFusionProgressCounts,
   formatProgressCounts,
+  isTerminalFusionProgress,
   publishFusionStatus,
   type FusionProgressCounts,
   type FusionUi,
@@ -29,12 +32,14 @@ import {
   readSubagentResultArtifact,
   readSubagentStatusArtifact,
 } from "./subagent-artifacts.js";
-import type {
-  FailedPanelSummary,
-  FusionProfile,
-  FusionRun,
-  PanelOutput,
-  ParsedFusionArgs,
+import {
+  memberLabel,
+  resolveSynthesisMode,
+  type FailedPanelSummary,
+  type FusionProfile,
+  type FusionRun,
+  type PanelOutput,
+  type ParsedFusionArgs,
 } from "./types.js";
 import {
   extractRunObservation,
@@ -149,9 +154,30 @@ export class FusionOrchestrator {
     }
 
     let resolved: ResolvedFusionProfile;
+    let baseProfileName: string | undefined;
     try {
       const config = await this.loadConfig(ctx);
       resolved = this.resolveProfile(config, args.profile);
+      baseProfileName = resolved.name;
+      if (args.panel?.length) {
+        // The named profile still supplies the judge and every other setting;
+        // only the panel is replaced. Inline models skip the alias pass that
+        // runs at config load, so re-run it over the assembled profile.
+        const inlineName = `${resolved.name} (inline panel)`;
+        const aliased = await applyClaudeAliasShorthand(
+          {
+            defaultProfile: inlineName,
+            profiles: {
+              [inlineName]: buildInlinePanelProfile(
+                resolved.profile,
+                args.panel,
+              ),
+            },
+          },
+          ctx,
+        );
+        resolved = this.resolveProfile(aliased, inlineName);
+      }
       this.configWarning = undefined;
     } catch (error: unknown) {
       const message = errorMessage(error);
@@ -165,7 +191,12 @@ export class FusionOrchestrator {
       run = this.runStore.startRun({
         prompt: args.prompt,
         profileName: resolved.name,
-        ...(args.operationId !== undefined ? { operationId: args.operationId } : {}),
+        ...(args.panel?.length
+          ? { inlinePanel: args.panel, baseProfileName: baseProfileName }
+          : {}),
+        ...(args.operationId !== undefined
+          ? { operationId: args.operationId }
+          : {}),
         phase: "panel",
       });
     } catch (error: unknown) {
@@ -188,6 +219,8 @@ export class FusionOrchestrator {
       const spawnResult = await this.rpc.spawn(
         buildPanelSpawnParams(resolved.profile, args.prompt),
       );
+      const spawnError = extractSubagentFailure(spawnResult);
+      if (spawnError) throw new FusionArgsError(spawnError);
       const panelRunId = extractSubagentRunId(spawnResult);
       if (!panelRunId) {
         throw new FusionArgsError(
@@ -345,6 +378,12 @@ export class FusionOrchestrator {
           ? configuredJudgeModel(this.activeProfile)
           : undefined,
       ),
+      ...(this.activeProfile
+        ? {
+            synthesis: resolveSynthesisMode(this.activeProfile),
+            panel: this.activeProfile.panel,
+          }
+        : {}),
     });
     const cancelled = this.runStore.cancelRun(active.id, {
       ...(active.chainRunId ? { chainRunId: active.chainRunId } : {}),
@@ -376,10 +415,19 @@ export class FusionOrchestrator {
 
     try {
       const config = await this.loadConfig(ctx);
-      this.activeProfile = this.resolveProfile(
+      // An inline run's profileName is a display name that no config defines,
+      // so rebuild it from the base profile plus the persisted entries. Looking
+      // the display name up throws, which used to leave activeProfile undefined
+      // and fail the run the moment its panel completed.
+      const base = this.resolveProfile(
         config,
-        active.profileName,
+        active.inlinePanel?.length
+          ? active.baseProfileName
+          : active.profileName,
       ).profile;
+      this.activeProfile = active.inlinePanel?.length
+        ? buildInlinePanelProfile(base, active.inlinePanel)
+        : base;
       this.configWarning = undefined;
     } catch (error: unknown) {
       const message = `Could not restore fusion profile "${active.profileName}": ${errorMessage(error)}`;
@@ -517,13 +565,17 @@ export class FusionOrchestrator {
       return { status: "ignored" };
     }
 
-    const extracted = extractPanelResults(
-      snapshot.resultPayload ?? snapshot.statusPayload ?? payload,
-      {
-        panel: profile.panel,
-        limit: profile.panel.length,
-      },
-    );
+    const lifecyclePayload =
+      snapshot.resultPayload ?? snapshot.statusPayload ?? payload;
+    const lifecycleError = extractSubagentFailure(lifecyclePayload);
+    if (!hasLifecycleResults(lifecyclePayload) && lifecycleError) {
+      return this.failActiveRun(lifecycleError);
+    }
+
+    const extracted = extractPanelResults(lifecyclePayload, {
+      panel: profile.panel,
+      limit: profile.panel.length,
+    });
     if (!extracted.ok) {
       return this.failActiveRun(
         `${extracted.error.message} (${extracted.error.path})`,
@@ -567,6 +619,8 @@ export class FusionOrchestrator {
         failures: storedPanelFailures(observed),
         ...withJudgeModel(configuredJudgeModel(profile)),
         judgeObservation,
+        ...(profile.blindPanelLabels ? { blindPanelLabels: true } : {}),
+        synthesis: resolveSynthesisMode(profile),
       });
       return this.completeActiveRun(report);
     }
@@ -628,16 +682,20 @@ export class FusionOrchestrator {
       return { status: "ignored" };
     }
 
-    const extracted = extractPanelResults(
-      snapshot.resultPayload ?? snapshot.statusPayload ?? payload,
-      {
-        panel: profile.panel,
-        limit: profile.panel.length,
-        ...(active.panelStoppedIndices
-          ? { stoppedPanelIndices: active.panelStoppedIndices }
-          : {}),
-      },
-    );
+    const lifecyclePayload =
+      snapshot.resultPayload ?? snapshot.statusPayload ?? payload;
+    const lifecycleError = extractSubagentFailure(lifecyclePayload);
+    if (!hasLifecycleResults(lifecyclePayload) && lifecycleError) {
+      return this.failActiveRun(lifecycleError);
+    }
+
+    const extracted = extractPanelResults(lifecyclePayload, {
+      panel: profile.panel,
+      limit: profile.panel.length,
+      ...(active.panelStoppedIndices
+        ? { stoppedPanelIndices: active.panelStoppedIndices }
+        : {}),
+    });
     if (!extracted.ok) {
       return this.failActiveRun(
         `${extracted.error.message} (${extracted.error.path})`,
@@ -742,6 +800,8 @@ export class FusionOrchestrator {
 
     try {
       const spawnResult = await this.rpc.spawn(decision.params);
+      const spawnError = extractSubagentFailure(spawnResult);
+      if (spawnError) throw new FusionArgsError(spawnError);
       const judgeRunId = extractSubagentRunId(spawnResult);
       if (!judgeRunId) {
         throw new FusionArgsError(decision.missingRunIdError);
@@ -789,14 +849,27 @@ export class FusionOrchestrator {
       return { status: "ignored" };
     }
 
-    const output = extractJudgeOutput(
-      snapshot.resultPayload ?? snapshot.statusPayload ?? payload,
-    );
+    const lifecyclePayload =
+      snapshot.resultPayload ?? snapshot.statusPayload ?? payload;
+    const lifecycleError = extractSubagentFailure(lifecyclePayload);
+    if (!hasLifecycleResults(lifecyclePayload) && lifecycleError) {
+      return this.failActiveRun(lifecycleError);
+    }
+
+    const output = extractJudgeOutput(lifecyclePayload);
     if (!output.ok) return this.failActiveRun(output.error);
 
-    const judgeModel = this.activeProfile
-      ? configuredJudgeModel(this.activeProfile)
-      : undefined;
+    // The panel and chain handlers already treat a missing profile as fatal.
+    // Without the same guard here the run "succeeds" with a degraded report:
+    // blind labels are never restored, and the judge model is dropped.
+    const profile = this.activeProfile;
+    if (!profile) {
+      return this.failActiveRun(
+        "Fusion judge completed, but the active profile was not available.",
+      );
+    }
+
+    const judgeModel = configuredJudgeModel(profile);
     const judgeObservation = mergeRunObservations(
       extractRunObservation(
         findStepsArray(snapshot.statusPayload)[0] ?? snapshot.statusPayload,
@@ -817,6 +890,8 @@ export class FusionOrchestrator {
       failures: storedPanelFailures(observed),
       ...withJudgeModel(judgeModel),
       judgeObservation,
+      ...(profile.blindPanelLabels ? { blindPanelLabels: true } : {}),
+      synthesis: resolveSynthesisMode(profile),
     });
     return this.completeActiveRun(report);
   }
@@ -850,12 +925,18 @@ export class FusionOrchestrator {
       );
     }
 
+    const statusIsTerminal =
+      isTerminalSubagentState(extractSubagentState(statusPayload)) ||
+      isTerminalFusionProgress(statusPayload);
+    const eventIsTerminal =
+      isTerminalSubagentState(extractSubagentState(input.eventPayload)) ||
+      isTerminalFusionProgress(input.eventPayload);
     const eventHasResults = hasResultsArray(input.eventPayload);
     if (eventPayloadMatches && eventHasResults) {
       return {
         statusPayload,
         resultPayload: input.eventPayload,
-        resultIsTerminal: true,
+        resultIsTerminal: eventIsTerminal || statusIsTerminal,
       };
     }
 
@@ -872,17 +953,14 @@ export class FusionOrchestrator {
     }
 
     if (hasResultsArray(statusPayload)) {
-      const resultIsTerminal =
-        eventPayloadMatches ||
-        isTerminalSubagentState(extractSubagentState(statusPayload));
       return {
         statusPayload,
         resultPayload: statusPayload,
-        resultIsTerminal,
+        resultIsTerminal: statusIsTerminal,
       };
     }
 
-    if (isTerminalSubagentState(extractSubagentState(statusPayload))) {
+    if (statusIsTerminal) {
       return {
         statusPayload,
         resultPayload: statusPayload,
@@ -894,9 +972,7 @@ export class FusionOrchestrator {
       return {
         statusPayload,
         resultPayload: input.eventPayload,
-        resultIsTerminal: isTerminalSubagentState(
-          extractSubagentState(input.eventPayload),
-        ),
+        resultIsTerminal: eventIsTerminal,
       };
     }
 
@@ -968,6 +1044,12 @@ export class FusionOrchestrator {
           ? configuredJudgeModel(this.activeProfile)
           : undefined,
       ),
+      ...(this.activeProfile
+        ? {
+            synthesis: resolveSynthesisMode(this.activeProfile),
+            panel: this.activeProfile.panel,
+          }
+        : {}),
     });
   }
 
@@ -1248,7 +1330,7 @@ function buildFusionStatusDetails(
     const activity = describeStepActivity(step);
     const metrics = describeStepMetrics(step);
     return {
-      label: member.label,
+      label: memberLabel(member),
       ...(member.role ? { role: member.role } : {}),
       ...(model ? { model } : {}),
       status: describePanelStatus(step),
@@ -1313,7 +1395,7 @@ function buildCompletedPanelStatusLines(
     );
     if (output) {
       return {
-        label: member.label,
+        label: memberLabel(member),
         ...(member.role ? { role: member.role } : {}),
         ...(model ? { model } : {}),
         status: "completed",
@@ -1323,7 +1405,7 @@ function buildCompletedPanelStatusLines(
       (item) => item.id === member.id || item.index === index,
     );
     return {
-      label: member.label,
+      label: memberLabel(member),
       ...(member.role ? { role: member.role } : {}),
       ...(model ? { model } : {}),
       status: failure ? "failed" : "unknown",
@@ -1526,6 +1608,38 @@ function isTerminalSubagentState(state: string | undefined): boolean {
   );
 }
 
+function hasLifecycleResults(payload: unknown): boolean {
+  return hasResultsArray(payload) || findStepsArray(payload).length > 0;
+}
+
+function extractSubagentFailure(payload: unknown): string | undefined {
+  if (!isRecord(payload)) return undefined;
+  const direct = firstNonBlankString(payload.error, payload.errorMessage);
+  if (direct) return direct;
+  if (isRecord(payload.details)) {
+    const detailsError = firstNonBlankString(
+      payload.details.error,
+      payload.details.errorMessage,
+    );
+    if (detailsError) return detailsError;
+  }
+  if (payload.isError === true && Array.isArray(payload.content)) {
+    for (const item of payload.content) {
+      const contentText = isRecord(item)
+        ? firstNonBlankString(item.text)
+        : undefined;
+      if (contentText) return contentText;
+    }
+  }
+  const text = firstNonBlankString(
+    payload.text,
+    isRecord(payload.details) ? payload.details.text : undefined,
+  );
+  if (text && /^error(?:\s|:)/i.test(text)) return text;
+  if (isRecord(payload.data)) return extractSubagentFailure(payload.data);
+  return undefined;
+}
+
 function firstNonBlankStringFromPayload(payload: unknown): string | undefined {
   if (!isRecord(payload)) return undefined;
   const direct = firstNonBlankString(

package/src/panel-completion.ts

@@ -4,11 +4,12 @@ import {
   buildJudgeSpawnParams,
   type JudgeSpawnParams,
 } from "./run-builder.js";
-import type {
-  FailedPanelSummary,
-  FusionProfile,
-  FusionRun,
-  PanelOutput,
+import {
+  resolveSynthesisMode,
+  type FailedPanelSummary,
+  type FusionProfile,
+  type FusionRun,
+  type PanelOutput,
 } from "./types.js";
 
 export type PanelCompletionDecision =
@@ -39,6 +40,8 @@ export function decidePanelCompletion(
       run: input.run,
       failures: input.panelFailures,
       ...withJudgeModel(judgeModel),
+      synthesis: resolveSynthesisMode(input.profile),
+      panel: input.profile.panel,
     });
     return {
       kind: "fail",
@@ -47,7 +50,14 @@ export function decidePanelCompletion(
     };
   }
 
-  if (input.panelOutputs.length === 1) {
+  // Under `select` every panelist answered the whole question, so a lone
+  // survivor is a complete if thin answer. Under `merge` it answered ONE facet:
+  // returning it as the answer would be wrong, not thin. Run the composer so
+  // the report names the facets nobody covered.
+  if (
+    input.panelOutputs.length === 1 &&
+    resolveSynthesisMode(input.profile) !== "merge"
+  ) {
     const report = renderSinglePanelReport({
       run: input.run,
       output: input.panelOutputs[0]!,
@@ -64,6 +74,7 @@ export function decidePanelCompletion(
       prompt: input.run.prompt,
       panelOutputs: input.panelOutputs,
       failedPanelists: input.panelFailures,
+      runId: input.run.id,
     }),
     missingRunIdError: input.fallbackJudge
       ? "pi-subagents spawn did not return a fallback judge run ID."