pi-advisor-flow 0.6.0 → 0.8.0

package/src/tools/render-advisor-result.ts

@@ -1,10 +1,11 @@
-import type { AgentToolResult } from "@earendil-works/pi-coding-agent";
-import {
-  getMarkdownTheme,
-  type Theme,
-  type ToolRenderResultOptions,
+import { getMarkdownTheme } from "@earendil-works/pi-coding-agent";
+import type {
+  AgentToolResult,
+  Theme,
+  ToolRenderResultOptions,
 } from "@earendil-works/pi-coding-agent";
 import { Box, Markdown, Spacer, Text } from "@earendil-works/pi-tui";
+
 import { getAdvisorSettings } from "../config/state.ts";
 import { textFrom } from "../conversation.ts";
 import { formatAdvisorUsage } from "../usage.ts";
@@ -29,6 +30,44 @@ const syncRenderPhase = (context: AdvisorToolContext, phase: string) => {
   context.state.phase = phase;
 };
 
+const attachmentLabels = (details: AdvisorToolDetails | undefined) =>
+  [
+    details?.draftBytes
+      ? `Draft attached · ${details.draftBytes} B`
+      : undefined,
+    details?.preferenceBytes
+      ? `Project preferences attached · ${details.preferenceBytes} B`
+      : undefined,
+    details?.trackedBytes
+      ? `Tracked files attached · ${details.trackedBytes} B`
+      : undefined,
+    details?.untrackedBytes
+      ? `Untracked files attached · ${details.untrackedBytes} B`
+      : undefined,
+  ].filter((label): label is string => label !== undefined);
+
+const renderJevSkipBox = (
+  box: Box,
+  result: AgentToolResult<AdvisorToolDetails>,
+  expanded: boolean,
+  theme: Theme
+) => {
+  const details = advisorResultDetails(result);
+  const lines = [
+    theme.fg("dim", theme.bold("◆ ADVISOR · SKIPPED")),
+    theme.fg("dim", `  ${details?.jev?.reason ?? ""}`),
+  ];
+  box.addChild(new Text(lines.join("\n"), 0, 0));
+  box.addChild(
+    new Markdown(
+      adviceForDisplay(textFrom(result.content), expanded),
+      0,
+      0,
+      getMarkdownTheme()
+    )
+  );
+};
+
 const renderPartialAdvisorResult = (
   box: Box,
   result: AgentToolResult<AdvisorToolDetails>,
@@ -78,6 +117,33 @@ const renderPartialAdvisorResult = (
   }
 };
 
+const thinkingPreview = (details: AdvisorToolDetails | undefined) =>
+  details?.thinking?.trim()
+    ? `${details.thinking.slice(0, 300)}${details.thinking.length > 300 ? "…" : ""}`
+    : "";
+
+const finalResultLines = (
+  details: AdvisorToolDetails | undefined,
+  advice: string,
+  theme: Theme
+): string[] => {
+  const lines = [renderAdvisorResponseHeader(hasSoundVerdict(advice), theme)];
+  if (details?.advisor) {
+    lines.push(theme.fg("dim", `  ${details.advisor}`));
+  }
+  if (getAdvisorSettings().showUsageDetails) {
+    const usage = formatAdvisorUsage(details?.usage);
+    if (usage) {
+      lines.push(theme.fg("dim", `  Usage: ${usage}`));
+    }
+  }
+  const attachments = attachmentLabels(details);
+  if (attachments.length) {
+    lines.push(theme.fg("dim", `  ${attachments.join(" · ")}`));
+  }
+  return lines;
+};
+
 const renderFinalAdvisorResult = (
   box: Box,
   result: AgentToolResult<AdvisorToolDetails>,
@@ -91,6 +157,10 @@ const renderFinalAdvisorResult = (
     context.state.timerId = undefined;
   }
   const details = advisorResultDetails(result);
+  if (details?.jev?.skipped) {
+    renderJevSkipBox(box, result, expanded, theme);
+    return;
+  }
   if (details?.scout) {
     context.state.scout = details.scout;
   }
@@ -102,36 +172,8 @@ const renderFinalAdvisorResult = (
     return;
   }
   const advice = details?.text || textFrom(result.content);
-  const lines = [renderAdvisorResponseHeader(hasSoundVerdict(advice), theme)];
-  if (details?.advisor) {
-    lines.push(theme.fg("dim", `  ${details.advisor}`));
-  }
-  if (getAdvisorSettings().showUsageDetails) {
-    const usage = formatAdvisorUsage(details?.usage);
-    if (usage) {
-      lines.push(theme.fg("dim", `  Usage: ${usage}`));
-    }
-  }
-  const attachments = [
-    details?.draftBytes
-      ? `Draft attached · ${details.draftBytes} B`
-      : undefined,
-    details?.preferenceBytes
-      ? `Project preferences attached · ${details.preferenceBytes} B`
-      : undefined,
-    details?.trackedBytes
-      ? `Tracked files attached · ${details.trackedBytes} B`
-      : undefined,
-    details?.untrackedBytes
-      ? `Untracked files attached · ${details.untrackedBytes} B`
-      : undefined,
-  ].filter(Boolean);
-  if (attachments.length) {
-    lines.push(theme.fg("dim", `  ${attachments.join(" · ")}`));
-  }
-  const thinking = details?.thinking?.trim()
-    ? `${details.thinking.slice(0, 300)}${details.thinking.length > 300 ? "…" : ""}`
-    : "";
+  const thinking = thinkingPreview(details);
+  const lines = finalResultLines(details, advice, theme);
   const displayAdvice = advice || "(Advisor returned no advice.)";
   box.addChild(new Text(lines.join("\n"), 0, 0));
   if (thinking) {

package/src/tools/render-common.ts

@@ -1,12 +1,14 @@
-import { getMarkdownTheme, type Theme } from "@earendil-works/pi-coding-agent";
+import { getMarkdownTheme } from "@earendil-works/pi-coding-agent";
+import type { Theme } from "@earendil-works/pi-coding-agent";
 import {
   Box,
-  type Component,
   Markdown,
   Text,
   truncateToWidth,
   visibleWidth,
 } from "@earendil-works/pi-tui";
+import type { Component } from "@earendil-works/pi-tui";
+
 import { advisorCollapseResponsesRef } from "../config/state.ts";
 import { piHideThinkingEnabled } from "../pi-settings.ts";
 
@@ -27,6 +29,9 @@ const THINKING_PREFIX = "  ";
 const THINKING_PREFIX_WIDTH = visibleWidth(THINKING_PREFIX);
 export type ThinkingTheme = Pick<Theme, "fg">;
 
+/** Shared no-op for interface-required methods that manage no state. */
+export const noop = (): void => undefined;
+
 /** Renders nested-model thinking as Markdown with the compact speech-bubble cue; the prefix is added after parsing so it cannot change block syntax. */
 class ThinkingMarkdown implements Component {
   private readonly markdown: Markdown;
@@ -59,28 +64,20 @@ class ThinkingMarkdown implements Component {
 }
 
 /** Collapsed placeholder shown when Pi's hide_thinking setting is on. */
-class HiddenThinkingLabel implements Component {
-  private readonly label: string;
-
-  constructor(theme: ThinkingTheme) {
-    this.label = theme.fg("thinkingText", `${THINKING_PREFIX}Thinking…`);
-  }
-
-  render(): string[] {
-    return [this.label];
-  }
-
-  invalidate(): void {
-    // The collapsed label is static.
-  }
-}
+const hiddenThinkingLabel = (theme: ThinkingTheme): Component => {
+  const label = theme.fg("thinkingText", `${THINKING_PREFIX}Thinking…`);
+  return {
+    invalidate: noop,
+    render: () => [label],
+  };
+};
 
 export const renderThinkingMarkdown = (
   thinking: string,
   theme: ThinkingTheme
 ): Component =>
   piHideThinkingEnabled()
-    ? new HiddenThinkingLabel(theme)
+    ? hiddenThinkingLabel(theme)
     : new ThinkingMarkdown(thinking, theme);
 
 export const resolveAdvisorRequest = (question?: string) =>
@@ -107,7 +104,7 @@ export const renderAdvisorCallBox = (
 
 const COLLAPSED_ADVICE_LINES = 12;
 // The system prompt requires this exact first line, so the match is exact too.
-const SOUND_VERDICT = /^Verdict:\s*sound$/;
+const SOUND_VERDICT = /^Verdict:\s*sound$/u;
 
 export const hasSoundVerdict = (advice: string) =>
   SOUND_VERDICT.test(

package/src/tools/scout-status.ts

@@ -3,7 +3,9 @@ import type {
   ExtensionContext,
   Theme,
 } from "@earendil-works/pi-coding-agent";
-import { type Box, Text } from "@earendil-works/pi-tui";
+import { Text } from "@earendil-works/pi-tui";
+import type { Box } from "@earendil-works/pi-tui";
+
 import { executorRef, getAdvisorSettings } from "../config/state.ts";
 import type { ScoutLifecycleEvent } from "../scout.ts";
 import { formatAdvisorUsage, snapshotAdvisorUsage } from "../usage.ts";
@@ -142,6 +144,43 @@ const scoutTitle = (scout: ScoutToolDetails, frame: string) => {
   return "◆ SCOUT · FALLBACK";
 };
 
+const scoutSummaryLine = (scout: ScoutToolDetails) =>
+  `  ${scout.model}${
+    scout.selectedCount === undefined
+      ? ""
+      : ` · ${scout.selectedCount} kept / ${Math.max(0, (scout.availableCount ?? 0) - scout.selectedCount)} omitted`
+  }${scout.latencyMs === undefined ? "" : ` · ${(scout.latencyMs / 1000).toFixed(1)}s`}`;
+
+const scoutExpandedLines = (
+  scout: ScoutToolDetails,
+  expanded: boolean,
+  theme: Theme
+): string[] => {
+  const lines: string[] = [];
+  if (expanded && scout.selectedLabels?.length) {
+    lines.push(
+      theme.fg("dim", `  Selected: ${scout.selectedLabels.join("; ")}`)
+    );
+  }
+  if (expanded && scout.synthesis) {
+    lines.push(
+      theme.fg(
+        "dim",
+        `  Scout synthesis (untrusted inference): ${scout.synthesis}`
+      )
+    );
+  }
+  if (expanded && scout.omittedBeforeScout) {
+    lines.push(
+      theme.fg(
+        "dim",
+        `  ${scout.omittedBeforeScout} group(s) omitted before Scout`
+      )
+    );
+  }
+  return lines;
+};
+
 export const renderScoutDetails = (
   box: Box,
   scout: ScoutToolDetails,
@@ -159,10 +198,7 @@ export const renderScoutDetails = (
         : "accent",
       theme.bold(title)
     ),
-    theme.fg(
-      "dim",
-      `  ${scout.model}${scout.selectedCount === undefined ? "" : ` · ${scout.selectedCount} kept / ${Math.max(0, (scout.availableCount ?? 0) - scout.selectedCount)} omitted`}${scout.latencyMs === undefined ? "" : ` · ${(scout.latencyMs / 1000).toFixed(1)}s`}`
-    ),
+    theme.fg("dim", scoutSummaryLine(scout)),
   ];
   if (getAdvisorSettings().showUsageDetails) {
     const usage = formatAdvisorUsage(scout.usage);
@@ -178,28 +214,7 @@ export const renderScoutDetails = (
   if (thinking.trim()) {
     box.addChild(renderThinkingMarkdown(thinking, theme));
   }
-  const expandedLines: string[] = [];
-  if (expanded && scout.selectedLabels?.length) {
-    expandedLines.push(
-      theme.fg("dim", `  Selected: ${scout.selectedLabels.join("; ")}`)
-    );
-  }
-  if (expanded && scout.synthesis) {
-    expandedLines.push(
-      theme.fg(
-        "dim",
-        `  Scout synthesis (untrusted inference): ${scout.synthesis}`
-      )
-    );
-  }
-  if (expanded && scout.omittedBeforeScout) {
-    expandedLines.push(
-      theme.fg(
-        "dim",
-        `  ${scout.omittedBeforeScout} group(s) omitted before Scout`
-      )
-    );
-  }
+  const expandedLines = scoutExpandedLines(scout, expanded, theme);
   if (expandedLines.length > 0) {
     box.addChild(new Text(expandedLines.join("\n"), 0, 0));
   }

package/src/tools/types.ts

@@ -1,4 +1,5 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+
 import type { appendOutcome } from "../outcomes.ts";
 import type { ScoutOutcome } from "../scout.ts";
 import type {
@@ -8,6 +9,8 @@ import type {
   GateTrigger,
 } from "../session-state.ts";
 import type { consultAdvisor, runAdvisorGate } from "./consultation.ts";
+import type { JevSkipKind, screenConsultation } from "./jev-filter.ts";
+import type { JevTurnGateDeps } from "./jev-turn-gate.ts";
 import type { ScoutStatusManager } from "./scout-status.ts";
 
 export type {
@@ -79,6 +82,11 @@ export interface AdvisorToolDetails {
   adviceId?: string;
   advisor?: string;
   draftBytes?: number;
+  jev?: {
+    kind: JevSkipKind;
+    reason: string;
+    skipped: boolean;
+  };
   preferenceBytes?: number;
   question?: string;
   scout?: ScoutToolDetails;
@@ -108,6 +116,7 @@ export interface ToolRegistrationContext {
   reservedCalls: Set<string>;
   runGate: typeof runAdvisorGate;
   scoutStatus: ScoutStatusManager;
+  screen: typeof screenConsultation;
   session: AdvisorSessionState;
 }
 
@@ -115,5 +124,7 @@ export interface ToolRegistrationDependencies {
   appendOutcome?: typeof appendOutcome;
   consult?: typeof consultAdvisor;
   runGate?: typeof runAdvisorGate;
+  screen?: typeof screenConsultation;
   statusManager?: ScoutStatusManager;
+  turnGateDeps?: JevTurnGateDeps;
 }

package/src/tools.ts

@@ -1,4 +1,3 @@
-// biome-ignore lint/performance/noBarrelFile: this facade intentionally preserves the public tools module contract.
 export {
   consultAdvisor,
   curateAdvisorConversation,