pi-advisor-flow 0.9.2-dev.5 → 0.10.0

package/src/tools/register-lifecycle.ts

@@ -95,6 +95,16 @@ export const registerToolLifecycle = ({
       : undefined;
   });
 
+  pi.on("input", () => {
+    session.clearFollowUps();
+  });
+
+  pi.on("tool_result", (event) => {
+    if (event.toolName !== "ask_advisor") {
+      session.advanceFollowUpToolCall();
+    }
+  });
+
   pi.on("tool_call", (event, ctx) => {
     if (session.blocked) {
       return {
@@ -149,6 +159,7 @@ export const registerToolLifecycle = ({
 
   pi.on("session_shutdown", (_event, ctx) => {
     reservedCalls.clear();
+    session.clearFollowUps();
     session.clearCallReservations();
     scoutStatus.clear(ctx);
     herdrBlock.clear();

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

@@ -162,6 +162,9 @@ const finalResultLines = (
   theme: Theme
 ): string[] => {
   const lines = [renderAdvisorResponseHeader(hasSoundVerdict(advice), theme)];
+  if (details?.followUp) {
+    lines.push(theme.fg("dim", "  Follow-up consultation"));
+  }
   if (details?.advisor) {
     lines.push(theme.fg("dim", `  ${details.advisor}`));
   }

package/src/tools/render-common.ts

@@ -85,11 +85,15 @@ export const resolveAdvisorRequest = (question?: string) =>
 
 export const renderAdvisorCallBox = (
   question: string | undefined,
-  theme: Theme
+  theme: Theme,
+  followUp = false
 ) => {
   const box = new Box(1, 1, (text) => theme.bg("customMessageBg", text));
   const label = theme.fg("customMessageLabel", theme.bold("[advisor]"));
-  const title = theme.fg("customMessageText", "Executor → Advisor");
+  const title = theme.fg(
+    "customMessageText",
+    followUp ? "Executor → Advisor · Follow-up" : "Executor → Advisor"
+  );
   box.addChild(
     new Text(
       question

package/src/tools/types.ts

@@ -48,6 +48,7 @@ export interface AdvisorConsultationResult {
   adviceId: string;
   agentRulesBytes?: number;
   draftBytes?: number;
+  followUp?: boolean;
   imageBytes?: number;
   imageCount?: number;
   imageOmissions?: number;
@@ -89,6 +90,7 @@ export interface AdvisorToolDetails {
   adviceId?: string;
   advisor?: string;
   agentRulesBytes?: number;
+  followUp?: boolean;
   draftBytes?: number;
   imageBytes?: number;
   imageCount?: number;

package/src/ui/settings-items.ts

@@ -17,6 +17,7 @@ import {
 import { isValidAdvisorToolPolicies } from "../config/validation.ts";
 import { JevSetupSubmenu } from "./jev-setup-submenu.ts";
 import { SearchableModelMultiSelector } from "./model-multi-selector.ts";
+import { SearchableModelSelector } from "./model-selector.ts";
 import {
   contextDescription,
   currentContextLabel,
@@ -28,6 +29,7 @@ import {
   withCurrentValue,
 } from "./settings-formatting.ts";
 import { TextSettingSubmenu } from "./text-setting-submenu.ts";
+import { FALLBACK_ADVISOR_MODEL_DISABLED } from "./types.ts";
 import type {
   AdvisorSettings,
   ContextPreset,
@@ -36,6 +38,7 @@ import type {
 
 export interface SettingsItemsOptions {
   effortLevels: string[];
+  fallbackModel: SettingItem;
   modelWhitelist: SettingItem;
   presets: ContextPreset[];
   settings: AdvisorSettings;
@@ -220,6 +223,37 @@ const jevItems = (
   },
 ];
 
+export const advisorFallbackModelItem = (
+  settings: AdvisorSettings,
+  modelRefs: string[] | undefined,
+  keybindings: KeybindingsManager | undefined,
+  theme: Theme,
+  tui: RenderRequester
+): SettingItem => ({
+  currentValue: settings.fallbackModel ?? FALLBACK_ADVISOR_MODEL_DISABLED,
+  description:
+    "Retry a failed Advisor request once with this optional model; the primary model remains unchanged.",
+  id: "fallbackModel",
+  label: "Fallback Advisor model",
+  submenu: (_currentValue, done) =>
+    new SearchableModelSelector({
+      allOptions: [
+        FALLBACK_ADVISOR_MODEL_DISABLED,
+        ...new Set(
+          modelRefs ?? (settings.fallbackModel ? [settings.fallbackModel] : [])
+        ),
+      ],
+      currentOption: settings.fallbackModel ?? FALLBACK_ADVISOR_MODEL_DISABLED,
+      keybindings: keybindings ?? getKeybindings(),
+      onCancel: done,
+      onSelect: (value) =>
+        done(value === FALLBACK_ADVISOR_MODEL_DISABLED ? "" : value),
+      theme,
+      title: "Fallback Advisor model",
+      tui,
+    }),
+});
+
 export const advisorModelWhitelistItem = (
   settings: AdvisorSettings,
   modelRefs: string[] | undefined,
@@ -252,6 +286,7 @@ export const advisorModelWhitelistItem = (
 
 export const createSettingsItems = ({
   effortLevels,
+  fallbackModel,
   modelWhitelist,
   presets,
   settings,
@@ -282,6 +317,7 @@ export const createSettingsItems = ({
       label: "Always on",
       values: TOGGLE_VALUES,
     },
+    fallbackModel,
   ];
   if (settings.simpleMode) {
     items.push(

package/src/ui/settings-mutations.ts

@@ -1,4 +1,5 @@
 import { DEFAULT_JEV_MODEL } from "../config/types.ts";
+import { FALLBACK_ADVISOR_MODEL_DISABLED } from "./types.ts";
 import type { AdvisorSettings, ContextPreset } from "./types.ts";
 
 const BOOLEAN_SETTING_FIELDS = [
@@ -55,6 +56,13 @@ const applyCoreMutation = (
       settings.alwaysOn = value === "On";
       return true;
     }
+    case "fallbackModel": {
+      settings.fallbackModel =
+        value === FALLBACK_ADVISOR_MODEL_DISABLED
+          ? undefined
+          : value.trim() || undefined;
+      return true;
+    }
     case "effort": {
       settings.effort = value;
       return true;

package/src/ui/settings-selector.ts

@@ -7,6 +7,7 @@ import {
   SIMPLE_MODE_GRADIENT_INTERVAL_MS,
 } from "./settings-formatting.ts";
 import {
+  advisorFallbackModelItem,
   advisorModelWhitelistItem,
   createSettingsItems,
 } from "./settings-items.ts";
@@ -96,6 +97,13 @@ export class AdvisorSettingsSelector implements Component, Focusable {
       }
       return defaultLabel(text, selected);
     };
+    const fallbackModel = advisorFallbackModelItem(
+      this.settings,
+      this.options.modelRefs,
+      this.options.keybindings,
+      this.options.theme,
+      this.options.tui
+    );
     const modelWhitelist = advisorModelWhitelistItem(
       this.settings,
       this.options.modelRefs,
@@ -105,6 +113,7 @@ export class AdvisorSettingsSelector implements Component, Focusable {
     );
     const items = createSettingsItems({
       effortLevels: this.options.effortLevels,
+      fallbackModel,
       modelWhitelist,
       presets: this.presets,
       settings: this.settings,

package/src/ui/types.ts

@@ -66,8 +66,11 @@ export interface ContextPreset {
   value: number;
 }
 
+export const FALLBACK_ADVISOR_MODEL_DISABLED = "Disabled (no fallback)";
+
 export interface AdvisorSettings {
   agentsMdContext?: boolean;
+  fallbackModel?: string;
   alwaysOn?: boolean;
   autoLoopGate?: boolean;
   blockOnBlocked?: boolean;