@ashx-j/lunr 0.2.13 → 0.2.14

package/dist/builtin-extensions/pi-subagents/src/runs/foreground/subagent-executor.js

@@ -12,7 +12,7 @@ import { buildDoctorReport } from "../../extension/doctor.js";
 import { clearPendingForegroundControlNotices } from "../../extension/control-notices.js";
 import { runSync } from "./execution.js";
 import { handleWatchdogToolAction, WATCHDOG_TOOL_ACTIONS } from "../../watchdog/tool-actions.js";
-import { buildModelCandidates, resolveEffectiveSubagentModel, resolveTierModelOverride } from "../shared/model-fallback.js";
+import { buildModelCandidates, captureModelSelection, resolveEffectiveSubagentModel, resolveTierModelOverride } from "../shared/model-fallback.js";
 import { aggregateParallelOutputs } from "../shared/parallel-utils.js";
 import { recordRun } from "../shared/run-history.js";
 import { buildChainInstructions, writeInitialProgressFile, getStepAgents, isParallelStep, isDynamicParallelStep, resolveStepBehavior, suppressProgressForReadOnlyTask, taskDisallowsFileUpdates, } from "../../shared/settings.js";
@@ -1045,6 +1045,8 @@ async function resumeAsyncRun(input) {
             description: recoveryDescriptor?.description ?? target.description ?? target.agent,
             permissions: recoveryDescriptor?.permissions ?? target.permissions ?? "read-only",
             model: input.params.model ?? recoveryDescriptor?.model ?? target.model,
+            modelSelection: recoveryDescriptor?.modelSelection
+                ?? captureModelSelection({ model: input.params.model ?? recoveryDescriptor?.model ?? target.model, tier: input.params.tier }),
             skill: recoveryDescriptor?.skills,
             cwd: effectiveCwd,
             output: recoveryDescriptor?.outputPath,
@@ -1749,8 +1751,11 @@ function runAsyncPath(data, deps) {
         const parallelTasks = params.tasks.map((task, index) => ({
             agent: task.agent,
             task: shouldForkAgent(contextPolicy, task.agent) ? wrapForkTask(task.task) : task.task,
+            description: task.description,
+            permissions: task.permissions,
             cwd: task.cwd,
             ...(task.model !== undefined ? { model: task.model } : {}),
+            ...(task.tier !== undefined ? { tier: task.tier } : {}),
             ...(skillOverrides[index] !== undefined ? { skill: skillOverrides[index] } : {}),
             ...(task.output !== undefined && task.output !== true ? { output: task.output } : {}),
             ...(task.outputMode !== undefined ? { outputMode: task.outputMode } : {}),
@@ -1854,6 +1859,7 @@ function runAsyncPath(data, deps) {
             permissions: params.permissions,
             model: modelOverride,
             tier: params.tier,
+            modelSelection: captureModelSelection({ model: params.model, tier: params.tier }),
             skill: params.skill,
             cwd: effectiveCwd,
             output: effectiveOutput,
@@ -2155,6 +2161,8 @@ async function runForegroundParallelTasks(input) {
             description: task.description,
             permissions: task.permissions,
             model: input.modelOverrides[index] ?? task.model,
+            tier: task.tier,
+            modelSelection: input.modelSelections[index] ?? captureModelSelection({ model: task.model, tier: task.tier }),
             skill: task.skill,
             cwd: taskCwd,
             output: task.output,
@@ -2299,6 +2307,7 @@ async function runParallelPath(data, deps) {
     const modelOverrides = tasks.map((task, i) => 
     // lunr: model tiers — explicit per-task model wins; otherwise resolve task.tier via the tier bridge.
     resolveEffectiveSubagentModel(behaviorOverrides[i]?.model ?? resolveTierModelOverride(task.tier), agentConfigs[i]?.model, ctx.model, availableModels, currentProvider, { scope: data.modelScope }));
+    const modelSelections = tasks.map((task) => captureModelSelection({ model: task.model, tier: task.tier }));
     if (params.clarify === true && ctx.hasUI) {
         const behaviors = agentConfigs.map((_c, i) => resolveStepBehavior(behaviorOverrides[i]));
         const availableSkills = discoverAvailableSkills(effectiveCwd);
@@ -2312,6 +2321,7 @@ async function runParallelPath(data, deps) {
             if (override?.model !== undefined) {
                 modelOverrides[i] = resolveEffectiveSubagentModel(override.model, agentConfigs[i]?.model, ctx.model, availableModels, currentProvider, { scope: data.modelScope });
                 behaviorOverrides[i].model = override.model;
+                modelSelections[i] = captureModelSelection({ model: override.model });
             }
             if (override?.output !== undefined)
                 behaviorOverrides[i].output = override.output;
@@ -2348,8 +2358,11 @@ async function runParallelPath(data, deps) {
                 return {
                     agent: t.agent,
                     task: taskText,
+                    description: t.description,
+                    permissions: t.permissions,
                     cwd: t.cwd,
-                    ...(behaviorOverrides[i]?.model !== undefined ? { model: behaviorOverrides[i].model } : {}),
+                    ...(behaviorOverrides[i]?.model !== undefined ? { model: behaviorOverrides[i].model } : t.model !== undefined ? { model: t.model } : {}),
+                    ...(behaviorOverrides[i]?.model === undefined && t.tier !== undefined ? { tier: t.tier } : {}),
                     ...(skillOverrides[i] !== undefined ? { skill: skillOverrides[i] } : {}),
                     ...(behaviorOverrides[i]?.output !== undefined ? { output: behaviorOverrides[i].output } : {}),
                     ...(behaviorOverrides[i]?.outputMode !== undefined ? { outputMode: behaviorOverrides[i].outputMode } : {}),
@@ -2448,6 +2461,7 @@ async function runParallelPath(data, deps) {
             availableModels,
             modelScope: data.modelScope,
             modelOverrides,
+            modelSelections,
             behaviors,
             firstProgressIndex: parallelProgressPrecreated ? -1 : firstProgressIndex,
             controlConfig,
@@ -2611,8 +2625,10 @@ async function runSinglePath(data, deps) {
         }
         task = result.templates[0];
         const override = result.behaviorOverrides[0];
-        if (override?.model !== undefined)
+        if (override?.model !== undefined) {
             modelOverride = resolveEffectiveSubagentModel(override.model, agentConfig.model, ctx.model, availableModels, currentProvider, { scope: data.modelScope });
+            spec = { ...spec, model: modelOverride, modelSelection: captureModelSelection({ model: override.model }) };
+        }
         if (override?.output !== undefined)
             effectiveOutput = normalizeSingleOutputOverride(override.output, agentConfig.output);
         if (override?.skills !== undefined)