pi-advisor-flow 0.7.0 → 0.8.1-dev.1

package/src/tools/registration.ts

@@ -1,9 +1,11 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+
 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 type { JevTurnGateRegistration } from "./jev-turn-gate.ts";
 import { registerAskAdvisorTool } from "./register-ask-advisor.ts";
 import { registerToolLifecycle } from "./register-lifecycle.ts";
 import { registerOutcomeTool } from "./register-outcome.ts";
@@ -35,18 +37,14 @@ 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,
-    }
-  );
+  const turnGate: JevTurnGateRegistration = {
+    activeTools: () => pi.getActiveTools(),
+    consult: registration.consult,
+    send: (message) => pi.sendMessage(message, { deliverAs: "steer" }),
+    session,
+  };
+  if (dependencies.turnGateDeps) {
+    turnGate.deps = dependencies.turnGateDeps;
+  }
+  registerJevTurnGate((event, handler) => pi.on(event, handler), turnGate);
 };

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";
@@ -116,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>,
@@ -144,23 +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 = attachmentLabels(details);
-  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 {

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,

package/src/ui/jev-setup-submenu.ts

@@ -1,21 +1,18 @@
 import type { Theme } from "@earendil-works/pi-coding-agent";
-import {
-  type Component,
-  type Focusable,
-  Key,
-  matchesKey,
-  truncateToWidth,
-} from "@earendil-works/pi-tui";
+import { Key, matchesKey, truncateToWidth } from "@earendil-works/pi-tui";
+import type { Component, Focusable } from "@earendil-works/pi-tui";
 import { noul } from "@typesafe-ai/sdk";
+
 import { jevClientFromCredentials } from "../jev/client.ts";
 import {
   clearKeyTypeSafeKey,
   consumePlaintextKeyWarning,
-  type JevKeyStoreResult,
   removeTypeSafeKeyFromAdvisorJson,
   writeKeyTypeSafeKey,
 } from "../jev/key-store.ts";
-import { type JevCredentials, resolveJevTransport } from "../jev/transport.ts";
+import type { JevKeyStoreResult } from "../jev/key-store.ts";
+import { resolveJevTransport } from "../jev/transport.ts";
+import type { JevCredentials } from "../jev/transport.ts";
 import { MaskedInput } from "./masked-input.ts";
 import type { RenderRequester } from "./types.ts";
 
@@ -48,19 +45,40 @@ type SetupAction =
   | "enter-key"
   | "done";
 
+const ACTION_LABELS: Record<SetupAction, string> = {
+  disable: "Disable",
+  "disable-clear": "Disable and clear stored key",
+  done: "Done",
+  "enter-key": "Enter a TypeSafe API key",
+  "verify-again": "Verify again",
+  "verify-enable": "Verify and enable",
+};
+
+const fireAndForget = async (action: Promise<unknown>): Promise<void> => {
+  try {
+    await action;
+  } catch {
+    // Background setup actions surface their own notices.
+  }
+};
+
 const transportLabel = (credentials: JevCredentials): string => {
   if (credentials.transport === "openrouter") {
     return "OpenRouter (reusing pi login)";
   }
   switch (credentials.source) {
-    case "advisor-json":
+    case "advisor-json": {
       return "TypeSafe (key: advisor.json — plaintext, not recommended)";
-    case "bun-secrets":
+    }
+    case "bun-secrets": {
       return "TypeSafe (key: Bun.secrets)";
-    case "file":
+    }
+    case "file": {
       return "TypeSafe (key: stored file, mode 0600)";
-    default:
+    }
+    default: {
       return "TypeSafe (key: TYPESAFE_API_KEY)";
+    }
   }
 };
 
@@ -107,7 +125,7 @@ export class JevSetupSubmenu implements Component, Focusable {
       onSubmit: (value) => this.submitEnteredKey(value),
       placeholder: "Paste a TypeSafe API key",
     });
