@byfriends/sdk 0.2.5 → 0.3.0

package/dist/index.mjs

@@ -8375,47 +8375,202 @@ function resolveAuthBackedClient(state, auth, build) {
 	return build(auth);
 }
 //#endregion
-//#region ../kosong/src/providers/anthropic.ts
+//#region ../kosong/src/providers/base-chat-provider.ts
 /**
-* Normalize an Anthropic `stop_reason` string to the unified
-* {@link FinishReason} enum.
+* Abstract base implementing the SDK-agnostic ChatProvider boilerplate.
 *
-* Source: `message.stop_reason` (non-stream) or the last `message_delta`
-* event's `delta.stop_reason` (stream).
+* Subclasses must implement:
+* - `generate(...)` — the streaming/dispatch loop (protocol-specific)
+* - `createRawClient(auth, defaultHeaders)` — `new OpenAI(...)` / `new Anthropic(...)` / etc.
+* - `thinkingEffort` getter — per-provider effort mapping
+* - `getCapability(model?)` — per-provider capability registry lookup
+* - `withThinking(effort)` — per-provider thinking configuration
+*
+* Subclasses inherit: `_clone`, `withGenerationKwargs`, `modelName`,
+* `modelParameters`, and the `_createClient` shell.
 */
-function normalizeAnthropicStopReason(raw) {
-	if (raw === null || raw === void 0) return {
-		finishReason: null,
-		rawFinishReason: null
-	};
-	switch (raw) {
-		case "end_turn":
-		case "stop_sequence": return {
-			finishReason: "completed",
-			rawFinishReason: raw
-		};
-		case "max_tokens": return {
-			finishReason: "truncated",
-			rawFinishReason: raw
-		};
-		case "tool_use": return {
-			finishReason: "tool_calls",
-			rawFinishReason: raw
+var BaseChatProvider = class {
+	_model;
+	_generationKwargs;
+	_apiKey;
+	_baseUrl;
+	_defaultHeaders;
+	_client;
+	_clientFactory;
+	constructor(_model, _generationKwargs, _apiKey = void 0, _baseUrl = "", _defaultHeaders = void 0, _client = void 0, _clientFactory = void 0) {
+		this._model = _model;
+		this._generationKwargs = _generationKwargs;
+		this._apiKey = _apiKey;
+		this._baseUrl = _baseUrl;
+		this._defaultHeaders = _defaultHeaders;
+		this._client = _client;
+		this._clientFactory = _clientFactory;
+	}
+	get modelName() {
+		return this._model;
+	}
+	get modelParameters() {
+		return {
+			model: this._model,
+			...this._generationKwargs
 		};
-		case "pause_turn": return {
-			finishReason: "paused",
-			rawFinishReason: raw
+	}
+	/**
+	* Return a shallow copy of this provider with `kwargs` merged into the
+	* generation-keyword bag. The clone shares transport state (client) with
+	* the original; only `_generationKwargs` is deep-copied.
+	*/
+	withGenerationKwargs(kwargs) {
+		const clone = this._clone();
+		clone._generationKwargs = {
+			...clone._generationKwargs,
+			...kwargs
 		};
-		case "refusal": return {
-			finishReason: "filtered",
-			rawFinishReason: raw
+		return clone;
+	}
+	/**
+	* Shallow clone preserving prototype and instance state, with a fresh
+	* `_generationKwargs` copy. Subclasses with extra clone-time cleanup
+	* (e.g. resetting a lazy `_files` cache) override and call `super._clone()`
+	* then apply their cleanup.
+	*/
+	_clone() {
+		const clone = Object.assign(Object.create(Object.getPrototypeOf(this)), this);
+		clone._generationKwargs = { ...this._generationKwargs };
+		return clone;
+	}
+	/**
+	* Resolve the SDK client for the current request, using cached/client-factory
+	* auth resolution. Delegates the actual SDK construction to
+	* {@link createRawClient}. The provider name passed to `requireProviderApiKey`
+	* is the subclass's `name`.
+	*/
+	_createClient(auth) {
+		return resolveAuthBackedClient({
+			cachedClient: this._client,
+			clientFactory: this._clientFactory
+		}, auth, (a) => {
+			const defaultHeaders = mergeRequestHeaders(this._defaultHeaders, a?.headers);
+			return this.createRawClient({
+				apiKey: requireProviderApiKey(this.name, a, this._apiKey),
+				headers: defaultHeaders
+			}, defaultHeaders);
+		});
+	}
+};
+//#endregion
+//#region ../kosong/src/providers/base-streamed-message.ts
+var BaseStreamedMessage = class {
+	_id = null;
+	_usage = null;
+	_finishReason = null;
+	_rawFinishReason = null;
+	_iter;
+	get id() {
+		return this._id;
+	}
+	get usage() {
+		return this._usage;
+	}
+	get finishReason() {
+		return this._finishReason;
+	}
+	get rawFinishReason() {
+		return this._rawFinishReason;
+	}
+	async *[Symbol.asyncIterator]() {
+		this._iter ??= this._buildIter();
+		yield* this._iter;
+	}
+};
+//#endregion
+//#region ../kosong/src/providers/provider-common.ts
+/**
+* Build a finish-reason normalizer from a per-provider raw-string → FinishReason table.
+*
+* Mirrors the shape of the per-adapter `normalizeXxxFinishReason` functions:
+* - `null` / `undefined` raw → `{ finishReason: null, rawFinishReason: null }`
+* - raw present and in the table → mapped FinishReason, raw echoed back
+* - raw present but not in the table → `'other'`, raw echoed back
+*
+* The returned function is stateless and safe to call repeatedly.
+*/
+function makeFinishReasonNormalizer(mapping) {
+	return (raw) => {
+		if (raw === null || raw === void 0) return {
+			finishReason: null,
+			rawFinishReason: null
 		};
-		default: return {
-			finishReason: "other",
+		return {
+			finishReason: mapping[raw] ?? "other",
 			rawFinishReason: raw
 		};
-	}
+	};
 }
+/**
+* Build the four-field `TokenUsage` from already-parsed per-provider numbers,
+* applying the `inputOther = total - cached` formula shared by OpenAI-style and
+* Google providers (which expose only a total prompt count and a cached subset).
+*
+* `inputOther` is clamped to ≥ 0 when `cached` exceeds `total` (defensive — a
+* provider should never report more cached than total, but we never emit a
+* negative usage field). Anthropic is excluded: it reports a real
+* `inputCacheCreation` field that does not fit this formula.
+*/
+function extractCacheUsage(total, cached, output) {
+	return {
+		inputOther: Math.max(0, total - cached),
+		output,
+		inputCacheRead: cached,
+		inputCacheCreation: 0
+	};
+}
+const NETWORK_RE$1 = /network|connection|connect|disconnect/i;
+const TIMEOUT_RE$1 = /timed?\s*out|timeout|deadline/i;
+/**
+* Convert a raw thrown value into a kosong `ChatProviderError` using the
+* shared message-based classification ladder:
+*
+* 1. already a `ChatProviderError` → returned as-is (identity)
+* 2. `status` provided → `normalizeAPIStatusError` (status + message + requestId)
+* 3. message matches `TIMEOUT_RE` → `APITimeoutError`
+* 4. message matches `NETWORK_RE` or any `extraNetworkMatchers`, or the value
+*    is a `TypeError` matching `extraTypeErrorMatch` → `APIConnectionError`
+* 5. otherwise → `ChatProviderError` wrapping the message
+*
+* Provider adapters that recognize SDK-specific error classes (e.g. OpenAI's
+* `APIConnectionTimeoutError`, Google's `GoogleApiError`) should unwrap them
+* into `(message, status?, requestId?)` before calling this function. The
+* SDK-class detection itself is provider-specific and stays in the adapter.
+*/
+function convertProviderError(error, opts = {}) {
+	if (error instanceof ChatProviderError) return error;
+	const message = error instanceof Error ? error.message : String(error);
+	if (typeof opts.status === "number") return normalizeAPIStatusError(opts.status, message, opts.requestId);
+	if (TIMEOUT_RE$1.test(message)) return new APITimeoutError(message);
+	if (NETWORK_RE$1.test(message)) return new APIConnectionError$3(message);
+	if (opts.extraNetworkMatchers?.some((re) => re.test(message))) return new APIConnectionError$3(message);
+	if (opts.extraTypeErrorMatch !== void 0 && error instanceof TypeError && message.includes(opts.extraTypeErrorMatch)) return new APIConnectionError$3(message);
+	if (error instanceof Error) return new ChatProviderError(`Error: ${message}`);
+	return new ChatProviderError(`Error: ${String(error)}`);
+}
+//#endregion
+//#region ../kosong/src/providers/anthropic.ts
+/**
+* Normalize an Anthropic `stop_reason` string to the unified
+* {@link FinishReason} enum.
+*
+* Source: `message.stop_reason` (non-stream) or the last `message_delta`
+* event's `delta.stop_reason` (stream).
+*/
+const normalizeAnthropicStopReason = makeFinishReasonNormalizer({
+	end_turn: "completed",
+	stop_sequence: "completed",
+	max_tokens: "truncated",
+	tool_use: "tool_calls",
+	pause_turn: "paused",
+	refusal: "filtered"
+});
 const INTERLEAVED_THINKING_BETA = "interleaved-thinking-2025-05-14";
 const FAMILY_VERSION_RE = /(?:opus|sonnet|haiku)[.-](\d+)[.-](\d{1,2})(?!\d)/;
 const OPUS_VERSION_RE = /opus[.-](\d+)[.-](\d{1,2})(?!\d)/;
@@ -8729,35 +8884,23 @@ function convertAnthropicError(error) {
 	if (error instanceof Error) return new ChatProviderError(`Error: ${error.message}`);
 	return new ChatProviderError(`Error: ${String(error)}`);
 }
-var AnthropicStreamedMessage = class {
-	_id = null;
-	_usage = {
-		inputOther: 0,
-		output: 0,
-		inputCacheRead: 0,
-		inputCacheCreation: 0
-	};
-	_finishReason = null;
-	_rawFinishReason = null;
-	_iter;
+var AnthropicStreamedMessage = class extends BaseStreamedMessage {
+	_response;
+	_isStream;
 	constructor(response, isStream) {
-		if (isStream) this._iter = this._convertStreamResponse(response);
-		else this._iter = this._convertNonStreamResponse(response);
-	}
-	get id() {
-		return this._id;
-	}
-	get usage() {
-		return this._usage;
-	}
-	get finishReason() {
-		return this._finishReason;
-	}
-	get rawFinishReason() {
-		return this._rawFinishReason;
+		super();
+		this._response = response;
+		this._isStream = isStream;
+		this._usage = {
+			inputOther: 0,
+			output: 0,
+			inputCacheRead: 0,
+			inputCacheCreation: 0
+		};
 	}
-	async *[Symbol.asyncIterator]() {
-		yield* this._iter;
+	_buildIter() {
+		if (this._isStream) return this._convertStreamResponse(this._response);
+		return this._convertNonStreamResponse(this._response);
 	}
 	_captureStopReason(raw) {
 		const normalized = normalizeAnthropicStopReason(raw);
@@ -8765,11 +8908,14 @@ var AnthropicStreamedMessage = class {
 		this._rawFinishReason = normalized.rawFinishReason;
 	}
 	_extractUsage(usage) {
+		const inputTokens = usage.input_tokens ?? 0;
+		const cacheRead = usage.cache_read_input_tokens ?? 0;
+		const cacheCreation = usage.cache_creation_input_tokens ?? 0;
 		this._usage = {
-			inputOther: usage.input_tokens ?? 0,
+			inputOther: Math.max(0, inputTokens - cacheRead - cacheCreation),
 			output: usage.output_tokens ?? 0,
-			inputCacheRead: usage.cache_read_input_tokens ?? 0,
-			inputCacheCreation: usage.cache_creation_input_tokens ?? 0
+			inputCacheRead: cacheRead,
+			inputCacheCreation: cacheCreation
 		};
 	}
 	async *_convertNonStreamResponse(response) {
@@ -8894,9 +9040,16 @@ var AnthropicStreamedMessage = class {
 					const deltaUsage = evt.usage;
 					if (deltaUsage !== void 0) {
 						if (typeof deltaUsage["output_tokens"] === "number") this._usage.output = deltaUsage["output_tokens"];
+						const prevInputOther = this._usage.inputOther;
+						const prevCacheRead = this._usage.inputCacheRead;
+						const prevCacheCreation = this._usage.inputCacheCreation;
 						if (typeof deltaUsage["cache_read_input_tokens"] === "number") this._usage.inputCacheRead = deltaUsage["cache_read_input_tokens"];
 						if (typeof deltaUsage["cache_creation_input_tokens"] === "number") this._usage.inputCacheCreation = deltaUsage["cache_creation_input_tokens"];
-						if (typeof deltaUsage["input_tokens"] === "number") this._usage.inputOther = deltaUsage["input_tokens"];
+						if (typeof deltaUsage["input_tokens"] === "number") this._usage.inputOther = Math.max(0, deltaUsage["input_tokens"] - this._usage.inputCacheRead - this._usage.inputCacheCreation);
+						else {
+							const totalInput = prevInputOther + prevCacheRead + prevCacheCreation;
+							this._usage.inputOther = Math.max(0, totalInput - this._usage.inputCacheRead - this._usage.inputCacheCreation);
+						}
 					}
 					const messageDeltaPayload = evt.delta;
 					if (messageDeltaPayload !== void 0 && "stop_reason" in messageDeltaPayload) this._captureStopReason(messageDeltaPayload["stop_reason"]);
@@ -8907,31 +9060,22 @@ var AnthropicStreamedMessage = class {
 		}
 	}
 };
-var AnthropicChatProvider = class {
+var AnthropicChatProvider = class AnthropicChatProvider extends BaseChatProvider {
 	name = "anthropic";
-	_model;
 	_stream;
-	_client;
-	_generationKwargs;
 	_metadata;
-	_apiKey;
-	_baseUrl;
-	_defaultHeaders;
-	_clientFactory;
 	constructor(options) {
-		this._model = options.model;
-		this._stream = options.stream ?? true;
-		this._metadata = options.metadata;
-		const apiKey = options.apiKey ?? process.env["ANTHROPIC_API_KEY"];
-		this._apiKey = apiKey === void 0 || apiKey.length === 0 ? void 0 : apiKey;
-		this._baseUrl = options.baseUrl;
-		this._defaultHeaders = options.defaultHeaders;
-		this._clientFactory = options.clientFactory;
-		this._client = this._apiKey === void 0 ? void 0 : this._buildClient(this._apiKey);
-		this._generationKwargs = {
+		const apiKey = options.apiKey === void 0 || options.apiKey.length === 0 ? process.env["ANTHROPIC_API_KEY"] ?? void 0 : options.apiKey;
+		const apiKeyResolved = apiKey === void 0 || apiKey.length === 0 ? void 0 : apiKey;
+		const baseUrl = options.baseUrl;
+		const client = apiKeyResolved === void 0 ? void 0 : AnthropicChatProvider.buildClient(apiKeyResolved, baseUrl, options.defaultHeaders);
+		const generationKwargs = {
 			max_tokens: resolveDefaultMaxTokens(options.model, options.defaultMaxTokens),
 			betaFeatures: options.betaFeatures ?? [INTERLEAVED_THINKING_BETA]
 		};
+		super(options.model, generationKwargs, apiKeyResolved, baseUrl ?? "", options.defaultHeaders, client, options.clientFactory);
+		this._stream = options.stream ?? true;
+		this._metadata = options.metadata;
 	}
 	get modelName() {
 		return this._model;
@@ -9024,24 +9168,25 @@ var AnthropicChatProvider = class {
 			throw convertAnthropicError(error);
 		}
 	}
-	_createClient(auth) {
-		return resolveAuthBackedClient({
-			cachedClient: this._client,
-			clientFactory: this._clientFactory
-		}, auth, (a) => this._buildClient(requireProviderApiKey("AnthropicChatProvider", a, this._apiKey)));
-	}
-	_buildClient(apiKey) {
+	static buildClient(apiKey, baseUrl, defaultHeaders) {
 		return new Anthropic({
 			apiKey,
+			baseURL: baseUrl,
+			defaultHeaders
+		});
+	}
+	createRawClient(auth, defaultHeaders) {
+		return new Anthropic({
+			apiKey: auth.apiKey,
 			baseURL: this._baseUrl,
-			defaultHeaders: this._defaultHeaders
+			defaultHeaders
 		});
 	}
 	withThinking(effort) {
 		if (effort === "off") {
 			let newBetas = [...this._generationKwargs.betaFeatures ?? []];
 			newBetas = newBetas.filter((b) => b !== INTERLEAVED_THINKING_BETA);
-			const clone = this._withGenerationKwargs({
+			const clone = this.withGenerationKwargs({
 				thinking: { type: "disabled" },
 				betaFeatures: newBetas
 			});
@@ -9052,7 +9197,7 @@ var AnthropicChatProvider = class {
 		if (effectiveEffort === "off") throw new Error("Non-off thinking effort unexpectedly clamped to off.");
 		let newBetas = [...this._generationKwargs.betaFeatures ?? []];
 		newBetas = newBetas.filter((b) => b !== INTERLEAVED_THINKING_BETA);
-		return this._withGenerationKwargs({
+		return this.withGenerationKwargs({
 			thinking: {
 				type: "adaptive",
 				display: "summarized"
@@ -9061,22 +9206,6 @@ var AnthropicChatProvider = class {
 			betaFeatures: newBetas
 		});
 	}
-	withGenerationKwargs(kwargs) {
-		return this._withGenerationKwargs(kwargs);
-	}
-	_withGenerationKwargs(kwargs) {
-		const clone = this._clone();
-		clone._generationKwargs = {
-			...clone._generationKwargs,
-			...kwargs
-		};
-		return clone;
-	}
-	_clone() {
-		const clone = Object.assign(Object.create(Object.getPrototypeOf(this)), this);
-		clone._generationKwargs = { ...this._generationKwargs };
-		return clone;
-	}
 };
 //#endregion
 //#region ../../node_modules/.pnpm/retry@0.13.1/node_modules/retry/lib/retry_operation.js
@@ -37547,30 +37676,19 @@ function messagesToGoogleGenAIContents(messages) {
 	}
 	return contents;
 }
-var GoogleGenAIStreamedMessage = class {
-	_id = null;
-	_usage = null;
-	_finishReason = null;
-	_rawFinishReason = null;
-	_iter;
+var GoogleGenAIStreamedMessage = class extends BaseStreamedMessage {
+	_response;
+	_isStream;
+	_signal;
 	constructor(response, isStream, signal) {
-		if (isStream) this._iter = this._convertStreamResponse(response, signal);
-		else this._iter = this._convertNonStreamResponse(response, signal);
-	}
-	get id() {
-		return this._id;
-	}
-	get usage() {
-		return this._usage;
-	}
-	get finishReason() {
-		return this._finishReason;
-	}
-	get rawFinishReason() {
-		return this._rawFinishReason;
+		super();
+		this._response = response;
+		this._isStream = isStream;
+		this._signal = signal;
 	}
-	async *[Symbol.asyncIterator]() {
-		yield* this._iter;
+	_buildIter() {
+		if (this._isStream) return this._convertStreamResponse(this._response, this._signal);
+		return this._convertNonStreamResponse(this._response, this._signal);
 	}
 	_captureFinishReason(response) {
 		const candidates = response["candidates"];
@@ -37626,12 +37744,8 @@ var GoogleGenAIStreamedMessage = class {
 		if (usageMetadata) {
 			const promptTokenCount = typeof usageMetadata["promptTokenCount"] === "number" ? usageMetadata["promptTokenCount"] : 0;
 			const cachedContentTokenCount = typeof usageMetadata["cachedContentTokenCount"] === "number" ? usageMetadata["cachedContentTokenCount"] : 0;
-			this._usage = {
-				inputOther: Math.max(promptTokenCount - cachedContentTokenCount, 0),
-				output: usageMetadata["candidatesTokenCount"] ?? 0,
-				inputCacheRead: cachedContentTokenCount,
-				inputCacheCreation: 0
-			};
+			const output = usageMetadata["candidatesTokenCount"] ?? 0;
+			this._usage = extractCacheUsage(promptTokenCount, cachedContentTokenCount, output);
 		}
 	}
 	/** Extract response ID from a response chunk. */
@@ -37669,59 +37783,44 @@ var GoogleGenAIStreamedMessage = class {
 		}
 	}
 };
-const NETWORK_RE$1 = /network|connection|connect|disconnect|fetch failed/i;
-const TIMEOUT_RE$1 = /timed?\s*out|timeout|deadline/i;
 /**
 * Convert a Google GenAI SDK error (or raw Error) to a kosong `ChatProviderError`.
 */
 function convertGoogleGenAIError(error) {
 	if (error instanceof ApiError) return normalizeAPIStatusError(error.status, error.message);
-	if (error instanceof Error) {
-		const msg = error.message;
-		if (TIMEOUT_RE$1.test(msg)) return new APITimeoutError(msg);
-		if (NETWORK_RE$1.test(msg) || error instanceof TypeError && msg.includes("fetch")) return new APIConnectionError$3(msg);
-		const statusCode = error.code;
-		if (typeof statusCode === "number") return normalizeAPIStatusError(statusCode, msg);
-		return new ChatProviderError(`GoogleGenAI error: ${msg}`);
-	}
-	return new ChatProviderError(`GoogleGenAI error: ${String(error)}`);
+	const statusCode = error.code;
+	if (error instanceof Error && typeof statusCode === "number") return normalizeAPIStatusError(statusCode, error.message);
+	return convertProviderError(error, {
+		extraNetworkMatchers: [/^fetch failed$/i],
+		extraTypeErrorMatch: "fetch"
+	});
 }
-var GoogleGenAIChatProvider = class {
+var GoogleGenAIChatProvider = class GoogleGenAIChatProvider extends BaseChatProvider {
 	name = "google_genai";
-	_model;
-	_client;
-	_generationKwargs;
-	_vertexai;
 	_stream;
-	_apiKey;
+	_vertexai;
 	_project;
 	_location;
-	_clientFactory;
 	constructor(options) {
-		this._model = options.model;
-		this._vertexai = options.vertexai ?? false;
-		this._stream = options.stream ?? true;
-		this._generationKwargs = {};
 		const apiKey = options.apiKey ?? process.env["GOOGLE_API_KEY"];
-		this._apiKey = apiKey === void 0 || apiKey.length === 0 ? void 0 : apiKey;
+		const apiKeyResolved = apiKey === void 0 || apiKey.length === 0 ? void 0 : apiKey;
+		const client = (options.vertexai ?? false) || apiKeyResolved !== void 0 ? GoogleGenAIChatProvider.buildClient(apiKeyResolved, options.vertexai ?? false, options.project, options.location) : void 0;
+		super(options.model, {}, apiKeyResolved, "", void 0, client, options.clientFactory);
+		this._stream = options.stream ?? true;
+		this._vertexai = options.vertexai ?? false;
 		this._project = options.project;
 		this._location = options.location;
-		this._clientFactory = options.clientFactory;
-		this._client = this._vertexai || this._apiKey !== void 0 ? this._buildClient(this._apiKey) : void 0;
 	}
-	_buildClient(apiKey) {
+	static buildClient(apiKey, vertexai, project, location) {
 		return new GoogleGenAI({
 			apiKey,
-			...this._vertexai ? {
+			...vertexai ? {
 				vertexai: true,
-				project: this._project,
-				location: this._location
+				project,
+				location
 			} : {}
 		});
 	}
-	get modelName() {
-		return this._model;
-	}
 	get thinkingEffort() {
 		const thinkingConfig = this._generationKwargs.thinking_config;
 		if (thinkingConfig === void 0) return null;
@@ -37771,15 +37870,26 @@ var GoogleGenAIChatProvider = class {
 			throw convertGoogleGenAIError(error);
 		}
 	}
+	/**
+	* Override the base auth-resolution path to preserve the Vertex AI
+	* short-circuit: Vertex uses service credentials, not request-scoped keys
+	* or headers, so `requireProviderApiKey` must not be enforced there.
+	*/
 	_createClient(auth) {
 		return resolveAuthBackedClient({
 			cachedClient: this._client,
 			clientFactory: this._clientFactory
 		}, auth, (a) => {
-			if (this._vertexai) return this._buildClient(this._apiKey);
-			return this._buildClient(requireProviderApiKey("GoogleGenAIChatProvider", a, this._apiKey));
+			if (this._vertexai) return GoogleGenAIChatProvider.buildClient(this._apiKey, this._vertexai, this._project, this._location);
+			return this.createRawClient({
+				apiKey: requireProviderApiKey("GoogleGenAIChatProvider", a, this._apiKey),
+				headers: void 0
+			}, void 0);
 		});
 	}
+	createRawClient(auth, _defaultHeaders) {
+		return GoogleGenAIChatProvider.buildClient(auth.apiKey, this._vertexai, this._project, this._location);
+	}
 	withThinking(effort) {
 		const thinkingConfig = { include_thoughts: true };
 		if (this._model.includes("gemini-3")) switch (effort) {
@@ -37821,19 +37931,6 @@ var GoogleGenAIChatProvider = class {
 		}
 		return this.withGenerationKwargs({ thinking_config: thinkingConfig });
 	}
-	withGenerationKwargs(kwargs) {
-		const clone = this._clone();
-		clone._generationKwargs = {
-			...clone._generationKwargs,
-			...kwargs
-		};
-		return clone;
-	}
-	_clone() {
-		const clone = Object.assign(Object.create(Object.getPrototypeOf(this)), this);
-		clone._generationKwargs = { ...this._generationKwargs };
-		return clone;
-	}
 };
 //#endregion
 //#region ../kosong/src/providers/openai-compat-schema.ts
@@ -45165,35 +45262,13 @@ function extractUsage(usage) {
 * - `'content_filter'` → `'filtered'`
 * - any other non-null string → `'other'`
 */
-function normalizeOpenAIFinishReason(raw) {
-	if (raw === null || raw === void 0) return {
-		finishReason: null,
-		rawFinishReason: null
-	};
-	switch (raw) {
-		case "stop": return {
-			finishReason: "completed",
-			rawFinishReason: raw
-		};
-		case "tool_calls":
-		case "function_call": return {
-			finishReason: "tool_calls",
-			rawFinishReason: raw
-		};
-		case "length": return {
-			finishReason: "truncated",
-			rawFinishReason: raw
-		};
-		case "content_filter": return {
-			finishReason: "filtered",
-			rawFinishReason: raw
-		};
-		default: return {
-			finishReason: "other",
-			rawFinishReason: raw
-		};
-	}
-}
+const normalizeOpenAIFinishReason = makeFinishReasonNormalizer({
+	stop: "completed",
+	tool_calls: "tool_calls",
+	function_call: "tool_calls",
+	length: "truncated",
+	content_filter: "filtered"
+});
 /**
 * Convert tool-role message content according to the chosen strategy.
 */
@@ -45481,30 +45556,19 @@ function extractUsageFromChunk(chunk) {
 	if (choiceUsage !== null && choiceUsage !== void 0 && typeof choiceUsage === "object") return choiceUsage;
 	return null;
 }
-var OpenAICompletionsStreamedMessage = class {
-	_id = null;
-	_usage = null;
-	_finishReason = null;
-	_rawFinishReason = null;
-	_iter;
+var OpenAICompletionsStreamedMessage = class extends BaseStreamedMessage {
+	_response;
+	_isStream;
+	_reasoningKey;
 	constructor(response, isStream, reasoningKey) {
-		if (isStream) this._iter = this._convertStreamResponse(response, reasoningKey);
-		else this._iter = this._convertNonStreamResponse(response, reasoningKey);
-	}
-	get id() {
-		return this._id;
-	}
-	get usage() {
-		return this._usage;
-	}
-	get finishReason() {
-		return this._finishReason;
-	}
-	get rawFinishReason() {
-		return this._rawFinishReason;
+		super();
+		this._response = response;
+		this._isStream = isStream;
+		this._reasoningKey = reasoningKey;
 	}
-	async *[Symbol.asyncIterator]() {
-		yield* this._iter;
+	_buildIter() {
+		if (this._isStream) return this._convertStreamResponse(this._response, this._reasoningKey);
+		return this._convertNonStreamResponse(this._response, this._reasoningKey);
 	}
 	_captureFinishReason(raw) {
 		const normalized = normalizeOpenAIFinishReason(raw);
@@ -45564,42 +45628,29 @@ var OpenAICompletionsStreamedMessage = class {
 		}
 	}
 };
-var OpenAICompletionsChatProvider = class {
+var OpenAICompletionsChatProvider = class extends BaseChatProvider {
 	name = "openai-completions";
-	_model;
 	_stream;
-	_apiKey;
-	_baseUrl;
-	_defaultHeaders;
-	_generationKwargs;
 	_thinkingEffortKey;
 	_reasoningKey;
 	_toolMessageConversion;
-	_client;
-	_clientFactory;
 	_files;
 	constructor(options) {
-		const apiKey = options.apiKey;
-		this._apiKey = apiKey === void 0 || apiKey.length === 0 ? void 0 : apiKey;
-		this._baseUrl = options.baseUrl ?? "";
-		this._defaultHeaders = options.defaultHeaders;
-		this._clientFactory = options.clientFactory;
-		this._model = options.model;
+		const apiKey = options.apiKey === void 0 || options.apiKey.length === 0 ? void 0 : options.apiKey;
+		const baseUrl = options.baseUrl ?? "";
+		const generationKwargs = { ...options.generationKwargs };
+		const client = apiKey === void 0 ? void 0 : new OpenAI({
+			apiKey,
+			baseURL: baseUrl,
+			defaultHeaders: options.defaultHeaders
+		});
+		super(options.model, generationKwargs, apiKey, baseUrl, options.defaultHeaders, client, options.clientFactory);
 		this._stream = options.stream ?? true;
 		const normalizedThinkingEffortKey = options.thinkingEffortKey?.trim();
 		this._thinkingEffortKey = normalizedThinkingEffortKey !== void 0 && normalizedThinkingEffortKey.length > 0 ? normalizedThinkingEffortKey : "reasoning_effort";
 		const normalizedReasoningKey = options.reasoningKey?.trim();
 		this._reasoningKey = normalizedReasoningKey !== void 0 && normalizedReasoningKey.length > 0 ? normalizedReasoningKey : void 0;
-		this._generationKwargs = { ...options.generationKwargs };
 		this._toolMessageConversion = options.toolMessageConversion ?? null;
-		this._client = this._apiKey === void 0 ? void 0 : new OpenAI({
-			apiKey: this._apiKey,
-			baseURL: this._baseUrl,
-			defaultHeaders: this._defaultHeaders
-		});
-	}
-	get modelName() {
-		return this._model;
 	}
 	get thinkingEffort() {
 		const customValue = this._generationKwargs[this._thinkingEffortKey];
@@ -45685,9 +45736,6 @@ var OpenAICompletionsChatProvider = class {
 		const nextEffort = { [this._thinkingEffortKey]: reasoningEffort };
 		return this._withGenerationKwargs(nextEffort).withExtraBody({ thinking });
 	}
-	withGenerationKwargs(kwargs) {
-		return this._withGenerationKwargs(kwargs);
-	}
 	withMaxCompletionTokens(maxCompletionTokens) {
 		return this._withGenerationKwargs({ max_completion_tokens: maxCompletionTokens });
 	}
@@ -45705,33 +45753,21 @@ var OpenAICompletionsChatProvider = class {
 		};
 		return this._withGenerationKwargs({ extra_body: merged });
 	}
-	_createClient(auth) {
-		return resolveAuthBackedClient({
-			cachedClient: this._client,
-			clientFactory: this._clientFactory
-		}, auth, (a) => {
-			const defaultHeaders = mergeRequestHeaders(this._defaultHeaders, a?.headers);
-			return new OpenAI({
-				apiKey: requireProviderApiKey("OpenAICompletionsChatProvider", a, this._apiKey),
-				baseURL: this._baseUrl,
-				defaultHeaders
-			});
-		});
-	}
 	_withGenerationKwargs(kwargs) {
-		const clone = this._clone();
-		clone._generationKwargs = {
-			...clone._generationKwargs,
-			...kwargs
-		};
-		return clone;
+		return this.withGenerationKwargs(kwargs);
 	}
 	_clone() {
-		const clone = Object.assign(Object.create(Object.getPrototypeOf(this)), this);
-		clone._generationKwargs = { ...this._generationKwargs };
+		const clone = super._clone();
 		clone._files = void 0;
 		return clone;
 	}
+	createRawClient(auth, defaultHeaders) {
+		return new OpenAI({
+			apiKey: auth.apiKey,
+			baseURL: this._baseUrl,
+			defaultHeaders
+		});
+	}
 };
 //#endregion
 //#region ../kosong/src/providers/openai-responses.ts
@@ -46039,30 +46075,17 @@ function convertTool(tool) {
 		strict: false
 	};
 }
-var OpenAIResponsesStreamedMessage = class {
-	_id = null;
-	_usage = null;
-	_finishReason = null;
-	_rawFinishReason = null;
-	_iter;
+var OpenAIResponsesStreamedMessage = class extends BaseStreamedMessage {
+	_response;
+	_isStream;
 	constructor(response, isStream) {
-		if (isStream) this._iter = this._convertStreamResponse(response);
-		else this._iter = this._convertNonStreamResponse(response);
-	}
-	get id() {
-		return this._id;
-	}
-	get usage() {
-		return this._usage;
-	}
-	get finishReason() {
-		return this._finishReason;
-	}
-	get rawFinishReason() {
-		return this._rawFinishReason;
+		super();
+		this._response = response;
+		this._isStream = isStream;
 	}
-	async *[Symbol.asyncIterator]() {
-		yield* this._iter;
+	_buildIter() {
+		if (this._isStream) return this._convertStreamResponse(this._response);
+		return this._convertNonStreamResponse(this._response);
 	}
 	_captureFinishReasonFromResponse(response) {
 		const status = readNullableStringField(response, "status");
@@ -46076,12 +46099,7 @@ var OpenAIResponsesStreamedMessage = class {
 		const outputTokens = readNumberField(usage, "output_tokens") ?? 0;
 		const details = readObjectField(usage, "input_tokens_details");
 		const cached = details ? readNumberField(details, "cached_tokens") ?? 0 : 0;
-		this._usage = {
-			inputOther: inputTokens - cached,
-			output: outputTokens,
-			inputCacheRead: cached,
-			inputCacheCreation: 0
-		};
+		this._usage = extractCacheUsage(inputTokens, cached, outputTokens);
 	}
 	async *_convertNonStreamResponse(response) {
 		this._id = readStringField$2(response, "id") ?? null;
@@ -46244,34 +46262,22 @@ var OpenAIResponsesStreamedMessage = class {
 		}
 	}
 };
-var OpenAIResponsesChatProvider = class {
+var OpenAIResponsesChatProvider = class OpenAIResponsesChatProvider extends BaseChatProvider {
 	name = "openai-responses";
-	_model;
 	_stream;
-	_apiKey;
-	_baseUrl;
-	_defaultHeaders;
-	_generationKwargs;
 	_toolMessageConversion;
-	_client;
 	_httpClient;
-	_clientFactory;
 	constructor(options) {
 		const apiKey = options.apiKey ?? process.env["OPENAI_API_KEY"];
-		this._apiKey = apiKey === void 0 || apiKey.length === 0 ? void 0 : apiKey;
-		this._baseUrl = options.baseUrl ?? "https://api.openai.com/v1";
-		this._defaultHeaders = options.defaultHeaders;
-		this._model = options.model;
+		const apiKeyResolved = apiKey === void 0 || apiKey.length === 0 ? void 0 : apiKey;
+		const baseUrl = options.baseUrl ?? "https://api.openai.com/v1";
+		const generationKwargs = {};
+		if (options.maxOutputTokens !== void 0) generationKwargs.max_output_tokens = options.maxOutputTokens;
+		const client = apiKeyResolved === void 0 ? void 0 : OpenAIResponsesChatProvider.buildClient(apiKeyResolved, baseUrl, options.defaultHeaders, options.httpClient);
+		super(options.model, generationKwargs, apiKeyResolved, baseUrl, options.defaultHeaders, client, options.clientFactory);
 		this._stream = true;
-		this._generationKwargs = {};
 		this._toolMessageConversion = options.toolMessageConversion ?? null;
 		this._httpClient = options.httpClient;
-		this._clientFactory = options.clientFactory;
-		if (options.maxOutputTokens !== void 0) this._generationKwargs.max_output_tokens = options.maxOutputTokens;
-		this._client = this._apiKey === void 0 ? void 0 : this._buildClient(this._apiKey);
-	}
-	get modelName() {
-		return this._model;
 	}
 	get thinkingEffort() {
 		return reasoningEffortToThinkingEffort(this._generationKwargs.reasoning_effort);
@@ -46330,41 +46336,18 @@ var OpenAIResponsesChatProvider = class {
 	}
 	withThinking(effort) {
 		const reasoningEffort = thinkingEffortToReasoningEffort(effort, this._model);
-		const clone = this._clone();
-		clone._generationKwargs = {
-			...clone._generationKwargs,
-			reasoning_effort: reasoningEffort
-		};
-		return clone;
+		return this.withGenerationKwargs({ reasoning_effort: reasoningEffort });
 	}
-	withGenerationKwargs(kwargs) {
-		const clone = this._clone();
-		clone._generationKwargs = {
-			...clone._generationKwargs,
-			...kwargs
-		};
-		return clone;
-	}
-	_clone() {
-		const clone = Object.assign(Object.create(Object.getPrototypeOf(this)), this);
-		clone._generationKwargs = { ...this._generationKwargs };
-		return clone;
+	createRawClient(auth, defaultHeaders) {
+		return OpenAIResponsesChatProvider.buildClient(auth.apiKey, this._baseUrl, defaultHeaders, this._httpClient);
 	}
-	_createClient(auth) {
-		return resolveAuthBackedClient({
-			cachedClient: this._client,
-			clientFactory: this._clientFactory
-		}, auth, (a) => this._buildClient(requireProviderApiKey("OpenAIResponsesChatProvider", a, this._apiKey), a));
-	}
-	_buildClient(apiKey, auth) {
-		const clientOpts = {
+	static buildClient(apiKey, baseURL, defaultHeaders, httpClient) {
+		return new OpenAI({
 			apiKey,
-			baseURL: this._baseUrl
-		};
-		const defaultHeaders = mergeRequestHeaders(this._defaultHeaders, auth?.headers);
-		if (defaultHeaders !== void 0) clientOpts["defaultHeaders"] = defaultHeaders;
-		if (this._httpClient !== void 0) clientOpts["httpClient"] = this._httpClient;
-		return new OpenAI(clientOpts);
+			baseURL,
+			...defaultHeaders !== void 0 ? { defaultHeaders } : {},
+			...httpClient !== void 0 ? { httpClient } : {}
+		});
 	}
 };
 //#endregion
@@ -47542,17 +47525,17 @@ async function loadAgentsMd(kaos, workDir) {
 		return true;
 	};
 	const home = kaos.gethome();
-	await collect(joinPath$2(kaos, home, ".byf", "AGENTS.md"));
-	const genericFiles = [joinPath$2(kaos, home, ".agents")].flatMap((dir) => ["AGENTS.md", "agents.md"].map((name) => joinPath$2(kaos, dir, name)));
+	await collect(joinPath$1(kaos, home, ".byf", "AGENTS.md"));
+	const genericFiles = [joinPath$1(kaos, home, ".agents")].flatMap((dir) => ["AGENTS.md", "agents.md"].map((name) => joinPath$1(kaos, dir, name)));
 	for (const file of genericFiles) if (await collect(file)) break;
 	for (const dir of dirs) {
-		await collect(joinPath$2(kaos, dir, ".byf", "AGENTS.md"));
-		for (const fileName of ["AGENTS.md", "agents.md"]) if (await collect(joinPath$2(kaos, dir, fileName))) break;
+		await collect(joinPath$1(kaos, dir, ".byf", "AGENTS.md"));
+		for (const fileName of ["AGENTS.md", "agents.md"]) if (await collect(joinPath$1(kaos, dir, fileName))) break;
 	}
 	return renderAgentFiles(discovered);
 }
 async function findProjectRoot$1(kaos, workDir) {
-	const path = pathMod$6(kaos);
+	const path = pathMod$5(kaos);
 	const initial = kaos.normpath(workDir);
 	let current = initial;
 	while (true) {
@@ -47563,7 +47546,7 @@ async function findProjectRoot$1(kaos, workDir) {
 	}
 }
 function dirsRootToLeaf(kaos, workDir, projectRoot) {
-	const path = pathMod$6(kaos);
+	const path = pathMod$5(kaos);
 	const dirs = [];
 	let current = kaos.normpath(workDir);
 	while (true) {
@@ -47638,10 +47621,10 @@ function byteLength(text) {
 function annotationFor(path) {
 	return `<!-- From: ${path} -->\n`;
 }
-function joinPath$2(kaos, ...parts) {
-	return pathMod$6(kaos).join(...parts);
+function joinPath$1(kaos, ...parts) {
+	return pathMod$5(kaos).join(...parts);
 }
-function pathMod$6(kaos) {
+function pathMod$5(kaos) {
 	return kaos.pathClass() === "win32" ? win32Path : posixPath;
 }
 //#endregion
@@ -54749,7 +54732,7 @@ const PROFILE_SOURCES = {
 	"profile/default/agent.yaml": agent_default$1,
 	"profile/default/coder.yaml": coder_default,
 	"profile/default/explore.yaml": explore_default,
-	"profile/default/system.md": "You are BYF, an AI agent running on the user's computer. Your job is to help\nusers accomplish tasks by taking action — read, write, search, and execute to\nmake real changes on the user's system. Answer questions when asked; otherwise,\nact.\n\nWhen responding, use the same language as the user unless explicitly instructed\notherwise.\n\n{{ ROLE_ADDITIONAL }}\n\n# First Principles\n\nThink from first principles. Strip away assumptions and conventions; every\naction must be traceable to a verifiable fact — the actual file contents,\ncommand output, data, or the user's explicit words. When in doubt, read\nbefore guessing, ask before assuming, verify before claiming.\n\n# Tool Use\n\nUse tools only when the task requires them. If the request can be answered\nwithout reading files, running commands, or searching the web, reply in text\ndirectly. When a request is ambiguous, prefer action — the user can see your\noutput and correct course.\n\nCode that only appears in your text response is NOT saved to the file system\nand will not take effect. To create or modify files, use `Write` or `Edit`.\nTo run commands, use `Bash`.\n\n# Protocol\n\n<system> tags in user or tool messages provide supplementary context. Treat\nthem as background information.\n\n<system-reminder> tags are authoritative directives that override default\nbehavior. They are unrelated to the messages they appear in. Always comply.\n\n# Safety\n\nThe environment is not a sandbox — your actions immediately affect the user's\nsystem.\n\n- Stay within the working directory unless explicitly instructed otherwise.\n- Git operations are destructive and may affect remote repositories. Never\n  execute git mutations unless explicitly asked; confirm each time.\n- Avoid installing or deleting anything outside the working directory. If\n  necessary, ask for confirmation first.\n\n# Working Environment\n\n## Operating System\n\nYou are running on **{{ BYF_OS }}**. The Bash tool executes commands using **{{ BYF_SHELL }}**.\n{% if BYF_OS == \"Windows\" %}\n\nIMPORTANT: You are on Windows. The Bash tool runs through Git Bash, so use Unix shell syntax inside Bash commands — `/dev/null` not `NUL`, and forward slashes in paths. For file operations, always prefer the built-in tools (Read, Write, Edit, Glob, Grep) over Bash commands — they work reliably across all platforms.\n{% endif %}\n\n## Working Directory\n\nThe current working directory is `{{ BYF_WORK_DIR }}`. This should be considered as the project root if you are instructed to perform tasks on the project. Every file system operation will be relative to the working directory if you do not explicitly specify the absolute path. Tools may require absolute paths for some parameters, IF SO, YOU MUST use absolute paths for these parameters.\n{% if BYF_ADDITIONAL_DIRS_INFO %}\n\n## Additional Directories\n\nThe following directories have been added to the workspace. You can read, write, search, and glob files in these directories as part of your workspace scope.\n\n{{ BYF_ADDITIONAL_DIRS_INFO }}\n{% endif %}\n\n# Project Information\n\n`AGENTS.md` files contain project-specific context, styles, and conventions for agents. They may exist at different locations in the project — each file governs its directory and all subdirectories beneath it. Deeper files take precedence over parent files.\n\nIf instructions conflict:\n- `<system-reminder>` directives override all other instructions, including user messages.\n- Safety rules are hard constraints and must never be violated, even if a user message or AGENTS.md says otherwise.\n- Beyond those two, user messages > AGENTS.md > default system instructions.\n\n{% if BYF_AGENTS_MD_TOO_LONG %}\n> ⚠️ The merged AGENTS.md content exceeds 4,000 tokens. Consider compressing project instructions to reduce context usage.\n{% endif %}\n\nThe `AGENTS.md` instructions (merged from all applicable directories):\n\n`````````\n{{ BYF_AGENTS_MD }}\n`````````\n\nIf you modified anything mentioned in `AGENTS.md` files, update the corresponding files to keep them up-to-date.\n\n# Skills\n\nSkills are reusable capabilities. When a skill from the listing matches the user's request, you MUST call the `Skill` tool (not free-form text).\n\n{{ BYF_SKILLS }}\n"
+	"profile/default/system.md": "You are BYF, an AI agent running on the user's computer. Your job is to help\nusers accomplish tasks by taking action — read, write, search, and execute to\nmake real changes on the user's system. Answer questions when asked; otherwise,\nact.\n\nWhen responding, use the same language as the user unless explicitly instructed\notherwise.\n\n{{ ROLE_ADDITIONAL }}\n\n# First Principles\n\nThink from first principles. Strip away assumptions and conventions; every\naction must be traceable to a verifiable fact — the actual file contents,\ncommand output, data, or the user's explicit words. When in doubt, read\nbefore guessing, ask before assuming, verify before claiming.\n\n# Tool Use\n\nUse tools only when the task requires them. If the request can be answered\nwithout reading files, running commands, or searching the web, reply in text\ndirectly. When a request is ambiguous, prefer action — the user can see your\noutput and correct course.\n\nCode that only appears in your text response is NOT saved to the file system\nand will not take effect. To create or modify files, use `Write` or `Edit`.\nTo run commands, use `Bash`.\n\n# Protocol\n\n<system> tags in user or tool messages provide supplementary context. Treat\nthem as background information.\n\n<system-reminder> tags are authoritative directives that override default\nbehavior. They are unrelated to the messages they appear in. Always comply.\n\n# Safety\n\nThe environment is not a sandbox — your actions immediately affect the user's\nsystem.\n\n- Stay within the working directory unless explicitly instructed otherwise.\n- Git operations are destructive and may affect remote repositories. Never\n  execute git mutations unless explicitly asked; confirm each time.\n- Avoid installing or deleting anything outside the working directory. If\n  necessary, ask for confirmation first.\n\n# Project Information\n\n`AGENTS.md` files contain project-specific context, styles, and conventions for agents. They may exist at different locations in the project — each file governs its directory and all subdirectories beneath it. Deeper files take precedence over parent files.\n\nIf instructions conflict:\n- `<system-reminder>` directives override all other instructions, including user messages.\n- Safety rules are hard constraints and must never be violated, even if a user message or AGENTS.md says otherwise.\n- Beyond those two, user messages > AGENTS.md > default system instructions.\n\n{% if BYF_AGENTS_MD_TOO_LONG %}\n> ⚠️ The merged AGENTS.md content exceeds 4,000 tokens. Consider compressing project instructions to reduce context usage.\n{% endif %}\n\nThe `AGENTS.md` instructions (merged from all applicable directories):\n\n`````````\n{{ BYF_AGENTS_MD }}\n`````````\n\nIf you modified anything mentioned in `AGENTS.md` files, update the corresponding files to keep them up-to-date.\n\n# Working Environment\n\n## Operating System\n\nYou are running on **{{ BYF_OS }}**. The Bash tool executes commands using **{{ BYF_SHELL }}**.\n{% if BYF_OS == \"Windows\" %}\n\nIMPORTANT: You are on Windows. The Bash tool runs through Git Bash, so use Unix shell syntax inside Bash commands — `/dev/null` not `NUL`, and forward slashes in paths. For file operations, always prefer the built-in tools (Read, Write, Edit, Glob, Grep) over Bash commands — they work reliably across all platforms.\n{% endif %}\n\n## Working Directory\n\nThe current working directory is `{{ BYF_WORK_DIR }}`. This should be considered as the project root if you are instructed to perform tasks on the project. Every file system operation will be relative to the working directory if you do not explicitly specify the absolute path. Tools may require absolute paths for some parameters, IF SO, YOU MUST use absolute paths for these parameters.\n{% if BYF_ADDITIONAL_DIRS_INFO %}\n\n## Additional Directories\n\nThe following directories have been added to the workspace. You can read, write, search, and glob files in these directories as part of your workspace scope.\n\n{{ BYF_ADDITIONAL_DIRS_INFO }}\n{% endif %}\n\n# Skills\n\nSkills are reusable capabilities. When a skill from the listing matches the user's request, you MUST call the `Skill` tool (not free-form text).\n\n{{ BYF_SKILLS }}\n"
 };
 const DEFAULT_INIT_PROMPT = init_default;
 const DEFAULT_AGENT_PROFILES = loadAgentProfilesFromSources([
@@ -55175,6 +55158,7 @@ var BackgroundProcessManager = class {
 		const kind = opts?.kind;
 		const taskId = generateTaskId(kind ?? "bash");
 		const entry = {
+			kind: "process",
 			taskId,
 			command,
 			description,
@@ -55374,9 +55358,10 @@ var BackgroundProcessManager = class {
 		entry.approvalReason = void 0;
 		entry.stopRequested = true;
 		entry.stopReason = stopReason;
-		try {
+		if (entry.kind === "process") try {
 			await entry.proc.kill("SIGTERM");
 		} catch {}
+		else entry.abort();
 		let graceTimer;
 		const graceful = await Promise.race([entry.lifecyclePromise.then(() => true, () => true), new Promise((resolve) => {
 			graceTimer = setTimeout(() => {
@@ -55388,9 +55373,11 @@ var BackgroundProcessManager = class {
 			await entry.persistWriteQueue;
 			return this.toInfo(entry);
 		}
-		if (!graceful && entry.proc.exitCode === null) try {
-			await entry.proc.kill("SIGKILL");
-		} catch {}
+		if (!graceful) if (entry.kind === "process") {
+			if (entry.proc.exitCode === null) try {
+				await entry.proc.kill("SIGKILL");
+			} catch {}
+		} else entry.abort();
 		if (TERMINAL_STATUSES.has(entry.status)) {
 			await entry.persistWriteQueue;
 			return this.toInfo(entry);
@@ -55448,32 +55435,15 @@ var BackgroundProcessManager = class {
 		else this.assertCanRegister();
 		const taskId = generateTaskId("agent");
 		const entry = {
+			kind: "promise",
 			taskId,
 			command: `[agent] ${description}`,
 			description,
 			timeoutMs: opts.timeoutMs,
+			completion,
+			abort: () => opts.abort?.(),
 			agentId: opts.agentId ?? taskId,
 			subagentType: opts.subagentType ?? "agent",
-			proc: {
-				stdin: {
-					write: () => false,
-					end: () => {}
-				},
-				stdout: {
-					setEncoding: () => {},
-					on: () => {}
-				},
-				stderr: {
-					setEncoding: () => {},
-					on: () => {}
-				},
-				pid: 0,
-				exitCode: null,
-				wait: () => completion.then(() => 0),
-				kill: async () => {
-					opts.abort?.();
-				}
-			},
 			outputChunks: [],
 			outputSizeBytes: 0,
 			status: "running",
@@ -55649,7 +55619,7 @@ var BackgroundProcessManager = class {
 		if (this.sessionDir !== void 0) await removeTask(this.sessionDir, taskId);
 	}
 	/**
-	* Persist the current state of a live ManagedProcess. Called from
+	* Persist the current state of a live TaskEntry. Called from
 	* `register()` and the lifecycle finally block. No-op unless attached.
 	*/
 	persistLive(entry) {
@@ -55659,7 +55629,7 @@ var BackgroundProcessManager = class {
 			task_id: entry.taskId,
 			command: entry.command,
 			description: entry.description,
-			pid: entry.proc.pid,
+			pid: entry.kind === "process" ? entry.proc.pid : 0,
 			started_at: entry.startedAt,
 			ended_at: entry.endedAt,
 			exit_code: entry.exitCode,
@@ -55705,7 +55675,7 @@ var BackgroundProcessManager = class {
 	}
 	observedExitCompletions() {
 		const completions = [];
-		for (const entry of this.processes.values()) if (!TERMINAL_STATUSES.has(entry.status) && entry.proc.exitCode !== null) completions.push(entry.lifecyclePromise);
+		for (const entry of this.processes.values()) if (entry.kind === "process" && !TERMINAL_STATUSES.has(entry.status) && entry.proc.exitCode !== null) completions.push(entry.lifecyclePromise);
 		return completions;
 	}
 	toInfo(entry) {
@@ -55714,7 +55684,7 @@ var BackgroundProcessManager = class {
 			command: entry.command,
 			description: entry.description,
 			status: entry.status,
-			pid: entry.proc.pid,
+			pid: entry.kind === "process" ? entry.proc.pid : null,
 			exitCode: entry.exitCode,
 			startedAt: entry.startedAt,
 			endedAt: entry.endedAt,
@@ -55762,7 +55732,7 @@ function infoToPersisted(info) {
 		task_id: info.taskId,
 		command: info.command,
 		description: info.description,
-		pid: info.pid,
+		pid: info.pid ?? 0,
 		started_at: info.startedAt,
 		ended_at: info.endedAt,
 		exit_code: info.exitCode,
@@ -58617,14 +58587,14 @@ const SENSITIVE_DOT_VARIANT_SUFFIXES = [
 ];
 const SENSITIVE_DOT_VARIANT_SUFFIX_SET = new Set(SENSITIVE_DOT_VARIANT_SUFFIXES);
 const DEFAULT_PATH_CLASS$1 = path$8.sep === "\\" ? "win32" : "posix";
-function pathMod$5(pathClass) {
+function pathMod$4(pathClass) {
 	return pathClass === "win32" ? win32Path : posixPath;
 }
 function comparable(path, pathClass) {
 	return pathClass === "win32" ? path.toLowerCase() : path;
 }
 function isSensitiveFile(path, pathClass = DEFAULT_PATH_CLASS$1) {
-	const mod = pathMod$5(pathClass);
+	const mod = pathMod$4(pathClass);
 	const comparableName = comparable(mod.basename(path), pathClass);
 	const comparablePath = comparable(path, pathClass);
 	if (ENV_EXEMPTIONS.has(comparableName)) return false;
@@ -58678,7 +58648,7 @@ var PathSecurityError = class extends Error {
 	}
 };
 const DEFAULT_PATH_CLASS = path$8.sep === "\\" ? "win32" : "posix";
-function pathMod$4(pathClass) {
+function pathMod$3(pathClass) {
 	return pathClass === "win32" ? win32Path : posixPath;
 }
 function comparablePath(path, pathClass) {
@@ -58708,7 +58678,7 @@ function normalizeUserPath(path, pathClass = DEFAULT_PATH_CLASS) {
 function expandUserPath$1(path, homeDir, pathClass) {
 	if (homeDir === void 0) return path;
 	if (path === "~") return homeDir;
-	if (path.startsWith("~/") || pathClass === "win32" && path.startsWith("~\\")) return pathMod$4(pathClass).join(homeDir, path.slice(2));
+	if (path.startsWith("~/") || pathClass === "win32" && path.startsWith("~\\")) return pathMod$3(pathClass).join(homeDir, path.slice(2));
 	return path;
 }
 /**
@@ -58717,7 +58687,7 @@ function expandUserPath$1(path, homeDir, pathClass) {
 */
 function canonicalizePath(path, cwd, pathClass = DEFAULT_PATH_CLASS) {
 	if (path === "") throw new PathSecurityError("PATH_INVALID", path, path, "Path cannot be empty");
-	const mod = pathMod$4(pathClass);
+	const mod = pathMod$3(pathClass);
 	const normalizedPath = normalizeUserPath(path, pathClass);
 	if (pathClass === "win32" && isWin32DriveRelative(normalizedPath)) throw new PathSecurityError("PATH_INVALID", path, normalizedPath, `"${path}" is a drive-relative Windows path. Use an absolute path like C:\\path or a path relative to the working directory.`);
 	if (!mod.isAbsolute(normalizedPath) && !mod.isAbsolute(cwd)) throw new PathSecurityError("PATH_INVALID", path, normalizedPath, `Cannot resolve "${path}" against non-absolute cwd "${cwd}".`);
@@ -58729,7 +58699,7 @@ function canonicalizePath(path, cwd, pathClass = DEFAULT_PATH_CLASS) {
 * on path-component boundaries. Both arguments must already be canonical.
 */
 function isWithinDirectory(candidate, base, pathClass = DEFAULT_PATH_CLASS) {
-	const mod = pathMod$4(pathClass);
+	const mod = pathMod$3(pathClass);
 	const comparableCandidate = comparablePath(candidate, pathClass);
 	const comparableBase = comparablePath(base, pathClass);
 	if (comparableCandidate === comparableBase) return true;
@@ -58755,7 +58725,7 @@ function relativeOutsideMessage(path, operation) {
 }
 function resolvePathAccess(path, cwd, config, options) {
 	const pathClass = options.pathClass ?? DEFAULT_PATH_CLASS;
-	const mod = pathMod$4(pathClass);
+	const mod = pathMod$3(pathClass);
 	const expandedPath = expandUserPath$1(normalizeUserPath(path, pathClass), options.homeDir, pathClass);
 	const rawIsAbsolute = mod.isAbsolute(expandedPath);
 	const canonical = canonicalizePath(expandedPath, cwd, pathClass);
@@ -58910,11 +58880,11 @@ var EditTool = class {
 		}
 	}
 };
-async function collectEntries$1(kaos, dirPath, maxWidth, pathClass) {
+async function collectEntries(kaos, dirPath, maxWidth, pathClass) {
 	const all = [];
 	try {
 		for await (const fullPath of kaos.iterdir(dirPath)) {
-			const name = basename$2(fullPath, pathClass);
+			const name = basename$1(fullPath, pathClass);
 			let isDir = false;
 			try {
 				isDir = ((await kaos.stat(fullPath)).stMode & 61440) === 16384;
@@ -58941,11 +58911,11 @@ async function collectEntries$1(kaos, dirPath, maxWidth, pathClass) {
 		readable: true
 	};
 }
-function pathMod$3(pathClass) {
+function pathMod$2(pathClass) {
 	return pathClass === "win32" ? win32Path : posixPath;
 }
-function basename$2(p, pathClass) {
-	return pathMod$3(pathClass).basename(p);
+function basename$1(p, pathClass) {
+	return pathMod$2(pathClass).basename(p);
 }
 /**
 * Return a 2-level tree listing of `workDir` suitable for inclusion in a
@@ -58955,7 +58925,7 @@ function basename$2(p, pathClass) {
 async function listDirectory(kaos, workDir) {
 	const lines = [];
 	const pathClass = kaos.pathClass();
-	const { entries, total, readable } = await collectEntries$1(kaos, workDir, 30, pathClass);
+	const { entries, total, readable } = await collectEntries(kaos, workDir, 30, pathClass);
 	if (!readable) return "[not readable]";
 	const remaining = total - entries.length;
 	for (let i = 0; i < entries.length; i++) {
@@ -58967,7 +58937,7 @@ async function listDirectory(kaos, workDir) {
 		if (isDir) {
 			lines.push(`${connector}${name}/`);
 			const childPrefix = isLast ? "    " : "│   ";
-			const child = await collectEntries$1(kaos, joinPath$1(workDir, name, pathClass), 10, pathClass);
+			const child = await collectEntries(kaos, joinPath(workDir, name, pathClass), 10, pathClass);
 			if (!child.readable) {
 				lines.push(`${childPrefix}└── [not readable]`);
 				continue;
@@ -58986,8 +58956,8 @@ async function listDirectory(kaos, workDir) {
 	if (remaining > 0) lines.push(`└── ... and ${String(remaining)} more entries`);
 	return lines.length > 0 ? lines.join("\n") : "(empty directory)";
 }
-function joinPath$1(parent, child, pathClass) {
-	return pathMod$3(pathClass).join(parent, child);
+function joinPath(parent, child, pathClass) {
+	return pathMod$2(pathClass).join(parent, child);
 }
 //#endregion
 //#region ../agent-core/src/tools/builtin/file/glob.md
@@ -65095,7 +65065,7 @@ var write_default = "Overwrite or append to a file with content exactly as provi
 const S_IFMT$2 = 61440;
 /** File-type bits of a directory. */
 const S_IFDIR$1 = 16384;
-function pathMod$2(pathClass) {
+function pathMod$1(pathClass) {
 	return pathClass === "win32" ? win32Path : posixPath;
 }
 const WriteInputSchema = z.object({
@@ -65162,7 +65132,7 @@ var WriteTool = class {
 	* skipped and the write proceeds, surfacing the real I/O error if any.
 	*/
 	async checkParentDirectory(safePath) {
-		const parent = pathMod$2(this.kaos.pathClass()).dirname(safePath);
+		const parent = pathMod$1(this.kaos.pathClass()).dirname(safePath);
 		let stat;
 		try {
 			stat = await this.kaos.stat(parent);
@@ -66078,8 +66048,14 @@ function project(history, ephemeralInjections) {
 		if (isBlockedUserPrompt(message)) return false;
 		return !isTranscriptOnlyHookResult(message) && message.partial !== true && !(message.role === "assistant" && message.content.length === 0 && message.toolCalls.length === 0);
 	}));
-	const injectionMessages = ephemeralInjections?.map((injection) => renderInjection(injection));
-	return injectionMessages ? [...injectionMessages, ...merged] : merged;
+	if (!ephemeralInjections?.length) return merged;
+	const afterSystemMsgs = ephemeralInjections.filter((injection) => !injection.position || injection.position === "after_system").map((injection) => renderInjection(injection));
+	const beforeUserMsgs = ephemeralInjections.filter((injection) => injection.position === "before_user").map((injection) => renderInjection(injection));
+	return [
+		...afterSystemMsgs,
+		...merged,
+		...beforeUserMsgs
+	];
 }
 function isTranscriptOnlyHookResult(message) {
 	return message.origin?.kind === "hook_result" && TRANSCRIPT_ONLY_HOOK_RESULT_EVENTS.has(message.origin.event ?? "");
@@ -67069,7 +67045,15 @@ var ContextMemory = class {
 		return this._history;
 	}
 	get messages() {
-		return project(this.history);
+		return this.getMessages();
+	}
+	/**
+	* Project history into provider-ready messages, optionally with
+	* ephemeral injections (e.g. timestamp, permission mode) appended
+	* at the `'before_user'` position.
+	*/
+	getMessages(ephemeral) {
+		return project(this.history, ephemeral);
 	}
 	applyObservationMasking(config) {
 		const effectiveConfig = config ?? DEFAULT_MASKING_CONFIG;
@@ -67730,146 +67714,55 @@ var DynamicInjector = class {
 	}
 };
 //#endregion
-//#region ../agent-core/src/agent/injection/directory-tree.ts
-const EXCLUDED_DIRS = new Set([
-	"node_modules",
-	".git",
-	"dist",
-	"build",
-	".next",
-	".nuxt",
-	".vite",
-	"target",
-	".turbo",
-	"coverage",
-	".cache",
-	".DS_Store",
-	".idea",
-	".vscode",
-	"venv",
-	".venv"
-]);
-const HIDDEN_DIR_WHITELIST = new Set([
-	".github",
-	".byf",
-	".agents",
-	".changeset",
-	".husky"
-]);
-var DirectoryTreeInjector = class extends DynamicInjector {
-	injectionVariant = "directory_tree";
-	lastTree;
-	hasInjected = false;
-	capturedTimestamp;
-	async getInjection() {
-		const kaos = this.agent.runtime.kaos;
-		const workDir = this.agent.config.cwd || kaos.getcwd();
-		const tree = await buildTree(kaos, workDir);
-		if (this.hasInjected && tree === this.lastTree) return;
-		this.lastTree = tree;
-		this.hasInjected = true;
-		if (this.capturedTimestamp === void 0) this.capturedTimestamp = (/* @__PURE__ */ new Date()).toISOString();
-		return `Current working directory structure (${workDir}):\n${tree}\n\nThe current date and time in ISO format is \`${this.capturedTimestamp}\`. This is only a reference for you when searching the web or checking file modification time, etc. If you need the exact time, use Bash tool with proper command.`;
-	}
-};
-async function buildTree(kaos, workDir) {
-	const lines = [];
-	const pathClass = kaos.pathClass();
-	const { entries, total, readable } = await collectEntries(kaos, workDir, 30, pathClass);
-	if (!readable) return "[not readable]";
-	const remaining = total - entries.length;
-	for (let i = 0; i < entries.length; i++) {
-		const entry = entries[i];
-		if (entry === void 0) continue;
-		const { name, isDir } = entry;
-		const isLast = i === entries.length - 1 && remaining === 0;
-		const connector = isLast ? "└── " : "├── ";
-		if (isDir) {
-			lines.push(`${connector}${name}/`);
-			const childPrefix = isLast ? "    " : "│   ";
-			const child = await collectEntries(kaos, joinPath(workDir, name, pathClass), 10, pathClass);
-			if (!child.readable) {
-				lines.push(`${childPrefix}└── [not readable]`);
-				continue;
-			}
-			const childRemaining = child.total - child.entries.length;
-			for (let j = 0; j < child.entries.length; j++) {
-				const ce = child.entries[j];
-				if (ce === void 0) continue;
-				const cConnector = j === child.entries.length - 1 && childRemaining === 0 ? "└── " : "├── ";
-				const suffix = ce.isDir ? "/" : "";
-				lines.push(`${childPrefix}${cConnector}${ce.name}${suffix}`);
-			}
-			if (childRemaining > 0) lines.push(`${childPrefix}└── ... and ${String(childRemaining)} more`);
-		} else lines.push(`${connector}${name}`);
-	}
-	if (remaining > 0) lines.push(`└── ... and ${String(remaining)} more entries`);
-	return lines.length > 0 ? lines.join("\n") : "(empty directory)";
-}
-async function collectEntries(kaos, dirPath, maxWidth, pathClass) {
-	const all = [];
-	try {
-		for await (const fullPath of kaos.iterdir(dirPath)) {
-			const name = basename$1(fullPath, pathClass);
-			if (shouldExclude(name)) continue;
-			let isDir = false;
-			try {
-				isDir = ((await kaos.stat(fullPath)).stMode & 61440) === 16384;
-			} catch {}
-			all.push({
-				name,
-				isDir
-			});
-		}
-	} catch {
-		return {
-			entries: [],
-			total: 0,
-			readable: false
-		};
-	}
-	all.sort((a, b) => {
-		if (a.isDir !== b.isDir) return a.isDir ? -1 : 1;
-		return a.name.localeCompare(b.name);
-	});
-	return {
-		entries: all.slice(0, maxWidth),
-		total: all.length,
-		readable: true
-	};
-}
-function shouldExclude(name) {
-	if (EXCLUDED_DIRS.has(name)) return true;
-	if (name.startsWith(".") && !HIDDEN_DIR_WHITELIST.has(name)) return true;
-	return false;
-}
-function pathMod$1(pathClass) {
-	return pathClass === "win32" ? win32Path : posixPath;
-}
-function basename$1(p, pathClass) {
-	return pathMod$1(pathClass).basename(p);
-}
-function joinPath(parent, child, pathClass) {
-	return pathMod$1(pathClass).join(parent, child);
-}
-//#endregion
 //#region ../agent-core/src/agent/injection/permission-mode.ts
-const AUTO_MODE_ENTER_REMINDER = [
+const AUTO_MODE_REMINDER = [
 	"Auto permission mode is active. Tool approvals will be handled automatically while this mode remains enabled.",
 	"  - Continue normally without pausing for approval prompts.",
 	"  - Do NOT call AskUserQuestion while auto mode is active. Make a reasonable decision and continue without asking the user."
 ].join("\n");
-const AUTO_MODE_EXIT_REMINDER = ["Auto permission mode is no longer active. Tool approvals and permission checks are back to the current mode.", "  - Continue normally, but expect approval prompts or denials when a tool requires them."].join("\n");
+/**
+* Ephemeral injector for permission mode state.
+*
+* Emits the current permission mode as an ephemeral injection placed at
+* the `'before_user'` position. Unlike the previous persistent approach
+* (which recorded transition events into history), the ephemeral approach
+* always reflects the current state — surviving compaction and avoiding
+* history pollution.
+*
+* Only auto mode produces an injection; in all other modes the absence
+* of a reminder signals that normal approval prompts apply.
+*/
 var PermissionModeInjector = class extends DynamicInjector {
 	injectionVariant = "permission_mode";
-	lastMode;
-	getInjection() {
-		const mode = this.agent.permission.mode;
-		const previousMode = this.lastMode;
-		if (mode === previousMode) return void 0;
-		this.lastMode = mode;
-		if (mode === "auto") return AUTO_MODE_ENTER_REMINDER;
-		if (previousMode === "auto") return AUTO_MODE_EXIT_REMINDER;
+	getInjection() {}
+	getEphemeral() {
+		if (this.agent.permission.mode !== "auto") return [];
+		return [{
+			kind: "system_reminder",
+			content: AUTO_MODE_REMINDER,
+			position: "before_user"
+		}];
+	}
+};
+//#endregion
+//#region ../agent-core/src/agent/injection/timestamp.ts
+/**
+* Ephemeral injector that provides the current timestamp at request time.
+*
+* The timestamp is rendered fresh on every step (not frozen) and placed
+* at the `'before_user'` position so it never breaks the cached prefix.
+* This aligns with the prompt-cache best practice of keeping per-request
+* dynamic content out of the cacheable system-prompt blocks.
+*/
+var TimestampInjector = class extends DynamicInjector {
+	injectionVariant = "timestamp";
+	getInjection() {}
+	getEphemeral() {
+		return [{
+			kind: "system_reminder",
+			content: `The current date and time in ISO format is \`${(/* @__PURE__ */ new Date()).toISOString()}\`. This is only a reference for you when searching the web or checking file modification time, etc. If you need the exact time, use Bash tool with proper command.`,
+			position: "before_user"
+		}];
 	}
 };
 //#endregion
@@ -67879,11 +67772,20 @@ var InjectionManager = class {
 	injectors;
 	constructor(agent) {
 		this.agent = agent;
-		this.injectors = [new PermissionModeInjector(agent), new DirectoryTreeInjector(agent)];
+		this.injectors = [new PermissionModeInjector(agent), new TimestampInjector(agent)];
 	}
 	async inject() {
 		for (const injector of this.injectors) await injector.inject();
 	}
+	getEphemeralInjections() {
+		return this.injectors.flatMap((injector) => {
+			try {
+				return injector.getEphemeral?.() ?? [];
+			} catch {
+				return [];
+			}
+		});
+	}
 	onContextClear() {
 		for (const injector of this.injectors) injector.onContextClear();
 	}
@@ -83152,20 +83054,25 @@ const CACHE_BOUNDARY_MARKER = "__CACHE_BOUNDARY__";
 *
 * These headers mark natural breaks in the system prompt where cache boundaries should be placed:
 * - "# Project Information" marks the start of project-specific content
+* - "# Working Environment" marks the start of session-specific environment (OS, working directory)
 * - "# Skills" marks the start of session-specific skills listing
 */
-const IMPLICIT_BOUNDARY_HEADERS = ["# Project Information", "# Skills"];
+const IMPLICIT_BOUNDARY_HEADERS = [
+	"# Project Information",
+	"# Working Environment",
+	"# Skills"
+];
 /**
 * Block names by position.
 *
 * - First block (before first marker): 'base'
 * - Last block (after last marker): 'sessionContext'
-* - Intermediate blocks: Sequential names from 'projectInstructions', 'skillsListing', etc.
+* - Intermediate blocks: Sequential names from 'projectInstructions', 'workingEnvironment', etc.
 */
 const BLOCK_NAMES = [
 	"base",
 	"projectInstructions",
-	"skillsListing",
+	"workingEnvironment",
 	"sessionContext"
 ];
 /**
@@ -83989,8 +83896,8 @@ var TurnFlow = class {
 						completionBudgetConfig
 					}),
 					buildMessages: () => {
-						const messages = this.agent.context.messages;
-						return applyCacheStaking(messages, { previousTurnMessageCount: this._previousTurnMessageCount });
+						const ephemeral = this.agent.injection.getEphemeralInjections();
+						return applyCacheStaking(this.agent.context.getMessages(ephemeral), { previousTurnMessageCount: this._previousTurnMessageCount });
 					},
 					dispatchEvent: this.buildDispatchEvent(turnId),
 					tools: this.agent.tools.loopTools,
@@ -89065,7 +88972,7 @@ var SessionSubagentHost = class {
 		const { id, agent } = await this.session.createAgent({
 			type: "sub",
 			generate: parent.rawGenerate
-		}, void 0, this.ownerAgentId);
+		}, void 0, this.ownerAgentId, options.parentToolCallId);
 		const controller = new AbortController();
 		const unlinkAbortSignal = linkAbortSignal(options.signal, controller);
 		this.activeChildren.set(id, {
@@ -89364,7 +89271,7 @@ var Session$1 = class {
 		})) return;
 		await Promise.all(Array.from(this.agents.values(), (agent) => agent.background.stopAll("Session closed")));
 	}
-	async createAgent(config, profile, parentAgentId) {
+	async createAgent(config, profile, parentAgentId, parentToolCallId) {
 		await this.skillsReady;
 		const type = config.type ?? "main";
 		const id = type === "main" ? "main" : this.nextGeneratedAgentId();
@@ -89376,7 +89283,8 @@ var Session$1 = class {
 		this.metadata.agents[id] = {
 			homedir,
 			type,
-			parentAgentId: parentAgentId ?? null
+			parentAgentId: parentAgentId ?? null,
+			parentToolCallId
 		};
 		this.writeMetadata();
 		return {
@@ -127223,7 +127131,8 @@ async function resumeSessionResult(summary, session, warning) {
 			usage,
 			tools: await api.getTools({ agentId }),
 			toolStore: agent.tools.storeData(),
-			background: agent.background.list(false)
+			background: agent.background.list(false),
+			parentToolCallId: session.metadata.agents[agentId]?.parentToolCallId
 		};
 	}
 	return {
@@ -128300,6 +128209,9 @@ function firstNonEmptyString(source, keys) {
 	}
 }
 async function fetchModels(baseUrl, apiKey, fetchImpl = fetch, signal) {
+	return fetchOpenAICompatModels(baseUrl, apiKey, fetchImpl, signal);
+}
+async function fetchOpenAICompatModels(baseUrl, apiKey, fetchImpl = fetch, signal) {
 	const res = await fetchImpl(`${baseUrl.replace(/\/+$/, "")}/models`, {
 		headers: {
 			Authorization: `Bearer ${apiKey}`,
@@ -128312,6 +128224,70 @@ async function fetchModels(baseUrl, apiKey, fetchImpl = fetch, signal) {
 	if (!isRecord(payload) || !Array.isArray(payload["data"])) throw new Error(`Unexpected models response for ${baseUrl}.`);
 	return payload["data"].map((item) => toModelInfo(item)).filter((item) => item !== void 0);
 }
+/**
+* Lists models from a provider using its native wire-type endpoint. Dispatches
+* per `type` so each protocol gets its correct auth header and response shape.
+* `openai-completions` and `openai_responses` share the OpenAI-compatible
+* `/models` endpoint; `anthropic` uses its native `x-api-key` endpoint with
+* pagination. Other types have dedicated native fetchers (added in
+* later slices).
+*/
+async function fetchModelsByType(type, baseUrl, apiKey, fetchImpl = fetch, signal) {
+	switch (type) {
+		case "openai-completions":
+		case "openai_responses": return fetchOpenAICompatModels(baseUrl, apiKey, fetchImpl, signal);
+		case "anthropic": return fetchAnthropicModels(baseUrl, apiKey, fetchImpl, signal);
+		default: throw new Error(`fetchModelsByType: unsupported provider type "${type}".`);
+	}
+}
+/**
+* Anthropic native `/v1/models` listing. Uses `x-api-key` + `anthropic-version`
+* headers (not Bearer). Response is paginated via `has_more` + `last_id`;
+* follow pages by passing `?after_id=<last_id>`. Defensive guards: a page that
+* claims `has_more` but omits `last_id` stops pagination (returns what we have)
+* rather than looping forever; a hard cap (10 pages) also bounds the loop.
+*/
+async function fetchAnthropicModels(baseUrl, apiKey, fetchImpl = fetch, signal) {
+	const base = baseUrl.replace(/\/+$/, "");
+	const ANTHROPIC_VERSION = "2023-06-01";
+	const MAX_PAGES = 10;
+	const collected = [];
+	let afterId;
+	for (let page = 0; page < MAX_PAGES; page += 1) {
+		const res = await fetchImpl(afterId === void 0 ? `${base}/models` : `${base}/models?after_id=${encodeURIComponent(afterId)}`, {
+			headers: {
+				"x-api-key": apiKey,
+				"anthropic-version": ANTHROPIC_VERSION,
+				Accept: "application/json"
+			},
+			signal
+		});
+		if (!res.ok) throw new ProviderApiError(await readApiErrorMessage(res, `Failed to list models (HTTP ${res.status}).`), res.status);
+		const payload = await res.json();
+		if (!isRecord(payload) || !Array.isArray(payload["data"])) throw new Error(`Unexpected models response for ${baseUrl}.`);
+		for (const item of payload["data"]) {
+			const info = anthropicModelToInfo(item);
+			if (info !== void 0) collected.push(info);
+		}
+		const hasMore = payload["has_more"] === true;
+		const lastId = typeof payload["last_id"] === "string" ? payload["last_id"] : void 0;
+		if (!hasMore || lastId === void 0 || lastId.length === 0) break;
+		afterId = lastId;
+	}
+	return collected;
+}
+function anthropicModelToInfo(item) {
+	if (!isRecord(item) || typeof item["id"] !== "string" || item["id"].length === 0) return;
+	const displayName = item["display_name"];
+	return {
+		id: item["id"],
+		contextLength: 2e5,
+		supportsReasoning: true,
+		supportsImageIn: true,
+		supportsVideoIn: false,
+		displayName: typeof displayName === "string" && displayName.length > 0 ? displayName : void 0
+	};
+}
 function capabilitiesForModel(model) {
 	const caps = /* @__PURE__ */ new Set();
 	if (model.supportsReasoning) caps.add("thinking");
@@ -128325,7 +128301,7 @@ function applyProviderConfig(config, options) {
 	const providerKey = options.name;
 	const modelKey = `${providerKey}/${options.selectedModel.id}`;
 	config.providers[providerKey] = {
-		type: "openai-completions",
+		type: options.type ?? "openai-completions",
 		baseUrl: options.baseUrl,
 		apiKey: options.apiKey,
 		thinkingEffortKey: options.selectedModel.reasoningEffortKey
@@ -128351,4 +128327,4 @@ function applyProviderConfig(config, options) {
 	};
 }
 //#endregion
-export { BYF_ERROR_INFO, ByfAuthFacade, ByfError, ByfHarness, CatalogFetchError, DEFAULT_CATALOG_URL, ErrorCodes, MCP_OAUTH_AUTHORIZATION_URL_TOOL_UPDATE, Session, applyCatalogProvider, applyProviderConfig, catalogBaseUrl, catalogIdMatchesModelId, catalogModelToAlias, catalogProviderModels, enrichWithCatalog, fetchCatalog, fetchModels, findCatalogModel, flushDiagnosticLogs, fromByfErrorPayload, __toESM as i, inferWireType, isByfError, loadBuiltInCatalog, log, __esmMin as n, __require as r, redact, resolveByfHome, resolveGlobalLogPath, __commonJSMin as t, toByfErrorPayload };
+export { BYF_ERROR_INFO, ByfAuthFacade, ByfError, ByfHarness, CatalogFetchError, DEFAULT_CATALOG_URL, ErrorCodes, MCP_OAUTH_AUTHORIZATION_URL_TOOL_UPDATE, Session, applyCatalogProvider, applyProviderConfig, catalogBaseUrl, catalogIdMatchesModelId, catalogModelToAlias, catalogProviderModels, enrichWithCatalog, fetchCatalog, fetchModels, fetchModelsByType, findCatalogModel, flushDiagnosticLogs, fromByfErrorPayload, __toESM as i, inferWireType, isByfError, loadBuiltInCatalog, log, __esmMin as n, __require as r, redact, resolveByfHome, resolveGlobalLogPath, __commonJSMin as t, toByfErrorPayload };