pi-advisor-flow 0.6.0 → 0.8.0

package/src/commands/renderers.ts

@@ -1,6 +1,12 @@
 import { getMarkdownTheme } from "@earendil-works/pi-coding-agent";
+import type {
+  EntryRenderer,
+  MessageRenderer,
+} from "@earendil-works/pi-coding-agent";
 import { Box, Markdown, Text } from "@earendil-works/pi-tui";
+
 import { getAdvisorSettings } from "../config/state.ts";
+import { isString } from "../content-utils.ts";
 import {
   adviceForDisplay,
   hasSoundVerdict,
@@ -11,66 +17,72 @@ import { formatAdvisorUsage } from "../usage.ts";
 import { ManualAdvisorProgressComponent } from "./manual-progress.ts";
 import type { CommandRuntime } from "./types.ts";
 
+interface ManualCallEntryDetails {
+  progressId?: string;
+  question?: string;
+}
+
+interface ManualResultDetails {
+  advisor?: string;
+  text?: string;
+  usage?: unknown;
+}
+
+const manualCallRenderer =
+  (runtime: CommandRuntime): EntryRenderer<ManualCallEntryDetails> =>
+  (entry, { expanded }, theme) => {
+    const { progressId, question } = entry.data ?? {};
+    const progress = progressId
+      ? runtime.manualProgress.get(progressId)
+      : undefined;
+    return progress
+      ? new ManualAdvisorProgressComponent(
+          question,
+          progress,
+          Boolean(expanded),
+          theme
+        )
+      : renderAdvisorCallBox(question, theme);
+  };
+
+const manualResultRenderer: MessageRenderer<ManualResultDetails> = (
+  message,
+  { expanded },
+  theme
+) => {
+  const { details } = message;
+  const box = new Box(1, 1, (text) => theme.bg("customMessageBg", text));
+  const advice =
+    details?.text ??
+    (isString(message.content)
+      ? message.content
+      : "(Advisor returned no advice.)");
+  // Manual consultations must render exactly like an Executor ask_advisor call.
+  box.addChild(
+    new Text(renderAdvisorResponseHeader(hasSoundVerdict(advice), theme), 0, 0)
+  );
+  if (details?.advisor) {
+    box.addChild(new Text(theme.fg("dim", `  ${details.advisor}`), 0, 0));
+  }
+  if (getAdvisorSettings().showUsageDetails) {
+    const usage = formatAdvisorUsage(details?.usage);
+    if (usage) {
+      box.addChild(new Text(theme.fg("dim", `  Usage: ${usage}`), 0, 0));
+    }
+  }
+  box.addChild(
+    new Markdown(adviceForDisplay(advice, expanded), 0, 0, getMarkdownTheme())
+  );
+  return box;
+};
+
 export const registerCommandRenderers = (runtime: CommandRuntime) => {
   runtime.pi.registerEntryRenderer?.(
     "advisor-manual-call",
-    (entry, { expanded }, theme) => {
-      const { progressId, question } = (entry.data ?? {}) as {
-        progressId?: string;
-        question?: string;
-      };
-      const progress = progressId
-        ? runtime.manualProgress.get(progressId)
-        : undefined;
-      return progress
-        ? new ManualAdvisorProgressComponent(
-            question,
-            progress,
-            Boolean(expanded),
-            theme
-          )
-        : renderAdvisorCallBox(question, theme);
-    }
+    manualCallRenderer(runtime)
   );
-
   runtime.pi.registerMessageRenderer?.(
     "advisor-manual-result",
-    (message, { expanded }, theme) => {
-      const details = message.details as
-        | { advisor?: string; text?: string; usage?: unknown }
-        | undefined;
-      const box = new Box(1, 1, (text) => theme.bg("customMessageBg", text));
-      const advice =
-        details?.text ??
-        (typeof message.content === "string"
-          ? message.content
-          : "(Advisor returned no advice.)");
-      // Manual consultations must render exactly like an Executor ask_advisor call.
-      box.addChild(
-        new Text(
-          renderAdvisorResponseHeader(hasSoundVerdict(advice), theme),
-          0,
-          0
-        )
-      );
-      if (details?.advisor) {
-        box.addChild(new Text(theme.fg("dim", `  ${details.advisor}`), 0, 0));
-      }
-      if (getAdvisorSettings().showUsageDetails) {
-        const usage = formatAdvisorUsage(details?.usage);
-        if (usage) {
-          box.addChild(new Text(theme.fg("dim", `  Usage: ${usage}`), 0, 0));
-        }
-      }
-      box.addChild(
-        new Markdown(
-          adviceForDisplay(advice, expanded),
-          0,
-          0,
-          getMarkdownTheme()
-        )
-      );
-      return box;
-    }
+    manualResultRenderer
   );
 };

package/src/commands/runtime.ts

@@ -2,6 +2,7 @@ import type {
   ExtensionAPI,
   ExtensionContext,
 } from "@earendil-works/pi-coding-agent";
+
 import { getAdvisorSettings } from "../config/state.ts";
 import { notifyHerdrAdvisorFailure } from "../herdr.ts";
 import type { AdvisorSessionState } from "../session-state.ts";
@@ -25,6 +26,18 @@ export const notify = (
   }
 };
 
