pi-advisor-flow 0.8.1-dev.2 → 0.8.2-dev.1

package/CHANGELOG.md

@@ -8,6 +8,22 @@ The format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and
 
 ### Added
 
+- Added a configurable Advisor Scout response-stream timeout in `/advisor-settings` and `advisor.json`, defaulting to 30 seconds. Model and auth resolution remain outside the timeout window.
+
+### Fixed
+
+- Scout timeout fallbacks now report that the original conversation was retained instead of showing a misleading zero-kept/all-omitted selection count.
+
+## 0.8.1 - 2026-09-23
+
+### Fixed
+
+- Preserve a native subagent's host-selected model and thinking level when `alwaysOn` or explicit `/advisor` activation runs in a process marked with `PI_SUBAGENT_CHILD=1`.
+- Keep marked child model selections out of the persisted parent Executor configuration.
+- Run Advisor Scout with the marked child's active model and thinking level instead of replacing them with the configured parent Executor.
+
+### Added
+
 - Published validated npm development previews for package changes on `main` under the `dev` dist-tag; stable installs continue to use `latest`.
 
 ## 0.8.0 - 2026-09-22

package/dist/index.js

@@ -14,6 +14,8 @@ var DEFAULT_ADVISOR_TOOL_RESULT_MAX_BYTES = PI_DEFAULT_MAX_BYTES;
 var DEFAULT_ADVISOR_GIT_CONTEXT_MAX_CHARS = 20000;
 var DEFAULT_JEV_MODEL = "jev-latest";
 var DEFAULT_JEV_TIMEOUT_MS = 8000;
+var DEFAULT_SCOUT_TIMEOUT_MS = 30000;
+var MAX_SCOUT_TIMEOUT_MS = 2147483647;
 var DEFAULT_JEV_DIGEST_MAX_CHARS = 4000;
 var DEFAULT_JEV_PRICE_PER_MTOK = 0.042;
 var DEFAULT_JEV_FILTER_SKIP_CONFIDENCE = 0.85;
@@ -82,6 +84,7 @@ var advisorOutcomeLoggingRef = false;
 var advisorUntrackedContentRef = false;
 var advisorTrackedFileContentRef = false;
 var advisorScoutEnabledRef = false;
