pi-advisor-flow 0.5.6 → 0.7.0

package/src/tools/registration.ts

@@ -1,17 +1,19 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { appendOutcome } from "../outcomes.js";
-import type { AdvisorSessionState } from "../session-state.js";
-import { consultAdvisor, runAdvisorGate } from "./consultation.js";
-import { registerAskAdvisorTool } from "./register-ask-advisor.js";
-import { registerToolLifecycle } from "./register-lifecycle.js";
-import { registerOutcomeTool } from "./register-outcome.js";
-import { registerToolRenderers } from "./register-renderers.js";
-import { ScoutStatusManager } from "./scout-status.js";
-import { advisorSessionState } from "./session.js";
+import { appendOutcome } from "../outcomes.ts";
+import type { AdvisorSessionState } from "../session-state.ts";
+import { consultAdvisor, runAdvisorGate } from "./consultation.ts";
+import { screenConsultation } from "./jev-filter.ts";
+import { registerJevTurnGate } from "./jev-turn-gate.ts";
+import { registerAskAdvisorTool } from "./register-ask-advisor.ts";
+import { registerToolLifecycle } from "./register-lifecycle.ts";
+import { registerOutcomeTool } from "./register-outcome.ts";
+import { registerToolRenderers } from "./register-renderers.ts";
+import { ScoutStatusManager } from "./scout-status.ts";
+import { advisorSessionState } from "./session.ts";
 import type {
   ToolRegistrationContext,
   ToolRegistrationDependencies,
-} from "./types.js";
+} from "./types.ts";
 
 export const registerAdvisorTool = (
   pi: ExtensionAPI,
@@ -25,6 +27,7 @@ export const registerAdvisorTool = (
     reservedCalls: new Set<string>(),
     runGate: dependencies.runGate ?? runAdvisorGate,
     scoutStatus: dependencies.statusManager ?? new ScoutStatusManager(),
+    screen: dependencies.screen ?? screenConsultation,
     session,
   };
 
@@ -32,4 +35,18 @@ export const registerAdvisorTool = (
   registerToolLifecycle(registration);
   registerAskAdvisorTool(registration);
   registerOutcomeTool(registration);
+  registerJevTurnGate(
+    (
+      event: Parameters<ExtensionAPI["on"]>[0],
+      handler: (event: unknown, ctx: never) => unknown
+    ) => pi.on(event, handler as never),
+    {
+      activeTools: () => pi.getActiveTools(),
+      consult: registration.consult,
+      ...(dependencies.turnGateDeps ? { deps: dependencies.turnGateDeps } : {}),
+      send: (message) =>
+        pi.sendMessage(message as never, { deliverAs: "steer" } as never),
+      session,
+    }
+  );
 };

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

@@ -4,19 +4,19 @@ import {
   type Theme,
   type ToolRenderResultOptions,
 } from "@earendil-works/pi-coding-agent";
-import { Box, Markdown, Text } from "@earendil-works/pi-tui";
-import { getAdvisorSettings } from "../config/state.js";
-import { textFrom } from "../conversation.js";
-import { formatAdvisorUsage } from "../usage.js";
+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";
 import {
   adviceForDisplay,
   hasSoundVerdict,
   renderAdvisorResponseHeader,
   renderThinkingMarkdown,
   SPINNER_FRAMES,
-} from "./render-common.js";
-import { renderScoutDetails } from "./scout-status.js";
-import type { AdvisorToolContext, AdvisorToolDetails } from "./types.js";
+} from "./render-common.ts";
+import { renderScoutDetails } from "./scout-status.ts";
+import type { AdvisorToolContext, AdvisorToolDetails } from "./types.ts";
 
 const advisorResultDetails = (result: AgentToolResult<AdvisorToolDetails>) =>
   result.details;
@@ -29,6 +29,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>,
@@ -91,6 +129,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;
   }
@@ -112,20 +154,7 @@ const renderFinalAdvisorResult = (
       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);
+  const attachments = attachmentLabels(details);
   if (attachments.length) {
     lines.push(theme.fg("dim", `  ${attachments.join(" · ")}`));
   }
