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

package/src/ui/settings-list-adapter.ts

@@ -1,11 +1,10 @@
-import {
-  type Component,
-  type Focusable,
-  type Input,
-  Key,
-  matchesKey,
-  type SettingItem,
-  type SettingsList,
+import { Key, matchesKey } from "@earendil-works/pi-tui";
+import type {
+  Component,
+  Focusable,
+  Input,
+  SettingItem,
+  SettingsList,
 } from "@earendil-works/pi-tui";
 
 interface SettingsListPrivateFields {
@@ -15,6 +14,8 @@ interface SettingsListPrivateFields {
   submenuComponent?: Component | null;
 }
 
+type SettingsListWithPrivateFields = SettingsList & SettingsListPrivateFields;
+
 /**
  * Contains the narrow compatibility access needed for pi-tui's SettingsList.
  * No other UI module should depend on its private fields.
@@ -45,6 +46,7 @@ export class SettingsListAdapter {
 
   setFocused(value: boolean): void {
     const fields = this.privateFields();
+    // SAFETY: a SettingsList submenu component is registered only when focusable.
     const submenu = fields.submenuComponent as Focusable | undefined;
     if (submenu) {
       submenu.focused = value;
@@ -53,7 +55,7 @@ export class SettingsListAdapter {
 
   setSelectedId(items: SettingItem[], selectedId: string): void {
     const selectedIndex = items.findIndex((item) => item.id === selectedId);
-    if (selectedIndex >= 0) {
+    if (selectedIndex !== -1) {
       this.privateFields().selectedIndex = selectedIndex;
     }
   }
@@ -63,9 +65,9 @@ export class SettingsListAdapter {
     onChange: (id: string, value: string) => void
   ): boolean {
     let direction = 0;
-    if (matchesKey(keyData, Key.left) || keyData === "\u001b[D") {
+    if (matchesKey(keyData, Key.left) || keyData === "\u001B[D") {
       direction = -1;
-    } else if (matchesKey(keyData, Key.right) || keyData === "\u001b[C") {
+    } else if (matchesKey(keyData, Key.right) || keyData === "\u001B[C") {
       direction = 1;
     }
     if (direction === 0) {
@@ -98,6 +100,7 @@ export class SettingsListAdapter {
   }
 
   private privateFields(): SettingsListPrivateFields {
-    return this.list as unknown as SettingsListPrivateFields;
+    // SAFETY: compatibility-only read of SettingsList's private layout fields.
+    return this.list as SettingsListWithPrivateFields;
   }
 }

package/src/ui/settings-mutations.ts

@@ -1,115 +1,202 @@
 import { DEFAULT_JEV_MODEL } from "../config/types.ts";
-import type { AdvisorSettings, ContextPreset, SettingValue } from "./types.ts";
+import type { AdvisorSettings, ContextPreset } from "./types.ts";
 
-const BOOLEAN_SETTING_IDS = new Set([
-  "scoutEnabled",
-  "showUsageDetails",
-  "showUsageFooter",
-  "planGate",
-  "failureGate",
-  "completionGate",
-  "collapseResponses",
-  "blockOnBlocked",
+const BOOLEAN_SETTING_FIELDS = [
   "autoLoopGate",
-  "sessionSummary",
+  "blockOnBlocked",
+  "collapseResponses",
+  "completionGate",
+  "failureGate",
   "herdrIntegration",
+  "outcomeLogging",
+  "planGate",
   "redactSecrets",
+  "scoutEnabled",
+  "sessionSummary",
+  "showUsageDetails",
+  "showUsageFooter",
   "trackedFileContent",
   "untrackedContent",
-  "outcomeLogging",
-]);
+] as const;
 
-export const mutateAdvisorSettings = (
+const BOOLEAN_SETTING_IDS = new Set<string>(BOOLEAN_SETTING_FIELDS);
+
+type BooleanSettingField = (typeof BOOLEAN_SETTING_FIELDS)[number];
+
+const parseModelWhitelist = (value: string) => [
+  ...new Set(
+    value
+      .split(",")
+      .map((model) => model.trim())
+      .filter(Boolean)
+  ),
+];
+
+const applyCoreMutation = (
   settings: AdvisorSettings,
   id: string,
   value: string,
   presets: ContextPreset[]
-): void => {
+): boolean => {
   switch (id) {
-    case "context":
+    case "context": {
       settings.contextMaxChars =
         presets.find((preset) => preset.label === value)?.value ??
         settings.contextMaxChars;
-      break;
-    case "simpleMode":
+      return true;
+    }
+    case "simpleMode": {
       settings.simpleMode = value === "On";
-      break;
-    case "alwaysOn":
+      return true;
+    }
+    case "alwaysOn": {
       settings.alwaysOn = value === "On";
-      break;
-    case "effort":
+      return true;
+    }
+    case "effort": {
       settings.effort = value;
-      break;
-    case "customRule":
+      return true;
+    }
+    case "customRule": {
       settings.customRule = value.trim() || undefined;
-      break;
-    case "toolPolicies":
+      return true;
+    }
+    case "toolPolicies": {
+      // SAFETY: the value originates from the settings submenu's previously validated JSON editor.
       settings.toolPolicies = JSON.parse(
         value
       ) as AdvisorSettings["toolPolicies"];
-      break;
-    case "loopThreshold":
+      return true;
+    }
+    case "loopThreshold": {
       settings.loopThreshold = Number(
         value.replace("After ", "").replace(" repeats", "")
       );
-      break;
-    case "maxCallsPerSession":
+      return true;
+    }
+    case "maxCallsPerSession": {
       settings.maxCallsPerSession = value === "∞" ? undefined : Number(value);
-      break;
-    case "failureMode":
+      return true;
+    }
+    case "modelWhitelist": {
+      settings.modelWhitelist = parseModelWhitelist(value);
+      return true;
+    }
+    case "failureMode": {
+      // SAFETY: value comes from the fixed failureMode options of the settings list.
       settings.failureMode = value as AdvisorSettings["failureMode"];
-      break;
-    case "gitContext":
+      return true;
+    }
+    case "gitContext": {
+      // SAFETY: value comes from the fixed GitContextLevel options of the settings list.
       settings.gitContext = value as AdvisorSettings["gitContext"];
-      break;
-    case "toolResultMaxLines":
+      return true;
+    }
+    default: {
+      return false;
+    }
+  }
+};
+
+const applyNumericMutation = (
+  settings: AdvisorSettings,
+  id: string,
+  value: string
+): boolean => {
+  switch (id) {
+    case "toolResultMaxLines": {
       settings.toolResultMaxLines = Number(value);
-      break;
-    case "toolResultMaxBytes":
+      return true;
+    }
+    case "toolResultMaxBytes": {
       settings.toolResultMaxBytes = Number(value);
-      break;
-    case "gitContextMaxChars":
+      return true;
+    }
+    case "gitContextMaxChars": {
       settings.gitContextMaxChars = Number(value);
-      break;
-    case "jevFilter":
+      return true;
+    }
+    default: {
+      return false;
+    }
+  }
+};
+
+const applyJevMutation = (
+  settings: AdvisorSettings,
+  id: string,
+  value: string
+): boolean => {
+  switch (id) {
+    case "jevFilter": {
       settings.jevFilterEnabled = value === "On";
-      break;
-    case "jevFilterSkipConfidence":
+      return true;
+    }
+    case "jevFilterSkipConfidence": {
       settings.jevFilterSkipConfidence = Number(value);
-      break;
-    case "jevFilterNoulMargin":
+      return true;
+    }
+    case "jevFilterNoulMargin": {
       settings.jevFilterNoulMargin = Number(value);
-      break;
-    case "jevFilterOverrideWindow":
+      return true;
+    }
+    case "jevFilterOverrideWindow": {
       settings.jevFilterOverrideWindow = Number(value.replace(" turns", ""));
-      break;
-    case "jevTurnGateEveryTurns":
+      return true;
+    }
+    case "jevTurnGateEveryTurns": {
       settings.jevTurnGateEveryTurns =
-        value === "Off" ? 0 : Number(value.replace(/[^0-9]/g, ""));
-      break;
-    case "jevTurnGateNoulThreshold":
+        value === "Off" ? 0 : Number(value.replaceAll(/[^0-9]/gu, ""));
+      return true;
+    }
+    case "jevTurnGateNoulThreshold": {
       settings.jevTurnGateNoulThreshold = Number(value);
-      break;
-    case "jevModel":
+      return true;
+    }
+    case "jevModel": {
       settings.jevModel = value.trim() || DEFAULT_JEV_MODEL;
-      break;
-    case "jevTimeoutMs":
+      return true;
+    }
+    case "jevTimeoutMs": {
       settings.jevTimeoutMs = Number(value);
-      break;
-    case "jevDigestMaxChars":
+      return true;
+    }
+    case "jevDigestMaxChars": {
       settings.jevDigestMaxChars = Number(value);
-      break;
-    case "jevPricePerMtok":
+      return true;
+    }
+    case "jevPricePerMtok": {
       settings.jevPricePerMtok = Number(value);
-      break;
-    case "jevTransport":
+      return true;
+    }
+    case "jevTransport": {
+      // SAFETY: value comes from the fixed jevTransport options of the settings list.
       settings.jevTransport = value as AdvisorSettings["jevTransport"];
-      break;
-    default:
-      if (BOOLEAN_SETTING_IDS.has(id)) {
-        (settings as unknown as Record<string, SettingValue | boolean>)[id] =
-          value === "On";
-      }
-      break;
+      return true;
+    }
+    default: {
+      return false;
+    }
+  }
+};
+
+export const mutateAdvisorSettings = (
+  settings: AdvisorSettings,
+  id: string,
+  value: string,
+  presets: ContextPreset[]
+): void => {
+  if (applyCoreMutation(settings, id, value, presets)) {
+    return;
+  }
+  if (applyNumericMutation(settings, id, value)) {
+    return;
+  }
+  if (applyJevMutation(settings, id, value)) {
+    return;
+  }
+  if (BOOLEAN_SETTING_IDS.has(id)) {
+    // SAFETY: BOOLEAN_SETTING_IDS only contains AdvisorSettings boolean fields.
+    settings[id as BooleanSettingField] = value === "On";
   }
 };

package/src/ui/settings-selector.ts

@@ -1,15 +1,15 @@
 import { getSettingsListTheme } from "@earendil-works/pi-coding-agent";
-import {
-  type Component,
-  type Focusable,
-  SettingsList,
-  truncateToWidth,
-} from "@earendil-works/pi-tui";
+import { SettingsList, truncateToWidth } from "@earendil-works/pi-tui";
+import type { Component, Focusable } from "@earendil-works/pi-tui";
+
 import {
   rainbowGradient,
   SIMPLE_MODE_GRADIENT_INTERVAL_MS,
 } from "./settings-formatting.ts";
-import { createSettingsItems } from "./settings-items.ts";
+import {
+  advisorModelWhitelistItem,
+  createSettingsItems,
+} from "./settings-items.ts";
 import { SettingsListAdapter } from "./settings-list-adapter.ts";
 import { mutateAdvisorSettings } from "./settings-mutations.ts";
 import type {
@@ -51,7 +51,7 @@ export class AdvisorSettingsSelector implements Component, Focusable {
             label: String(configuredContext),
             value: configuredContext,
           },
-        ].sort((a, b) => a.value - b.value);
+        ].toSorted((a, b) => a.value - b.value);
     if (this.settings.simpleMode) {
       this.startSimpleModeGradient();
     }
@@ -96,8 +96,16 @@ export class AdvisorSettingsSelector implements Component, Focusable {
       }
       return defaultLabel(text, selected);
     };
+    const modelWhitelist = advisorModelWhitelistItem(
+      this.settings,
+      this.options.modelRefs,
+      this.options.keybindings,
+      this.options.theme,
+      this.options.tui
+    );
     const items = createSettingsItems({
       effortLevels: this.options.effortLevels,
+      modelWhitelist,
       presets: this.presets,
       settings: this.settings,
       theme: this.options.theme,
@@ -147,12 +155,13 @@ export class AdvisorSettingsSelector implements Component, Focusable {
     (this.options.onChange ?? this.options.onSave)?.({
       ...this.settings,
       showUsageDetails: this.settings.showUsageDetails ?? true,
-      toolPolicies: { ...(this.settings.toolPolicies ?? {}) },
+      toolPolicies: { ...this.settings.toolPolicies },
     });
     if (
       id === "context" ||
       id === "simpleMode" ||
       id === "customRule" ||
+      id === "modelWhitelist" ||
       id === "toolPolicies"
     ) {
       this.settingsList = this.createSettingsList(id);

package/src/ui/text-setting-submenu.ts

@@ -1,9 +1,6 @@
-import {
-  type Component,
-  type Focusable,
-  Input,
-  truncateToWidth,
-} from "@earendil-works/pi-tui";
+import { Input, truncateToWidth } from "@earendil-works/pi-tui";
+import type { Component, Focusable } from "@earendil-works/pi-tui";
+
 import type { TextSettingSubmenuOptions } from "./types.ts";
 
 /** Small inline editor used by SettingsList for the two free-form settings. */

package/src/ui/types.ts

@@ -1,5 +1,6 @@
 import type { Theme } from "@earendil-works/pi-coding-agent";
 import type { KeybindingsManager, TUI } from "@earendil-works/pi-tui";
+
 import type { GateFailureMode } from "../config/types.ts";
 import type { GitContextLevel } from "../git.ts";
 
@@ -11,6 +12,7 @@ export interface SearchableModelSelectorOptions {
   allOptions: string[];
   currentOption?: string;
   keybindings: KeybindingsManager;
+  multiSelect?: false;
   onCancel: () => void;
   onSelect: (value: string) => void;
   theme: Theme;
@@ -18,6 +20,15 @@ export interface SearchableModelSelectorOptions {
   tui: RenderRequester;
 }
 
+export interface SearchableModelMultiSelectorOptions extends Omit<
+  SearchableModelSelectorOptions,
+  "currentOption" | "multiSelect" | "onSelect"
+> {
+  currentOptions: string[];
+  multiSelect: true;
+  onSelect: (values: string[]) => void;
+}
+
 export interface ManualAdvisorRequest {
   /** The repository disclosure level selected for this consultation. */
   gitContext: GitContextLevel;
@@ -82,6 +93,7 @@ export interface AdvisorSettings {
   jevTurnGateNoulThreshold?: number;
   loopThreshold?: number;
   maxCallsPerSession?: number;
+  modelWhitelist?: string[];
   outcomeLogging?: boolean;
   planGate: boolean;
   redactSecrets?: boolean;
@@ -100,6 +112,8 @@ export interface AdvisorSettings {
 export interface AdvisorSettingsSelectorOptions {
   effortLevels: string[];
   initial: AdvisorSettings;
+  keybindings?: KeybindingsManager;
+  modelRefs?: string[];
   onCancel: () => void;
   onChange?: (settings: AdvisorSettings) => void;
   /** @deprecated Use onChange; retained for extensions embedding this component. */

package/src/ui.ts

@@ -1,4 +1,3 @@
-// biome-ignore lint/performance/noBarrelFile: this facade intentionally preserves the public UI module contract.
 export { ManualAdvisorDialog } from "./ui/manual-dialog.ts";
 export { SearchableModelSelector } from "./ui/model-selector.ts";
 export { AdvisorSettingsSelector } from "./ui/settings-selector.ts";

package/src/usage.ts

@@ -1,5 +1,8 @@
 import type { Usage } from "@earendil-works/pi-ai/compat";
 
+import { isNumber, isRecordOf } from "./content-utils.ts";
+import type { JsonValue } from "./content-utils.ts";
+
 /** Normalized usage returned by an Advisor or Scout provider response. */
 export interface AdvisorUsageSnapshot {
   cacheRead?: number;
@@ -22,26 +25,22 @@ export interface AdvisorUsageTotals {
   totalTokens?: number;
 }
 
-const finite = (value: unknown) =>
-  typeof value === "number" && Number.isFinite(value) && value >= 0
-    ? value
-    : undefined;
+const finite = (value: JsonValue | undefined): number | undefined =>
+  isNumber(value) && Number.isFinite(value) && value >= 0 ? value : undefined;
 
 const add = (left: number | undefined, right: number | undefined) =>
   left === undefined || right === undefined ? (left ?? right) : left + right;
 
-import { isRecord } from "./content-utils.ts";
-
 const costFields = ["input", "output", "cacheRead", "cacheWrite", "total"];
 
 /** Extracts provider-agnostic usage fields without trusting provider metadata. */
-export const snapshotAdvisorUsage = (
-  usage: unknown
+export const snapshotAdvisorUsage = <Input>(
+  usage: Input
 ): AdvisorUsageSnapshot | undefined => {
-  if (!isRecord(usage)) {
+  if (!isRecordOf(usage)) {
     return undefined;
   }
-  const cost = isRecord(usage.cost) ? usage.cost : undefined;
+  const cost = isRecordOf(usage.cost) ? usage.cost : undefined;
   const snapshot = {
     cacheRead: finite(usage.cacheRead),
     cacheWrite: finite(usage.cacheWrite),
@@ -60,7 +59,7 @@ export const snapshotAdvisorUsage = (
 };
 
 /** Returns the reported provider cost, when the response includes one. */
-export const advisorUsageCost = (usage: unknown): number | undefined =>
+export const advisorUsageCost = <Input>(usage: Input): number | undefined =>
   snapshotAdvisorUsage(usage)?.cost;
 
 /**
@@ -68,23 +67,21 @@ export const advisorUsageCost = (usage: unknown): number | undefined =>
  * Missing fields become zero only at this Pi API boundary; absent usage remains
  * undefined so an unavailable request is never presented as a zero-cost call.
  */
-export const advisorUsageForPi = (usage: unknown): Usage | undefined => {
+export const advisorUsageForPi = <Input>(usage: Input): Usage | undefined => {
   const snapshot = snapshotAdvisorUsage(usage);
-  if (!(snapshot && isRecord(usage))) {
+  if (!(snapshot && isRecordOf(usage))) {
     return undefined;
   }
-  const cost = isRecord(usage.cost) ? usage.cost : undefined;
+  const cost = isRecordOf(usage.cost) ? usage.cost : undefined;
   const input = snapshot.input ?? 0;
   const output = snapshot.output ?? 0;
   const cacheRead = snapshot.cacheRead ?? 0;
   const cacheWrite = snapshot.cacheWrite ?? 0;
   const cacheWrite1h = finite(usage.cacheWrite1h);
   const reasoning = finite(usage.reasoning);
-  return {
+  const piUsage: Usage = {
     cacheRead,
     cacheWrite,
-    ...(cacheWrite1h === undefined ? {} : { cacheWrite1h }),
-    ...(reasoning === undefined ? {} : { reasoning }),
     cost: {
       cacheRead: finite(cost?.cacheRead) ?? 0,
       cacheWrite: finite(cost?.cacheWrite) ?? 0,
@@ -97,6 +94,13 @@ export const advisorUsageForPi = (usage: unknown): Usage | undefined => {
     totalTokens:
       snapshot.totalTokens ?? input + output + cacheRead + cacheWrite,
   };
+  if (cacheWrite1h !== undefined) {
+    piUsage.cacheWrite1h = cacheWrite1h;
+  }
+  if (reasoning !== undefined) {
+    piUsage.reasoning = reasoning;
+  }
+  return piUsage;
 };
 
 /** Creates empty totals without treating absent usage as zero usage. */
@@ -107,7 +111,10 @@ export const emptyAdvisorUsageTotals = (): AdvisorUsageTotals => ({
 });
 
 /** Adds one direct Advisor response to session-local usage totals. */
-export const addAdvisorUsage = (totals: AdvisorUsageTotals, usage: unknown) => {
+export const addAdvisorUsage = <Input>(
+  totals: AdvisorUsageTotals,
+  usage: Input
+) => {
   totals.calls += 1;
   const snapshot = snapshotAdvisorUsage(usage);
   if (!snapshot) {
@@ -165,7 +172,7 @@ const formatUsageFields = (usage: AdvisorUsageSnapshot): string | undefined => {
   return tokens.join(" · ") || undefined;
 };
 
-export const formatAdvisorUsage = (usage: unknown): string | undefined => {
+export const formatAdvisorUsage = <Input>(usage: Input): string | undefined => {
   const snapshot = snapshotAdvisorUsage(usage);
   return snapshot ? formatUsageFields(snapshot) : undefined;
 };