@oh-my-pi/pi-coding-agent 16.2.11 → 16.2.12

package/src/mcp/transports/stdio.ts

@@ -575,17 +575,27 @@ export class StdioTransport implements MCPTransport {
 
 		const stdin = this.#process.stdin;
 		const message = `${JSON.stringify(request)}\n`;
-		try {
-			// Await both: Bun's FileSink can surface a broken pipe either as a
-			// synchronous throw or as a rejected Promise (the EPIPE arrives on a
-			// processTicksAndRejections tick). Awaiting funnels both into this catch
-			// so the request rejects cleanly instead of leaving a floating rejected
-			// promise that crashes the process via the unhandledRejection handler.
-			await stdin.write(message);
-			await stdin.flush();
-		} catch (error: unknown) {
+		const failFromSend = (error: unknown) => {
+			if (settled) return;
 			cleanup();
 			reject(error instanceof Error ? error : new Error(String(error)));
+		};
+		try {
+			// Never `await` write/flush. Bun's FileSink returns a pending Promise
+			// once the OS pipe buffer fills (default ~64 KB on POSIX), and a
+			// subprocess that stops draining stdin will park those awaits forever.
+			// Awaiting here would keep the async fn stuck above `return promise`,
+			// past the timeout timer and the abort handler, orphaning the deferred
+			// rejection and hanging the caller (#3945). Route sync throws (Windows
+			// EPIPE) and async rejections (POSIX EPIPE on processTicksAndRejections)
+			// into `reject()` while leaving the returned promise free to settle
+			// from the response, timer, abort signal, or read-loop transport-close.
+			const wrote = stdin.write(message);
+			if (isThenable(wrote)) wrote.then(undefined, failFromSend);
+			const flushed = stdin.flush();
+			if (isThenable(flushed)) flushed.then(undefined, failFromSend);
+		} catch (error) {
+			failFromSend(error);
 		}
 
 		return promise;

package/src/memories/index.ts

@@ -1219,7 +1219,6 @@ async function resolveMemoryModel(options: {
 		const resolved = resolveModelRoleValue(requestedModel, modelRegistry.getAll(), {
 			settings: session.settings,
 			matchPreferences: getModelMatchPreferences(session.settings),
-			modelRegistry,
 		});
 		if (resolved.model) return resolved.model;
 	}

package/src/mnemopi/backend.ts

@@ -511,7 +511,7 @@ async function resolveMnemopiProviderOptions(
 	}
 
 	try {
-		const resolved = resolveRoleSelection(["tiny", "smol"], settings, modelRegistry.getAvailable(), modelRegistry);
+		const resolved = resolveRoleSelection(["tiny", "smol"], settings, modelRegistry.getAvailable());
 		const model = resolved?.model;
 		if (!model) {
 			logger.warn("Mnemopi: llmMode=smol but no tiny/smol model resolved; continuing without LLM.");

package/src/modes/components/model-selector.ts

@@ -58,21 +58,6 @@ function makeRoleBadgeToken(label: string, color: ThemeColor, assigned: RoleAssi
 	return `${badge} ${theme.fg("dim", `(${thinkingLabel})`)}`;
 }
 
-function normalizeSearchText(value: string): string {
-	return value
-		.toLowerCase()
-		.replace(/[^a-z0-9]+/g, " ")
-		.trim();
-}
-
-function compactSearchText(value: string): string {
-	return value.toLowerCase().replace(/[^a-z0-9]+/g, "");
-}
-
-function getAlphaSearchTokens(query: string): string[] {
-	return [...normalizeSearchText(query).matchAll(/[a-z]+/g)].map(match => match[0]).filter(token => token.length > 0);
-}
-
 function computeModelRank(model: Model, roles: Record<string, RoleAssignment | undefined>): number {
 	let i = 0;
 	while (i < MODEL_ROLE_IDS.length) {
@@ -94,17 +79,6 @@ interface ModelItem {
 	selector: string;
 }
 
-interface CanonicalModelItem {
-	kind: "canonical";
-	id: string;
-	model: Model;
-	selector: string;
-	variantCount: number;
-	searchText: string;
-	normalizedSearchText: string;
-	compactSearchText: string;
-}
-
 interface ScopedModelItem {
 	model: Model;
 	thinkingLevel?: string;
@@ -134,12 +108,8 @@ interface ProviderTabState {
 	providerId?: string;
 }
 const ALL_TAB = "ALL";
-const CANONICAL_TAB = "CANONICAL";
 
-const STATIC_PROVIDER_TABS: ProviderTabState[] = [
-	{ id: ALL_TAB, label: ALL_TAB },
-	{ id: CANONICAL_TAB, label: CANONICAL_TAB },
-];
+const STATIC_PROVIDER_TABS: ProviderTabState[] = [{ id: ALL_TAB, label: ALL_TAB }];
 
 const MODEL_TAB_REFRESH_DEBOUNCE_MS = 120;
 
@@ -168,8 +138,6 @@ export class ModelSelectorComponent extends Container {
 	#menuContainer: Container;
 	#allModels: ModelItem[] = [];
 	#filteredModels: ModelItem[] = [];
-	#canonicalModels: CanonicalModelItem[] = [];
-	#filteredCanonicalModels: CanonicalModelItem[] = [];
 	#selectedIndex: number = 0;
 	#roles = {} as Record<string, RoleAssignment | undefined>;
 	#settings = null as unknown as Settings;
@@ -297,8 +265,7 @@ export class ModelSelectorComponent extends Container {
 		// Hydrate synchronously from the current registry snapshot so the first
 		// Enter after opening the selector acts on cached models instead of being
 		// dropped while the offline refresh promise is still pending. This stays
-		// on the open path, so it must remain cheap — heavy lifting lives in the
-		// registry's one-pass getCanonicalModelSelections.
+		// on the open path, so it must remain cheap.
 		this.#syncFromRegistryState();
 
 		// Reconcile with cached discovery state in the background. A --models
@@ -342,7 +309,6 @@ export class ModelSelectorComponent extends Container {
 			const resolved = resolveModelRoleValue(roleValue, allModels, {
 				settings: this.#settings,
 				matchPreferences,
-				modelRegistry: this.#modelRegistry,
 			});
 			if (resolved.model) {
 				nextRoles[role] = {
@@ -360,7 +326,6 @@ export class ModelSelectorComponent extends Container {
 				const resolved = resolveModelRoleValue(`pi/${role}`, candidates, {
 					settings: this.#settings,
 					matchPreferences,
-					modelRegistry: this.#modelRegistry,
 				});
 				if (!resolved.model) continue;
 				nextRoles[role] = {
@@ -444,30 +409,6 @@ export class ModelSelectorComponent extends Container {
 		});
 	}
 
-	#sortCanonicalModels(models: CanonicalModelItem[], { skipRoleRank = false }: { skipRoleRank?: boolean } = {}): void {
-		const mruOrder = this.#settings.getStorage()?.getModelUsageOrder() ?? [];
-		const mruIndex = new Map(mruOrder.map((key, i) => [key, i]));
-
-		const modelRank = (item: CanonicalModelItem) => computeModelRank(item.model, this.#roles);
-
-		models.sort((a, b) => {
-			if (!skipRoleRank) {
-				const aRank = modelRank(a);
-				const bRank = modelRank(b);
-				if (aRank !== bRank) return aRank - bRank;
-			}
-
-			const aMru = mruIndex.get(`${a.model.provider}/${a.model.id}`) ?? Number.MAX_SAFE_INTEGER;
-			const bMru = mruIndex.get(`${b.model.provider}/${b.model.id}`) ?? Number.MAX_SAFE_INTEGER;
-			if (aMru !== bMru) return aMru - bMru;
-
-			const providerCmp = a.model.provider.localeCompare(b.model.provider);
-			if (providerCmp !== 0) return providerCmp;
-
-			return a.id.localeCompare(b.id);
-		});
-	}
-
 	#loadModelsFromCurrentRegistryState(): void {
 		let models: ModelItem[];
 		if (this.#scopedModels.length > 0) {
@@ -498,8 +439,6 @@ export class ModelSelectorComponent extends Container {
 			} catch (error) {
 				this.#allModels = [];
 				this.#filteredModels = [];
-				this.#canonicalModels = [];
-				this.#filteredCanonicalModels = [];
 				this.#errorMessage = error instanceof Error ? error.message : String(error);
 				return;
 			}
@@ -507,42 +446,14 @@ export class ModelSelectorComponent extends Container {
 
 		const candidates = models.map(item => item.model);
 		this.#loadRoleModels(candidates);
-		const canonicalSelections = this.#modelRegistry.getCanonicalModelSelections({
-			availableOnly: this.#scopedModels.length === 0,
-			candidates,
-		});
-		const canonicalModels = canonicalSelections.map(({ record, model: selectedModel }): CanonicalModelItem => {
-			const searchText = [
-				record.id,
-				record.name,
-				selectedModel.provider,
-				selectedModel.id,
-				selectedModel.name,
-				...record.variants.flatMap(variant => [variant.selector, variant.model.name]),
-			].join(" ");
-			return {
-				kind: "canonical",
-				id: record.id,
-				model: selectedModel,
-				selector: record.id,
-				variantCount: record.variants.length,
-				searchText,
-				normalizedSearchText: normalizeSearchText(searchText),
-				compactSearchText: compactSearchText(searchText),
-			};
-		});
 
 		this.#sortModels(models);
-		this.#sortCanonicalModels(canonicalModels);
 
 		this.#allModels = models;
 		this.#filteredModels = models;
-		this.#canonicalModels = canonicalModels;
-		this.#filteredCanonicalModels = canonicalModels;
-		const visibleModels = this.#isCanonicalTab() ? canonicalModels : models;
 		this.#selectedIndex = this.#coerceSelectedIndex(
-			Math.min(this.#selectedIndex, Math.max(0, visibleModels.length - 1)),
-			visibleModels,
+			Math.min(this.#selectedIndex, Math.max(0, models.length - 1)),
+			models,
 		);
 	}
 
@@ -717,10 +628,6 @@ export class ModelSelectorComponent extends Container {
 		return this.#getActiveTab().providerId;
 	}
 
-	#isCanonicalTab(): boolean {
-		return this.#getActiveTabId() === CANONICAL_TAB;
-	}
-
 	#isModelOverCurrentContext(model: Model): boolean {
 		const contextWindow = model.contextWindow ?? 0;
 		return this.#currentContextTokens > 0 && contextWindow > 0 && this.#currentContextTokens > contextWindow;
@@ -734,7 +641,7 @@ export class ModelSelectorComponent extends Container {
 		return ` ${theme.status.disabled} context>${formatNumber(model.contextWindow ?? 0).toLowerCase()}`;
 	}
 
-	#isItemDisabled(item: ModelItem | CanonicalModelItem): boolean {
+	#isItemDisabled(item: ModelItem): boolean {
 		return this.#isModelOverContextLimit(item.model);
 	}
 
@@ -745,14 +652,11 @@ export class ModelSelectorComponent extends Container {
 		return this.#formatCurrentContextLimitSuffix(model);
 	}
 
-	#getVisibleItems(): ReadonlyArray<ModelItem | CanonicalModelItem> {
-		return this.#isCanonicalTab() ? this.#filteredCanonicalModels : this.#filteredModels;
+	#getVisibleItems(): ReadonlyArray<ModelItem> {
+		return this.#filteredModels;
 	}
 
-	#coerceSelectedIndex(
-		index: number,
-		visibleItems: ReadonlyArray<ModelItem | CanonicalModelItem> = this.#getVisibleItems(),
-	): number {
+	#coerceSelectedIndex(index: number, visibleItems: ReadonlyArray<ModelItem> = this.#getVisibleItems()): number {
 		const maxIndex = visibleItems.length - 1;
 		if (maxIndex < 0) {
 			return 0;
@@ -798,21 +702,16 @@ export class ModelSelectorComponent extends Container {
 	}
 
 	#filterModels(query: string): void {
-		const activeTabId = this.#getActiveTabId();
 		const activeProviderId = this.#getActiveProviderId();
-		const isCanonicalTab = activeTabId === CANONICAL_TAB;
 
-		// Start with all models or filter by provider/canonical view
 		let baseModels = this.#allModels;
-		const baseCanonicalModels = this.#canonicalModels;
 		if (activeProviderId) {
 			baseModels = this.#allModels.filter(m => m.provider === activeProviderId);
 		}
 
-		// Apply fuzzy filter if query is present
 		if (query.trim()) {
 			// If user is searching from a provider tab, auto-switch to ALL to show global provider results.
-			if (activeProviderId && !isCanonicalTab) {
+			if (activeProviderId) {
 				this.#activeTabIndex = 0;
 				if (this.#tabBar && this.#tabBar.getActiveIndex() !== 0) {
 					this.#tabBar.setActiveIndex(0);
@@ -822,55 +721,22 @@ export class ModelSelectorComponent extends Container {
 				baseModels = this.#allModels;
 			}
 
-			if (isCanonicalTab) {
-				const alphaTokens = getAlphaSearchTokens(query);
-				const alphaFiltered =
-					alphaTokens.length === 0
-						? baseCanonicalModels
-						: baseCanonicalModels.filter(item =>
-								alphaTokens.every(token => item.normalizedSearchText.includes(token)),
-							);
-				const compactQuery = compactSearchText(query);
-				const substringFiltered =
-					compactQuery.length === 0
-						? alphaFiltered
-						: alphaFiltered.filter(item => item.compactSearchText.includes(compactQuery));
-				const fuzzySource =
-					substringFiltered.length > 0
-						? substringFiltered
-						: alphaFiltered.length > 0
-							? alphaFiltered
-							: baseCanonicalModels;
-				// Fuzzy provides the candidate set, but `${provider}/${id}` scoring
-				// is biased by provider-prefix length (e.g. `openai/X` beats
-				// `openai-codex/X` purely because the prefix is shorter). Re-sort by
-				// affinity — MRU then version — so the user's actually-used model
-				// wins. Role rank is skipped: when narrowing by query, a weakly
-				// matching default model should not be promoted above a stronger
-				// non-default match.
-				const fuzzyMatches = fuzzyFilter(fuzzySource, query, ({ searchText }) => searchText);
-				this.#sortCanonicalModels(fuzzyMatches, { skipRoleRank: true });
-				this.#filteredCanonicalModels = fuzzyMatches;
-			} else {
-				// Match against the displayed "provider/id" string so the user can
-				// type what they see: bare names (`mimo`, `kimi`), provider prefixes
-				// (`openrouter`), or scoped queries (`openrouter/mimo`) all flow
-				// through the same fuzzy matcher. The score is biased by provider-
-				// prefix length, so re-sort by MRU/version afterwards; skip role
-				// rank so a weakly matching default doesn't trump a stronger match.
-				const fuzzyMatches = fuzzyFilter(baseModels, query, ({ id, provider }) => `${provider}/${id}`);
-				this.#sortModels(fuzzyMatches, { skipRoleRank: true });
-				this.#filteredModels = fuzzyMatches;
-			}
+			// Match against the displayed "provider/id" string so the user can
+			// type what they see: bare names (`mimo`, `kimi`), provider prefixes
+			// (`openrouter`), or scoped queries (`openrouter/mimo`) all flow
+			// through the same fuzzy matcher. The score is biased by provider-
+			// prefix length, so re-sort by MRU/version afterwards; skip role
+			// rank so a weakly matching default doesn't trump a stronger match.
+			const fuzzyMatches = fuzzyFilter(baseModels, query, ({ id, provider }) => `${provider}/${id}`);
+			this.#sortModels(fuzzyMatches, { skipRoleRank: true });
+			this.#filteredModels = fuzzyMatches;
 		} else {
 			this.#filteredModels = baseModels;
-			this.#filteredCanonicalModels = baseCanonicalModels;
 		}
 
-		const visibleItems = isCanonicalTab ? this.#filteredCanonicalModels : this.#filteredModels;
 		this.#selectedIndex = this.#coerceSelectedIndex(
-			Math.min(this.#selectedIndex, Math.max(0, visibleItems.length - 1)),
-			visibleItems,
+			Math.min(this.#selectedIndex, Math.max(0, this.#filteredModels.length - 1)),
+			this.#filteredModels,
 		);
 		this.#updateList();
 	}
@@ -940,8 +806,7 @@ export class ModelSelectorComponent extends Container {
 
 	#updateList(): void {
 		this.#listContainer.clear();
-		const isCanonicalTab = this.#isCanonicalTab();
-		const visibleItems = isCanonicalTab ? this.#filteredCanonicalModels : this.#filteredModels;
+		const visibleItems = this.#filteredModels;
 
 		const maxVisible = 10;
 		const startIndex = Math.max(
@@ -959,8 +824,6 @@ export class ModelSelectorComponent extends Container {
 		for (let i = startIndex; i < endIndex; i++) {
 			const item = visibleItems[i];
 			if (!item) continue;
-			const canonicalItem = isCanonicalTab ? (item as CanonicalModelItem) : undefined;
-			const providerItem = isCanonicalTab ? undefined : (item as ModelItem);
 
 			const isSelected = i === this.#selectedIndex;
 			const isDisabled = this.#isItemDisabled(item);
@@ -988,25 +851,17 @@ export class ModelSelectorComponent extends Container {
 			let line = "";
 			if (isSelected) {
 				const prefix = theme.fg("accent", `${theme.nav.cursor} `);
-				if (isCanonicalTab) {
-					const variants = theme.fg("dim", ` [${canonicalItem?.variantCount ?? 0}]`);
-					const backing = theme.fg("dim", ` -> ${item.model.provider}/${item.model.id}`);
-					line = `${prefix}${theme.fg("accent", item.id)}${variants}${backing}${badgeText}${disabledSuffix}`;
-				} else if (showProvider) {
-					const providerPrefix = theme.fg("dim", `${providerItem?.provider ?? ""}/`);
-					line = `${prefix}${providerPrefix}${theme.fg("accent", providerItem?.id ?? item.id)}${badgeText}${disabledSuffix}`;
+				if (showProvider) {
+					const providerPrefix = theme.fg("dim", `${item.provider}/`);
+					line = `${prefix}${providerPrefix}${theme.fg("accent", item.id)}${badgeText}${disabledSuffix}`;
 				} else {
 					line = `${prefix}${theme.fg("accent", item.id)}${badgeText}${disabledSuffix}`;
 				}
 			} else {
 				const prefix = "  ";
-				if (isCanonicalTab) {
-					const variants = theme.fg("dim", ` [${canonicalItem?.variantCount ?? 0}]`);
-					const backing = theme.fg("dim", ` -> ${item.model.provider}/${item.model.id}`);
-					line = `${prefix}${item.id}${variants}${backing}${badgeText}${disabledSuffix}`;
-				} else if (showProvider) {
-					const providerPrefix = theme.fg("dim", `${providerItem?.provider ?? ""}/`);
-					line = `${prefix}${providerPrefix}${providerItem?.id ?? item.id}${badgeText}${disabledSuffix}`;
+				if (showProvider) {
+					const providerPrefix = theme.fg("dim", `${item.provider}/`);
+					line = `${prefix}${providerPrefix}${item.id}${badgeText}${disabledSuffix}`;
 				} else {
 					line = `${prefix}${item.id}${badgeText}${disabledSuffix}`;
 				}
@@ -1044,9 +899,6 @@ export class ModelSelectorComponent extends Container {
 				return;
 			}
 			this.#listContainer.addChild(new Spacer(1));
-			const suffix = isCanonicalTab
-				? ` (${selected.model.provider}/${selected.model.id}, ${(selected as CanonicalModelItem).variantCount} variants)`
-				: "";
 			const limitWarning = this.#isItemDisabled(selected)
 				? theme.fg(
 						"dim",
@@ -1054,7 +906,7 @@ export class ModelSelectorComponent extends Container {
 					)
 				: "";
 			this.#listContainer.addChild(
-				new Text(theme.fg("muted", `  Model Name: ${selected.model.name}${suffix}`) + limitWarning, 0, 0),
+				new Text(theme.fg("muted", `  Model Name: ${selected.model.name}`) + limitWarning, 0, 0),
 			);
 		}
 	}
@@ -1086,10 +938,8 @@ export class ModelSelectorComponent extends Container {
 		return foundIndex >= 0 ? foundIndex : 0;
 	}
 
-	#getSelectedItem(): ModelItem | CanonicalModelItem | undefined {
-		return this.#isCanonicalTab()
-			? this.#filteredCanonicalModels[this.#selectedIndex]
-			: this.#filteredModels[this.#selectedIndex];
+	#getSelectedItem(): ModelItem | undefined {
+		return this.#filteredModels[this.#selectedIndex];
 	}
 
 	#coerceMenuSelectedIndex(index: number): number {
@@ -1100,7 +950,7 @@ export class ModelSelectorComponent extends Container {
 		return Math.max(0, Math.min(index, maxIndex));
 	}
 
-	#moveMenuSelection(delta: number, _selectedItem: ModelItem | CanonicalModelItem, optionCount: number): void {
+	#moveMenuSelection(delta: number, _selectedItem: ModelItem, optionCount: number): void {
 		this.#menuSelectedIndex = (this.#menuSelectedIndex + delta + optionCount) % optionCount;
 		this.#updateMenu();
 	}
@@ -1375,11 +1225,7 @@ export class ModelSelectorComponent extends Container {
 		}
 	}
 
-	#handleSelect(
-		item: ModelItem | CanonicalModelItem,
-		role: string | null,
-		thinkingLevel?: ConfiguredThinkingLevel,
-	): void {
+	#handleSelect(item: ModelItem, role: string | null, thinkingLevel?: ConfiguredThinkingLevel): void {
 		if (this.#isItemDisabled(item)) {
 			return;
 		}

package/src/modes/controllers/event-controller.ts

@@ -72,11 +72,6 @@ export class EventController {
 	// emits one read per completion — does not break it, so a run of consecutive
 	// reads collapses into one group even across completion boundaries.
 	#lastVisibleBlockCount = 0;
-	// Bumped on each assistant message_start. Scopes the placeholder key for a
-	// not-yet-id'd streamed tool block (see the toolCall loop) so a sealed,
-	// undeleted pending entry from an aborted message can never be reused by the
-	// next message's same content index.
-	#streamTurnNonce = 0;
 	#renderedCustomMessages = new Set<string>();
 	#lastIntent: string | undefined = undefined;
 	#backgroundToolCallIds = new Set<string>();
@@ -406,7 +401,6 @@ export class EventController {
 			this.ctx.ui.requestRender();
 		} else if (event.message.role === "assistant") {
 			this.#lastVisibleBlockCount = 0;
-			this.#streamTurnNonce++;
 			this.ctx.streamingComponent = createAssistantMessageComponent(this.ctx);
 			this.ctx.streamingMessage = event.message;
 			this.ctx.chatContainer.addChild(this.ctx.streamingComponent);
@@ -613,14 +607,9 @@ export class EventController {
 			if (this.ctx.streamingMessage.content.some(content => content.type === "toolCall")) {
 				this.ctx.streamingComponent.markTranscriptBlockFinalized();
 			}
-			for (const [contentIndex, content] of this.ctx.streamingMessage.content.entries()) {
+			for (const content of this.ctx.streamingMessage.content) {
 				if (content.type !== "toolCall") continue;
 				if (content.name === "read") {
-					// Read groups key by the real id (one group spans several reads),
-					// and the owned-dialect parser delivers id + args together when
-					// the call closes, so a parseable target without an id never
-					// occurs here. Defer if it somehow does.
-					if (!content.id) continue;
 					if (!readArgsHaveTarget(content.arguments)) {
 						// Args still streaming — defer until path is parseable so we can route to the
 						// read group (regular files) vs ToolExecutionComponent (internal URLs).
@@ -643,26 +632,6 @@ export class EventController {
 					// Internal URL read falls through to ToolExecutionComponent below.
 				}
 
-				// The owned-dialect tool parser (text-based tool calls for OAuth
-				// Anthropic / OpenAI) appends a tool block when it detects the call
-				// opening and only fills `id` + arguments once the call's text
-				// closes — so the live preview must stream while `content.id` is "".
-				// Key the preview by stable content position until the id lands,
-				// then migrate the pending entry + reveal state onto the real id
-				// (so `tool_execution_*`, which always carries the real id, matches
-				// the same component instead of orphaning a blank card). Native
-				// structured tool calls — every Gemini call, and Anthropic/OpenAI
-				// function calls — carry the id from the first frame, so
-				// `pendingKey === content.id` throughout and the migration no-ops.
-				const streamKey = `\u0000stream:${this.#streamTurnNonce}:${contentIndex}`;
-				const pendingKey = content.id || streamKey;
-				if (content.id && this.ctx.pendingTools.has(streamKey)) {
-					const migrated = this.ctx.pendingTools.get(streamKey);
-					this.ctx.pendingTools.delete(streamKey);
-					if (migrated) this.ctx.pendingTools.set(pendingKey, migrated);
-					this.#toolArgsReveal.rekey(streamKey, pendingKey);
-				}
-
 				// Preserve the raw partial JSON only for renderers that need to surface fields before the JSON object closes.
 				// Bash uses this to show inline env assignments during streaming instead of popping them in at completion.
 				// While the JSON is still open, ToolArgsRevealController paces the
@@ -674,16 +643,16 @@ export class EventController {
 				const rawInput = content.customWireName !== undefined;
 				const tool = this.ctx.viewSession.getToolByName(content.name);
 				if (partialJson) {
-					renderArgs = this.#toolArgsReveal.setTarget(pendingKey, partialJson, {
+					renderArgs = this.#toolArgsReveal.setTarget(content.id, partialJson, {
 						rawInput,
 						exposeRawPartialJson: exposesRawPartialJson(content.name, rawInput, tool),
 						fullArgs: content.arguments,
 					});
 				} else {
-					this.#toolArgsReveal.finish(pendingKey);
+					this.#toolArgsReveal.finish(content.id);
 					renderArgs = content.arguments;
 				}
-				if (!this.ctx.pendingTools.has(pendingKey)) {
+				if (!this.ctx.pendingTools.has(content.id)) {
 					this.#resolveDisplaceablePoll(content.name);
 					this.#resetReadGroup();
 					const component = new ToolExecutionComponent(
@@ -702,13 +671,13 @@ export class EventController {
 					);
 					component.setExpanded(this.ctx.toolOutputExpanded);
 					this.ctx.chatContainer.addChild(component);
-					this.ctx.pendingTools.set(pendingKey, component);
-					this.#toolArgsReveal.bind(pendingKey, component);
+					this.ctx.pendingTools.set(content.id, component);
+					this.#toolArgsReveal.bind(content.id, component);
 				} else {
-					const component = this.ctx.pendingTools.get(pendingKey);
+					const component = this.ctx.pendingTools.get(content.id);
 					if (component) {
 						component.updateArgs(renderArgs, content.id);
-						this.#toolArgsReveal.bind(pendingKey, component);
+						this.#toolArgsReveal.bind(content.id, component);
 					}
 				}
 			}

package/src/modes/controllers/selector-controller.ts

@@ -248,7 +248,6 @@ export class SelectorController {
 			const advisorRoleSel = resolveAdvisorRoleSelection(
 				this.ctx.settings,
 				this.ctx.session.modelRegistry.getAvailable(),
-				this.ctx.session.modelRegistry,
 			);
 			const defaultAdvisorModel = advisorRoleSel?.model;
 			const deps: AdvisorConfigDeps = {

package/src/modes/controllers/tool-args-reveal.ts

@@ -177,18 +177,6 @@ export class ToolArgsRevealController {
 		if (entry) entry.component = component;
 	}
 
-	/** Migrate a live reveal entry from a placeholder key onto the real
-	 *  tool-call id once the owned-dialect parser assigns it. No-op when no
-	 *  entry exists under `from` (smoothing disabled, or the JSON already
-	 *  closed and `finish` cleared it). */
-	rekey(from: string, to: string): void {
-		if (from === to) return;
-		const entry = this.#entries.get(from);
-		if (!entry) return;
-		this.#entries.delete(from);
-		this.#entries.set(to, entry);
-	}
-
 	/** Final arguments arrived (the JSON closed): drop the reveal so the
 	 *  caller's final-args render wins immediately, mirroring how assistant
 	 *  text snaps to the full message at message_end. */

package/src/prompts/system/subagent-system-prompt.md

@@ -62,9 +62,9 @@ Yield protocol:
 This is your only way to return a final result. For structured results, you NEVER put JSON in plain text or substitute a text summary for `result.data`.
 
 {{#if outputSchema}}
-Your result MUST match this TypeScript interface:
+Your terminal `yield` MUST use exactly this shape — the schema fields go inside `result.data`, NEVER at the top level and NEVER as a stringified summary:
 ```ts
-{{jtdToTypeScript outputSchema}}
+{{renderYieldSchema outputSchema}}
 ```
 {{/if}}
 

package/src/prompts/system/tool-call-loop-redirect.md

@@ -0,0 +1,8 @@
+<system-interrupt reason="tool_call_loop_detected">
+You called `{{tool_name}}` {{count}} consecutive times with identical arguments:
+`{{arguments_summary}}`
+
+Last result (truncated): `{{result_summary}}`
+
+NEVER call `{{tool_name}}` with those arguments again this turn. Use different arguments, choose another tool, or summarize findings and yield if complete.
+</system-interrupt>

package/src/prompts/tools/eval.md

@@ -39,8 +39,8 @@ tool.<name>(args) → unknown
     Invoke any session tool; `args` = its parameter object.
 completion(prompt, model?="default", system?=None, schema?=None) → str | dict
     Oneshot, stateless (no history/tools). `model`: "smol" fast | "default" session | "slow" most capable. `schema` (JSON-Schema) → structured output, parsed object.
-{{#if spawns}}agent(prompt, agent?="task", model?=None, label?=None, schema?=None, handle?=False) → str | dict
-    Run a subagent → final output. `agent` picks another discovered agent; `schema` as in completion(). Background via `local://` files named in the prompt. `handle` → DAG node dict { text, output, handle: "agent://<id>", id, agent } (parsed under `data` when `schema` set).
+{{#if spawns}}agent(prompt, agent?="{{spawnDefaultAgent}}", model?=None, label?=None, schema?=None, handle?=False) → str | dict
+    Run a subagent → final output. `agent` picks another discovered agent; omit it to use `{{spawnDefaultAgent}}`.{{#if spawnAllowedAgentsText}} Allowed agents: {{spawnAllowedAgentsText}}.{{/if}} `schema` as in completion(). Background via `local://` files named in the prompt. `handle` → DAG node dict { text, output, handle: "agent://<id>", id, agent } (parsed under `data` when `schema` set).
 {{#if js}}    JS: options are ONE trailing object — agent(prompt, { agent, schema, handle }).
 {{/if}}
 {{/if}}

package/src/prompts/tools/task.md

@@ -10,7 +10,7 @@ Execution blocks your turn: the call only returns once the work is completely fi
 - **One-pass agents:** Prefer agents that investigate **and** edit in a single pass; only spin a read-only discovery step (e.g. `explore`) when the affected files are genuinely unknown.
 
 # Inputs
-- `agent` (optional): The base agent type to use (e.g., `explore`, `reviewer`). Defaults to `task` (the general-purpose worker) — omit it for the default worker instead of passing `agent: "task"`.
+- `agent` (optional): The base agent type to use (e.g., `explore`, `reviewer`). Defaults to `{{defaultAgent}}`{{#if defaultAgentIsGeneric}} (the general-purpose worker){{/if}} — omit it for the default worker instead of passing `agent: "{{defaultAgent}}"`.{{#if allowedAgentsText}} Current spawn policy allows: {{allowedAgentsText}}.{{/if}}
 {{#if batchEnabled}}
 - `context`: Shared project state, constraints, and contracts. Applies to the entire batch; do not duplicate this background into individual tasks.
 - `tasks[]`: Array of subagents to spawn.