@@ -153,10 +182,11 @@ export const renderAdvisorResult = (
   theme: Theme,
   context: AdvisorToolContext
 ) => {
+  // Pi frames this inside its own padded tool box; padding here doubles the gap below the request.
   const box =
     context.lastComponent instanceof Box
       ? context.lastComponent
-      : new Box(1, 1, (text: string) => theme.bg("customMessageBg", text));
+      : new Box(1, 0, (text: string) => theme.bg("customMessageBg", text));
   box.setBgFn((text) => theme.bg("customMessageBg", text));
   box.clear();
   if (isPartial) {
@@ -164,5 +194,7 @@ export const renderAdvisorResult = (
   } else {
     renderFinalAdvisorResult(box, result, expanded, theme, context);
   }
+  // Restores the bottom breathing room the removed vertical padding provided.
+  box.addChild(new Spacer(1));
   return box;
 };

package/src/tools/render-common.ts

@@ -7,7 +7,8 @@ import {
   truncateToWidth,
   visibleWidth,
 } from "@earendil-works/pi-tui";
-import { advisorCollapseResponsesRef } from "../config/state.js";
+import { advisorCollapseResponsesRef } from "../config/state.ts";
+import { piHideThinkingEnabled } from "../pi-settings.ts";
 
 export const SPINNER_FRAMES = [
   "⠋",
@@ -22,20 +23,11 @@ export const SPINNER_FRAMES = [
   "⠏",
 ];
 
-const THINKING_PREFIX = "  💭 ";
+const THINKING_PREFIX = "  ";
 const THINKING_PREFIX_WIDTH = visibleWidth(THINKING_PREFIX);
 export type ThinkingTheme = Pick<Theme, "fg">;
 
-/**
- * Renders visible nested-model thinking with the same Markdown semantics as
- * Pi's assistant thinking blocks while keeping the compact speech-bubble cue.
- * The prefix is added after Markdown parsing so it cannot change block syntax.
- *
- * Note: During streaming, incomplete Markdown (e.g., `**text` without closing **)
- * displays raw markers transiently until delimiters arrive. This mirrors expected
- * behavior when typing Markdown incrementally and is acceptable in the context
- * of brief thinking previews. When thinking is complete, all markers render.
- */
+/** 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;
   private readonly prefix: string;
@@ -66,10 +58,30 @@ 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.
+  }
+}
+
 export const renderThinkingMarkdown = (
   thinking: string,
   theme: ThinkingTheme
-): Component => new ThinkingMarkdown(thinking, theme);
+): Component =>
+  piHideThinkingEnabled()
+    ? new HiddenThinkingLabel(theme)
+    : new ThinkingMarkdown(thinking, theme);
 
 export const resolveAdvisorRequest = (question?: string) =>
   question?.trim() || undefined;

package/src/tools/scout-status.ts

@@ -4,11 +4,11 @@ import type {
   Theme,
 } from "@earendil-works/pi-coding-agent";
 import { type Box, Text } from "@earendil-works/pi-tui";
-import { executorRef, getAdvisorSettings } from "../config/state.js";
-import type { ScoutLifecycleEvent } from "../scout.js";
-import { formatAdvisorUsage, snapshotAdvisorUsage } from "../usage.js";
-import { renderThinkingMarkdown, SPINNER_FRAMES } from "./render-common.js";
-import type { ScoutToolDetails } from "./types.js";
+import { executorRef, getAdvisorSettings } from "../config/state.ts";
+import type { ScoutLifecycleEvent } from "../scout.ts";
+import { formatAdvisorUsage, snapshotAdvisorUsage } from "../usage.ts";
+import { renderThinkingMarkdown, SPINNER_FRAMES } from "./render-common.ts";
+import type { ScoutToolDetails } from "./types.ts";
 
 export const scoutDetailsFromEvent = (
   event: ScoutLifecycleEvent,

package/src/tools/session.ts

@@ -1,3 +1,3 @@
-import { AdvisorSessionState } from "../session-state.js";
+import { AdvisorSessionState } from "../session-state.ts";
 
 export const advisorSessionState = new AdvisorSessionState();

package/src/tools/types.ts

@@ -1,21 +1,23 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import type { appendOutcome } from "../outcomes.js";
-import type { ScoutOutcome } from "../scout.js";
+import type { appendOutcome } from "../outcomes.ts";
+import type { ScoutOutcome } from "../scout.ts";
 import type {
   AdvisorSessionState,
   ConsultationTrigger,
   GateDecision,
   GateTrigger,
-} from "../session-state.js";
-import type { consultAdvisor, runAdvisorGate } from "./consultation.js";
-import type { ScoutStatusManager } from "./scout-status.js";
+} 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 {
   AdvisorInvocationRecord,
   ConsultationTrigger,
   GateDecision,
   GateTrigger,
-} from "../session-state.js";
+} from "../session-state.ts";
 
 export interface ScoutToolDetails {
   availableCount?: number;
@@ -79,6 +81,11 @@ export interface AdvisorToolDetails {
   adviceId?: string;
   advisor?: string;
   draftBytes?: number;
+  jev?: {
+    kind: JevSkipKind;
+    reason: string;
+    skipped: boolean;
+  };
   preferenceBytes?: number;
   question?: string;
   scout?: ScoutToolDetails;
@@ -89,7 +96,7 @@ export interface AdvisorToolDetails {
   usage?: unknown;
 }
 
-export interface AdvisorRenderState {
+interface AdvisorRenderState {
   phase?: string;
   scout?: ScoutToolDetails;
   timerId?: ReturnType<typeof setInterval>;
@@ -108,6 +115,7 @@ export interface ToolRegistrationContext {
   reservedCalls: Set<string>;
   runGate: typeof runAdvisorGate;
   scoutStatus: ScoutStatusManager;
+  screen: typeof screenConsultation;
   session: AdvisorSessionState;
 }
 
@@ -115,5 +123,7 @@ export interface ToolRegistrationDependencies {
   appendOutcome?: typeof appendOutcome;
   consult?: typeof consultAdvisor;
   runGate?: typeof runAdvisorGate;
+  screen?: typeof screenConsultation;
   statusManager?: ScoutStatusManager;
+  turnGateDeps?: JevTurnGateDeps;
 }

package/src/tools.ts

@@ -3,9 +3,9 @@ export {
   consultAdvisor,
   curateAdvisorConversation,
   runAdvisorGate,
-} from "./tools/consultation.js";
-export { gateFailureEffectForMode } from "./tools/gate-policy.js";
-export { parseAutomaticDecision } from "./tools/gate-protocol.js";
+} from "./tools/consultation.ts";
+export { gateFailureEffectForMode } from "./tools/gate-policy.ts";
+export { parseAutomaticDecision } from "./tools/gate-protocol.ts";
 export {
   ADVISOR_DECISION_SYSTEM,
   ADVISOR_SYSTEM,
@@ -15,8 +15,8 @@ export {
   advisorRepositoryContext,
   advisorRequestConversation,
   gitContextNote,
-} from "./tools/prompts.js";
-export { registerAdvisorTool } from "./tools/registration.js";
+} from "./tools/prompts.ts";
+export { registerAdvisorTool } from "./tools/registration.ts";
 export {
   adviceForDisplay,
   hasSoundVerdict,
@@ -25,14 +25,14 @@ export {
   renderThinkingMarkdown,
   resolveAdvisorRequest,
   SPINNER_FRAMES,
-} from "./tools/render-common.js";
+} from "./tools/render-common.ts";
 export {
   appendScoutLifecycleEntry,
   renderScoutDetails,
   ScoutStatusManager,
   scoutDetailsFromEvent,
-} from "./tools/scout-status.js";
-export { advisorSessionState } from "./tools/session.js";
+} from "./tools/scout-status.ts";
+export { advisorSessionState } from "./tools/session.ts";
 export type {
   AdvisorConsultationResult,
   AdvisorGateFailure,
@@ -44,4 +44,4 @@ export type {
   GateFailureCategory,
   GateTrigger,
   ScoutToolDetails,
-} from "./tools/types.js";
+} from "./tools/types.ts";