-    this.refresh().catch(() => undefined);
+    void fireAndForget(this.refresh());
   }
 
   get focused(): boolean {
@@ -135,14 +153,14 @@ export class JevSetupSubmenu implements Component, Focusable {
     const actions = this.actions();
     if (
       matchesKey(keyData, Key.down) ||
-      keyData === "\u001b[B" ||
-      keyData === "\u001bOB"
+      keyData === "\u001B[B" ||
+      keyData === "\u001BOB"
     ) {
       this.selectedIndex = (this.selectedIndex + 1) % actions.length;
     } else if (
       matchesKey(keyData, Key.up) ||
-      keyData === "\u001b[A" ||
-      keyData === "\u001bOA"
+      keyData === "\u001B[A" ||
+      keyData === "\u001BOA"
     ) {
       this.selectedIndex =
         (this.selectedIndex - 1 + actions.length) % actions.length;
@@ -162,28 +180,29 @@ export class JevSetupSubmenu implements Component, Focusable {
       "",
     ];
     if (this.credentials) {
-      lines.push(`  Transport: ${transportLabel(this.credentials)}`);
-      lines.push(`  Filter: ${enabled ? "On" : "Off"}`);
+      lines.push(
+        `  Transport: ${transportLabel(this.credentials)}`,
+        `  Filter: ${enabled ? "On" : "Off"}`
+      );
     } else if (this.mode === "verifying") {
       lines.push("  Checking available Jev credentials…");
     } else {
       lines.push(
-        "  No Jev credentials found. Enter a TypeSafe API key below, or add"
+        "  No Jev credentials found. Enter a TypeSafe API key below, or add",
+        "  an OpenRouter login in pi; it is reused automatically."
       );
-      lines.push("  an OpenRouter login in pi; it is reused automatically.");
     }
     if (this.notice) {
-      lines.push("");
-      lines.push(theme.fg("warning", `  ${this.notice}`));
+      lines.push("", theme.fg("warning", `  ${this.notice}`));
     }
     lines.push("");
     if (this.mode === "verifying") {
       lines.push("  Verifying with a live Jev call…");
     } else if (this.mode === "key-entry") {
       lines.push(
-        `  ${this.maskedInput.render(Math.max(10, width - 4))[0] ?? ""}`
+        `  ${this.maskedInput.render(Math.max(10, width - 4))[0] ?? ""}`,
+        theme.fg("dim", "  Enter: verify · Esc: cancel")
       );
-      lines.push(theme.fg("dim", "  Enter: verify · Esc: cancel"));
     } else {
       for (const [index, label] of this.labels().entries()) {
         const prefix = index === this.selectedIndex ? "→ " : "  ";
@@ -210,20 +229,8 @@ export class JevSetupSubmenu implements Component, Focusable {
     return actions;
   }
 
-  private actionLabels(): Record<SetupAction, string> {
-    return {
-      disable: "Disable",
-      "disable-clear": "Disable and clear stored key",
-      done: "Done",
-      "enter-key": "Enter a TypeSafe API key",
-      "verify-again": "Verify again",
-      "verify-enable": "Verify and enable",
-    };
-  }
-
   private labels(): string[] {
-    const labels = this.actionLabels();
-    return this.actions().map((action) => labels[action]);
+    return this.actions().map((action) => ACTION_LABELS[action]);
   }
 
   private async refresh(): Promise<void> {
@@ -242,26 +249,25 @@ export class JevSetupSubmenu implements Component, Focusable {
   }
 
   private activate(action: SetupAction): void {
-    switch (action) {
-      case "done":
-        this.options.done();
-        return;
-      case "enter-key":
-        this.mode = "key-entry";
-        return;
-      case "disable":
-        this.notice = undefined;
-        this.options.done("Off");
-        return;
-      case "disable-clear":
-        this.disableAndClear().catch(() => undefined);
-        return;
-      case "verify-again":
-      case "verify-enable":
-        this.verifyAndEnable().catch(() => undefined);
-        return;
-      default:
-        return;
+    if (action === "done") {
+      this.options.done();
+      return;
+    }
+    if (action === "enter-key") {
+      this.mode = "key-entry";
+      return;
+    }
+    if (action === "disable") {
+      this.notice = undefined;
+      this.options.done("Off");
+      return;
+    }
+    if (action === "disable-clear") {
+      void fireAndForget(this.disableAndClear());
+      return;
+    }
+    if (action === "verify-again" || action === "verify-enable") {
+      void fireAndForget(this.verifyAndEnable());
     }
   }
 

package/src/ui/manual-dialog-render.ts

@@ -3,6 +3,7 @@ import {
   visibleWidth,
   wrapTextWithAnsi,
 } from "@earendil-works/pi-tui";
+
 import type { GitContextLevel } from "../git.ts";
 import type { ManualAdvisorDialogView } from "./types.ts";
 

package/src/ui/manual-dialog.ts

@@ -1,29 +1,34 @@
-import {
-  type Component,
-  Editor,
-  type EditorTheme,
-  type Focusable,
-  Key,
-  type Keybindings,
-  type KeyId,
-  matchesKey,
+import { Editor, Key, matchesKey } from "@earendil-works/pi-tui";
+import type {
+  Component,
+  EditorTheme,
+  Focusable,
+  Keybindings,
+  KeyId,
 } from "@earendil-works/pi-tui";
-import {
-  clampGitContextLevel,
-  GIT_CONTEXT_LEVELS,
-  type GitContextLevel,
-} from "../git.ts";
+
+import { clampGitContextLevel, GIT_CONTEXT_LEVELS } from "../git.ts";
+import type { GitContextLevel } from "../git.ts";
 import { renderManualAdvisorDialog } from "./manual-dialog-render.ts";
 import type {
   ManualAdvisorDialogOptions,
   ManualAdvisorFocus,
+  ManualAdvisorRequest,
 } from "./types.ts";
 
-// Keep the keybinding components separate from Socket's URL-string heuristic.
+// SAFETY: the joined literal is exactly the registered "tui.input.tab" keybinding path.
 const TUI_INPUT_TAB: keyof Keybindings = ["tui", "input", "tab"].join(
   "."
 ) as keyof Keybindings;
 
+interface ManualDialogState {
+  completed: boolean;
+  focused: boolean;
+}
+
+const isShiftTab = (keyData: string): boolean =>
+  matchesKey(keyData, Key.shift("tab"));
+
 /** The small, non-persistent /advisor-manual form; callers own budget and consultation decisions. */
 export class ManualAdvisorDialog implements Component, Focusable {
   private readonly options: ManualAdvisorDialogOptions;
@@ -32,7 +37,7 @@ export class ManualAdvisorDialog implements Component, Focusable {
   private gitIndex: number;
   private actionIndex = 0;
   private focusTarget: ManualAdvisorFocus = "editor";
-  private readonly state: { completed: boolean; focused: boolean } = {
+  private readonly state: ManualDialogState = {
     completed: false,
     focused: false,
   };
@@ -54,7 +59,7 @@ export class ManualAdvisorDialog implements Component, Focusable {
     // while the configured level remains the hard ceiling.
     this.gitLevels = GIT_CONTEXT_LEVELS.filter(
       (level) => clampGitContextLevel(level, options.gitContext) === level
-    ).reverse();
+    ).toReversed();
     this.gitIndex = Math.max(0, this.gitLevels.indexOf(options.gitContext));
 
     const editorTheme: EditorTheme = {
@@ -90,7 +95,7 @@ export class ManualAdvisorDialog implements Component, Focusable {
       this.cancel();
       return;
     }
-    if (this.isShiftTab(keyData)) {
+    if (isShiftTab(keyData)) {
       this.changeFocus(-1);
       return;
     }
@@ -98,24 +103,12 @@ export class ManualAdvisorDialog implements Component, Focusable {
       this.changeFocus(1);
       return;
     }
-
-    switch (this.focusTarget) {
-      case "editor":
-        // Editor owns Enter/Shift+Enter and all cursor/editing semantics. Its
-        // onSubmit callback above is the sole editor submission path. At the
-        // edge of the message, a directional key also moves to the adjacent
-        // form control so the Git selector is reachable without Tab.
-        this.handleEditorInput(keyData);
-        return;
-      case "git":
-        this.handleGitInput(keyData);
-        return;
-      case "actions":
-        this.handleActionInput(keyData);
-        return;
-      default:
-        return;
-    }
+    const handlers: Record<ManualAdvisorFocus, (keyData: string) => void> = {
+      actions: (key) => this.handleActionInput(key),
+      editor: (key) => this.handleEditorInput(key),
+      git: (key) => this.handleGitInput(key),
+    };
+    handlers[this.focusTarget](keyData);
   }
 
   render(width: number): string[] {
@@ -137,6 +130,10 @@ export class ManualAdvisorDialog implements Component, Focusable {
   }
 
   private handleEditorInput(keyData: string): void {
+    // Editor owns Enter/Shift+Enter and all cursor/editing semantics. Its
+    // onSubmit callback above is the sole editor submission path. At the
+    // edge of the message, a directional key also moves to the adjacent
+    // form control so the Git selector is reachable without Tab.
     let direction: -1 | 1 | undefined;
     if (this.matches(keyData, "tui.editor.cursorDown", Key.down)) {
       direction = 1;
@@ -257,10 +254,6 @@ export class ManualAdvisorDialog implements Component, Focusable {
     );
   }
 
-  private isShiftTab(keyData: string): boolean {
-    return matchesKey(keyData, Key.shift("tab"));
-  }
-
   private isCancel(keyData: string): boolean {
     return (
       matchesKey(keyData, Key.escape) ||
@@ -284,10 +277,13 @@ export class ManualAdvisorDialog implements Component, Focusable {
       return;
     }
     this.state.completed = true;
-    this.options.onSubmit({
+    const request: ManualAdvisorRequest = {
       gitContext: this.gitLevels[this.gitIndex] ?? "off",
-      ...(message ? { message } : {}),
-    });
+    };
+    if (message) {
+      request.message = message;
+    }
+    this.options.onSubmit(request);
   }
 
   private cancel(): void {