@arhen/pi-core-subagent 1.3.35 → 1.3.37

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@arhen/pi-core-subagent",
-	"version": "1.3.35",
+	"version": "1.3.37",
 	"type": "module",
 	"description": "pi extension: fast in-process subagents with a dependency-graph scheduler (needs edges gate tasks and carry upstream output into dependent prompts), plus background runs, intercom and agent-to-agent mailbox. Leader defines agents inline.",
 	"license": "MIT",

package/src/agentfile.ts

@@ -44,11 +44,40 @@ const STOP = new Set([
 	"how",
 	"what",
 	"who",
+	// Generic connectors/verbs that carry no routing signal. Two of these shared
+	// used to be enough to bind a task to an unrelated agent file (a "release
+	// audit" landing on a PRD writer via "from" + "user").
+	"from",
+	"into",
+	"user",
+	"note",
+	"creat",
+	"create",
+	"make",
+	"use",
+	"work",
+	"run",
+	"new",
+	"other",
+	"single",
+	"formal",
+	"description",
+	"this",
+	"that",
+	"it",
+	"all",
+	"any",
+	"per",
+	"via",
 ]);
 
 /** A body becomes the child's ENTIRE system prompt — an oversized reference file
  *  would blow the context window and kill the session with a cryptic error. */
 const MAX_BODY_CHARS = 64_000;
+/** A file takes over the prompt AND the model, so a weak match is expensive.
+ *  Both gates must pass: distinct shared terms, and share of the description. */
+const MIN_SHARED_TERMS = 2;
+const MIN_DESC_COVERAGE = 0.2;
 
 /** Per-cwd memo of the ancestor walk (project dirs then home), since the files
  *  can't meaningfully change within one run and the walk costs 3 sync stats per
@@ -72,10 +101,25 @@ function tokens(text: string): string[] {
 		});
 }
 
+/**
+ * Overlap between the spawn goal and a file's description.
+ *
+ * Absolute count alone is a bad signal: two shared filler words bound unrelated
+ * tasks to whichever agent file happened to share them, and the file then
+ * overrode the model too (403s on a plan without that model). Require BOTH a
+ * floor of distinct shared terms AND meaningful coverage of the description,
+ * so a match means "this file is about that", not "these strings brushed past
+ * each other".
+ */
 function score(query: string[], desc: string[]): number {
-	let shared = 0;
-	for (const t of query) if (desc.includes(t)) shared += 1;
-	return shared >= 2 ? shared : 0;
+	if (desc.length === 0) return 0;
+	const q = new Set(query);
+	const shared = new Set<string>();
+	for (const t of desc) if (q.has(t)) shared.add(t);
+	if (shared.size < MIN_SHARED_TERMS) return 0;
+	const uniqueDesc = new Set(desc);
+	if (shared.size / uniqueDesc.size < MIN_DESC_COVERAGE) return 0;
+	return shared.size;
 }
 
 function readAgentFile(dir: string): AgentFileInfo[] {

package/src/format.ts

@@ -241,9 +241,13 @@ export function makeTaskNotice(run: RunSnapshot, task: TaskSnapshot, kind: strin
 	const wt = task.branch
 		? ` · branch ${task.branch}${task.changedFiles?.length ? `, ${task.changedFiles.length} file(s)` : ""}`
 		: "";
+	// A matched agent file overrides prompt AND model — on a failure (bad model,
+	// 403, wrong persona) that override is the likeliest cause, so it has to be
+	// in the notice, not only in the run summary the leader may never read.
+	const src = task.agentFile ? `\nAgent file: ${task.agentFile}${task.model ? ` (model ${task.model})` : ""}` : "";
 	return [
 		`Task ${task.agent} (${task.id}) ${kind} in run ${run.id}: ${detail}${wt}`,
-		`Goal: ${goal}`,
+		`Goal: ${goal}${src}`,
 		`Use subagent_result(runId: "${run.id}", taskId: "${task.id}") for full output.`,
 	].join("\n");
 }

package/src/manager.ts

@@ -154,6 +154,7 @@ export function cloneRun(run: RunSnapshot): RunSnapshot {
 export function resolveChildModel(ctx: ExtensionContext, explicit: string | undefined) {
 	if (!explicit?.trim()) return ctx.model; // inherit the parent's active model
 	const ref = explicit.trim();
+	if (!ctx.modelRegistry) return ctx.model; // no registry to check against (tests, headless)
 	const available = ctx.modelRegistry.getAvailable();
 	// Model ids can contain slashes (e.g. 9router/cc/claude-opus-5), so a bare id
 	// match and every provider/id split point must be tried, not just the first.
@@ -755,6 +756,10 @@ export class SubagentManager {
 		try {
 			model = resolveChildModel(ctx, file?.model ?? input.model);
 			validateThinking(model, thinking);
+			// Record the model ACTUALLY used — an agent file's `model:` overrides the
+			// requested one, and showing the request in the widget hides that entirely
+			// (a 403 then names a model the leader never asked for).
+			if (model) this.updateTask(run, task, { model: model.id }, ctx, onUpdate);
 		} catch (err) {
 			this.updateTask(
 				run,
@@ -1115,6 +1120,26 @@ export class SubagentManager {
 			}
 		}
 		const edges = resolveNeeds(inputs, mode);
+		// Pre-flight every task's model BEFORE the run exists. A matched agent file
+		// overrides the requested model, so an unresolvable one is the leader's
+		// mistake to see NOW — not N children dying one by one on their first turn
+		// with an error naming a model the leader never asked for.
+		for (let i = 0; i < inputs.length; i++) {
+			const input = inputs[i] as TaskInput;
+			const cwd = input.cwd ?? ctx.cwd;
+			const file = resolveAgentFile(input.agent, input.task, cwd, getAgentDir());
+			const requested = file?.model ?? input.model;
+			try {
+				validateThinking(resolveChildModel(ctx, requested), input.thinking);
+			} catch (err) {
+				const where = file?.model
+					? ` (from agent file ${file.path}, which overrides the requested model${input.model ? ` "${input.model}"` : ""})`
+					: "";
+				throw new Error(
+					`Task ${input.id ?? `task_${i + 1}`} (${input.agent}): ${err instanceof Error ? err.message : String(err)}${where}`,
+				);
+			}
+		}
 
 		const run: RunSnapshot = {
 			id: newId("run"),