+const reportManualBudgetExhausted = (ctx: ExtensionContext) => {
+  const message = "Advisor call budget exhausted for this session.";
+  notify(ctx, message, "warning");
+  notifyHerdrAdvisorFailure("Advisor budget exhausted", message);
+};
+
+const requestManualRender = (ctx: ExtensionContext) => {
+  if (ctx.hasUI) {
+    ctx.ui.setStatus("advisor-manual", undefined);
+  }
+};
+
 class CommandRuntime implements CommandRuntimeContract {
   readonly advisorSessionState: AdvisorSessionState;
   readonly manualConsultations = new Map<AbortController, symbol>();
@@ -34,7 +47,9 @@ class CommandRuntime implements CommandRuntimeContract {
     ReturnType<typeof setInterval>
   >();
   readonly pi: ExtensionAPI;
+  readonly reportManualBudgetExhausted = reportManualBudgetExhausted;
   readonly requestAdvisor: ManualConsult;
+  readonly requestManualRender = requestManualRender;
   readonly scoutStatus: ScoutStatusManager;
   manualProgressSequence = 0;
   pendingExecutorModelRef: string | undefined;
@@ -59,8 +74,7 @@ class CommandRuntime implements CommandRuntimeContract {
           undefined,
           undefined,
           undefined,
-          onScout,
-          undefined
+          onScout
         ));
   }
 
@@ -94,18 +108,6 @@ class CommandRuntime implements CommandRuntimeContract {
       );
     }
   }
