@diousk/pi-subagents-fast 0.24.0 → 0.25.1

package/src/nested-tools.ts

@@ -64,7 +64,7 @@ interface NestedSpawnOptions {
   invocation?: AgentInvocation;
   signal?: AbortSignal;
   onAssistantUsage?: (usage: { input: number; output: number; cacheWrite: number }) => void;
-  onSessionCreated?: (session: AgentSession) => void;
+  onSessionCreated?: (session: AgentSession, agentConfig?: AgentConfig) => void;
   depth: number;
   parentAgentId: string;
   maxSubagentDepth: number;
@@ -259,7 +259,7 @@ export function createNestedSubagentTools(context: NestedToolContext): ToolDefin
       const rootSessionId = context.manager.getRecord(context.parentAgentId)?.rootSessionId;
       const childDepth = context.depth + 1;
       const options: NestedSpawnOptions = {
-        routing: { policy: loadRoutingPolicy(context.configCwd, registry), modelExplicit: !!invocation.modelInput, thinkingExplicit: invocation.thinking !== undefined, entrypoint: "nested" },
+        routing: { policy: loadRoutingPolicy(context.configCwd, registry), allowedAgentTypes: allowed ? [...allowed] : undefined, modelExplicit: !!invocation.modelInput, thinkingExplicit: invocation.thinking !== undefined, entrypoint: "nested" },
         agentConfig: config,
         description: params.description,
         model,
@@ -308,20 +308,18 @@ export function createNestedSubagentTools(context: NestedToolContext): ToolDefin
       // explain itself. Filed under the ROOT session and this branch's config
       // root, so a nested transcript lands in the same `tasks/` directory as its
       // ancestors' rather than in a directory of its own.
-      const transcriptSessionId =
-        rootSessionId !== undefined && (config?.outputTranscript ?? getOutputTranscriptDefault())
-          ? rootSessionId
-          : undefined;
       let childId: string | undefined;
-      const attachTranscript = (id: string): void => {
+      const attachTranscript = (id: string, selected = config): void => {
         childId = id;
-        if (transcriptSessionId === undefined) return;
+        if (rootSessionId === undefined) return;
         const rec = context.manager.getRecord(id);
-        if (!rec) return;
-        rec.outputFile = createOutputFilePath(context.configCwd, id, transcriptSessionId);
+        if (!rec || rec.outputFile || (!rec.session && (rec.status === "queued" || options.routing?.policy?.mode === "jev" || rec.routing?.mode === "jev"))) return;
+        if (!(selected?.outputTranscript ?? getOutputTranscriptDefault())) return;
+        rec.outputFile = createOutputFilePath(context.configCwd, id, rootSessionId);
         writeInitialEntry(rec.outputFile, id, params.prompt, ctx.cwd);
       };
-      options.onSessionCreated = (session) => {
+      options.onSessionCreated = (session, selected) => {
+        if (childId !== undefined) attachTranscript(childId, selected);
         const rec = childId === undefined ? undefined : context.manager.getRecord(childId);
         if (rec?.outputFile && childId !== undefined) {
           rec.outputCleanup = streamToOutputFile(session, rec.outputFile, childId, ctx.cwd);

package/src/routing-config.ts

@@ -6,7 +6,7 @@ export type RoutingMode = "auto" | "shadow" | "jev" | "off";
 
 export interface JevConfig {
   TYPESAFE_API_KEY?: string;
-  models: { model: string; description: string; thinkingLevel: ThinkingLevel }[];
+  models: { model: string; description: string; thinkingLevel: ThinkingLevel; instruction?: string }[];
 }
 
 /** Validate the whole block; never merge candidate lists or credentials. */
@@ -21,23 +21,28 @@ export function parseJevConfig(raw: unknown): JevConfig | false {
     (typeof value.TYPESAFE_API_KEY !== "string" || !value.TYPESAFE_API_KEY || /\s|[\x00-\x1f\x7f]/.test(value.TYPESAFE_API_KEY))) {
     throw new Error("TYPESAFE_API_KEY must be a nonempty token without whitespace or control characters");
   }
-  if (!Array.isArray(value.models) || value.models.length < 1 || value.models.length > 254) {
-    throw new Error("jev.models must contain 1–254 models");
+  const entries = value.models ?? [];
+  if (!Array.isArray(entries) || entries.length > 254 || value.models === null) {
+    throw new Error("jev.models must contain 0–254 models");
   }
   const seen = new Set<string>();
-  const models = value.models.map((entry: unknown) => {
+  const models = entries.map((entry: unknown) => {
     if (!entry || typeof entry !== "object" || Array.isArray(entry)) throw new Error("Each Jev model needs model and description");
     const candidate = entry as Record<string, unknown>;
-    if (Object.keys(candidate).some(key => key !== "model" && key !== "description" && key !== "thinkingLevel") ||
+    if (Object.keys(candidate).some(key => key !== "model" && key !== "description" && key !== "thinkingLevel" && key !== "instruction") ||
       typeof candidate.model !== "string" || !/^[^\s/]+\/\S+$/.test(candidate.model) ||
       typeof candidate.description !== "string" || !candidate.description.trim() || candidate.description.length > 4000) {
       throw new Error("Each Jev model needs an exact provider/model-id and a description of 1–4000 characters");
     }
     const thinkingLevel = ROUTING_THINKING_LEVELS.find(level => level === candidate.thinkingLevel);
     if (!thinkingLevel) throw new Error("Each Jev model requires thinkingLevel: minimal, low, medium, high, xhigh or max");
+    if (candidate.instruction !== undefined && (typeof candidate.instruction !== "string" || candidate.instruction.length > 16_000)) {
+      throw new Error("Jev model instruction must be a string of at most 16000 characters");
+    }
+    const instruction = typeof candidate.instruction === "string" ? candidate.instruction.trim() : "";
     if (seen.has(candidate.model)) throw new Error("jev.models contains duplicate models");
     seen.add(candidate.model);
-    return { model: candidate.model, description: candidate.description.trim(), thinkingLevel };
+    return { model: candidate.model, description: candidate.description.trim(), thinkingLevel, ...(instruction ? { instruction } : {}) };
   });
   return { models, ...(typeof value.TYPESAFE_API_KEY === "string" ? { TYPESAFE_API_KEY: value.TYPESAFE_API_KEY } : {}) };
 }

package/src/ui/model-routing-menu.ts

@@ -32,7 +32,7 @@ export async function showRoutingMenu(ctx: ExtensionCommandContext, records: ()
     : policy.source === "guideline" ? "Jev is inactive while a custom guideline is configured." : "";
   const note = policy.mode === "off" ? "No routing guidance or Jev requests."
     : policy.mode === "shadow" ? `Observe Jev; actual choice: ${labels[policy.source]}. Jev calls may incur charges.`
-    : policy.mode === "jev" ? `Jev first; fallback: ${labels[policy.fallbackSource ?? "baseline"]}.${policy.jev ? "" : " Configure Jev models and credentials to use Jev."}`
+    : policy.mode === "jev" ? `Wait for Jev to choose an agent/model; fallback: ${labels[policy.fallbackSource ?? "baseline"]}.${policy.jev ? "" : " Configure agent/model profiles and TypeSafe credentials to use Jev."}`
     : policy.diagnostic ?? inactive;
   const choice = await ctx.ui.select(`Model routing: ${policy.mode} — ${note || labels[policy.source]}`, [
     "Runtime status", "Routing mode", "Custom guideline path", "Jev models and descriptions", "Typesafe API key", "Use Pi/environment credentials", "Disable custom guideline", "Disable Jev", "Back",
@@ -62,9 +62,8 @@ export async function showRoutingMenu(ctx: ExtensionCommandContext, records: ()
   const models = settings.jev ? settings.jev.models.map(entry => ({ ...entry })) : [];
   // Creating a project block must not silently copy a global credential.
   const localKey = local.jev ? local.jev.TYPESAFE_API_KEY : undefined;
-  if (choice === "Use Pi/environment credentials") return models.length ? { jev: { models } } : undefined;
+  if (choice === "Use Pi/environment credentials") return { jev: { models } };
   if (choice === "Typesafe API key") {
-    if (!models.length) { ctx.ui.notify("Configure Jev models first.", "info"); return; }
     const key = await maskedApiKey(ctx);
     if (!key) return;
     try { return { jev: parseJevConfig({ models, TYPESAFE_API_KEY: key }) }; }
@@ -92,7 +91,9 @@ export async function showRoutingMenu(ctx: ExtensionCommandContext, records: ()
     const selectedLevel = await ctx.ui.select(`Thinking level (required${current ? `; current: ${current.thinkingLevel}` : ""})`, [...ROUTING_THINKING_LEVELS]);
     const thinkingLevel = ROUTING_THINKING_LEVELS.find(level => level === selectedLevel);
     if (!thinkingLevel) continue;
-    const entry = { model: model.trim(), description: description.trim(), thinkingLevel };
+    const instruction = await ctx.ui.editor("Additional instruction (optional; blank to omit)", current?.instruction ?? "");
+    if (instruction === undefined) continue;
+    const entry = { model: model.trim(), description: description.trim(), thinkingLevel, ...(instruction.trim() ? { instruction: instruction.trim() } : {}) };
     if (current) models[index] = entry;
     else models.push(entry);
   }

package/src/ui/routing-status.ts

@@ -1,6 +1,6 @@
 import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import { matchesKey, Text } from "@earendil-works/pi-tui";
-import { eligibleModels, loadRoutingPolicy } from "../model-routing.js";
+import { eligibleModels, loadRoutingPolicy, routingCandidates } from "../model-routing.js";
 import { isScopeModelsEnabled } from "../model-scope.js";
 import { loadRoutingSettings, projectRoutingSettings } from "../settings.js";
 import type { AgentRecord } from "../types.js";
@@ -10,7 +10,7 @@ export async function routingStatusText(ctx: ExtensionCommandContext, records: r
   const { settings, guidelineFile } = loadRoutingSettings(ctx.cwd);
   const local = projectRoutingSettings(ctx.cwd);
   const policy = loadRoutingPolicy(ctx.cwd);
-  const config = settings.jev;
+  const config = settings.jev === false ? false : policy.jev ?? settings.jev;
   const apiKey = config ? config.TYPESAFE_API_KEY : undefined;
   const available = eligibleModels(ctx);
   const labels = { agents: "Custom agents", guideline: "Custom guideline", jev: "Jev", baseline: "Existing model" };
@@ -49,6 +49,14 @@ export async function routingStatusText(ctx: ExtensionCommandContext, records: r
       lines.push(`${profile.model} | thinking: ${profile.thinkingLevel} | ${available.has(profile.model) ? "eligible" : "unavailable or excluded by scope"}`, `  ${profile.description}`);
     }
   } else lines.push("None. Every profile requires model, description and thinkingLevel.");
+  if (policy.mode === "jev" || policy.mode === "shadow") {
+    const candidates = routingCandidates(ctx, policy, ctx.model);
+    lines.push("", `Combined eligible profiles: ${candidates.length} (maximum 254)`);
+    for (const agent of policy.agentProfiles ?? []) {
+      const candidate = candidates.find(entry => entry.agentConfig?.name === agent.name);
+      lines.push(`Agent: ${agent.name} | ${candidate ? `${candidate.model} | thinking: ${candidate.thinkingLevel ?? "inherited"} | eligible` : "unavailable or excluded by scope"}`, `  ${agent.description}`);
+    }
+  }
   lines.push("", "Recent retained agents (latest 10; includes nested/workflow agents):");
   const recent = [...records].filter(record => record.routing).sort((a, b) => b.startedAt - a.startedAt).slice(0, 10);
   if (!recent.length) lines.push("No routing decisions yet. Start a fresh subagent; resumed agents do not reroute.");
@@ -58,6 +66,8 @@ export async function routingStatusText(ctx: ExtensionCommandContext, records: r
       `  Mode: ${route.mode} | Source: ${route.source} | Result: ${route.code}`,
       `  ${route.reason}`);
     if (route.model) lines.push(`  Selected: ${route.model} | requested thinking: ${route.thinkingLevel ?? "inherited"}`);
+    if (route.agent) lines.push(`  Selected agent: ${route.agent}`);
+    if (route.suggestedAgent) lines.push(`  Shadow agent suggestion: ${route.suggestedAgent}`);
     if (route.suggestedModel) lines.push(`  Shadow suggestion: ${route.suggestedModel} | thinking: ${route.suggestedThinkingLevel ?? "inherited"}`);
     if (record.invocation?.modelId) lines.push(`  Actual: ${record.invocation.modelId} | effective thinking: ${record.invocation.thinking ?? "unknown"}`);
     if (route.confidence !== undefined) lines.push(`  Confidence: ${(route.confidence * 100).toFixed(1)}%`);