+var advisorScoutTimeoutMsRef = DEFAULT_SCOUT_TIMEOUT_MS;
 var showUsageDetailsRef = true;
 var showUsageFooterRef = false;
 var setExecutorRef = (ref) => {
@@ -218,6 +221,9 @@ var setAdvisorTrackedFileContentRef = (enabled) => {
 var setAdvisorScoutEnabledRef = (enabled) => {
   advisorScoutEnabledRef = enabled;
 };
+var setAdvisorScoutTimeoutMsRef = (value) => {
+  advisorScoutTimeoutMsRef = value;
+};
 var setShowUsageDetailsRef = (enabled) => {
   showUsageDetailsRef = enabled;
 };
@@ -256,6 +262,7 @@ var getAdvisorSettings = () => ({
   planGate: advisorPlanGateRef,
   redactSecrets: advisorRedactSecretsRef,
   scoutEnabled: advisorScoutEnabledRef,
+  scoutTimeoutMs: advisorScoutTimeoutMsRef,
   sessionSummary: advisorSessionSummaryRef,
   showUsageDetails: showUsageDetailsRef,
   showUsageFooter: showUsageFooterRef,
@@ -272,6 +279,16 @@ var splitRef = (ref) => {
   return i === -1 ? ["openai-codex", ref] : [ref.slice(0, i), ref.slice(i + 1)];
 };
 
+// src/child-session.ts
+var isMarkedSubagent = () => process.env.PI_SUBAGENT_CHILD === "1";
+var effectiveExecutorRef = (ctx) => {
+  if (isMarkedSubagent() && ctx.model) {
+    return `${ctx.model.provider}/${ctx.model.id}`;
+  }
+  return executorRef;
+};
+var effectiveExecutorEffort = (ctx) => isMarkedSubagent() ? ctx.thinkingLevel : executorEffortRef;
+
 // src/content-utils.ts
 var isRecord = (value) => Boolean(value) && typeof value === "object" && !Array.isArray(value);
 var isRecordOf = (value) => Boolean(value) && typeof value === "object" && !Array.isArray(value);
@@ -426,6 +443,7 @@ var isValidGateFailureMode = (value) => isString(value) && GATE_FAILURE_MODE_NAM
 var isValidToolResultMaxLines = (value) => nonNegativeSafeInteger(value);
 var isValidToolResultMaxBytes = (value) => nonNegativeSafeInteger(value);
 var isValidJevTimeoutMs = (value) => typeof value === "number" && Number.isSafeInteger(value) && value >= 1;
+var isValidScoutTimeoutMs = (value) => typeof value === "number" && Number.isSafeInteger(value) && value >= 1 && value <= MAX_SCOUT_TIMEOUT_MS;
 var isValidJevDigestMaxChars = (value) => nonNegativeSafeInteger(value);
 var isValidJevPricePerMtok = (value) => typeof value === "number" && Number.isFinite(value) && value > 0;
 var isValidJevSkipConfidence = (value) => typeof value === "number" && Number.isFinite(value) && value >= 0.5 && value <= 1;
@@ -621,6 +639,13 @@ var CONFIG_SCHEMA = {
     persisted: true,
     type: "boolean"
   },
+  advisorScoutTimeoutMs: {
+    accepted: `a positive safe integer no greater than ${MAX_SCOUT_TIMEOUT_MS} milliseconds`,
+    current: () => advisorScoutTimeoutMsRef,
+    persisted: true,
+    type: "number",
+    validate: isValidScoutTimeoutMs
+  },
   advisorSessionSummary: {
     accepted: "true or false",
     current: () => advisorSessionSummaryRef,
@@ -859,6 +884,7 @@ var resetDefaults = () => {
   setAdvisorUntrackedContentRef(false);
   setAdvisorTrackedFileContentRef(false);
   setAdvisorScoutEnabledRef(false);
+  setAdvisorScoutTimeoutMsRef(DEFAULT_SCOUT_TIMEOUT_MS);
   setShowUsageDetailsRef(true);
   setShowUsageFooterRef(false);
 };
@@ -891,6 +917,7 @@ var applyConfig = (config) => {
   applyOptionalConfig(config, "advisorModelWhitelist", setAdvisorModelWhitelistRef);
   applyOptionalConfig(config, "advisorSessionSummary", setAdvisorSessionSummaryRef);
   applyOptionalConfig(config, "advisorScoutEnabled", setAdvisorScoutEnabledRef);
+  applyOptionalConfig(config, "advisorScoutTimeoutMs", setAdvisorScoutTimeoutMsRef);
   applyOptionalConfig(config, "showUsageDetails", setShowUsageDetailsRef);
   applyOptionalConfig(config, "showUsageFooter", setShowUsageFooterRef);
   applyOptionalConfig(config, "simpleMode", setSimpleModeRef);
@@ -2691,7 +2718,6 @@ var formatAdvisorUsageStatus = (totals) => {
 };
 
 // src/scout.ts
-var SCOUT_TIMEOUT_MS = 30000;
 var SCOUT_SYSTEM = [
   "You are Scout, a context curator serving a separate engineering Advisor.",
   "Select only conversation groups materially relevant to the current request, unresolved decisions, attempted work, diagnostics, and validation.",
@@ -2814,17 +2840,17 @@ var setupAbortWatch = (parentSignal, timeoutMs) => {
     wasTimedOut: () => timedOut
   };
 };
-var streamScoutResponse = async (dependencies, resolved, manifest, parentSignal, timeoutMs, publish) => {
+var streamScoutResponse = async (dependencies, resolved, executorModel, executorEffort, manifest, parentSignal, timeoutMs, publish) => {
   const { abortPromise, controller, teardown, wasTimedOut } = setupAbortWatch(parentSignal, timeoutMs);
   try {
     const collection = dependencies.collect(resolved, {
       messages: [manifestMessage(manifest)],
       onChunk: (thinking, text) => {
         if (!controller.signal.aborted) {
-          publish({ model: executorRef, text, thinking, type: "chunk" });
+          publish({ model: executorModel, text, thinking, type: "chunk" });
         }
       },
-      reasoning: executorEffortRef,
+      reasoning: executorEffort,
       signal: controller.signal,
       systemPrompt: SCOUT_SYSTEM
     });
@@ -2843,7 +2869,7 @@ var streamScoutResponse = async (dependencies, resolved, manifest, parentSignal,
     teardown();
   }
 };
-var runAdvisorScout = async (ctx, manifest, parentSignal, onEvent, timeoutMs = SCOUT_TIMEOUT_MS, dependencies = defaultDependencies) => {
+var runAdvisorScout = async (ctx, manifest, parentSignal, onEvent, timeoutMs = advisorScoutTimeoutMsRef, dependencies = defaultDependencies) => {
   const startedAt = Date.now();
   const publish = (event) => {
     onEvent?.(event);
@@ -2857,7 +2883,7 @@ var runAdvisorScout = async (ctx, manifest, parentSignal, onEvent, timeoutMs = S
       category,
       message,
       metrics: usage === undefined ? baseMetrics(manifest, startedAt) : { ...baseMetrics(manifest, startedAt), usage },
-      model: executorRef,
+      model: effectiveExecutorRef(ctx),
       ok: false
     };
     publish({ outcome, type: "fallback" });
@@ -2866,9 +2892,11 @@ var runAdvisorScout = async (ctx, manifest, parentSignal, onEvent, timeoutMs = S
   if (parentSignal?.aborted) {
     return cancelled();
   }
+  const executorModel = effectiveExecutorRef(ctx);
+  const executorEffort = effectiveExecutorEffort(ctx);
   let resolved;
   try {
-    resolved = await dependencies.resolve(ctx, executorRef, "Scout");
+    resolved = await dependencies.resolve(ctx, executorModel, "Scout");
   } catch (error) {
     if (parentSignal?.aborted) {
       return cancelled();
@@ -2879,8 +2907,8 @@ var runAdvisorScout = async (ctx, manifest, parentSignal, onEvent, timeoutMs = S
   if (parentSignal?.aborted) {
     return cancelled();
   }
-  publish({ model: executorRef, type: "call" });
-  const streamed = await streamScoutResponse(dependencies, resolved, manifest, parentSignal, timeoutMs, publish);
+  publish({ model: executorModel, type: "call" });
+  const streamed = await streamScoutResponse(dependencies, resolved, executorModel, executorEffort, manifest, parentSignal, timeoutMs, publish);
   if (!streamed.ok) {
     if (parentSignal?.aborted) {
       return cancelled();
@@ -2907,7 +2935,7 @@ var runAdvisorScout = async (ctx, manifest, parentSignal, onEvent, timeoutMs = S
       ]).size,
       usage: snapshotAdvisorUsage(streamed.streamed.usage)
     },
-    model: executorRef,
+    model: executorModel,
     ok: true,
     selectedLabels: manifest.groups.filter((group) => group.required || selection.selectedIds.includes(group.id)).map((group) => group.label),
     selection
@@ -3488,7 +3516,6 @@ var scoutDetailsFromEvent = (event, previous) => {
     latencyMs: outcome.metrics.latencyMs,
     model: outcome.model,
     omittedBeforeScout: outcome.metrics.omittedBeforeScout,
-    selectedCount: 0,
     status: "fallback",
     usage: snapshotAdvisorUsage(outcome.metrics.usage)
   };
@@ -3560,7 +3587,16 @@ var scoutTitle = (scout, frame) => {
   }
   return "◆ SCOUT · FALLBACK";
 };
-var scoutSummaryLine = (scout) => `  ${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`}`;
+var scoutSelectionSummary = (scout) => {
+  if (scout.status === "fallback") {
+    return " · original conversation retained";
+  }
+  if (scout.status !== "curated" || scout.selectedCount === undefined) {
+    return "";
+  }
+  return ` · ${scout.selectedCount} kept / ${Math.max(0, (scout.availableCount ?? 0) - scout.selectedCount)} omitted`;
+};
+var scoutSummaryLine = (scout) => `  ${scout.model}${scoutSelectionSummary(scout)}${scout.latencyMs === undefined ? "" : ` · ${(scout.latencyMs / 1000).toFixed(1)}s`}`;
 var scoutExpandedLines = (scout, expanded, theme) => {
   const lines = [];
   if (expanded && scout.selectedLabels?.length) {
@@ -4173,7 +4209,7 @@ var resolveActivationModels = async (runtime, ctx) => {
   if (!(advisorAuth.ok && advisorAuth.apiKey)) {
     return { error: `No API key for Advisor ${advisorRef}` };
   }
-  if (!await runtime.setExecutorModel(executor)) {
+  if (!isMarkedSubagent() && !await runtime.setExecutorModel(executor)) {
     return { error: `No API key for Executor ${executorRef}` };
   }
   return {};
@@ -4219,7 +4255,7 @@ var activateAdvisor = async (runtime, args, ctx, announce = true) => {
     saveConfig(ctx, { persistAdvisor: true, persistExecutor: true });
   }
   runtime.pendingExecutorModelRef = undefined;
-  if (executorEffortRef) {
+  if (executorEffortRef && !isMarkedSubagent()) {
     runtime.pi.setThinkingLevel(executorEffortRef);
   }
   if (!runtime.flowEnabled()) {
@@ -4230,9 +4266,11 @@ var activateAdvisor = async (runtime, args, ctx, announce = true) => {
     ]);
   }
   if (announce) {
+    const activeExecutorRef = effectiveExecutorRef(ctx);
+    const activeExecutorEffort = effectiveExecutorEffort(ctx);
     notify(ctx, `${ADVISOR_ACTIVATION_EXPLANATION}
 
-Advisor flow ready — Executor: ${executorRef} (thinking: ${executorEffortRef || "default"}) · Advisor: ${advisorRef} (thinking: ${advisorEffortRef || "default"})`, "info");
+Advisor flow ready — Executor: ${activeExecutorRef} (thinking: ${activeExecutorEffort || "default"}) · Advisor: ${advisorRef} (thinking: ${advisorEffortRef || "default"})`, "info");
   }
 };
 
@@ -4251,7 +4289,7 @@ var registerCommandLifecycle = (runtime, activateAdvisor) => {
     }
   });
   runtime.pi.on("model_select", (event, ctx) => {
-    if (event.source !== "set" || runtime.suppressModelSelectionSync) {
+    if (event.source !== "set" || runtime.suppressModelSelectionSync || isMarkedSubagent()) {
       return;
     }
     const selected = `${event.model.provider}/${event.model.id}`;
@@ -6041,6 +6079,16 @@ var toggle = (id, label, description, value, defaultValue) => ({
   label,
   values: TOGGLE_VALUES
 });
+var scoutTimeoutItem = (settings) => {
+  const timeoutMs = settings.scoutTimeoutMs ?? DEFAULT_SCOUT_TIMEOUT_MS;
+  return {
+    currentValue: String(timeoutMs),
+    description: "Maximum time for Scout's response stream; model and auth resolution happen before this timeout starts.",
+    id: "scoutTimeoutMs",
+    label: "Scout timeout ms",
+    values: numericValues(timeoutMs, [5000, 1e4, 15000, 30000, 45000, 60000, 90000, 120000])
+  };
+};
 var jevItems = (settings, theme, tui) => [
   {
     currentValue: settingValue(settings.jevFilterEnabled, false),
@@ -6198,7 +6246,7 @@ var createSettingsItems = ({
     id: "effort",
     label: "Advisor reasoning",
     values: withCurrentValue(currentEffort(settings.effort), effortLevels)
-  }, modelWhitelist, toggle("scoutEnabled", "Experimental Advisor Scout", "Enable the experimental Scout before Advisor calls.", settings.scoutEnabled, false), toggle("showUsageDetails", "Show usage and cost details", "Show token usage and cost details in Advisor responses.", settings.showUsageDetails, true), toggle("showUsageFooter", "Show usage in footer", "Show the current Advisor usage summary in the footer.", settings.showUsageFooter, false), toggle("planGate", "Plan gate", "Ask the Advisor to review implementation plans.", settings.planGate, true), toggle("failureGate", "Failure gate", "Ask the Advisor to review repeated failures.", settings.failureGate, true), toggle("completionGate", "Completion gate", "Ask the Advisor to review work before declaring success.", settings.completionGate, true), toggle("collapseResponses", "Collapse long responses", "Collapse long Advisor responses in the transcript.", settings.collapseResponses, false), {
+  }, modelWhitelist, toggle("scoutEnabled", "Experimental Advisor Scout", "Enable the experimental Scout before Advisor calls.", settings.scoutEnabled, false), scoutTimeoutItem(settings), toggle("showUsageDetails", "Show usage and cost details", "Show token usage and cost details in Advisor responses.", settings.showUsageDetails, true), toggle("showUsageFooter", "Show usage in footer", "Show the current Advisor usage summary in the footer.", settings.showUsageFooter, false), toggle("planGate", "Plan gate", "Ask the Advisor to review implementation plans.", settings.planGate, true), toggle("failureGate", "Failure gate", "Ask the Advisor to review repeated failures.", settings.failureGate, true), toggle("completionGate", "Completion gate", "Ask the Advisor to review work before declaring success.", settings.completionGate, true), toggle("collapseResponses", "Collapse long responses", "Collapse long Advisor responses in the transcript.", settings.collapseResponses, false), {
     currentValue: settings.customRule || "None",
     description: "Add a rule that triggers Advisor involvement.",
     id: "customRule",
@@ -6496,6 +6544,10 @@ var applyJevMutation = (settings, id, value) => {
       settings.jevTimeoutMs = Number(value);
       return true;
     }
+    case "scoutTimeoutMs": {
+      settings.scoutTimeoutMs = Number(value);
+      return true;
+    }
     case "jevDigestMaxChars": {
       settings.jevDigestMaxChars = Number(value);
       return true;
@@ -6653,6 +6705,7 @@ var applySessionSettings = (settings) => {
   setAdvisorModelWhitelistRef(settings.modelWhitelist ?? []);
   setAdvisorSessionSummaryRef(settings.sessionSummary ?? false);
   setAdvisorScoutEnabledRef(settings.scoutEnabled ?? false);
+  setAdvisorScoutTimeoutMsRef(settings.scoutTimeoutMs ?? DEFAULT_SCOUT_TIMEOUT_MS);
   setShowUsageDetailsRef(settings.showUsageDetails ?? true);
   setShowUsageFooterRef(settings.showUsageFooter ?? false);
   setSimpleModeRef(settings.simpleMode ?? false);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-advisor-flow",
-  "version": "0.8.1-dev.2",
+  "version": "0.8.2-dev.1",
   "description": "Advanced Executor/Advisor flow for Pi, fully configurable and extendable.",
   "keywords": [
     "advisor",

package/src/child-session.ts

@@ -0,0 +1,15 @@
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+
+import { executorEffortRef, executorRef } from "./config/state.ts";
+
+export const isMarkedSubagent = () => process.env.PI_SUBAGENT_CHILD === "1";
+
+export const effectiveExecutorRef = (ctx: ExtensionContext) => {
+  if (isMarkedSubagent() && ctx.model) {
+    return `${ctx.model.provider}/${ctx.model.id}`;
+  }
+  return executorRef;
+};
+
+export const effectiveExecutorEffort = (ctx: ExtensionContext) =>
+  isMarkedSubagent() ? ctx.thinkingLevel : executorEffortRef;

package/src/commands/activation.ts

@@ -1,5 +1,10 @@
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 
+import {
+  effectiveExecutorEffort,
+  effectiveExecutorRef,
+  isMarkedSubagent,
+} from "../child-session.ts";
 import { parseArgs } from "../config/args.ts";
 import {
   advisorEffortRef,
@@ -51,7 +56,7 @@ const resolveActivationModels = async (
   if (!(advisorAuth.ok && advisorAuth.apiKey)) {
     return { error: `No API key for Advisor ${advisorRef}` };
   }
-  if (!(await runtime.setExecutorModel(executor))) {
+  if (!isMarkedSubagent() && !(await runtime.setExecutorModel(executor))) {
     return { error: `No API key for Executor ${executorRef}` };
   }
   return {};
@@ -116,7 +121,7 @@ export const activateAdvisor = async (
   // an older inactive selection override an explicit activation argument on a
   // later attempt.
   runtime.pendingExecutorModelRef = undefined;
-  if (executorEffortRef) {
+  if (executorEffortRef && !isMarkedSubagent()) {
     // SAFETY: executorEffortRef is operator-configured and trusted to name a ThinkingLevel.
     runtime.pi.setThinkingLevel(executorEffortRef as ThinkingLevel);
   }
@@ -128,9 +133,11 @@ export const activateAdvisor = async (
     ]);
   }
   if (announce) {
+    const activeExecutorRef = effectiveExecutorRef(ctx);
+    const activeExecutorEffort = effectiveExecutorEffort(ctx);
     notify(
       ctx,
-      `${ADVISOR_ACTIVATION_EXPLANATION}\n\nAdvisor flow ready — Executor: ${executorRef} (thinking: ${executorEffortRef || "default"}) · Advisor: ${advisorRef} (thinking: ${advisorEffortRef || "default"})`,
+      `${ADVISOR_ACTIVATION_EXPLANATION}\n\nAdvisor flow ready — Executor: ${activeExecutorRef} (thinking: ${activeExecutorEffort || "default"}) · Advisor: ${advisorRef} (thinking: ${advisorEffortRef || "default"})`,
       "info"
     );
   }

package/src/commands/lifecycle.ts

@@ -1,5 +1,6 @@
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 
+import { isMarkedSubagent } from "../child-session.ts";
 import {
   alwaysOnRef,
   executorRef,
@@ -40,7 +41,11 @@ export const registerCommandLifecycle = (
     // "restore" replays a stored session model and "cycle" changes the active
     // model without an explicit `/model` choice. Neither should redefine the
     // configured Executor.
-    if (event.source !== "set" || runtime.suppressModelSelectionSync) {
+    if (
+      event.source !== "set" ||
+      runtime.suppressModelSelectionSync ||
+      isMarkedSubagent()
+    ) {
       return;
     }
     const selected = `${event.model.provider}/${event.model.id}`;

package/src/commands/settings-persistence.ts

@@ -31,6 +31,7 @@ import {
   setAdvisorPlanGateRef,
   setAdvisorRedactSecretsRef,
   setAdvisorScoutEnabledRef,
+  setAdvisorScoutTimeoutMsRef,
   setAdvisorSessionSummaryRef,
   setAdvisorToolPoliciesRef,
   setAdvisorToolResultMaxBytesRef,
@@ -55,6 +56,7 @@ import {
   DEFAULT_JEV_TRANSPORT,
   DEFAULT_JEV_TURN_GATE_EVERY_TURNS,
   DEFAULT_JEV_TURN_GATE_NOUL_THRESHOLD,
+  DEFAULT_SCOUT_TIMEOUT_MS,
 } from "../config/types.ts";
 import type { AdvisorSettings } from "../ui/types.ts";
 
@@ -75,6 +77,9 @@ const applySessionSettings = (settings: AdvisorSettings) => {
   setAdvisorModelWhitelistRef(settings.modelWhitelist ?? []);
   setAdvisorSessionSummaryRef(settings.sessionSummary ?? false);
   setAdvisorScoutEnabledRef(settings.scoutEnabled ?? false);
+  setAdvisorScoutTimeoutMsRef(
+    settings.scoutTimeoutMs ?? DEFAULT_SCOUT_TIMEOUT_MS
+  );
   setShowUsageDetailsRef(settings.showUsageDetails ?? true);
   setShowUsageFooterRef(settings.showUsageFooter ?? false);
   setSimpleModeRef(settings.simpleMode ?? false);

package/src/config/defaults.ts

@@ -29,6 +29,7 @@ import {
   setAdvisorRedactSecretsRef,
   setAdvisorRef,
   setAdvisorScoutEnabledRef,
+  setAdvisorScoutTimeoutMsRef,
   setAdvisorSessionSummaryRef,
   setAdvisorToolPoliciesRef,
   setAdvisorToolResultMaxBytesRef,
@@ -60,6 +61,7 @@ import {
   DEFAULT_JEV_TRANSPORT,
   DEFAULT_JEV_TURN_GATE_EVERY_TURNS,
   DEFAULT_JEV_TURN_GATE_NOUL_THRESHOLD,
+  DEFAULT_SCOUT_TIMEOUT_MS,
 } from "./types.ts";
 
 export const resetDefaults = () => {
@@ -105,6 +107,7 @@ export const resetDefaults = () => {
   setAdvisorUntrackedContentRef(false);
   setAdvisorTrackedFileContentRef(false);
   setAdvisorScoutEnabledRef(false);
+  setAdvisorScoutTimeoutMsRef(DEFAULT_SCOUT_TIMEOUT_MS);
   setShowUsageDetailsRef(true);
   setShowUsageFooterRef(false);
 };
@@ -179,6 +182,11 @@ export const applyConfig = (config: AdvisorConfig) => {
     setAdvisorSessionSummaryRef
   );
   applyOptionalConfig(config, "advisorScoutEnabled", setAdvisorScoutEnabledRef);
+  applyOptionalConfig(
+    config,
+    "advisorScoutTimeoutMs",
+    setAdvisorScoutTimeoutMsRef
+  );
   applyOptionalConfig(config, "showUsageDetails", setShowUsageDetailsRef);
   applyOptionalConfig(config, "showUsageFooter", setShowUsageFooterRef);
   applyOptionalConfig(config, "simpleMode", setSimpleModeRef);

package/src/config/schema.ts

@@ -32,6 +32,7 @@ import {
   advisorRedactSecretsRef,
   advisorRef,
   advisorScoutEnabledRef,
+  advisorScoutTimeoutMsRef,
   advisorSessionSummaryRef,
   advisorToolPoliciesRef,
   advisorToolResultMaxBytesRef,
@@ -56,6 +57,7 @@ import {
   GATE_FAILURE_MODES,
   JEV_TRANSPORTS,
   MAX_CONTEXT_MAX_CHARS,
+  MAX_SCOUT_TIMEOUT_MS,
 } from "./types.ts";
 
 /** An empty ref means no model has been selected yet. */
@@ -116,6 +118,12 @@ export const isValidToolResultMaxBytes = (value: unknown): value is number =>
 export const isValidJevTimeoutMs = (value: unknown): value is number =>
   typeof value === "number" && Number.isSafeInteger(value) && value >= 1;
 
+const isValidScoutTimeoutMs = (value: unknown): value is number =>
+  typeof value === "number" &&
+  Number.isSafeInteger(value) &&
+  value >= 1 &&
+  value <= MAX_SCOUT_TIMEOUT_MS;
+
 export const isValidJevDigestMaxChars = (value: unknown): value is number =>
   nonNegativeSafeInteger(value);
 
@@ -344,6 +352,13 @@ export const CONFIG_SCHEMA = {
     persisted: true,
     type: "boolean",
   },
+  advisorScoutTimeoutMs: {
+    accepted: `a positive safe integer no greater than ${MAX_SCOUT_TIMEOUT_MS} milliseconds`,
+    current: () => advisorScoutTimeoutMsRef,
+    persisted: true,
+    type: "number",
+    validate: isValidScoutTimeoutMs,
+  },
   advisorSessionSummary: {
     accepted: "true or false",
     current: () => advisorSessionSummaryRef,

package/src/config/state.ts

@@ -14,6 +14,7 @@ import {
   DEFAULT_JEV_TRANSPORT,
   DEFAULT_JEV_TURN_GATE_EVERY_TURNS,
   DEFAULT_JEV_TURN_GATE_NOUL_THRESHOLD,
+  DEFAULT_SCOUT_TIMEOUT_MS,
 } from "./types.ts";
 import type {
   AdvisorToolPolicies,
@@ -68,6 +69,7 @@ export let advisorOutcomeLoggingRef = false;
 export let advisorUntrackedContentRef = false;
 export let advisorTrackedFileContentRef = false;
 export let advisorScoutEnabledRef = false;
+export let advisorScoutTimeoutMsRef = DEFAULT_SCOUT_TIMEOUT_MS;
 export let showUsageDetailsRef = true;
 export let showUsageFooterRef = false;
 
@@ -213,6 +215,9 @@ export const setAdvisorTrackedFileContentRef = (enabled: boolean) => {
 export const setAdvisorScoutEnabledRef = (enabled: boolean) => {
   advisorScoutEnabledRef = enabled;
 };
+export const setAdvisorScoutTimeoutMsRef = (value: number) => {
+  advisorScoutTimeoutMsRef = value;
+};
 export const setShowUsageDetailsRef = (enabled: boolean) => {
   showUsageDetailsRef = enabled;
 };
@@ -256,6 +261,7 @@ export const getAdvisorSettings = () => ({
   planGate: advisorPlanGateRef,
   redactSecrets: advisorRedactSecretsRef,
   scoutEnabled: advisorScoutEnabledRef,
+  scoutTimeoutMs: advisorScoutTimeoutMsRef,
   sessionSummary: advisorSessionSummaryRef,
   showUsageDetails: showUsageDetailsRef,
   showUsageFooter: showUsageFooterRef,

package/src/config/types.ts

@@ -23,6 +23,8 @@ export const DEFAULT_JEV_MODEL = "jev-latest";
 // Provisional: the latency benchmark was dropped from scope; revisit if live
 // measurements suggest a different bound.
 export const DEFAULT_JEV_TIMEOUT_MS = 8000;
+export const DEFAULT_SCOUT_TIMEOUT_MS = 30_000;
+export const MAX_SCOUT_TIMEOUT_MS = 2_147_483_647;
 export const DEFAULT_JEV_DIGEST_MAX_CHARS = 4000;
 export const DEFAULT_JEV_PRICE_PER_MTOK = 0.042;
 export const DEFAULT_JEV_FILTER_SKIP_CONFIDENCE = 0.85;
@@ -86,6 +88,7 @@ export interface AdvisorConfig {
   advisorPlanGate?: boolean;
   advisorRedactSecrets?: boolean;
   advisorScoutEnabled?: boolean;
+  advisorScoutTimeoutMs?: number;
   advisorSessionSummary?: boolean;
   advisorToolPolicies?: AdvisorToolPolicies;
   advisorToolResultMaxBytes?: number;

package/src/scout.ts

@@ -1,7 +1,11 @@
 import type { Message } from "@earendil-works/pi-ai/compat";
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 
-import { executorEffortRef, executorRef } from "./config/state.ts";
+import {
+  effectiveExecutorEffort,
+  effectiveExecutorRef,
+} from "./child-session.ts";
+import { advisorScoutTimeoutMsRef } from "./config/state.ts";
 import { isRecord, isString } from "./content-utils.ts";
 import { collectTextStream, resolveConfiguredModel } from "./model-stream.ts";
 import type {
@@ -18,8 +22,6 @@ import type { ScoutManifest } from "./scout-types.ts";
 import { snapshotAdvisorUsage } from "./usage.ts";
 import type { AdvisorUsageSnapshot } from "./usage.ts";
 
-const SCOUT_TIMEOUT_MS = 30_000;
-
 export const SCOUT_SYSTEM = [
   "You are Scout, a context curator serving a separate engineering Advisor.",
   "Select only conversation groups materially relevant to the current request, unresolved decisions, attempted work, diagnostics, and validation.",
@@ -250,6 +252,8 @@ type ScoutStreamResult =
 const streamScoutResponse = async (
   dependencies: ScoutDependencies,
   resolved: ResolvedConfiguredModel,
+  executorModel: string,
+  executorEffort: string | undefined,
   manifest: ScoutManifest,
   parentSignal: AbortSignal | undefined,
   timeoutMs: number,
@@ -264,10 +268,10 @@ const streamScoutResponse = async (
       messages: [manifestMessage(manifest)],
       onChunk: (thinking, text) => {
         if (!controller.signal.aborted) {
-          publish({ model: executorRef, text, thinking, type: "chunk" });
+          publish({ model: executorModel, text, thinking, type: "chunk" });
         }
       },
-      reasoning: executorEffortRef,
+      reasoning: executorEffort,
       signal: controller.signal,
       systemPrompt: SCOUT_SYSTEM,
     });
@@ -294,7 +298,7 @@ export const runAdvisorScout = async (
   manifest: ScoutManifest,
   parentSignal?: AbortSignal,
   onEvent?: (event: ScoutLifecycleEvent) => void,
-  timeoutMs = SCOUT_TIMEOUT_MS,
+  timeoutMs = advisorScoutTimeoutMsRef,
   dependencies: ScoutDependencies = defaultDependencies
 ): Promise<ScoutOutcome> => {
   const startedAt = Date.now();
@@ -317,7 +321,7 @@ export const runAdvisorScout = async (
         usage === undefined
           ? baseMetrics(manifest, startedAt)
           : { ...baseMetrics(manifest, startedAt), usage },
-      model: executorRef,
+      model: effectiveExecutorRef(ctx),
       ok: false as const,
     };
     publish({ outcome, type: "fallback" });
@@ -328,9 +332,11 @@ export const runAdvisorScout = async (
     return cancelled();
   }
 
+  const executorModel = effectiveExecutorRef(ctx);
+  const executorEffort = effectiveExecutorEffort(ctx);
   let resolved: ResolvedConfiguredModel;
   try {
-    resolved = await dependencies.resolve(ctx, executorRef, "Scout");
+    resolved = await dependencies.resolve(ctx, executorModel, "Scout");
   } catch (error) {
     if (parentSignal?.aborted) {
       return cancelled();
@@ -342,11 +348,13 @@ export const runAdvisorScout = async (
   if (parentSignal?.aborted) {
     return cancelled();
   }
-  publish({ model: executorRef, type: "call" });
+  publish({ model: executorModel, type: "call" });
 
   const streamed = await streamScoutResponse(
     dependencies,
     resolved,
+    executorModel,
+    executorEffort,
     manifest,
     parentSignal,
     timeoutMs,
@@ -390,7 +398,7 @@ export const runAdvisorScout = async (
       ]).size,
       usage: snapshotAdvisorUsage(streamed.streamed.usage),
     },
-    model: executorRef,
+    model: executorModel,
     ok: true as const,
     selectedLabels: manifest.groups
       .filter(

package/src/tools/scout-status.ts

@@ -53,7 +53,6 @@ export const scoutDetailsFromEvent = (
         latencyMs: outcome.metrics.latencyMs,
         model: outcome.model,
         omittedBeforeScout: outcome.metrics.omittedBeforeScout,
-        selectedCount: 0,
         status: "fallback",
         usage: snapshotAdvisorUsage(outcome.metrics.usage),
       };
@@ -144,12 +143,18 @@ const scoutTitle = (scout: ScoutToolDetails, frame: string) => {
   return "◆ SCOUT · FALLBACK";
 };
 
+const scoutSelectionSummary = (scout: ScoutToolDetails) => {
+  if (scout.status === "fallback") {
+    return " · original conversation retained";
+  }
+  if (scout.status !== "curated" || scout.selectedCount === undefined) {
+    return "";
+  }
+  return ` · ${scout.selectedCount} kept / ${Math.max(0, (scout.availableCount ?? 0) - scout.selectedCount)} omitted`;
+};
+
 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`}`;
+  `  ${scout.model}${scoutSelectionSummary(scout)}${scout.latencyMs === undefined ? "" : ` · ${(scout.latencyMs / 1000).toFixed(1)}s`}`;
 
 const scoutExpandedLines = (
   scout: ScoutToolDetails,

package/src/ui/settings-items.ts

@@ -12,6 +12,7 @@ import {
   DEFAULT_JEV_TIMEOUT_MS,
   DEFAULT_JEV_TRANSPORT,
   DEFAULT_JEV_TURN_GATE_NOUL_THRESHOLD,
+  DEFAULT_SCOUT_TIMEOUT_MS,
 } from "../config/types.ts";
 import { isValidAdvisorToolPolicies } from "../config/validation.ts";
 import { JevSetupSubmenu } from "./jev-setup-submenu.ts";
@@ -56,6 +57,21 @@ const toggle = (
   values: TOGGLE_VALUES,
 });
 
+const scoutTimeoutItem = (settings: AdvisorSettings): SettingItem => {
+  const timeoutMs = settings.scoutTimeoutMs ?? DEFAULT_SCOUT_TIMEOUT_MS;
+  return {
+    currentValue: String(timeoutMs),
+    description:
+      "Maximum time for Scout's response stream; model and auth resolution happen before this timeout starts.",
+    id: "scoutTimeoutMs",
+    label: "Scout timeout ms",
+    values: numericValues(
+      timeoutMs,
+      [5000, 10_000, 15_000, 30_000, 45_000, 60_000, 90_000, 120_000]
+    ),
+  };
+};
+
 const jevItems = (
   settings: AdvisorSettings,
   theme: Theme,
@@ -288,6 +304,7 @@ export const createSettingsItems = ({
       settings.scoutEnabled,
       false
     ),
+    scoutTimeoutItem(settings),
     toggle(
       "showUsageDetails",
       "Show usage and cost details",

package/src/ui/settings-mutations.ts

@@ -161,6 +161,10 @@ const applyJevMutation = (
       settings.jevTimeoutMs = Number(value);
       return true;
     }
+    case "scoutTimeoutMs": {
+      settings.scoutTimeoutMs = Number(value);
+      return true;
+    }
     case "jevDigestMaxChars": {
       settings.jevDigestMaxChars = Number(value);
       return true;

package/src/ui/types.ts

@@ -98,6 +98,7 @@ export interface AdvisorSettings {
   planGate: boolean;
   redactSecrets?: boolean;
   scoutEnabled?: boolean;
+  scoutTimeoutMs?: number;
   sessionSummary?: boolean;
   showUsageDetails?: boolean;
   showUsageFooter?: boolean;