@bastani/atomic 0.9.4-alpha.6 → 0.9.4-alpha.7

package/dist/builtin/subagents/src/runs/foreground/subagent-executor-single.ts

@@ -2,7 +2,7 @@ import { randomUUID } from "node:crypto";
 import { APP_NAME } from "@bastani/atomic";
 import { ChainClarifyComponent, type ChainClarifyResult } from "./chain-clarify.ts";
 import { currentModelFullId, resolveModelCandidate } from "../shared/model-fallback.ts";
-import { toModelInfo, type ModelInfo } from "../../shared/model-info.ts";
+import { collectKnownModelProviders, toModelInfo, type ModelInfo } from "../../shared/model-info.ts";
 import { discoverAvailableSkills, normalizeSkillInput } from "../../agents/skills.ts";
 import { recordRun } from "../shared/run-history.ts";
 import { getSingleResultOutput, compactForegroundDetails } from "../../shared/utils.ts";
@@ -76,6 +76,7 @@ export async function runSinglePath(data: ExecutionContextData, deps: ResolvedEx
 
 	const currentProvider = ctx.model?.provider;
 	const availableModels: ModelInfo[] = ctx.modelRegistry.getAvailable().map(toModelInfo);
+	const knownModelProviders = collectKnownModelProviders(ctx.modelRegistry);
 	let task = params.task ?? "";
 	let modelOverride: string | undefined = resolveModelCandidate(
 		(params.model as string | undefined) ?? agentConfig.model,
@@ -145,6 +146,7 @@ export async function runSinglePath(data: ExecutionContextData, deps: ResolvedEx
 				agentConfig,
 				ctx: asyncCtx,
 				availableModels,
+				knownModelProviders,
 				cwd: effectiveCwd,
 				maxOutput: params.maxOutput,
 				artifactsDir: artifactConfig.enabled ? artifactsDir : undefined,
@@ -246,6 +248,7 @@ export async function runSinglePath(data: ExecutionContextData, deps: ResolvedEx
 		index: 0,
 		modelOverride,
 		availableModels,
+		knownModelProviders,
 		preferredModelProvider: currentProvider,
 		currentModel: currentModelFullId(ctx.model),
 		skills: effectiveSkills,

package/dist/builtin/subagents/src/runs/shared/attempt-watchdog.ts

@@ -0,0 +1,126 @@
+import type { ChildProcess } from "node:child_process";
+import { trySignalChild } from "../../shared/post-exit-stdio-guard.ts";
+
+const DEFAULT_IDLE_MS = 5 * 60_000;
+const DEFAULT_WALL_MS = 60 * 60_000;
+const DEFAULT_KILL_GRACE_MS = 3_000;
+
+export interface AttemptTimeoutConfig {
+	idleMs: number;
+	wallMs: number;
+	killGraceMs: number;
+}
+
+export interface AttemptWatchdog {
+	activity(): void;
+	clear(): void;
+}
+
+/** Parse a millisecond override from the environment. Non-numeric values are
+ * silently ignored (the default applies). Zero or negative values are clamped
+ * to `0`, which callers treat as "timeout disabled". */
+function envMs(name: string): number | undefined {
+	const raw = process.env[name];
+	if (!raw) return undefined;
+	const value = Number(raw);
+	if (!Number.isFinite(value)) return undefined;
+	return value > 0 ? Math.floor(value) : 0;
+}
+
+function positiveEnvMs(name: string): number | undefined {
+	const value = envMs(name);
+	return value !== undefined && value > 0 ? value : undefined;
+}
+
+export function resolveAttemptTimeoutConfig(): AttemptTimeoutConfig {
+	return {
+		// `0` (or a negative value) disables the corresponding timeout entirely.
+		idleMs: envMs("ATOMIC_SUBAGENT_ATTEMPT_IDLE_TIMEOUT_MS") ?? DEFAULT_IDLE_MS,
+		wallMs: envMs("ATOMIC_SUBAGENT_ATTEMPT_TIMEOUT_MS") ?? DEFAULT_WALL_MS,
+		// The SIGTERM→SIGKILL grace period intentionally cannot be disabled: once a
+		// watchdog trips, escalation must always be bounded. `0`, negative, or
+		// non-numeric values fall back to the default.
+		killGraceMs: positiveEnvMs("ATOMIC_SUBAGENT_ATTEMPT_KILL_GRACE_MS") ?? DEFAULT_KILL_GRACE_MS,
+	};
+}
+
+export function idleTimeoutMessage(idleMs: number): string {
+	return `Subagent model attempt timed out after ${idleMs}ms without child activity.`;
+}
+
+export function wallTimeoutMessage(wallMs: number): string {
+	return `Subagent model attempt timed out after ${wallMs}ms.`;
+}
+
+export function createAttemptWatchdog(params: {
+	child: ChildProcess;
+	config?: Partial<AttemptTimeoutConfig>;
+	onTimeout: (message: string) => void;
+	isSettled: () => boolean;
+	/** Reports whether a tool call is currently executing in the child. A slow tool
+	 * (long build, large test suite) can legitimately stay silent past the idle
+	 * window, so an in-flight tool execution counts as activity and defers the idle
+	 * trip. The wall-clock cap still bounds the whole attempt. */
+	isToolActive?: () => boolean;
+}): AttemptWatchdog {
+	const config = { ...resolveAttemptTimeoutConfig(), ...(params.config ?? {}) };
+	let idleTimer: NodeJS.Timeout | undefined;
+	let wallTimer: NodeJS.Timeout | undefined;
+	let killTimer: NodeJS.Timeout | undefined;
+	let tripped = false;
+
+	const clearIdle = () => {
+		if (!idleTimer) return;
+		clearTimeout(idleTimer);
+		idleTimer = undefined;
+	};
+	const clearAll = () => {
+		clearIdle();
+		if (wallTimer) {
+			clearTimeout(wallTimer);
+			wallTimer = undefined;
+		}
+		if (killTimer) {
+			clearTimeout(killTimer);
+			killTimer = undefined;
+		}
+	};
+	const trip = (message: string) => {
+		if (tripped || params.isSettled()) return;
+		tripped = true;
+		clearIdle();
+		params.onTimeout(message);
+		trySignalChild(params.child, "SIGTERM");
+		killTimer = setTimeout(() => {
+			if (!params.isSettled()) trySignalChild(params.child, "SIGKILL");
+		}, config.killGraceMs);
+		killTimer.unref?.();
+	};
+	const scheduleIdle = () => {
+		clearIdle();
+		if (config.idleMs <= 0) return; // idle watchdog disabled
+		idleTimer = setTimeout(() => {
+			if (params.isToolActive?.()) {
+				// Do not kill a healthy attempt that is busy inside a slow tool call;
+				// re-arm the idle window and let the wall-clock cap bound the attempt.
+				scheduleIdle();
+				return;
+			}
+			trip(idleTimeoutMessage(config.idleMs));
+		}, config.idleMs);
+		idleTimer.unref?.();
+	};
+
+	scheduleIdle();
+	if (config.wallMs > 0) {
+		wallTimer = setTimeout(() => trip(wallTimeoutMessage(config.wallMs)), config.wallMs);
+		wallTimer.unref?.();
+	}
+
+	return {
+		activity() {
+			if (!tripped && !params.isSettled()) scheduleIdle();
+		},
+		clear: clearAll,
+	};
+}

package/dist/builtin/subagents/src/runs/shared/model-candidate-filter.ts

@@ -0,0 +1,53 @@
+import { splitKnownThinkingSuffix } from "../../shared/model-info.ts";
+import type { ModelAttempt } from "../../shared/types.ts";
+import type { AvailableModelInfo } from "./model-fallback.ts";
+
+export interface FilteredModelCandidates {
+	candidates: string[];
+	skippedAttempts: ModelAttempt[];
+}
+
+function providerFromModel(model: string | undefined): string | undefined {
+	if (!model) return undefined;
+	const { baseModel } = splitKnownThinkingSuffix(model);
+	const slash = baseModel.indexOf("/");
+	return slash > 0 ? baseModel.slice(0, slash) : undefined;
+}
+
+export function skippedModelAttempt(model: string, reason: string): ModelAttempt {
+	return {
+		model,
+		success: false,
+		exitCode: null,
+		error: reason,
+	};
+}
+
+export function filterSpawnableModelCandidates(params: {
+	candidates: string[];
+	availableModels?: AvailableModelInfo[];
+	knownModelProviders?: string[];
+	currentModel?: string;
+}): FilteredModelCandidates {
+	const providersWithAvailableAuth = new Set((params.availableModels ?? []).map((model) => model.provider));
+	const knownProviders = new Set(params.knownModelProviders ?? []);
+	const currentModel = params.currentModel;
+	const filtered: string[] = [];
+	const skippedAttempts: ModelAttempt[] = [];
+	for (const candidate of params.candidates) {
+		if (currentModel && candidate === currentModel) {
+			filtered.push(candidate);
+			continue;
+		}
+		const provider = providerFromModel(candidate);
+		const shouldSkip = provider !== undefined
+			&& knownProviders.has(provider)
+			&& !providersWithAvailableAuth.has(provider);
+		if (!shouldSkip) {
+			filtered.push(candidate);
+			continue;
+		}
+		skippedAttempts.push(skippedModelAttempt(candidate, `Skipped ${candidate}: provider '${provider}' has no configured API key/auth in the current session.`));
+	}
+	return { candidates: filtered, skippedAttempts };
+}

package/dist/builtin/subagents/src/runs/shared/model-fallback.ts

@@ -117,6 +117,7 @@ export type ModelFallbackFailureKind =
 	| "provider_unavailable"
 	| "network_timeout"
 	| "model_unavailable"
+	| "request_incompatible"
 	| "cancelled"
 	| "task_failure"
 	| "unknown";
@@ -144,6 +145,7 @@ const FALLBACKABLE_FAILURE_KINDS: ReadonlySet<ModelFallbackFailureKind> = new Se
 	"provider_unavailable",
 	"network_timeout",
 	"model_unavailable",
+	"request_incompatible",
 ]);
 
 function asRecord(value: unknown): Record<string, unknown> | undefined {
@@ -222,6 +224,9 @@ function normalizeCode(value: string | number | undefined): string | undefined {
 
 function kindFromStatus(status: number | undefined): ModelFallbackFailureKind | undefined {
 	switch (status) {
+		case 400:
+		case 413: case 422:
+			return "request_incompatible";
 		case 401:
 		case 403:
 			return "auth_on_candidate_provider";
@@ -237,6 +242,15 @@ function kindFromStatus(status: number | undefined): ModelFallbackFailureKind |
 	}
 }
 
+const REQUEST_INCOMPATIBLE_CODES: ReadonlySet<string> = new Set([
+	"invalid_request", "invalid_request_error", "bad_request", "context_length_exceeded",
+	"request_too_large", "too_large", "request_entity_too_large", "max_tokens",
+	"max_context_length", "context_window_exceeded",
+]);
+function requestIncompatibleKindFromCode(code: string | number | undefined): ModelFallbackFailureKind | undefined {
+	const normalizedCode = normalizeCode(code);
+	return normalizedCode !== undefined && REQUEST_INCOMPATIBLE_CODES.has(normalizedCode) ? "request_incompatible" : undefined;
+}
 function refusalKindFromCode(code: string | number | undefined): ModelFallbackFailureKind | undefined {
 	const normalizedCode = normalizeCode(code);
 	if (normalizedCode === undefined) return undefined;
@@ -258,6 +272,14 @@ function refusalKindFromCode(code: string | number | undefined): ModelFallbackFa
 	}
 }
 
+const CODE_KINDS_BY_KIND: ReadonlyArray<readonly [ModelFallbackFailureKind, ReadonlySet<string>]> = [
+	["auth_on_candidate_provider", new Set(["auth", "auth_required", "authentication_required", "unauthorized", "forbidden", "invalid_api_key", "missing_api_key", "invalid_key"])],
+	["network_timeout", new Set(["etimedout", "econnreset", "econnrefused", "enotfound", "eai_again", "fetch_failed", "network_error", "timeout", "timeout_error", "und_err_connect_timeout"])],
+	["rate_limit", new Set(["rate_limit", "rate_limit_exceeded", "too_many_requests", "quota_exceeded"])],
+	["cancelled", new Set(["aborterror", "aborted", "cancelled", "canceled"])],
+	["model_unavailable", new Set(["model_not_found", "model_unavailable", "model_disabled", "unknown_model"])],
+	["provider_unavailable", new Set(["provider_error", "api_error", "service_unavailable", "temporarily_unavailable", "overloaded"])],
+];
 function kindFromCode(code: string | number | undefined): ModelFallbackFailureKind | undefined {
 	const normalizedCode = normalizeCode(code);
 	if (normalizedCode === undefined) return undefined;
@@ -265,54 +287,19 @@ function kindFromCode(code: string | number | undefined): ModelFallbackFailureKi
 	if (refusalKind !== undefined) return refusalKind;
 	const httpStatusKind = kindFromStatus(integerFrom(code));
 	if (httpStatusKind !== undefined) return httpStatusKind;
-
-	switch (normalizedCode) {
-		case "auth":
-		case "auth_required":
-		case "authentication_required":
-		case "unauthorized":
-		case "forbidden":
-		case "invalid_api_key":
-		case "missing_api_key":
-		case "invalid_key":
-			return "auth_on_candidate_provider";
-		case "etimedout":
-		case "econnreset":
-		case "econnrefused":
-		case "enotfound":
-		case "eai_again":
-		case "fetch_failed":
-		case "network_error":
-		case "timeout":
-		case "timeout_error":
-		case "und_err_connect_timeout":
-			return "network_timeout";
-		case "rate_limit":
-		case "rate_limit_exceeded":
-		case "too_many_requests":
-		case "quota_exceeded":
-			return "rate_limit";
-		case "aborterror":
-		case "aborted":
-		case "cancelled":
-		case "canceled":
-			return "cancelled";
-		case "model_not_found":
-		case "model_unavailable":
-		case "model_disabled":
-		case "unknown_model":
-			return "model_unavailable";
-		case "provider_error":
-		case "api_error":
-		case "service_unavailable":
-		case "temporarily_unavailable":
-		case "overloaded":
-			return "provider_unavailable";
-		default:
-			return undefined;
-	}
-}
-
+	const requestIncompatibleKind = requestIncompatibleKindFromCode(code);
+	if (requestIncompatibleKind !== undefined) return requestIncompatibleKind;
+	return CODE_KINDS_BY_KIND.find(([_, codes]) => codes.has(normalizedCode))?.[0];
+}
+
+const REQUEST_INCOMPATIBLE_FAILURE_PATTERNS: readonly RegExp[] = [
+	/\bcontext[_\s-]?(?:length|window)(?:[_\s-]?exceeded)?\b/i,
+	/\bmax[_\s-]?(?:context|tokens?)\b/i,
+	/\b(?:request(?:[_\s-]?entity)?[_\s-]?too|too)[_\s-]?large\b/i,
+	/\b(?:unsupported|unknown|invalid)\s+(?:tool|parameter|function)\b/i,
+	/\b(?:tool|parameter|function)\s+(?:not\s+(?:supported|found|allowed)|unknown|invalid)\b/i,
+	/\b(?:invalid[_\s-]?request(?:[_\s-]?error)?|bad[_\s-]?request)\b/i,
+];
 const PROVIDER_REFUSAL_FAILURE_PATTERNS: readonly RegExp[] = [
 	/\bfinish[_\s-]?reason\b[^\n]*\bcontent[_\s-]?filter\b/i,
 	/\bcontent[_\s-]?filter(?:ed|ing)?\b/i,
@@ -335,6 +322,7 @@ function refusalKindFromMessage(message: string): ModelFallbackFailureKind | und
 function fallbackKindFromMessage(message: string, name: string | undefined): ModelFallbackFailureKind | undefined {
 	const refusalKind = refusalKindFromMessage(message);
 	if (refusalKind !== undefined) return refusalKind;
+	if (REQUEST_INCOMPATIBLE_FAILURE_PATTERNS.some((pattern) => pattern.test(message))) return "request_incompatible";
 	const nameKind = kindFromCode(name);
 	if (nameKind !== undefined) return nameKind;
 	if (!RETRYABLE_MODEL_FAILURE_PATTERNS.some((pattern) => pattern.test(message))) return undefined;
@@ -372,15 +360,21 @@ function makeSignal(
 	};
 }
 
-function fallbackSignalFromMessage(
+function fallbackSignalForMessage(
+	message: string | undefined,
 	value: unknown,
 	source: ModelFallbackFailureSource | undefined,
 ): ModelFallbackFailureSignal | undefined {
-	const message = modelFailureMessage(value);
-	if (!message.trim()) return undefined;
+	if (message === undefined || message.trim().length === 0) return undefined;
 	const kind = fallbackKindFromMessage(message, errorName(value));
 	return kind === undefined ? undefined : makeSignal(kind, value, source);
 }
+function fallbackSignalFromMessage(value: unknown, source: ModelFallbackFailureSource | undefined): ModelFallbackFailureSignal | undefined {
+	return fallbackSignalForMessage(modelFailureMessage(value), value, source);
+}
+function fallbackSignalFromDirectMessage(value: unknown, source: ModelFallbackFailureSource | undefined): ModelFallbackFailureSignal | undefined {
+	return fallbackSignalForMessage(directMessageFrom(value), value, source);
+}
 
 function classifyAssistantRefusalSignal(
 	value: unknown,
@@ -433,6 +427,12 @@ function structuredSignal(
 		if (isRefusalSignal(causeSignal)) return causeSignal;
 		firstNestedFallbackSignal ??= causeSignal;
 	}
+	// Direct-message classification runs after nested traversal so a generic wrapper
+	// ("invalid request"/"400 bad request") cannot mask a non-retryable nested signal.
+	// Kept in the same position as the workflows classifier so the two copies stay
+	// behaviorally parallel (see test/unit/model-fallback-classifier-conformance.test.ts).
+	const directMessageSignal = fallbackSignalFromDirectMessage(value, source);
+	if (directMessageSignal !== undefined) return directMessageSignal;
 	const statusKind = kindFromStatus(statusFrom(value));
 	if (statusKind !== undefined) return makeSignal(statusKind, value, source);
 	if (codeKind !== undefined) return makeSignal(codeKind, value, source);
@@ -463,8 +463,7 @@ function messageFromUnknown(value: unknown, seen: Set<unknown>): string | undefi
 	const status = statusFrom(value);
 	if (status !== undefined) return `Model request failed with status ${status}`;
 	const code = codeFrom(value);
-	if (code !== undefined) return `Model request failed with code ${String(code)}`;
-	return undefined;
+	return code !== undefined ? `Model request failed with code ${String(code)}` : undefined;
 }
 export function modelFailureMessage(error: unknown): string {
 	const structuredMessage = messageFromUnknown(error, new Set());

package/dist/builtin/subagents/src/runs/shared/parallel-utils.ts

@@ -1,4 +1,5 @@
 import type { CodexFastModeResolvedSettings, CodexFastModeScope } from "@bastani/atomic";
+import type { ModelAttempt } from "../../shared/types.ts";
 
 export interface RunnerSubagentStep {
 	agent: string;
@@ -13,6 +14,7 @@ export interface RunnerSubagentStep {
 	fastMode?: boolean;
 	modelFastModes?: Record<string, boolean>;
 	modelCandidates?: string[];
+	modelAttempts?: ModelAttempt[];
 	codexFastModeSettings?: CodexFastModeResolvedSettings;
 	codexFastModeScope?: CodexFastModeScope;
 	tools?: string[];

package/dist/builtin/subagents/src/shared/model-info.ts

@@ -27,6 +27,22 @@ export function toModelInfo(model: RegistryModelLike): ModelInfo {
 	};
 }
 
+interface KnownProviderRegistryLike {
+	getAvailable(): ReadonlyArray<{ provider: string }>;
+	/** Older hosts may not expose `getAll()`; callers probe at runtime and fall back
+	 * to `getAvailable()`. */
+	getAll?: () => ReadonlyArray<{ provider: string }>;
+}
+
+/** Collect the distinct providers of every model the registry knows about — including
+ * providers without configured auth — falling back to `getAvailable()` when the host
+ * registry does not expose `getAll()`. Used to pre-filter spawn candidates whose
+ * provider is known but keyless. */
+export function collectKnownModelProviders(registry: KnownProviderRegistryLike): string[] {
+	const models = typeof registry.getAll === "function" ? registry.getAll() : registry.getAvailable();
+	return [...new Set(models.map((model) => model.provider))];
+}
+
 /** Resolve the effective thinking level from a model string (which may contain a known suffix like `:high`)
  * and an explicit thinking config value. Returns `undefined` when no thinking is applicable
  * (e.g. no model was specified, or the model has no suffix and no config was provided). */

package/dist/builtin/subagents/src/shared/types-config.ts

@@ -80,6 +80,8 @@ export interface RunSyncOptions {
 	modelOverride?: string;
 	/** Registry models available for heuristic bare-model resolution */
 	availableModels?: Array<{ provider: string; id: string; fullId: string }>;
+	/** Providers known to the registry before auth filtering */
+	knownModelProviders?: string[];
 	/** Current parent-session provider to prefer for ambiguous bare model ids */
 	preferredModelProvider?: string;
 	/** Current parent-session model to try after configured fallback models */

package/dist/builtin/web-access/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bastani/web-access",
-  "version": "0.9.4-alpha.6",
+  "version": "0.9.4-alpha.7",
   "private": true,
   "description": "Atomic extension for web search, URL fetching, GitHub repo cloning, PDF/video extraction. Fork of: https://github.com/nicobailon/pi-web-access",
   "contributors": [

package/dist/builtin/workflows/CHANGELOG.md

@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 
 ## [Unreleased]
 
+## [0.9.4-alpha.7] - 2026-07-02
+
+### Fixed
+
+- Fixed workflow stage model fallback so request/context incompatibility failures (HTTP 400/413/422 bad/unprocessable/payload-too-large request, unsupported tool/parameter, context-length/context-window overflow, `invalid_request`/`bad_request`/`too_large` errors) advance the chain to the next candidate instead of stopping. When none of the configured candidates can serve the request, the stage now falls back to the current user-selected model. Refusals, content-filter/safety blocks, cancellations, and task failures still stop the chain ([#1580](https://github.com/bastani-inc/atomic/issues/1580)).
+
 ## [0.9.4-alpha.6] - 2026-07-01
 
 ### Changed

package/dist/builtin/workflows/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bastani/workflows",
-  "version": "0.9.4-alpha.6",
+  "version": "0.9.4-alpha.7",
   "private": true,
   "description": "Atomic extension for multi-stage workflow authoring and execution.",
   "contributors": [

package/dist/builtin/workflows/src/runs/shared/model-fallback-failures.ts

@@ -51,6 +51,7 @@ export type ModelFallbackFailureKind =
   | "network_timeout"
   | "transport_error"
   | "model_unavailable"
+  | "request_incompatible"
   | "cancelled"
   | "task_failure"
   | "unknown";
@@ -79,6 +80,7 @@ const FALLBACKABLE_FAILURE_KINDS: ReadonlySet<ModelFallbackFailureKind> = new Se
   "network_timeout",
   "transport_error",
   "model_unavailable",
+  "request_incompatible",
 ]);
 
 function asRecord(value: unknown): Record<string, unknown> | undefined {
@@ -157,6 +159,9 @@ function normalizeCode(value: string | number | undefined): string | undefined {
 
 function kindFromStatus(status: number | undefined): ModelFallbackFailureKind | undefined {
   switch (status) {
+    case 400:
+    case 413: case 422:
+      return "request_incompatible";
     case 401:
     case 403:
       return "auth_on_candidate_provider";
@@ -193,6 +198,15 @@ function refusalKindFromCode(code: string | number | undefined): ModelFallbackFa
   }
 }
 
+const REQUEST_INCOMPATIBLE_CODES: ReadonlySet<string> = new Set([
+  "invalid_request", "invalid_request_error", "bad_request", "context_length_exceeded",
+  "request_too_large", "too_large", "request_entity_too_large", "max_tokens",
+  "max_context_length", "context_window_exceeded",
+]);
+function requestIncompatibleKindFromCode(code: string | number | undefined): ModelFallbackFailureKind | undefined {
+  const normalizedCode = normalizeCode(code);
+  return normalizedCode !== undefined && REQUEST_INCOMPATIBLE_CODES.has(normalizedCode) ? "request_incompatible" : undefined;
+}
 function kindFromCode(code: string | number | undefined): ModelFallbackFailureKind | undefined {
   const normalizedCode = normalizeCode(code);
   if (normalizedCode === undefined) return undefined;
@@ -200,6 +214,8 @@ function kindFromCode(code: string | number | undefined): ModelFallbackFailureKi
   if (refusalKind !== undefined) return refusalKind;
   const httpStatusKind = kindFromStatus(integerFrom(code));
   if (httpStatusKind !== undefined) return httpStatusKind;
+  const requestIncompatibleKind = requestIncompatibleKindFromCode(code);
+  if (requestIncompatibleKind !== undefined) return requestIncompatibleKind;
 
   switch (normalizedCode) {
     case "auth":
@@ -248,6 +264,18 @@ function kindFromCode(code: string | number | undefined): ModelFallbackFailureKi
   }
 }
 
+const REQUEST_INCOMPATIBLE_FAILURE_PATTERNS: readonly RegExp[] = [
+  /\bcontext[_\s-]?length(?:[_\s-]?exceeded)?\b/i,
+  /\bcontext[_\s-]?window(?:[_\s-]?exceeded)?\b/i,
+  /\bmax[_\s-]?context\b/i,
+  /\bmax[_\s-]?tokens?\b/i,
+  /\brequest(?:[_\s-]?entity)?[_\s-]?too[_\s-]?large\b/i,
+  /\btoo[_\s-]?large\b/i,
+  /\b(?:unsupported|unknown|invalid)\s+(?:tool|parameter|function)\b/i,
+  /\b(?:tool|parameter|function)\s+(?:not\s+(?:supported|found|allowed)|unknown|invalid)\b/i,
+  /\binvalid[_\s-]?request(?:[_\s-]?error)?\b/i,
+  /\bbad[_\s-]?request\b/i,
+];
 const PROVIDER_REFUSAL_FAILURE_PATTERNS: readonly RegExp[] = [
   /\bfinish[_\s-]?reason\b[^\n]*\bcontent[_\s-]?filter\b/i,
   /\bcontent[_\s-]?filter(?:ed|ing)?\b/i,
@@ -283,6 +311,7 @@ function fallbackKindFromMessage(message: string, name: string | undefined): Mod
   if (refusalKind !== undefined) return refusalKind;
   const transportOutageKind = transportOutageKindFromMessage(message);
   if (transportOutageKind !== undefined) return transportOutageKind;
+  if (REQUEST_INCOMPATIBLE_FAILURE_PATTERNS.some((pattern) => pattern.test(message))) return "request_incompatible";
   const nameKind = kindFromCode(name);
   if (nameKind !== undefined) return nameKind;
   if (!RETRYABLE_MODEL_FAILURE_PATTERNS.some((pattern) => pattern.test(message))) return undefined;
@@ -371,9 +400,6 @@ function structuredSignal(
   const directRefusalSignal = classifyAssistantRefusalSignal(value, source);
   if (directRefusalSignal !== undefined) return directRefusalSignal;
 
-  const directMessageSignal = fallbackSignalFromDirectMessage(value, source);
-  if (directMessageSignal !== undefined) return directMessageSignal;
-
   const codeKind = kindFromCode(codeFrom(value));
   const nameKind = kindFromCode(errorName(value));
   if (codeKind === "cancelled" || nameKind === "cancelled") return makeSignal("cancelled", value, source);
@@ -387,7 +413,6 @@ function structuredSignal(
     if (isRefusalSignal(diagnosticSignal)) return diagnosticSignal;
     firstNestedFallbackSignal ??= diagnosticSignal;
   }
-
   const cause = causeOf(value);
   const causeSignal = structuredSignal(cause, nestedSeen, source)
     ?? fallbackSignalFromMessage(cause, source);
@@ -396,6 +421,11 @@ function structuredSignal(
     firstNestedFallbackSignal ??= causeSignal;
   }
 
+  // Direct-message classification runs after nested traversal so a generic wrapper
+  // ("invalid request"/"400 bad request") cannot mask a non-retryable nested signal.
+  const directMessageSignal = fallbackSignalFromDirectMessage(value, source);
+  if (directMessageSignal !== undefined) return directMessageSignal;
+
   const statusKind = kindFromStatus(statusFrom(value));
   if (statusKind !== undefined) return makeSignal(statusKind, value, source);
   if (codeKind !== undefined) return makeSignal(codeKind, value, source);

package/dist/core/agent-session-extension-bindings.d.ts

@@ -17,6 +17,7 @@ export declare function buildExtensionResourcePaths(this: AgentSession, entries:
 }>;
 export declare function getExtensionSourceLabel(this: AgentSession, extensionPath: string): string;
 export declare function _applyExtensionBindings(this: AgentSession, runner: ExtensionRunner): void;
+export declare function refreshCurrentModelFromRegistry(this: AgentSession): void;
 export declare function _refreshCurrentModelFromRegistry(this: AgentSession): void;
 export declare function _bindExtensionCore(this: AgentSession, runner: ExtensionRunner): void;
 export declare function reload(this: AgentSession): Promise<void>;
@@ -30,6 +31,7 @@ export declare const agentSessionExtensionBindingsMethods: {
     buildExtensionResourcePaths: typeof buildExtensionResourcePaths;
     getExtensionSourceLabel: typeof getExtensionSourceLabel;
     _applyExtensionBindings: typeof _applyExtensionBindings;
+    refreshCurrentModelFromRegistry: typeof refreshCurrentModelFromRegistry;
     _refreshCurrentModelFromRegistry: typeof _refreshCurrentModelFromRegistry;
     _bindExtensionCore: typeof _bindExtensionCore;
     reload: typeof reload;

package/dist/core/agent-session-extension-bindings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-session-extension-bindings.d.ts","sourceRoot":"","sources":["../../src/core/agent-session-extension-bindings.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,2BAA2B,IAAI,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC9F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAK7D,wBAAsB,cAAc,CAAC,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBnG;AAGD,wBAAsB,6BAA6B,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,GAAG,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAuBnH;AAGD,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,KAAK,CAAC;IAC/H,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,WAAW,CAAC;QAAC,MAAM,EAAE,WAAW,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CACxF,CAAC,CAcD;AAGD,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,GAAG,MAAM,CAOzF;AAGD,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,eAAe,GAAG,IAAI,CAQzF;AAGD,wBAAgB,gCAAgC,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI,CAiBzE;AAGD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,eAAe,GAAG,IAAI,CA+GpF;AAGD,wBAAsB,MAAM,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAqB9D;AAMD;;;GAGG;AAEH,eAAO,MAAM,oCAAoC;;;;;;;;;CAShD,CAAC","sourcesContent":["import { basename, dirname } from \"node:path\";\nimport { resetApiProviders } from \"@earendil-works/pi-ai/compat\";\nimport type { AgentSessionInternalSurface as AgentSession } from \"./agent-session-methods.ts\";\nimport type { ExtensionBindings } from \"./agent-session-types.ts\";\nimport type { ExtensionRunner } from \"./extensions/index.ts\";\nimport type { ResourceExtensionPaths } from \"./resource-loader.ts\";\nimport { emitSessionShutdownEvent } from \"./extensions/runner.ts\";\nimport type { SlashCommandInfo } from \"./slash-commands.ts\";\n\nexport async function bindExtensions(this: AgentSession, bindings: ExtensionBindings): Promise<void> {\n\tif (bindings.uiContext !== undefined) {\n\t\tthis._extensionUIContext = bindings.uiContext;\n\t}\n\tif (bindings.mode !== undefined) {\n\t\tthis._extensionMode = bindings.mode;\n\t}\n\tif (bindings.commandContextActions !== undefined) {\n\t\tthis._extensionCommandContextActions = bindings.commandContextActions;\n\t}\n\tif (bindings.shutdownHandler !== undefined) {\n\t\tthis._extensionShutdownHandler = bindings.shutdownHandler;\n\t}\n\tif (bindings.onError !== undefined) {\n\t\tthis._extensionErrorListener = bindings.onError;\n\t}\n\n\tthis._applyExtensionBindings(this._extensionRunner);\n\tawait this._extensionRunner.emit(this._sessionStartEvent);\n\tawait this.extendResourcesFromExtensions(this._sessionStartEvent.reason === \"reload\" ? \"reload\" : \"startup\");\n}\n\n\nexport async function extendResourcesFromExtensions(this: AgentSession, reason: \"startup\" | \"reload\"): Promise<void> {\n\tif (!this._extensionRunner.hasHandlers(\"resources_discover\")) {\n\t\treturn;\n\t}\n\n\tconst { skillPaths, promptPaths, themePaths } = await this._extensionRunner.emitResourcesDiscover(\n\t\tthis._cwd,\n\t\treason,\n\t);\n\n\tif (skillPaths.length === 0 && promptPaths.length === 0 && themePaths.length === 0) {\n\t\treturn;\n\t}\n\n\tconst extensionPaths: ResourceExtensionPaths = {\n\t\tskillPaths: this.buildExtensionResourcePaths(skillPaths),\n\t\tpromptPaths: this.buildExtensionResourcePaths(promptPaths),\n\t\tthemePaths: this.buildExtensionResourcePaths(themePaths),\n\t};\n\n\tthis._resourceLoader.extendResources(extensionPaths);\n\tthis._baseSystemPrompt = this._rebuildSystemPrompt(this.getActiveToolNames());\n\tthis.agent.state.systemPrompt = this._systemPromptOverride ?? this._baseSystemPrompt;\n}\n\n\nexport function buildExtensionResourcePaths(this: AgentSession, entries: Array<{ path: string; extensionPath: string }>): Array<{\n\tpath: string;\n\tmetadata: { source: string; scope: \"temporary\"; origin: \"top-level\"; baseDir?: string };\n}> {\n\treturn entries.map((entry) => {\n\t\tconst source = this.getExtensionSourceLabel(entry.extensionPath);\n\t\tconst baseDir = entry.extensionPath.startsWith(\"<\") ? undefined : dirname(entry.extensionPath);\n\t\treturn {\n\t\t\tpath: entry.path,\n\t\t\tmetadata: {\n\t\t\t\tsource,\n\t\t\t\tscope: \"temporary\",\n\t\t\t\torigin: \"top-level\",\n\t\t\t\tbaseDir,\n\t\t\t},\n\t\t};\n\t});\n}\n\n\nexport function getExtensionSourceLabel(this: AgentSession, extensionPath: string): string {\n\tif (extensionPath.startsWith(\"<\")) {\n\t\treturn `extension:${extensionPath.replace(/[<>]/g, \"\")}`;\n\t}\n\tconst base = basename(extensionPath);\n\tconst name = base.replace(/\\.(ts|js)$/, \"\");\n\treturn `extension:${name}`;\n}\n\n\nexport function _applyExtensionBindings(this: AgentSession, runner: ExtensionRunner): void {\n\trunner.setUIContext(this._extensionUIContext, this._extensionMode);\n\trunner.bindCommandContext(this._extensionCommandContextActions);\n\n\tthis._extensionErrorUnsubscriber?.();\n\tthis._extensionErrorUnsubscriber = this._extensionErrorListener\n\t\t? runner.onError(this._extensionErrorListener)\n\t\t: undefined;\n}\n\n\nexport function _refreshCurrentModelFromRegistry(this: AgentSession): void {\n\tconst currentModel = this.model;\n\tif (!currentModel) {\n\t\treturn;\n\t}\n\n\tconst refreshedModel = this._modelRegistry.find(currentModel.provider, currentModel.id);\n\tif (!refreshedModel || refreshedModel === currentModel) {\n\t\treturn;\n\t}\n\n\tconst replay = this._getResumeContextWindowReplayForModel(refreshedModel);\n\tthis.agent.state.model = replay.model;\n\tif (currentModel.contextWindow !== replay.contextWindow) {\n\t\tthis._emit({ type: \"context_window_changed\", contextWindow: replay.contextWindow });\n\t}\n\tthis._refreshBaseSystemPromptFromActiveTools();\n}\n\n\nexport function _bindExtensionCore(this: AgentSession, runner: ExtensionRunner): void {\n\tconst getCommands = (): SlashCommandInfo[] => {\n\t\tconst extensionCommands: SlashCommandInfo[] = runner.getRegisteredCommands().map((command) => ({\n\t\t\tname: command.invocationName,\n\t\t\tdescription: command.description,\n\t\t\tsource: \"extension\",\n\t\t\tsourceInfo: command.sourceInfo,\n\t\t}));\n\n\t\tconst templates: SlashCommandInfo[] = this.promptTemplates.map((template) => ({\n\t\t\tname: template.name,\n\t\t\tdescription: template.description,\n\t\t\tsource: \"prompt\",\n\t\t\tsourceInfo: template.sourceInfo,\n\t\t}));\n\n\t\tconst skills: SlashCommandInfo[] = this._resourceLoader.getSkills().skills.map((skill) => ({\n\t\t\tname: `skill:${skill.name}`,\n\t\t\tdescription: skill.description,\n\t\t\tsource: \"skill\",\n\t\t\tsourceInfo: skill.sourceInfo,\n\t\t}));\n\n\t\treturn [...extensionCommands, ...templates, ...skills];\n\t};\n\n\trunner.bindCore(\n\t\t{\n\t\t\tsendMessage: (message, options) => {\n\t\t\t\tthis.sendCustomMessage(message, options).catch((err) => {\n\t\t\t\t\trunner.emitError({\n\t\t\t\t\t\textensionPath: \"<runtime>\",\n\t\t\t\t\t\tevent: \"send_message\",\n\t\t\t\t\t\terror: err instanceof Error ? err.message : String(err),\n\t\t\t\t\t});\n\t\t\t\t});\n\t\t\t},\n\t\t\tsendUserMessage: (content, options) => {\n\t\t\t\tthis.sendUserMessage(content, options).catch((err) => {\n\t\t\t\t\trunner.emitError({\n\t\t\t\t\t\textensionPath: \"<runtime>\",\n\t\t\t\t\t\tevent: \"send_user_message\",\n\t\t\t\t\t\terror: err instanceof Error ? err.message : String(err),\n\t\t\t\t\t});\n\t\t\t\t});\n\t\t\t},\n\t\t\tappendEntry: (customType, data) => {\n\t\t\t\tthis.sessionManager.appendCustomEntry(customType, data);\n\t\t\t},\n\t\t\tsetSessionName: (name) => {\n\t\t\t\tthis.setSessionName(name);\n\t\t\t},\n\t\t\tgetSessionName: () => {\n\t\t\t\treturn this.sessionManager.getSessionName();\n\t\t\t},\n\t\t\tsetLabel: (entryId, label) => {\n\t\t\t\tthis.sessionManager.appendLabelChange(entryId, label);\n\t\t\t},\n\t\t\tgetActiveTools: () => this.getActiveToolNames(),\n\t\t\tgetAllTools: () => this.getAllTools(),\n\t\t\tsetActiveTools: (toolNames) => this.setActiveToolsByName(toolNames),\n\t\t\trefreshTools: () => this._refreshToolRegistry(),\n\t\t\tgetCommands,\n\t\t\tsetModel: async (model) => {\n\t\t\t\tif (!this.modelRegistry.hasConfiguredAuth(model)) return false;\n\t\t\t\tawait this.setModel(model);\n\t\t\t\treturn true;\n\t\t\t},\n\t\t\tgetThinkingLevel: () => this.thinkingLevel,\n\t\t\tsetThinkingLevel: (level) => this.setThinkingLevel(level),\n\t\t},\n\t\t{\n\t\t\tgetModel: () => this.model,\n\t\t\tisIdle: () => !this.isStreaming,\n\t\t\tisProjectTrusted: () => this.settingsManager.isProjectTrusted(),\n\t\t\tgetSignal: () => this.agent.signal,\n\t\t\tabort: () => this.abort(),\n\t\t\thasPendingMessages: () => this.pendingMessageCount > 0,\n\t\t\tshutdown: () => {\n\t\t\t\tthis._extensionShutdownHandler?.();\n\t\t\t},\n\t\t\tgetContextUsage: () => this.getContextUsage(),\n\t\t\tcompact: (options) => {\n\t\t\t\tvoid (async () => {\n\t\t\t\t\ttry {\n\t\t\t\t\t\tconst result = await this.compact({\n\t\t\t\t\t\t\t...(options?.compression_ratio === undefined ? {} : { compression_ratio: options.compression_ratio }),\n\t\t\t\t\t\t\t...(options?.preserve_recent === undefined ? {} : { preserve_recent: options.preserve_recent }),\n\t\t\t\t\t\t\t...(options?.query === undefined ? {} : { query: options.query }),\n\t\t\t\t\t\t});\n\t\t\t\t\t\toptions?.onComplete?.(result);\n\t\t\t\t\t} catch (error) {\n\t\t\t\t\t\tconst err = error instanceof Error ? error : new Error(String(error));\n\t\t\t\t\t\toptions?.onError?.(err);\n\t\t\t\t\t}\n\t\t\t\t})();\n\t\t\t},\n\t\t\tgetSystemPrompt: () => this.systemPrompt,\n\t\t\tgetSystemPromptOptions: () => this._baseSystemPromptOptions,\n\t\t},\n\t\t{\n\t\t\tregisterProvider: (name, config) => {\n\t\t\t\tthis._modelRegistry.registerProvider(name, config);\n\t\t\t\tthis._refreshCurrentModelFromRegistry();\n\t\t\t},\n\t\t\tunregisterProvider: (name) => {\n\t\t\t\tthis._modelRegistry.unregisterProvider(name);\n\t\t\t\tthis._refreshCurrentModelFromRegistry();\n\t\t\t},\n\t\t},\n\t);\n}\n\n\nexport async function reload(this: AgentSession): Promise<void> {\n\tconst previousFlagValues = this._extensionRunner.getFlagValues();\n\tawait emitSessionShutdownEvent(this._extensionRunner, { type: \"session_shutdown\", reason: \"reload\" });\n\tawait this.settingsManager.reload();\n\tresetApiProviders();\n\tawait this._resourceLoader.reload();\n\tthis._buildRuntime({\n\t\tactiveToolNames: this.getActiveToolNames(),\n\t\tflagValues: previousFlagValues,\n\t\tincludeAllExtensionTools: true,\n\t});\n\n\tconst hasBindings =\n\t\tthis._extensionUIContext ||\n\t\tthis._extensionCommandContextActions ||\n\t\tthis._extensionShutdownHandler ||\n\t\tthis._extensionErrorListener;\n\tif (hasBindings) {\n\t\tawait this._extensionRunner.emit({ type: \"session_start\", reason: \"reload\" });\n\t\tawait this.extendResourcesFromExtensions(\"reload\");\n\t}\n}\n\n// =========================================================================\n// Auto-Retry\n// =========================================================================\n\n/**\n * Check if an error is retryable (overloaded, rate limit, server errors).\n * Context overflow errors are NOT retryable (handled by compaction instead).\n */\n\nexport const agentSessionExtensionBindingsMethods = {\n\tbindExtensions,\n\textendResourcesFromExtensions,\n\tbuildExtensionResourcePaths,\n\tgetExtensionSourceLabel,\n\t_applyExtensionBindings,\n\t_refreshCurrentModelFromRegistry,\n\t_bindExtensionCore,\n\treload,\n};\n"]}
+{"version":3,"file":"agent-session-extension-bindings.d.ts","sourceRoot":"","sources":["../../src/core/agent-session-extension-bindings.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,2BAA2B,IAAI,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC9F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAK7D,wBAAsB,cAAc,CAAC,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBnG;AAGD,wBAAsB,6BAA6B,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,GAAG,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAuBnH;AAGD,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,KAAK,CAAC;IAC/H,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,WAAW,CAAC;QAAC,MAAM,EAAE,WAAW,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CACxF,CAAC,CAcD;AAGD,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,GAAG,MAAM,CAOzF;AAGD,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,eAAe,GAAG,IAAI,CAQzF;AAGD,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI,CAExE;AAED,wBAAgB,gCAAgC,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI,CAqBzE;AAGD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,eAAe,GAAG,IAAI,CA+GpF;AAGD,wBAAsB,MAAM,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAqB9D;AAMD;;;GAGG;AAEH,eAAO,MAAM,oCAAoC;;;;;;;;;;CAUhD,CAAC","sourcesContent":["import { basename, dirname } from \"node:path\";\nimport { resetApiProviders } from \"@earendil-works/pi-ai/compat\";\nimport type { AgentSessionInternalSurface as AgentSession } from \"./agent-session-methods.ts\";\nimport type { ExtensionBindings } from \"./agent-session-types.ts\";\nimport type { ExtensionRunner } from \"./extensions/index.ts\";\nimport type { ResourceExtensionPaths } from \"./resource-loader.ts\";\nimport { emitSessionShutdownEvent } from \"./extensions/runner.ts\";\nimport type { SlashCommandInfo } from \"./slash-commands.ts\";\n\nexport async function bindExtensions(this: AgentSession, bindings: ExtensionBindings): Promise<void> {\n\tif (bindings.uiContext !== undefined) {\n\t\tthis._extensionUIContext = bindings.uiContext;\n\t}\n\tif (bindings.mode !== undefined) {\n\t\tthis._extensionMode = bindings.mode;\n\t}\n\tif (bindings.commandContextActions !== undefined) {\n\t\tthis._extensionCommandContextActions = bindings.commandContextActions;\n\t}\n\tif (bindings.shutdownHandler !== undefined) {\n\t\tthis._extensionShutdownHandler = bindings.shutdownHandler;\n\t}\n\tif (bindings.onError !== undefined) {\n\t\tthis._extensionErrorListener = bindings.onError;\n\t}\n\n\tthis._applyExtensionBindings(this._extensionRunner);\n\tawait this._extensionRunner.emit(this._sessionStartEvent);\n\tawait this.extendResourcesFromExtensions(this._sessionStartEvent.reason === \"reload\" ? \"reload\" : \"startup\");\n}\n\n\nexport async function extendResourcesFromExtensions(this: AgentSession, reason: \"startup\" | \"reload\"): Promise<void> {\n\tif (!this._extensionRunner.hasHandlers(\"resources_discover\")) {\n\t\treturn;\n\t}\n\n\tconst { skillPaths, promptPaths, themePaths } = await this._extensionRunner.emitResourcesDiscover(\n\t\tthis._cwd,\n\t\treason,\n\t);\n\n\tif (skillPaths.length === 0 && promptPaths.length === 0 && themePaths.length === 0) {\n\t\treturn;\n\t}\n\n\tconst extensionPaths: ResourceExtensionPaths = {\n\t\tskillPaths: this.buildExtensionResourcePaths(skillPaths),\n\t\tpromptPaths: this.buildExtensionResourcePaths(promptPaths),\n\t\tthemePaths: this.buildExtensionResourcePaths(themePaths),\n\t};\n\n\tthis._resourceLoader.extendResources(extensionPaths);\n\tthis._baseSystemPrompt = this._rebuildSystemPrompt(this.getActiveToolNames());\n\tthis.agent.state.systemPrompt = this._systemPromptOverride ?? this._baseSystemPrompt;\n}\n\n\nexport function buildExtensionResourcePaths(this: AgentSession, entries: Array<{ path: string; extensionPath: string }>): Array<{\n\tpath: string;\n\tmetadata: { source: string; scope: \"temporary\"; origin: \"top-level\"; baseDir?: string };\n}> {\n\treturn entries.map((entry) => {\n\t\tconst source = this.getExtensionSourceLabel(entry.extensionPath);\n\t\tconst baseDir = entry.extensionPath.startsWith(\"<\") ? undefined : dirname(entry.extensionPath);\n\t\treturn {\n\t\t\tpath: entry.path,\n\t\t\tmetadata: {\n\t\t\t\tsource,\n\t\t\t\tscope: \"temporary\",\n\t\t\t\torigin: \"top-level\",\n\t\t\t\tbaseDir,\n\t\t\t},\n\t\t};\n\t});\n}\n\n\nexport function getExtensionSourceLabel(this: AgentSession, extensionPath: string): string {\n\tif (extensionPath.startsWith(\"<\")) {\n\t\treturn `extension:${extensionPath.replace(/[<>]/g, \"\")}`;\n\t}\n\tconst base = basename(extensionPath);\n\tconst name = base.replace(/\\.(ts|js)$/, \"\");\n\treturn `extension:${name}`;\n}\n\n\nexport function _applyExtensionBindings(this: AgentSession, runner: ExtensionRunner): void {\n\trunner.setUIContext(this._extensionUIContext, this._extensionMode);\n\trunner.bindCommandContext(this._extensionCommandContextActions);\n\n\tthis._extensionErrorUnsubscriber?.();\n\tthis._extensionErrorUnsubscriber = this._extensionErrorListener\n\t\t? runner.onError(this._extensionErrorListener)\n\t\t: undefined;\n}\n\n\nexport function refreshCurrentModelFromRegistry(this: AgentSession): void {\n\tthis._refreshCurrentModelFromRegistry();\n}\n\nexport function _refreshCurrentModelFromRegistry(this: AgentSession): void {\n\tconst currentModel = this.model;\n\tif (!currentModel) {\n\t\treturn;\n\t}\n\n\tconst refreshedModel = this._modelRegistry.find(currentModel.provider, currentModel.id);\n\tif (!refreshedModel || refreshedModel === currentModel) {\n\t\treturn;\n\t}\n\n\tconst previousModel = currentModel;\n\tconst previousThinkingLevel = this.thinkingLevel;\n\tconst replay = this._getResumeContextWindowReplayForModel(refreshedModel);\n\tthis.agent.state.model = replay.model;\n\tif (currentModel.contextWindow !== replay.contextWindow) {\n\t\tthis._emit({ type: \"context_window_changed\", contextWindow: replay.contextWindow });\n\t}\n\tthis.setThinkingLevel(previousThinkingLevel);\n\tthis._refreshBaseSystemPromptFromActiveTools();\n\tthis._emit({ type: \"model_changed\", model: replay.model, previousModel, source: \"restore\" });\n}\n\n\nexport function _bindExtensionCore(this: AgentSession, runner: ExtensionRunner): void {\n\tconst getCommands = (): SlashCommandInfo[] => {\n\t\tconst extensionCommands: SlashCommandInfo[] = runner.getRegisteredCommands().map((command) => ({\n\t\t\tname: command.invocationName,\n\t\t\tdescription: command.description,\n\t\t\tsource: \"extension\",\n\t\t\tsourceInfo: command.sourceInfo,\n\t\t}));\n\n\t\tconst templates: SlashCommandInfo[] = this.promptTemplates.map((template) => ({\n\t\t\tname: template.name,\n\t\t\tdescription: template.description,\n\t\t\tsource: \"prompt\",\n\t\t\tsourceInfo: template.sourceInfo,\n\t\t}));\n\n\t\tconst skills: SlashCommandInfo[] = this._resourceLoader.getSkills().skills.map((skill) => ({\n\t\t\tname: `skill:${skill.name}`,\n\t\t\tdescription: skill.description,\n\t\t\tsource: \"skill\",\n\t\t\tsourceInfo: skill.sourceInfo,\n\t\t}));\n\n\t\treturn [...extensionCommands, ...templates, ...skills];\n\t};\n\n\trunner.bindCore(\n\t\t{\n\t\t\tsendMessage: (message, options) => {\n\t\t\t\tthis.sendCustomMessage(message, options).catch((err) => {\n\t\t\t\t\trunner.emitError({\n\t\t\t\t\t\textensionPath: \"<runtime>\",\n\t\t\t\t\t\tevent: \"send_message\",\n\t\t\t\t\t\terror: err instanceof Error ? err.message : String(err),\n\t\t\t\t\t});\n\t\t\t\t});\n\t\t\t},\n\t\t\tsendUserMessage: (content, options) => {\n\t\t\t\tthis.sendUserMessage(content, options).catch((err) => {\n\t\t\t\t\trunner.emitError({\n\t\t\t\t\t\textensionPath: \"<runtime>\",\n\t\t\t\t\t\tevent: \"send_user_message\",\n\t\t\t\t\t\terror: err instanceof Error ? err.message : String(err),\n\t\t\t\t\t});\n\t\t\t\t});\n\t\t\t},\n\t\t\tappendEntry: (customType, data) => {\n\t\t\t\tthis.sessionManager.appendCustomEntry(customType, data);\n\t\t\t},\n\t\t\tsetSessionName: (name) => {\n\t\t\t\tthis.setSessionName(name);\n\t\t\t},\n\t\t\tgetSessionName: () => {\n\t\t\t\treturn this.sessionManager.getSessionName();\n\t\t\t},\n\t\t\tsetLabel: (entryId, label) => {\n\t\t\t\tthis.sessionManager.appendLabelChange(entryId, label);\n\t\t\t},\n\t\t\tgetActiveTools: () => this.getActiveToolNames(),\n\t\t\tgetAllTools: () => this.getAllTools(),\n\t\t\tsetActiveTools: (toolNames) => this.setActiveToolsByName(toolNames),\n\t\t\trefreshTools: () => this._refreshToolRegistry(),\n\t\t\tgetCommands,\n\t\t\tsetModel: async (model) => {\n\t\t\t\tif (!this.modelRegistry.hasConfiguredAuth(model)) return false;\n\t\t\t\tawait this.setModel(model);\n\t\t\t\treturn true;\n\t\t\t},\n\t\t\tgetThinkingLevel: () => this.thinkingLevel,\n\t\t\tsetThinkingLevel: (level) => this.setThinkingLevel(level),\n\t\t},\n\t\t{\n\t\t\tgetModel: () => this.model,\n\t\t\tisIdle: () => !this.isStreaming,\n\t\t\tisProjectTrusted: () => this.settingsManager.isProjectTrusted(),\n\t\t\tgetSignal: () => this.agent.signal,\n\t\t\tabort: () => this.abort(),\n\t\t\thasPendingMessages: () => this.pendingMessageCount > 0,\n\t\t\tshutdown: () => {\n\t\t\t\tthis._extensionShutdownHandler?.();\n\t\t\t},\n\t\t\tgetContextUsage: () => this.getContextUsage(),\n\t\t\tcompact: (options) => {\n\t\t\t\tvoid (async () => {\n\t\t\t\t\ttry {\n\t\t\t\t\t\tconst result = await this.compact({\n\t\t\t\t\t\t\t...(options?.compression_ratio === undefined ? {} : { compression_ratio: options.compression_ratio }),\n\t\t\t\t\t\t\t...(options?.preserve_recent === undefined ? {} : { preserve_recent: options.preserve_recent }),\n\t\t\t\t\t\t\t...(options?.query === undefined ? {} : { query: options.query }),\n\t\t\t\t\t\t});\n\t\t\t\t\t\toptions?.onComplete?.(result);\n\t\t\t\t\t} catch (error) {\n\t\t\t\t\t\tconst err = error instanceof Error ? error : new Error(String(error));\n\t\t\t\t\t\toptions?.onError?.(err);\n\t\t\t\t\t}\n\t\t\t\t})();\n\t\t\t},\n\t\t\tgetSystemPrompt: () => this.systemPrompt,\n\t\t\tgetSystemPromptOptions: () => this._baseSystemPromptOptions,\n\t\t},\n\t\t{\n\t\t\tregisterProvider: (name, config) => {\n\t\t\t\tthis._modelRegistry.registerProvider(name, config);\n\t\t\t\tthis.refreshCurrentModelFromRegistry();\n\t\t\t},\n\t\t\tunregisterProvider: (name) => {\n\t\t\t\tthis._modelRegistry.unregisterProvider(name);\n\t\t\t\tthis.refreshCurrentModelFromRegistry();\n\t\t\t},\n\t\t},\n\t);\n}\n\n\nexport async function reload(this: AgentSession): Promise<void> {\n\tconst previousFlagValues = this._extensionRunner.getFlagValues();\n\tawait emitSessionShutdownEvent(this._extensionRunner, { type: \"session_shutdown\", reason: \"reload\" });\n\tawait this.settingsManager.reload();\n\tresetApiProviders();\n\tawait this._resourceLoader.reload();\n\tthis._buildRuntime({\n\t\tactiveToolNames: this.getActiveToolNames(),\n\t\tflagValues: previousFlagValues,\n\t\tincludeAllExtensionTools: true,\n\t});\n\n\tconst hasBindings =\n\t\tthis._extensionUIContext ||\n\t\tthis._extensionCommandContextActions ||\n\t\tthis._extensionShutdownHandler ||\n\t\tthis._extensionErrorListener;\n\tif (hasBindings) {\n\t\tawait this._extensionRunner.emit({ type: \"session_start\", reason: \"reload\" });\n\t\tawait this.extendResourcesFromExtensions(\"reload\");\n\t}\n}\n\n// =========================================================================\n// Auto-Retry\n// =========================================================================\n\n/**\n * Check if an error is retryable (overloaded, rate limit, server errors).\n * Context overflow errors are NOT retryable (handled by compaction instead).\n */\n\nexport const agentSessionExtensionBindingsMethods = {\n\tbindExtensions,\n\textendResourcesFromExtensions,\n\tbuildExtensionResourcePaths,\n\tgetExtensionSourceLabel,\n\t_applyExtensionBindings,\n\trefreshCurrentModelFromRegistry,\n\t_refreshCurrentModelFromRegistry,\n\t_bindExtensionCore,\n\treload,\n};\n"]}