-
-  reportManualBudgetExhausted(ctx: ExtensionContext) {
-    const message = "Advisor call budget exhausted for this session.";
-    notify(ctx, message, "warning");
-    notifyHerdrAdvisorFailure("Advisor budget exhausted", message);
-  }
-
-  requestManualRender(ctx: ExtensionContext) {
-    if (ctx.hasUI) {
-      ctx.ui.setStatus("advisor-manual", undefined);
-    }
-  }
 }
 
 export const createCommandRuntime = (

package/src/commands/settings-commands.ts

@@ -7,7 +7,11 @@ import {
 import { saveConfig } from "../config/storage.ts";
 import { AdvisorSettingsSelector } from "../ui/settings-selector.ts";
 import { loadCommandConfig } from "./activation-preparation.ts";
-import { CONTEXT_PRESETS, EFFORT_LEVELS } from "./model-options.ts";
+import {
+  CONTEXT_PRESETS,
+  EFFORT_LEVELS,
+  getConfiguredModelRefs,
+} from "./model-options.ts";
 import { notify } from "./runtime.ts";
 import { saveAdvisorSettings } from "./settings-persistence.ts";
 import type { CommandRuntime } from "./types.ts";
@@ -21,12 +25,14 @@ export const registerSettingsCommands = (runtime: CommandRuntime) => {
       }
 
       const initial = getAdvisorSettings();
-      await ctx.ui.custom<void>(
-        (tui, theme, _keybindings, done) =>
+      await ctx.ui.custom<undefined>(
+        (tui, theme, keybindings, done) =>
           new AdvisorSettingsSelector({
             effortLevels: EFFORT_LEVELS,
             initial,
-            onCancel: () => done(),
+            keybindings,
+            modelRefs: getConfiguredModelRefs(ctx),
+            onCancel: () => done(undefined),
             onChange: (settings) => {
               try {
                 saveAdvisorSettings(ctx, settings);

package/src/commands/settings-persistence.ts

@@ -1,4 +1,5 @@
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+
 import {
   getPersistedModelRefs,
   setAdvisorAutoLoopGateRef,
@@ -12,8 +13,20 @@ import {
   setAdvisorGitContextMaxCharsRef,
   setAdvisorGitContextRef,
   setAdvisorHerdrIntegrationRef,
+  setAdvisorJevDigestMaxCharsRef,
+  setAdvisorJevFilterEnabledRef,
+  setAdvisorJevFilterNoulMarginRef,
+  setAdvisorJevFilterOverrideWindowRef,
+  setAdvisorJevFilterSkipConfidenceRef,
+  setAdvisorJevModelRef,
+  setAdvisorJevPricePerMtokRef,
+  setAdvisorJevTimeoutMsRef,
+  setAdvisorJevTransportRef,
+  setAdvisorJevTurnGateEveryTurnsRef,
+  setAdvisorJevTurnGateNoulThresholdRef,
   setAdvisorLoopThresholdRef,
   setAdvisorMaxCallsPerSessionRef,
+  setAdvisorModelWhitelistRef,
   setAdvisorOutcomeLoggingRef,
   setAdvisorPlanGateRef,
   setAdvisorRedactSecretsRef,
@@ -31,10 +44,21 @@ import {
   setSimpleModeRef,
 } from "../config/state.ts";
 import { saveConfig, saveGlobalOutcomeLogging } from "../config/storage.ts";
+import {
+  DEFAULT_JEV_DIGEST_MAX_CHARS,
+  DEFAULT_JEV_FILTER_NOUL_MARGIN,
+  DEFAULT_JEV_FILTER_OVERRIDE_WINDOW,
+  DEFAULT_JEV_FILTER_SKIP_CONFIDENCE,
+  DEFAULT_JEV_MODEL,
+  DEFAULT_JEV_PRICE_PER_MTOK,
+  DEFAULT_JEV_TIMEOUT_MS,
+  DEFAULT_JEV_TRANSPORT,
+  DEFAULT_JEV_TURN_GATE_EVERY_TURNS,
+  DEFAULT_JEV_TURN_GATE_NOUL_THRESHOLD,
+} from "../config/types.ts";
 import type { AdvisorSettings } from "../ui/types.ts";
 
-// biome-ignore lint/complexity/noExcessiveCognitiveComplexity: one settings form maps every persisted control.
-const applyAdvisorSettings = (settings: AdvisorSettings) => {
+const applySessionSettings = (settings: AdvisorSettings) => {
   setAdvisorEffortRef(
     settings.effort === "Default (Model Default)" ? undefined : settings.effort
   );
@@ -48,6 +72,7 @@ const applyAdvisorSettings = (settings: AdvisorSettings) => {
   setAdvisorAutoLoopGateRef(settings.autoLoopGate ?? true);
   setAdvisorLoopThresholdRef(settings.loopThreshold ?? 3);
   setAdvisorMaxCallsPerSessionRef(settings.maxCallsPerSession);
+  setAdvisorModelWhitelistRef(settings.modelWhitelist ?? []);
   setAdvisorSessionSummaryRef(settings.sessionSummary ?? false);
   setAdvisorScoutEnabledRef(settings.scoutEnabled ?? false);
   setShowUsageDetailsRef(settings.showUsageDetails ?? true);
@@ -56,6 +81,37 @@ const applyAdvisorSettings = (settings: AdvisorSettings) => {
   setAlwaysOnRef(settings.alwaysOn ?? false);
   setAdvisorFailureModeRef(settings.failureMode ?? "block-session");
   setAdvisorHerdrIntegrationRef(settings.herdrIntegration ?? true);
+};
+
+const applyJevSettings = (settings: AdvisorSettings) => {
+  setAdvisorJevFilterEnabledRef(settings.jevFilterEnabled ?? false);
+  setAdvisorJevFilterSkipConfidenceRef(
+    settings.jevFilterSkipConfidence ?? DEFAULT_JEV_FILTER_SKIP_CONFIDENCE
+  );
+  setAdvisorJevFilterNoulMarginRef(
+    settings.jevFilterNoulMargin ?? DEFAULT_JEV_FILTER_NOUL_MARGIN
+  );
+  setAdvisorJevFilterOverrideWindowRef(
+    settings.jevFilterOverrideWindow ?? DEFAULT_JEV_FILTER_OVERRIDE_WINDOW
+  );
+  setAdvisorJevModelRef(settings.jevModel ?? DEFAULT_JEV_MODEL);
+  setAdvisorJevTimeoutMsRef(settings.jevTimeoutMs ?? DEFAULT_JEV_TIMEOUT_MS);
+  setAdvisorJevDigestMaxCharsRef(
+    settings.jevDigestMaxChars ?? DEFAULT_JEV_DIGEST_MAX_CHARS
+  );
+  setAdvisorJevPricePerMtokRef(
+    settings.jevPricePerMtok ?? DEFAULT_JEV_PRICE_PER_MTOK
+  );
+  setAdvisorJevTransportRef(settings.jevTransport ?? DEFAULT_JEV_TRANSPORT);
+  setAdvisorJevTurnGateEveryTurnsRef(
+    settings.jevTurnGateEveryTurns ?? DEFAULT_JEV_TURN_GATE_EVERY_TURNS
+  );
+  setAdvisorJevTurnGateNoulThresholdRef(
+    settings.jevTurnGateNoulThreshold ?? DEFAULT_JEV_TURN_GATE_NOUL_THRESHOLD
+  );
+};
+
+const applyDisclosureSettings = (settings: AdvisorSettings) => {
   setAdvisorToolResultMaxLinesRef(settings.toolResultMaxLines ?? 2000);
   setAdvisorToolResultMaxBytesRef(settings.toolResultMaxBytes ?? 50 * 1024);
   setAdvisorRedactSecretsRef(settings.redactSecrets ?? false);
@@ -67,6 +123,12 @@ const applyAdvisorSettings = (settings: AdvisorSettings) => {
   setAdvisorOutcomeLoggingRef(settings.outcomeLogging ?? false);
 };
 
+const applyAdvisorSettings = (settings: AdvisorSettings) => {
+  applySessionSettings(settings);
+  applyJevSettings(settings);
+  applyDisclosureSettings(settings);
+};
+
 export const saveAdvisorSettings = (
   ctx: ExtensionContext,
   settings: AdvisorSettings

package/src/commands/types.ts

@@ -2,6 +2,7 @@ import type {
   ExtensionAPI,
   ExtensionContext,
 } from "@earendil-works/pi-coding-agent";
+
 import type { GitContextLevel } from "../git.ts";
 import type { ScoutLifecycleEvent } from "../scout.ts";
 import type { AdvisorSessionState } from "../session-state.ts";
@@ -16,6 +17,7 @@ export type ManualConsult = (
   onScout?: (event: ScoutLifecycleEvent) => void,
   gitContext?: GitContextLevel
 ) => Promise<{
+  adviceId?: string;
   markdown: string;
   thinkingText: string;
   draftBytes?: number;

package/src/commands.ts

@@ -1,4 +1,3 @@
-// biome-ignore lint/performance/noBarrelFile: this facade intentionally preserves the public command module contract.
 export { registerCommands } from "./commands/registration.ts";
 export type {
   CommandDependencies,

package/src/config/args.ts

@@ -9,7 +9,7 @@ import {
 import { MAX_CONTEXT_MAX_CHARS } from "./types.ts";
 import { isValidContextMaxChars } from "./validation.ts";
 
-const ARGUMENT_WHITESPACE = /\s+/;
+const ARGUMENT_WHITESPACE = /\s+/u;
 
 export const parseArgs = (args: string): string | undefined => {
   let nextExecutor = executorRef;

package/src/config/defaults.ts

@@ -10,8 +10,20 @@ import {
   setAdvisorGitContextMaxCharsRef,
   setAdvisorGitContextRef,
   setAdvisorHerdrIntegrationRef,
+  setAdvisorJevDigestMaxCharsRef,
+  setAdvisorJevFilterEnabledRef,
+  setAdvisorJevFilterNoulMarginRef,
+  setAdvisorJevFilterOverrideWindowRef,
+  setAdvisorJevFilterSkipConfidenceRef,
+  setAdvisorJevModelRef,
+  setAdvisorJevPricePerMtokRef,
+  setAdvisorJevTimeoutMsRef,
+  setAdvisorJevTransportRef,
+  setAdvisorJevTurnGateEveryTurnsRef,
+  setAdvisorJevTurnGateNoulThresholdRef,
   setAdvisorLoopThresholdRef,
   setAdvisorMaxCallsPerSessionRef,
+  setAdvisorModelWhitelistRef,
   setAdvisorOutcomeLoggingRef,
   setAdvisorPlanGateRef,
   setAdvisorRedactSecretsRef,
@@ -38,6 +50,16 @@ import {
   DEFAULT_ADVISOR_TOOL_RESULT_MAX_BYTES,
   DEFAULT_ADVISOR_TOOL_RESULT_MAX_LINES,
   DEFAULT_CONTEXT_MAX_CHARS,
+  DEFAULT_JEV_DIGEST_MAX_CHARS,
+  DEFAULT_JEV_FILTER_NOUL_MARGIN,
+  DEFAULT_JEV_FILTER_OVERRIDE_WINDOW,
+  DEFAULT_JEV_FILTER_SKIP_CONFIDENCE,
+  DEFAULT_JEV_MODEL,
+  DEFAULT_JEV_PRICE_PER_MTOK,
+  DEFAULT_JEV_TIMEOUT_MS,
+  DEFAULT_JEV_TRANSPORT,
+  DEFAULT_JEV_TURN_GATE_EVERY_TURNS,
+  DEFAULT_JEV_TURN_GATE_NOUL_THRESHOLD,
 } from "./types.ts";
 
 export const resetDefaults = () => {
@@ -56,11 +78,23 @@ export const resetDefaults = () => {
   setAdvisorAutoLoopGateRef(true);
   setAdvisorLoopThresholdRef(3);
   setAdvisorMaxCallsPerSessionRef(undefined);
+  setAdvisorModelWhitelistRef([]);
   setAdvisorSessionSummaryRef(false);
   setSimpleModeRef(false);
   setAlwaysOnRef(false);
   setAdvisorFailureModeRef("block-session");
   setAdvisorHerdrIntegrationRef(true);
+  setAdvisorJevModelRef(DEFAULT_JEV_MODEL);
+  setAdvisorJevFilterEnabledRef(false);
+  setAdvisorJevFilterSkipConfidenceRef(DEFAULT_JEV_FILTER_SKIP_CONFIDENCE);
+  setAdvisorJevFilterNoulMarginRef(DEFAULT_JEV_FILTER_NOUL_MARGIN);
+  setAdvisorJevFilterOverrideWindowRef(DEFAULT_JEV_FILTER_OVERRIDE_WINDOW);
+  setAdvisorJevTimeoutMsRef(DEFAULT_JEV_TIMEOUT_MS);
+  setAdvisorJevDigestMaxCharsRef(DEFAULT_JEV_DIGEST_MAX_CHARS);
+  setAdvisorJevPricePerMtokRef(DEFAULT_JEV_PRICE_PER_MTOK);
+  setAdvisorJevTransportRef(DEFAULT_JEV_TRANSPORT);
+  setAdvisorJevTurnGateEveryTurnsRef(DEFAULT_JEV_TURN_GATE_EVERY_TURNS);
+  setAdvisorJevTurnGateNoulThresholdRef(DEFAULT_JEV_TURN_GATE_NOUL_THRESHOLD);
   setAdvisorToolResultMaxLinesRef(DEFAULT_ADVISOR_TOOL_RESULT_MAX_LINES);
   setAdvisorToolResultMaxBytesRef(DEFAULT_ADVISOR_TOOL_RESULT_MAX_BYTES);
   setAdvisorRedactSecretsRef(false);
@@ -82,7 +116,7 @@ const applyOptionalConfig = <Key extends keyof AdvisorConfig>(
 ) => {
   const value = config[key];
   if (value !== undefined) {
-    apply(value as NonNullable<AdvisorConfig[Key]>);
+    apply(value);
   }
 };
 
@@ -134,6 +168,11 @@ export const applyConfig = (config: AdvisorConfig) => {
     "advisorMaxCallsPerSession",
     setAdvisorMaxCallsPerSessionRef
   );
+  applyOptionalConfig(
+    config,
+    "advisorModelWhitelist",
+    setAdvisorModelWhitelistRef
+  );
   applyOptionalConfig(
     config,
     "advisorSessionSummary",
@@ -150,6 +189,49 @@ export const applyConfig = (config: AdvisorConfig) => {
     "advisorHerdrIntegration",
     setAdvisorHerdrIntegrationRef
   );
+  applyOptionalConfig(
+    config,
+    "advisorJevFilterEnabled",
+    setAdvisorJevFilterEnabledRef
+  );
+  applyOptionalConfig(
+    config,
+    "advisorJevFilterSkipConfidence",
+    setAdvisorJevFilterSkipConfidenceRef
+  );
+  applyOptionalConfig(
+    config,
+    "advisorJevFilterNoulMargin",
+    setAdvisorJevFilterNoulMarginRef
+  );
+  applyOptionalConfig(
+    config,
+    "advisorJevFilterOverrideWindow",
+    setAdvisorJevFilterOverrideWindowRef
+  );
+  applyNonEmptyStringConfig(config.advisorJevModel, setAdvisorJevModelRef);
+  applyOptionalConfig(config, "advisorJevTimeoutMs", setAdvisorJevTimeoutMsRef);
+  applyOptionalConfig(
+    config,
+    "advisorJevDigestMaxChars",
+    setAdvisorJevDigestMaxCharsRef
+  );
+  applyOptionalConfig(
+    config,
+    "advisorJevPricePerMtok",
+    setAdvisorJevPricePerMtokRef
+  );
+  applyOptionalConfig(config, "advisorJevTransport", setAdvisorJevTransportRef);
+  applyOptionalConfig(
+    config,
+    "advisorJevTurnGateEveryTurns",
+    setAdvisorJevTurnGateEveryTurnsRef
+  );
+  applyOptionalConfig(
+    config,
+    "advisorJevTurnGateNoulThreshold",
+    setAdvisorJevTurnGateNoulThresholdRef
+  );
   applyOptionalConfig(
     config,
     "advisorToolResultMaxLines",