create-expert 0.0.37 → 0.0.39

package/dist/bin/cli.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 import { a as __toCommonJS, i as __require, n as __esmMin, o as __toESM, r as __exportAll, t as __commonJSMin } from "../chunk-D_gEzPfs.js";
-import { $ as boolean, A as startCommandInputSchema, At as defineLazy, C as startGeneration, Ct as $ZodObject, D as stopRunByExceededMaxSteps, Dt as safeParse$1, E as stopRunByError, Et as parseAsync, F as checkpointSchema, Ft as PerstackError, G as number$1, It as defaultMaxRetries, J as _instanceof, K as ZodOptional$1, Lt as defaultTimeout, M as lockfileSchema, Mt as $constructor, N as jobSchema, Nt as NEVER, O as stopRunByInteractiveTool, Ot as safeParseAsync$1, P as expertSchema, Pt as knownModels, Q as array$1, Rt as createId, S as skipDelegates, St as meta$1, T as stopRunByDelegate, Tt as parse$1, Y as _null, Z as any, _ as resolveToolResults, _t as url, a as BASE_SKILL_PREFIX, at as looseObject, b as runParamsSchema, bt as toJSONSchema, c as attemptCompletion$1, ct as object$2, d as continueToNextStep, dt as record, et as custom, f as createRuntimeEvent, ft as strictObject, g as proceedToInteractiveTools, gt as unknown, h as finishToolCall, ht as union, i as getFilteredEnv, it as literal, j as perstackConfigSchema, jt as normalizeParams, k as runCommandInputSchema, kt as clone, l as callTools, lt as optional, m as finishMcpTools, mt as tuple, n as createFilteredEventListener, nt as intersection, o as createBaseToolActivity, ot as never, p as createStreamingEvent, pt as string, q as _enum, r as validateEventFilter, rt as lazy, s as createGeneralToolActivity, st as number, t as parseWithFriendlyError, tt as discriminatedUnion, u as completeRun, ut as preprocess, v as resumeFromStop, vt as safeParseAsync$2, w as startRun, wt as $ZodType, x as runSettingSchema, xt as describe$1, y as retry, yt as datetime } from "../src-D-q0VJ6r.js";
+import { $ as boolean, A as startCommandInputSchema, At as defineLazy, C as startGeneration, Ct as $ZodObject, D as stopRunByExceededMaxSteps, Dt as safeParse$1, E as stopRunByError, Et as parseAsync, F as checkpointSchema, Ft as PerstackError, G as number$1, It as defaultMaxRetries, J as _instanceof, K as ZodOptional$1, Lt as defaultTimeout, M as lockfileSchema, Mt as $constructor, N as jobSchema, Nt as NEVER, O as stopRunByInteractiveTool, Ot as safeParseAsync$1, P as expertSchema, Pt as knownModels, Q as array$1, Rt as createId, S as skipDelegates, St as meta$1, T as stopRunByDelegate, Tt as parse$1, Y as _null, Z as any, _ as resolveToolResults, _t as url, a as BASE_SKILL_PREFIX, at as looseObject, b as runParamsSchema, bt as toJSONSchema, c as attemptCompletion$1, ct as object$2, d as continueToNextStep, dt as record, et as custom, f as createRuntimeEvent, ft as strictObject, g as proceedToInteractiveTools, gt as unknown, h as finishToolCall, ht as union, i as getFilteredEnv, it as literal, j as perstackConfigSchema, jt as normalizeParams, k as runCommandInputSchema, kt as clone, l as callTools, lt as optional, m as finishMcpTools, mt as tuple, n as createFilteredEventListener, nt as intersection, o as createBaseToolActivity, ot as never, p as createStreamingEvent, pt as string, q as _enum, r as validateEventFilter, rt as lazy, s as createGeneralToolActivity, st as number, t as parseWithFriendlyError, tt as discriminatedUnion, u as completeRun, ut as preprocess, v as resumeFromStop, vt as safeParseAsync$2, w as startRun, wt as $ZodType, x as runSettingSchema, xt as describe$1, y as retry, yt as datetime } from "../src-C0pz_C3h.js";
 import { t as require_token_error } from "../token-error-CfavTss_.js";
 import * as fs$2 from "node:fs";
-import fs, { existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, writeFileSync } from "node:fs";
+import fs, { existsSync, readFileSync, readdirSync, realpathSync } from "node:fs";
 import fs$1, { constants, lstat, mkdir, open, readFile, stat, writeFile } from "node:fs/promises";
 import path, { dirname, extname } from "node:path";
 import os from "node:os";
@@ -1020,17 +1020,21 @@ function getJobsDir() {
 function getJobDir(jobId) {
 	return `${getJobsDir()}/${jobId}`;
 }
-function storeJob(job) {
+async function storeJob(job) {
 	const jobDir = getJobDir(job.id);
-	if (!existsSync(jobDir)) mkdirSync(jobDir, { recursive: true });
-	writeFileSync(path.resolve(jobDir, "job.json"), JSON.stringify(job, null, 2));
+	await mkdir(jobDir, { recursive: true });
+	await writeFile(path.resolve(jobDir, "job.json"), JSON.stringify(job, null, 2));
 }
-function retrieveJob(jobId) {
+async function retrieveJob(jobId) {
 	const jobDir = getJobDir(jobId);
 	const jobPath = path.resolve(jobDir, "job.json");
-	if (!existsSync(jobPath)) return;
-	const content = readFileSync(jobPath, "utf-8");
-	return jobSchema.parse(JSON.parse(content));
+	try {
+		const content = await readFile(jobPath, "utf-8");
+		return jobSchema.parse(JSON.parse(content));
+	} catch (error) {
+		if (error instanceof Error && "code" in error && error.code === "ENOENT") return;
+		throw error;
+	}
 }
 function getAllJobs$1() {
 	const jobsDir = getJobsDir();
@@ -16305,7 +16309,7 @@ const EMPTY_COMPLETION_RESULT = { completion: {
 //#endregion
 //#region ../base/package.json
 var name$5 = "@perstack/base";
-var version$2 = "0.0.60";
+var version$2 = "0.0.61";
 
 //#endregion
 //#region ../base/src/tools/todo.ts
@@ -19746,23 +19750,41 @@ var SkillManager = class SkillManager {
 					const delegateExpert = experts[key];
 					if (!delegateExpert) throw new Error(`Expert "${key}" not found`);
 					await sm.addDelegate(delegateExpert);
+					if (!expert.delegates.includes(key)) expert.delegates.push(key);
 					return { delegateToolName: sm.getAdapters().get(delegateExpert.name)?.getToolDefinitions()[0]?.name ?? delegateExpert.name };
 				},
-				removeDelegate: (name) => sm.removeDelegate(name),
+				removeDelegate: async (name) => {
+					await sm.removeDelegate(name);
+					const index = expert.delegates.indexOf(name);
+					if (index >= 0) expert.delegates.splice(index, 1);
+				},
 				createExpert: async (input) => {
-					const expert = expertSchema.parse({
+					if (input.delegates) {
+						const missing = input.delegates.filter((d) => !experts[d]);
+						if (missing.length > 0) throw new Error(`Cannot create expert "${input.key}": delegates [${missing.join(", ")}] do not exist. Create them with createExpert first.`);
+					}
+					const skills = input.skills ? {
+						"@perstack/base": input.skills["@perstack/base"] ?? {
+							type: "mcpStdioSkill",
+							command: "npx",
+							packageName: "@perstack/base",
+							pick: ["attemptCompletion"]
+						},
+						...input.skills
+					} : void 0;
+					const newExpert = expertSchema.parse({
 						key: input.key,
 						name: input.key,
 						version: input.version ?? "1.0.0",
 						description: input.description,
 						instruction: input.instruction,
-						skills: input.skills,
+						skills,
 						delegates: input.delegates,
 						tags: input.tags,
 						providerTools: input.providerTools
 					});
-					experts[expert.key] = expert;
-					return { expertKey: expert.key };
+					experts[newExpert.key] = newExpert;
+					return { expertKey: newExpert.key };
 				}
 			});
 			break;
@@ -19917,7 +19939,7 @@ var SkillManager = class SkillManager {
 
 //#endregion
 //#region ../../packages/runtime/package.json
-var version$1 = "0.0.107";
+var version$1 = "0.0.110";
 
 //#endregion
 //#region ../../packages/runtime/src/helpers/usage.ts
@@ -22127,7 +22149,7 @@ async function* executeTool({ execute, input, options }) {
 }
 
 //#endregion
-//#region ../../node_modules/.pnpm/@ai-sdk+anthropic@3.0.44_zod@4.3.6/node_modules/@ai-sdk/anthropic/dist/internal/index.mjs
+//#region ../../node_modules/.pnpm/@ai-sdk+anthropic@3.0.45_zod@4.3.6/node_modules/@ai-sdk/anthropic/dist/internal/index.mjs
 var anthropicFailedResponseHandler$1 = createJsonErrorResponseHandler({
 	errorSchema: lazySchema(() => zodSchema(object$2({
 		type: literal("error"),
@@ -25259,7 +25281,7 @@ function guessServiceRegion(url, headers) {
 }
 
 //#endregion
-//#region ../../node_modules/.pnpm/@ai-sdk+amazon-bedrock@4.0.60_zod@4.3.6/node_modules/@ai-sdk/amazon-bedrock/dist/index.mjs
+//#region ../../node_modules/.pnpm/@ai-sdk+amazon-bedrock@4.0.61_zod@4.3.6/node_modules/@ai-sdk/amazon-bedrock/dist/index.mjs
 var BEDROCK_STOP_REASONS = [
 	"stop",
 	"stop_sequence",
@@ -26659,7 +26681,7 @@ var bedrockImageResponseSchema = object$2({
 	details: record(string(), unknown()).optional(),
 	preview: unknown().optional()
 });
-var VERSION$9 = "4.0.60";
+var VERSION$9 = "4.0.61";
 function createSigV4FetchFunction(getCredentials, fetch = globalThis.fetch) {
 	return async (input, init) => {
 		var _a, _b;
@@ -26905,8 +26927,8 @@ Original error: ${errorMessage}`);
 var bedrock = createAmazonBedrock();
 
 //#endregion
-//#region ../../node_modules/.pnpm/@ai-sdk+anthropic@3.0.44_zod@4.3.6/node_modules/@ai-sdk/anthropic/dist/index.mjs
-var VERSION$8 = "3.0.44";
+//#region ../../node_modules/.pnpm/@ai-sdk+anthropic@3.0.45_zod@4.3.6/node_modules/@ai-sdk/anthropic/dist/index.mjs
+var VERSION$8 = "3.0.45";
 var anthropicFailedResponseHandler = createJsonErrorResponseHandler({
 	errorSchema: lazySchema(() => zodSchema(object$2({
 		type: literal("error"),
@@ -30104,7 +30126,7 @@ var AnthropicMessagesLanguageModel = class {
 	}
 };
 function getModelCapabilities(modelId) {
-	if (modelId.includes("claude-opus-4-6")) return {
+	if (modelId.includes("claude-sonnet-4-6") || modelId.includes("claude-opus-4-6")) return {
 		maxOutputTokens: 128e3,
 		supportsStructuredOutput: true,
 		isKnownModel: true
@@ -30460,7 +30482,7 @@ function createAnthropic(options = {}) {
 var anthropic = createAnthropic();
 
 //#endregion
-//#region ../../node_modules/.pnpm/@ai-sdk+openai@3.0.29_zod@4.3.6/node_modules/@ai-sdk/openai/dist/internal/index.mjs
+//#region ../../node_modules/.pnpm/@ai-sdk+openai@3.0.30_zod@4.3.6/node_modules/@ai-sdk/openai/dist/internal/index.mjs
 var openaiErrorDataSchema$1 = object$2({ error: object$2({
 	message: string(),
 	type: string().nullish(),
@@ -32241,6 +32263,54 @@ var shellOutputSchema$1 = lazySchema(() => zodSchema(object$2({ output: array$1(
 		exitCode: number()
 	})])
 })) })));
+var shellSkillsSchema$1 = array$1(discriminatedUnion("type", [object$2({
+	type: literal("skillReference"),
+	skillId: string(),
+	version: string().optional()
+}), object$2({
+	type: literal("inline"),
+	name: string(),
+	description: string(),
+	source: object$2({
+		type: literal("base64"),
+		mediaType: literal("application/zip"),
+		data: string()
+	})
+})])).optional();
+var shellArgsSchema$1 = lazySchema(() => zodSchema(object$2({ environment: union([
+	object$2({
+		type: literal("containerAuto"),
+		fileIds: array$1(string()).optional(),
+		memoryLimit: _enum([
+			"1g",
+			"4g",
+			"16g",
+			"64g"
+		]).optional(),
+		networkPolicy: discriminatedUnion("type", [object$2({ type: literal("disabled") }), object$2({
+			type: literal("allowlist"),
+			allowedDomains: array$1(string()),
+			domainSecrets: array$1(object$2({
+				domain: string(),
+				name: string(),
+				value: string()
+			})).optional()
+		})]).optional(),
+		skills: shellSkillsSchema$1
+	}),
+	object$2({
+		type: literal("containerReference"),
+		containerId: string()
+	}),
+	object$2({
+		type: literal("local").optional(),
+		skills: array$1(object$2({
+			name: string(),
+			description: string(),
+			path: string()
+		})).optional()
+	})
+]).optional() })));
 createProviderToolFactoryWithOutputSchema({
 	id: "openai.shell",
 	inputSchema: shellInputSchema$1,
@@ -32418,11 +32488,33 @@ async function convertToOpenAIResponsesInput$1({ prompt, toolNameMapping, system
 					});
 					break;
 				}
-				case "tool-result":
+				case "tool-result": {
 					if (part.output.type === "execution-denied" || part.output.type === "json" && typeof part.output.value === "object" && part.output.value != null && "type" in part.output.value && part.output.value.type === "execution-denied") break;
 					if (hasConversation) break;
+					const resolvedResultToolName = toolNameMapping.toProviderToolName(part.toolName);
+					if (hasShellTool && resolvedResultToolName === "shell") {
+						if (part.output.type === "json") {
+							const parsedOutput = await validateTypes({
+								value: part.output.value,
+								schema: shellOutputSchema$1
+							});
+							input.push({
+								type: "shell_call_output",
+								call_id: part.toolCallId,
+								output: parsedOutput.output.map((item) => ({
+									stdout: item.stdout,
+									stderr: item.stderr,
+									outcome: item.outcome.type === "timeout" ? { type: "timeout" } : {
+										type: "exit",
+										exit_code: item.outcome.exitCode
+									}
+								}))
+							});
+						}
+						break;
+					}
 					if (store) {
-						const itemId = (_j = (_i = (_h = part.providerMetadata) == null ? void 0 : _h[providerOptionsName]) == null ? void 0 : _i.itemId) != null ? _j : part.toolCallId;
+						const itemId = (_j = (_i = (_h = part.providerOptions) == null ? void 0 : _h[providerOptionsName]) == null ? void 0 : _i.itemId) != null ? _j : part.toolCallId;
 						input.push({
 							type: "item_reference",
 							id: itemId
@@ -32432,6 +32524,7 @@ async function convertToOpenAIResponsesInput$1({ prompt, toolNameMapping, system
 						message: `Results for OpenAI tool ${part.toolName} are not sent to the API when store is false`
 					});
 					break;
+				}
 				case "reasoning": {
 					const providerOptions = await parseProviderOptions({
 						provider: providerOptionsName,
@@ -32760,6 +32853,24 @@ var openaiResponsesChunkSchema$1 = lazySchema(() => zodSchema(union([
 					"incomplete"
 				]),
 				action: object$2({ commands: array$1(string()) })
+			}),
+			object$2({
+				type: literal("shell_call_output"),
+				id: string(),
+				call_id: string(),
+				status: _enum([
+					"in_progress",
+					"completed",
+					"incomplete"
+				]),
+				output: array$1(object$2({
+					stdout: string(),
+					stderr: string(),
+					outcome: discriminatedUnion("type", [object$2({ type: literal("timeout") }), object$2({
+						type: literal("exit"),
+						exit_code: number()
+					})])
+				}))
 			})
 		])
 	}),
@@ -32934,6 +33045,24 @@ var openaiResponsesChunkSchema$1 = lazySchema(() => zodSchema(union([
 					"incomplete"
 				]),
 				action: object$2({ commands: array$1(string()) })
+			}),
+			object$2({
+				type: literal("shell_call_output"),
+				id: string(),
+				call_id: string(),
+				status: _enum([
+					"in_progress",
+					"completed",
+					"incomplete"
+				]),
+				output: array$1(object$2({
+					stdout: string(),
+					stderr: string(),
+					outcome: discriminatedUnion("type", [object$2({ type: literal("timeout") }), object$2({
+						type: literal("exit"),
+						exit_code: number()
+					})])
+				}))
 			})
 		])
 	}),
@@ -33258,6 +33387,24 @@ var openaiResponsesResponseSchema$1 = lazySchema(() => zodSchema(object$2({
 				"incomplete"
 			]),
 			action: object$2({ commands: array$1(string()) })
+		}),
+		object$2({
+			type: literal("shell_call_output"),
+			id: string(),
+			call_id: string(),
+			status: _enum([
+				"in_progress",
+				"completed",
+				"incomplete"
+			]),
+			output: array$1(object$2({
+				stdout: string(),
+				stderr: string(),
+				outcome: discriminatedUnion("type", [object$2({ type: literal("timeout") }), object$2({
+					type: literal("exit"),
+					exit_code: number()
+				})])
+			}))
 		})
 	])).optional(),
 	service_tier: string().nullish(),
@@ -33572,9 +33719,17 @@ async function prepareResponsesTools$2({ tools, toolChoice }) {
 				case "openai.local_shell":
 					openaiTools.push({ type: "local_shell" });
 					break;
-				case "openai.shell":
-					openaiTools.push({ type: "shell" });
+				case "openai.shell": {
+					const args = await validateTypes({
+						value: tool.args,
+						schema: shellArgsSchema$1
+					});
+					openaiTools.push({
+						type: "shell",
+						...args.environment && { environment: mapShellEnvironment$1(args.environment) }
+					});
 					break;
+				}
 				case "openai.apply_patch":
 					openaiTools.push({ type: "apply_patch" });
 					break;
@@ -33702,6 +33857,46 @@ async function prepareResponsesTools$2({ tools, toolChoice }) {
 		default: throw new UnsupportedFunctionalityError({ functionality: `tool choice type: ${type}` });
 	}
 }
+function mapShellEnvironment$1(environment) {
+	if (environment.type === "containerReference") return {
+		type: "container_reference",
+		container_id: environment.containerId
+	};
+	if (environment.type === "containerAuto") {
+		const env2 = environment;
+		return {
+			type: "container_auto",
+			file_ids: env2.fileIds,
+			memory_limit: env2.memoryLimit,
+			network_policy: env2.networkPolicy == null ? void 0 : env2.networkPolicy.type === "disabled" ? { type: "disabled" } : {
+				type: "allowlist",
+				allowed_domains: env2.networkPolicy.allowedDomains,
+				domain_secrets: env2.networkPolicy.domainSecrets
+			},
+			skills: mapShellSkills$1(env2.skills)
+		};
+	}
+	return {
+		type: "local",
+		skills: environment.skills
+	};
+}
+function mapShellSkills$1(skills) {
+	return skills == null ? void 0 : skills.map((skill) => skill.type === "skillReference" ? {
+		type: "skill_reference",
+		skill_id: skill.skillId,
+		version: skill.version
+	} : {
+		type: "inline",
+		name: skill.name,
+		description: skill.description,
+		source: {
+			type: "base64",
+			media_type: skill.source.mediaType,
+			data: skill.source.data
+		}
+	});
+}
 function extractApprovalRequestIdToToolCallIdMapping$1(prompt) {
 	var _a, _b;
 	const mapping = {};
@@ -33729,7 +33924,7 @@ var OpenAIResponsesLanguageModel$1 = class {
 		return this.config.provider;
 	}
 	async getArgs({ maxOutputTokens, temperature, stopSequences, topP, topK, presencePenalty, frequencyPenalty, seed, prompt, providerOptions, tools, toolChoice, responseFormat }) {
-		var _a, _b, _c, _d, _e, _f;
+		var _a, _b, _c, _d, _e, _f, _g, _h, _i;
 		const warnings = [];
 		const modelCapabilities = getOpenAILanguageModelCapabilities$1(this.modelId);
 		if (topK != null) warnings.push({
@@ -33899,6 +34094,8 @@ var OpenAIResponsesLanguageModel$1 = class {
 			tools,
 			toolChoice
 		});
+		const shellToolEnvType = (_i = (_h = (_g = tools == null ? void 0 : tools.find((tool) => tool.type === "provider" && tool.id === "openai.shell")) == null ? void 0 : _g.args) == null ? void 0 : _h.environment) == null ? void 0 : _i.type;
+		const isShellProviderExecuted = shellToolEnvType === "containerAuto" || shellToolEnvType === "containerReference";
 		return {
 			webSearchToolName,
 			args: {
@@ -33909,12 +34106,13 @@ var OpenAIResponsesLanguageModel$1 = class {
 			warnings: [...warnings, ...toolWarnings],
 			store,
 			toolNameMapping,
-			providerOptionsName
+			providerOptionsName,
+			isShellProviderExecuted
 		};
 	}
 	async doGenerate(options) {
 		var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
-		const { args: body, warnings, webSearchToolName, toolNameMapping, providerOptionsName } = await this.getArgs(options);
+		const { args: body, warnings, webSearchToolName, toolNameMapping, providerOptionsName, isShellProviderExecuted } = await this.getArgs(options);
 		const url = this.config.url({
 			path: "/responses",
 			modelId: this.modelId
@@ -33986,9 +34184,25 @@ var OpenAIResponsesLanguageModel$1 = class {
 					toolCallId: part.call_id,
 					toolName: toolNameMapping.toCustomToolName("shell"),
 					input: JSON.stringify({ action: { commands: part.action.commands } }),
+					...isShellProviderExecuted && { providerExecuted: true },
 					providerMetadata: { [providerOptionsName]: { itemId: part.id } }
 				});
 				break;
+			case "shell_call_output":
+				content.push({
+					type: "tool-result",
+					toolCallId: part.call_id,
+					toolName: toolNameMapping.toCustomToolName("shell"),
+					result: { output: part.output.map((item) => ({
+						stdout: item.stdout,
+						stderr: item.stderr,
+						outcome: item.outcome.type === "exit" ? {
+							type: "exit",
+							exitCode: item.outcome.exit_code
+						} : { type: "timeout" }
+					})) }
+				});
+				break;
 			case "message":
 				for (const contentPart of part.content) {
 					if (((_c = (_b = options.providerOptions) == null ? void 0 : _b[providerOptionsName]) == null ? void 0 : _c.logprobs) && contentPart.logprobs) logprobs.push(contentPart.logprobs);
@@ -34223,7 +34437,7 @@ var OpenAIResponsesLanguageModel$1 = class {
 		};
 	}
 	async doStream(options) {
-		const { args: body, warnings, webSearchToolName, toolNameMapping, store, providerOptionsName } = await this.getArgs(options);
+		const { args: body, warnings, webSearchToolName, toolNameMapping, store, providerOptionsName, isShellProviderExecuted } = await this.getArgs(options);
 		const { responseHeaders, value: response } = await postJsonToApi({
 			url: this.config.url({
 				path: "/responses",
@@ -34393,7 +34607,7 @@ var OpenAIResponsesLanguageModel$1 = class {
 							toolName: toolNameMapping.toCustomToolName("shell"),
 							toolCallId: value.item.call_id
 						};
-						else if (value.item.type === "message") {
+						else if (value.item.type === "shell_call_output") {} else if (value.item.type === "message") {
 							ongoingAnnotations.splice(0, ongoingAnnotations.length);
 							controller.enqueue({
 								type: "text-start",
@@ -34598,9 +34812,23 @@ var OpenAIResponsesLanguageModel$1 = class {
 								toolCallId: value.item.call_id,
 								toolName: toolNameMapping.toCustomToolName("shell"),
 								input: JSON.stringify({ action: { commands: value.item.action.commands } }),
+								...isShellProviderExecuted && { providerExecuted: true },
 								providerMetadata: { [providerOptionsName]: { itemId: value.item.id } }
 							});
-						} else if (value.item.type === "reasoning") {
+						} else if (value.item.type === "shell_call_output") controller.enqueue({
+							type: "tool-result",
+							toolCallId: value.item.call_id,
+							toolName: toolNameMapping.toCustomToolName("shell"),
+							result: { output: value.item.output.map((item) => ({
+								stdout: item.stdout,
+								stderr: item.stderr,
+								outcome: item.outcome.type === "exit" ? {
+									type: "exit",
+									exitCode: item.outcome.exit_code
+								} : { type: "timeout" }
+							})) }
+						});
+						else if (value.item.type === "reasoning") {
 							const activeReasoningPart = activeReasoning[value.item.id];
 							const summaryPartIndices = Object.entries(activeReasoningPart.summaryParts).filter(([_, status]) => status === "active" || status === "can-conclude").map(([summaryIndex]) => summaryIndex);
 							for (const summaryIndex of summaryPartIndices) controller.enqueue({
@@ -34886,14 +35114,14 @@ function escapeJSONDelta$1(delta) {
 }
 
 //#endregion
-//#region ../../node_modules/.pnpm/@ai-sdk+azure@3.0.30_zod@4.3.6/node_modules/@ai-sdk/azure/dist/index.mjs
+//#region ../../node_modules/.pnpm/@ai-sdk+azure@3.0.31_zod@4.3.6/node_modules/@ai-sdk/azure/dist/index.mjs
 var azureOpenaiTools = {
 	codeInterpreter: codeInterpreter$1,
 	fileSearch: fileSearch$3,
 	imageGeneration: imageGeneration$1,
 	webSearchPreview: webSearchPreview$1
 };
-var VERSION$7 = "3.0.30";
+var VERSION$7 = "3.0.31";
 function createAzure(options = {}) {
 	var _a;
 	const getHeaders = () => {
@@ -48344,7 +48572,7 @@ var googleTools = {
 };
 
 //#endregion
-//#region ../../node_modules/.pnpm/@ai-sdk+google-vertex@4.0.58_zod@4.3.6/node_modules/@ai-sdk/google-vertex/dist/index.mjs
+//#region ../../node_modules/.pnpm/@ai-sdk+google-vertex@4.0.59_zod@4.3.6/node_modules/@ai-sdk/google-vertex/dist/index.mjs
 var authInstance = null;
 var authOptions = null;
 function getAuth(options) {
@@ -48361,7 +48589,7 @@ async function generateAuthToken(options) {
 	const token = await (await getAuth(options || {}).getClient()).getAccessToken();
 	return (token == null ? void 0 : token.token) || null;
 }
-var VERSION$4 = "4.0.58";
+var VERSION$4 = "4.0.59";
 var googleVertexFailedResponseHandler = createJsonErrorResponseHandler({
 	errorSchema: object$2({ error: object$2({
 		code: number().nullable(),
@@ -48959,7 +49187,7 @@ function createVertex2(options = {}) {
 var vertex = createVertex2();
 
 //#endregion
-//#region ../../node_modules/.pnpm/@ai-sdk+openai@3.0.29_zod@4.3.6/node_modules/@ai-sdk/openai/dist/index.mjs
+//#region ../../node_modules/.pnpm/@ai-sdk+openai@3.0.30_zod@4.3.6/node_modules/@ai-sdk/openai/dist/index.mjs
 var openaiErrorDataSchema = object$2({ error: object$2({
 	message: string(),
 	type: string().nullish(),
@@ -50560,6 +50788,54 @@ var shellOutputSchema = lazySchema(() => zodSchema(object$2({ output: array$1(ob
 		exitCode: number()
 	})])
 })) })));
+var shellSkillsSchema = array$1(discriminatedUnion("type", [object$2({
+	type: literal("skillReference"),
+	skillId: string(),
+	version: string().optional()
+}), object$2({
+	type: literal("inline"),
+	name: string(),
+	description: string(),
+	source: object$2({
+		type: literal("base64"),
+		mediaType: literal("application/zip"),
+		data: string()
+	})
+})])).optional();
+var shellArgsSchema = lazySchema(() => zodSchema(object$2({ environment: union([
+	object$2({
+		type: literal("containerAuto"),
+		fileIds: array$1(string()).optional(),
+		memoryLimit: _enum([
+			"1g",
+			"4g",
+			"16g",
+			"64g"
+		]).optional(),
+		networkPolicy: discriminatedUnion("type", [object$2({ type: literal("disabled") }), object$2({
+			type: literal("allowlist"),
+			allowedDomains: array$1(string()),
+			domainSecrets: array$1(object$2({
+				domain: string(),
+				name: string(),
+				value: string()
+			})).optional()
+		})]).optional(),
+		skills: shellSkillsSchema
+	}),
+	object$2({
+		type: literal("containerReference"),
+		containerId: string()
+	}),
+	object$2({
+		type: literal("local").optional(),
+		skills: array$1(object$2({
+			name: string(),
+			description: string(),
+			path: string()
+		})).optional()
+	})
+]).optional() })));
 var shell = createProviderToolFactoryWithOutputSchema({
 	id: "openai.shell",
 	inputSchema: shellInputSchema,
@@ -50895,11 +51171,33 @@ async function convertToOpenAIResponsesInput({ prompt, toolNameMapping, systemMe
 					});
 					break;
 				}
-				case "tool-result":
+				case "tool-result": {
 					if (part.output.type === "execution-denied" || part.output.type === "json" && typeof part.output.value === "object" && part.output.value != null && "type" in part.output.value && part.output.value.type === "execution-denied") break;
 					if (hasConversation) break;
+					const resolvedResultToolName = toolNameMapping.toProviderToolName(part.toolName);
+					if (hasShellTool && resolvedResultToolName === "shell") {
+						if (part.output.type === "json") {
+							const parsedOutput = await validateTypes({
+								value: part.output.value,
+								schema: shellOutputSchema
+							});
+							input.push({
+								type: "shell_call_output",
+								call_id: part.toolCallId,
+								output: parsedOutput.output.map((item) => ({
+									stdout: item.stdout,
+									stderr: item.stderr,
+									outcome: item.outcome.type === "timeout" ? { type: "timeout" } : {
+										type: "exit",
+										exit_code: item.outcome.exitCode
+									}
+								}))
+							});
+						}
+						break;
+					}
 					if (store) {
-						const itemId = (_j = (_i = (_h = part.providerMetadata) == null ? void 0 : _h[providerOptionsName]) == null ? void 0 : _i.itemId) != null ? _j : part.toolCallId;
+						const itemId = (_j = (_i = (_h = part.providerOptions) == null ? void 0 : _h[providerOptionsName]) == null ? void 0 : _i.itemId) != null ? _j : part.toolCallId;
 						input.push({
 							type: "item_reference",
 							id: itemId
@@ -50909,6 +51207,7 @@ async function convertToOpenAIResponsesInput({ prompt, toolNameMapping, systemMe
 						message: `Results for OpenAI tool ${part.toolName} are not sent to the API when store is false`
 					});
 					break;
+				}
 				case "reasoning": {
 					const providerOptions = await parseProviderOptions({
 						provider: providerOptionsName,
@@ -51237,6 +51536,24 @@ var openaiResponsesChunkSchema = lazySchema(() => zodSchema(union([
 					"incomplete"
 				]),
 				action: object$2({ commands: array$1(string()) })
+			}),
+			object$2({
+				type: literal("shell_call_output"),
+				id: string(),
+				call_id: string(),
+				status: _enum([
+					"in_progress",
+					"completed",
+					"incomplete"
+				]),
+				output: array$1(object$2({
+					stdout: string(),
+					stderr: string(),
+					outcome: discriminatedUnion("type", [object$2({ type: literal("timeout") }), object$2({
+						type: literal("exit"),
+						exit_code: number()
+					})])
+				}))
 			})
 		])
 	}),
@@ -51411,6 +51728,24 @@ var openaiResponsesChunkSchema = lazySchema(() => zodSchema(union([
 					"incomplete"
 				]),
 				action: object$2({ commands: array$1(string()) })
+			}),
+			object$2({
+				type: literal("shell_call_output"),
+				id: string(),
+				call_id: string(),
+				status: _enum([
+					"in_progress",
+					"completed",
+					"incomplete"
+				]),
+				output: array$1(object$2({
+					stdout: string(),
+					stderr: string(),
+					outcome: discriminatedUnion("type", [object$2({ type: literal("timeout") }), object$2({
+						type: literal("exit"),
+						exit_code: number()
+					})])
+				}))
 			})
 		])
 	}),
@@ -51735,6 +52070,24 @@ var openaiResponsesResponseSchema = lazySchema(() => zodSchema(object$2({
 				"incomplete"
 			]),
 			action: object$2({ commands: array$1(string()) })
+		}),
+		object$2({
+			type: literal("shell_call_output"),
+			id: string(),
+			call_id: string(),
+			status: _enum([
+				"in_progress",
+				"completed",
+				"incomplete"
+			]),
+			output: array$1(object$2({
+				stdout: string(),
+				stderr: string(),
+				outcome: discriminatedUnion("type", [object$2({ type: literal("timeout") }), object$2({
+					type: literal("exit"),
+					exit_code: number()
+				})])
+			}))
 		})
 	])).optional(),
 	service_tier: string().nullish(),
@@ -51828,9 +52181,17 @@ async function prepareResponsesTools$1({ tools, toolChoice }) {
 				case "openai.local_shell":
 					openaiTools2.push({ type: "local_shell" });
 					break;
-				case "openai.shell":
-					openaiTools2.push({ type: "shell" });
+				case "openai.shell": {
+					const args = await validateTypes({
+						value: tool.args,
+						schema: shellArgsSchema
+					});
+					openaiTools2.push({
+						type: "shell",
+						...args.environment && { environment: mapShellEnvironment(args.environment) }
+					});
 					break;
+				}
 				case "openai.apply_patch":
 					openaiTools2.push({ type: "apply_patch" });
 					break;
@@ -51958,6 +52319,46 @@ async function prepareResponsesTools$1({ tools, toolChoice }) {
 		default: throw new UnsupportedFunctionalityError({ functionality: `tool choice type: ${type}` });
 	}
 }
+function mapShellEnvironment(environment) {
+	if (environment.type === "containerReference") return {
+		type: "container_reference",
+		container_id: environment.containerId
+	};
+	if (environment.type === "containerAuto") {
+		const env2 = environment;
+		return {
+			type: "container_auto",
+			file_ids: env2.fileIds,
+			memory_limit: env2.memoryLimit,
+			network_policy: env2.networkPolicy == null ? void 0 : env2.networkPolicy.type === "disabled" ? { type: "disabled" } : {
+				type: "allowlist",
+				allowed_domains: env2.networkPolicy.allowedDomains,
+				domain_secrets: env2.networkPolicy.domainSecrets
+			},
+			skills: mapShellSkills(env2.skills)
+		};
+	}
+	return {
+		type: "local",
+		skills: environment.skills
+	};
+}
+function mapShellSkills(skills) {
+	return skills == null ? void 0 : skills.map((skill) => skill.type === "skillReference" ? {
+		type: "skill_reference",
+		skill_id: skill.skillId,
+		version: skill.version
+	} : {
+		type: "inline",
+		name: skill.name,
+		description: skill.description,
+		source: {
+			type: "base64",
+			media_type: skill.source.mediaType,
+			data: skill.source.data
+		}
+	});
+}
 function extractApprovalRequestIdToToolCallIdMapping(prompt) {
 	var _a, _b;
 	const mapping = {};
@@ -51985,7 +52386,7 @@ var OpenAIResponsesLanguageModel = class {
 		return this.config.provider;
 	}
 	async getArgs({ maxOutputTokens, temperature, stopSequences, topP, topK, presencePenalty, frequencyPenalty, seed, prompt, providerOptions, tools, toolChoice, responseFormat }) {
-		var _a, _b, _c, _d, _e, _f;
+		var _a, _b, _c, _d, _e, _f, _g, _h, _i;
 		const warnings = [];
 		const modelCapabilities = getOpenAILanguageModelCapabilities(this.modelId);
 		if (topK != null) warnings.push({
@@ -52155,6 +52556,8 @@ var OpenAIResponsesLanguageModel = class {
 			tools,
 			toolChoice
 		});
+		const shellToolEnvType = (_i = (_h = (_g = tools == null ? void 0 : tools.find((tool) => tool.type === "provider" && tool.id === "openai.shell")) == null ? void 0 : _g.args) == null ? void 0 : _h.environment) == null ? void 0 : _i.type;
+		const isShellProviderExecuted = shellToolEnvType === "containerAuto" || shellToolEnvType === "containerReference";
 		return {
 			webSearchToolName,
 			args: {
@@ -52165,12 +52568,13 @@ var OpenAIResponsesLanguageModel = class {
 			warnings: [...warnings, ...toolWarnings],
 			store,
 			toolNameMapping,
-			providerOptionsName
+			providerOptionsName,
+			isShellProviderExecuted
 		};
 	}
 	async doGenerate(options) {
 		var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
-		const { args: body, warnings, webSearchToolName, toolNameMapping, providerOptionsName } = await this.getArgs(options);
+		const { args: body, warnings, webSearchToolName, toolNameMapping, providerOptionsName, isShellProviderExecuted } = await this.getArgs(options);
 		const url = this.config.url({
 			path: "/responses",
 			modelId: this.modelId
@@ -52242,9 +52646,25 @@ var OpenAIResponsesLanguageModel = class {
 					toolCallId: part.call_id,
 					toolName: toolNameMapping.toCustomToolName("shell"),
 					input: JSON.stringify({ action: { commands: part.action.commands } }),
+					...isShellProviderExecuted && { providerExecuted: true },
 					providerMetadata: { [providerOptionsName]: { itemId: part.id } }
 				});
 				break;
+			case "shell_call_output":
+				content.push({
+					type: "tool-result",
+					toolCallId: part.call_id,
+					toolName: toolNameMapping.toCustomToolName("shell"),
+					result: { output: part.output.map((item) => ({
+						stdout: item.stdout,
+						stderr: item.stderr,
+						outcome: item.outcome.type === "exit" ? {
+							type: "exit",
+							exitCode: item.outcome.exit_code
+						} : { type: "timeout" }
+					})) }
+				});
+				break;
 			case "message":
 				for (const contentPart of part.content) {
 					if (((_c = (_b = options.providerOptions) == null ? void 0 : _b[providerOptionsName]) == null ? void 0 : _c.logprobs) && contentPart.logprobs) logprobs.push(contentPart.logprobs);
@@ -52479,7 +52899,7 @@ var OpenAIResponsesLanguageModel = class {
 		};
 	}
 	async doStream(options) {
-		const { args: body, warnings, webSearchToolName, toolNameMapping, store, providerOptionsName } = await this.getArgs(options);
+		const { args: body, warnings, webSearchToolName, toolNameMapping, store, providerOptionsName, isShellProviderExecuted } = await this.getArgs(options);
 		const { responseHeaders, value: response } = await postJsonToApi({
 			url: this.config.url({
 				path: "/responses",
@@ -52649,7 +53069,7 @@ var OpenAIResponsesLanguageModel = class {
 							toolName: toolNameMapping.toCustomToolName("shell"),
 							toolCallId: value.item.call_id
 						};
-						else if (value.item.type === "message") {
+						else if (value.item.type === "shell_call_output") {} else if (value.item.type === "message") {
 							ongoingAnnotations.splice(0, ongoingAnnotations.length);
 							controller.enqueue({
 								type: "text-start",
@@ -52854,9 +53274,23 @@ var OpenAIResponsesLanguageModel = class {
 								toolCallId: value.item.call_id,
 								toolName: toolNameMapping.toCustomToolName("shell"),
 								input: JSON.stringify({ action: { commands: value.item.action.commands } }),
+								...isShellProviderExecuted && { providerExecuted: true },
 								providerMetadata: { [providerOptionsName]: { itemId: value.item.id } }
 							});
-						} else if (value.item.type === "reasoning") {
+						} else if (value.item.type === "shell_call_output") controller.enqueue({
+							type: "tool-result",
+							toolCallId: value.item.call_id,
+							toolName: toolNameMapping.toCustomToolName("shell"),
+							result: { output: value.item.output.map((item) => ({
+								stdout: item.stdout,
+								stderr: item.stderr,
+								outcome: item.outcome.type === "exit" ? {
+									type: "exit",
+									exitCode: item.outcome.exit_code
+								} : { type: "timeout" }
+							})) }
+						});
+						else if (value.item.type === "reasoning") {
 							const activeReasoningPart = activeReasoning[value.item.id];
 							const summaryPartIndices = Object.entries(activeReasoningPart.summaryParts).filter(([_, status]) => status === "active" || status === "can-conclude").map(([summaryIndex]) => summaryIndex);
 							for (const summaryIndex of summaryPartIndices) controller.enqueue({
@@ -53393,7 +53827,7 @@ var OpenAITranscriptionModel = class {
 		};
 	}
 };
-var VERSION$3 = "3.0.29";
+var VERSION$3 = "3.0.30";
 function createOpenAI(options = {}) {
 	var _a, _b;
 	const baseURL = (_a = withoutTrailingSlash(loadOptionalSetting({
@@ -53484,7 +53918,7 @@ function createOpenAI(options = {}) {
 var openai = createOpenAI();
 
 //#endregion
-//#region ../../node_modules/.pnpm/ollama-ai-provider-v2@3.3.0_ai@6.0.86_zod@4.3.6__zod@4.3.6/node_modules/ollama-ai-provider-v2/dist/index.mjs
+//#region ../../node_modules/.pnpm/ollama-ai-provider-v2@3.3.1_ai@6.0.91_zod@4.3.6__zod@4.3.6/node_modules/ollama-ai-provider-v2/dist/index.mjs
 function convertToOllamaCompletionPrompt({ prompt, user = "user", assistant = "assistant" }) {
 	let text = "";
 	if (prompt[0].role === "system") {
@@ -75465,7 +75899,7 @@ function validateRuntimeVersion(experts) {
 //#endregion
 //#region ../../packages/runtime/src/helpers/setup-experts.ts
 async function setupExperts(setting, resolveExpertToRun) {
-	const resolveFn = resolveExpertToRun ?? (await import("../resolve-expert-DsQia0Mr.js")).resolveExpertToRun;
+	const resolveFn = resolveExpertToRun ?? (await import("../resolve-expert-CTnETi9d.js")).resolveExpertToRun;
 	const { expertKey } = setting;
 	const experts = { ...setting.experts };
 	const clientOptions = {
@@ -75768,7 +76202,7 @@ var require_dist$1 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 }));
 
 //#endregion
-//#region ../../node_modules/.pnpm/@ai-sdk+gateway@3.0.46_zod@4.3.6/node_modules/@ai-sdk/gateway/dist/index.mjs
+//#region ../../node_modules/.pnpm/@ai-sdk+gateway@3.0.50_zod@4.3.6/node_modules/@ai-sdk/gateway/dist/index.mjs
 var import_dist$1 = require_dist$1();
 var symbol$1 = Symbol.for("vercel.ai.gateway.error");
 var _a$1, _b;
@@ -76652,7 +77086,7 @@ async function getVercelRequestId() {
 	var _a9;
 	return (_a9 = (0, import_dist$1.getContext)().headers) == null ? void 0 : _a9["x-vercel-id"];
 }
-var VERSION$2 = "3.0.46";
+var VERSION$2 = "3.0.50";
 var AI_GATEWAY_PROTOCOL_VERSION = "0.0.1";
 function createGatewayProvider(options = {}) {
 	var _a9, _b9;
@@ -77673,7 +78107,7 @@ var TraceAPI = function() {
 var trace = TraceAPI.getInstance();
 
 //#endregion
-//#region ../../node_modules/.pnpm/ai@6.0.86_zod@4.3.6/node_modules/ai/dist/index.mjs
+//#region ../../node_modules/.pnpm/ai@6.0.91_zod@4.3.6/node_modules/ai/dist/index.mjs
 var __defProp = Object.defineProperty;
 var __export = (target, all) => {
 	for (var name21 in all) __defProp(target, name21, {
@@ -78209,7 +78643,7 @@ function detectMediaType({ data, signatures }) {
 	const bytes = typeof processedData === "string" ? convertBase64ToUint8Array(processedData.substring(0, Math.min(processedData.length, 24))) : processedData;
 	for (const signature of signatures) if (bytes.length >= signature.bytesPrefix.length && signature.bytesPrefix.every((byte, index) => byte === null || bytes[index] === byte)) return signature.mediaType;
 }
-var VERSION = "6.0.86";
+var VERSION = "6.0.91";
 var download = async ({ url, maxBytes, abortSignal }) => {
 	var _a21;
 	const urlText = url.toString();
@@ -87806,7 +88240,7 @@ async function callingMcpToolsLogic({ setting, checkpoint, step, skillManager })
 					...checkpoint,
 					messages: [...checkpoint.messages, ...newMessages],
 					usage: newUsage,
-					contextWindowUsage: checkpoint.contextWindow ? calculateContextWindowUsage(newUsage, checkpoint.contextWindow) : void 0,
+					contextWindowUsage: checkpoint.contextWindowUsage,
 					status: "completed",
 					pendingToolCalls: void 0,
 					partialToolResults: void 0
@@ -87970,9 +88404,10 @@ async function generatingRunResultLogic({ setting, checkpoint, step, eventListen
 	const { text, reasoning } = generationResult;
 	const thinkingParts = extractThinkingParts(reasoning);
 	const thinkingText = extractThinkingText(reasoning);
+	const resultText = text || "OK";
 	const newMessages = [toolMessage, createExpertMessage([...thinkingParts, {
 		type: "textPart",
-		text: text ?? ""
+		text: resultText
 	}])];
 	if (thinkingText && !reasoningCompletedViaCallback) await eventListener(createStreamingEvent("completeStreamingReasoning", setting, checkpoint, { text: thinkingText }));
 	const newUsage = sumUsage(checkpoint.usage, usage);
@@ -87981,7 +88416,7 @@ async function generatingRunResultLogic({ setting, checkpoint, step, eventListen
 			...checkpoint,
 			messages: [...messages, ...newMessages],
 			usage: newUsage,
-			contextWindowUsage: checkpoint.contextWindow ? calculateContextWindowUsage(newUsage, checkpoint.contextWindow) : void 0,
+			contextWindowUsage: checkpoint.contextWindow ? calculateContextWindowUsage(usage, checkpoint.contextWindow) : void 0,
 			status: "completed",
 			pendingToolCalls: void 0,
 			partialToolResults: void 0
@@ -87992,7 +88427,7 @@ async function generatingRunResultLogic({ setting, checkpoint, step, eventListen
 			finishedAt: Date.now(),
 			usage: sumUsage(step.usage, usage)
 		},
-		text,
+		text: resultText,
 		usage
 	});
 }
@@ -88583,7 +89018,7 @@ const runtimeStateMachine = setup({ types: {
 							...context.checkpoint,
 							messages: [...context.checkpoint.messages, event.newMessage],
 							usage: newUsage,
-							contextWindowUsage: context.checkpoint.contextWindow ? calculateContextWindowUsage(newUsage, context.checkpoint.contextWindow) : void 0,
+							contextWindowUsage: context.checkpoint.contextWindow ? calculateContextWindowUsage(event.usage, context.checkpoint.contextWindow) : void 0,
 							retryCount: 0
 						};
 					},
@@ -89074,43 +89509,65 @@ var DelegationExecutor = class {
 	async executeSingleDelegation(delegation, parentSetting, parentContext, parentExpert, runFn, parentOptions) {
 		const { expert, toolCallId, toolName, query } = delegation;
 		const delegateRunId = createId();
-		const resultCheckpoint = await runFn({
-			setting: {
-				...parentSetting,
-				runId: delegateRunId,
-				expertKey: expert.key,
-				input: { text: query }
+		const delegateSetting = {
+			...parentSetting,
+			runId: delegateRunId,
+			expertKey: expert.key,
+			input: { text: query }
+		};
+		const delegateCheckpoint = {
+			id: createId(),
+			jobId: parentSetting.jobId,
+			runId: delegateRunId,
+			status: "init",
+			stepNumber: parentContext.stepNumber,
+			messages: [],
+			expert: {
+				key: expert.key,
+				name: expert.name,
+				version: expert.version
 			},
-			checkpoint: {
-				id: createId(),
-				jobId: parentSetting.jobId,
-				runId: delegateRunId,
-				status: "init",
-				stepNumber: parentContext.stepNumber,
-				messages: [],
+			delegatedBy: {
 				expert: {
-					key: expert.key,
-					name: expert.name,
-					version: expert.version
-				},
-				delegatedBy: {
-					expert: {
-						key: parentExpert.key,
-						name: parentExpert.name,
-						version: parentExpert.version
-					},
-					toolCallId,
-					toolName,
-					checkpointId: parentContext.id,
-					runId: parentSetting.runId
+					key: parentExpert.key,
+					name: parentExpert.name,
+					version: parentExpert.version
 				},
-				usage: createEmptyUsage(),
-				contextWindow: parentContext.contextWindow
-			}
-		}, {
-			...parentOptions,
-			returnOnDelegationComplete: true
-		});
+				toolCallId,
+				toolName,
+				checkpointId: parentContext.id,
+				runId: parentSetting.runId
+			},
+			usage: createEmptyUsage(),
+			contextWindow: parentContext.contextWindow
+		};
+		let resultCheckpoint;
+		try {
+			resultCheckpoint = await runFn({
+				setting: delegateSetting,
+				checkpoint: delegateCheckpoint
+			}, {
+				...parentOptions,
+				returnOnDelegationComplete: true
+			});
+		} catch (error) {
+			return {
+				toolCallId,
+				toolName,
+				expertKey: expert.key,
+				text: `Delegation to ${expert.key} failed: ${error instanceof Error ? error.message : String(error)}`,
+				stepNumber: parentContext.stepNumber,
+				deltaUsage: createEmptyUsage()
+			};
+		}
+		if (resultCheckpoint.status !== "completed") return {
+			toolCallId,
+			toolName,
+			expertKey: expert.key,
+			text: `Delegation to ${expert.key} ended with status: ${resultCheckpoint.status}`,
+			stepNumber: resultCheckpoint.stepNumber,
+			deltaUsage: resultCheckpoint.usage
+		};
 		return this.extractDelegationResult(resultCheckpoint, toolCallId, toolName, expert.key);
 	}
 	extractDelegationResult(checkpoint, toolCallId, toolName, expertKey) {
@@ -89175,19 +89632,19 @@ const defaultCreateJob = (jobId, expertKey, maxSteps, runtimeVersion = getCurren
 */
 async function run(runInput, options) {
 	let { setting, checkpoint } = runParamsSchema.parse(runInput);
-	const storeJob = options?.storeJob ?? (() => {});
-	const retrieveJob = options?.retrieveJob ?? (() => void 0);
+	const storeJob = options?.storeJob ?? (async () => {});
+	const retrieveJob = options?.retrieveJob ?? (async () => void 0);
 	const retrieveCheckpoint = options?.retrieveCheckpoint ?? (async () => {
 		throw new Error("retrieveCheckpoint not provided");
 	});
 	const createJob = options?.createJob ?? defaultCreateJob;
-	let job = retrieveJob(setting.jobId) ?? createJob(setting.jobId, setting.expertKey, setting.maxSteps);
+	let job = await retrieveJob(setting.jobId) ?? createJob(setting.jobId, setting.expertKey, setting.maxSteps);
 	if (job.status !== "running") job = {
 		...job,
 		status: "running",
 		finishedAt: void 0
 	};
-	storeJob(job);
+	await storeJob(job);
 	const runExecutor = new CoordinatorExecutor({
 		shouldContinueRun: options?.shouldContinueRun,
 		storeCheckpoint: options?.storeCheckpoint,
@@ -89207,31 +89664,31 @@ async function run(runInput, options) {
 		switch (resultCheckpoint.status) {
 			case "completed":
 				if (options?.returnOnDelegationComplete) {
-					storeJob(job);
+					await storeJob(job);
 					return resultCheckpoint;
 				}
 				if (resultCheckpoint.delegatedBy) {
-					storeJob(job);
+					await storeJob(job);
 					const parentCheckpoint = await retrieveCheckpoint(setting.jobId, resultCheckpoint.delegatedBy.checkpointId);
 					const result = buildReturnFromDelegation(setting, resultCheckpoint, parentCheckpoint);
 					setting = result.setting;
 					checkpoint = result.checkpoint;
 					break;
 				}
-				storeJob({
+				await storeJob({
 					...job,
 					status: "completed",
 					finishedAt: Date.now()
 				});
 				return resultCheckpoint;
 			case "stoppedByInteractiveTool":
-				storeJob({
+				await storeJob({
 					...job,
 					status: "stoppedByInteractiveTool"
 				});
 				return resultCheckpoint;
 			case "stoppedByDelegate": {
-				storeJob(job);
+				await storeJob(job);
 				const { delegateTo } = resultCheckpoint;
 				if (!delegateTo || delegateTo.length === 0) throw new Error("No delegations found in checkpoint");
 				const executor = new DelegationExecutor();
@@ -89246,21 +89703,21 @@ async function run(runInput, options) {
 				break;
 			}
 			case "stoppedByExceededMaxSteps":
-				storeJob({
+				await storeJob({
 					...job,
 					status: "stoppedByMaxSteps",
 					finishedAt: Date.now()
 				});
 				return resultCheckpoint;
 			case "stoppedByError":
-				storeJob({
+				await storeJob({
 					...job,
 					status: "stoppedByError",
 					finishedAt: Date.now()
 				});
 				return resultCheckpoint;
 			case "stoppedByCancellation":
-				storeJob({
+				await storeJob({
 					...job,
 					status: "stoppedByCancellation",
 					finishedAt: Date.now()
@@ -113396,6 +113853,17 @@ var EventQueue = class EventQueue {
 	}
 };
 
+//#endregion
+//#region ../../packages/tui-components/src/colors.ts
+const colors = {
+	primary: "white",
+	muted: "gray",
+	accent: "cyan",
+	success: "green",
+	warn: "yellow",
+	destructive: "red"
+};
+
 //#endregion
 //#region ../../packages/tui-components/src/constants.ts
 const UI_CONSTANTS = {
@@ -113419,11 +113887,7 @@ const INDICATOR = {
 	BULLET: "●",
 	ELLIPSIS: "..."
 };
-const STOP_EVENT_TYPES = [
-	"stopRunByInteractiveTool",
-	"stopRunByDelegate",
-	"stopRunByExceededMaxSteps"
-];
+const STOP_EVENT_TYPES = ["stopRunByInteractiveTool", "stopRunByExceededMaxSteps"];
 const KEY_BINDINGS = {
 	NAVIGATE_UP: "↑",
 	NAVIGATE_DOWN: "↓",
@@ -113729,7 +114193,7 @@ const ActionRowSimple = ({ indicatorColor, text, textDimColor = false }) => /* @
 			color: indicatorColor,
 			children: INDICATOR.BULLET
 		}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-			color: "white",
+			color: colors.primary,
 			dimColor: textDimColor,
 			children: text
 		})]
@@ -113747,11 +114211,11 @@ const ActionRow = ({ indicatorColor, label, summary, children }) => /* @__PURE__
 				children: INDICATOR.BULLET
 			}),
 			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-				color: "white",
+				color: colors.primary,
 				children: label
 			}),
 			summary && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-				color: "white",
+				color: colors.primary,
 				dimColor: true,
 				children: summary
 			})
@@ -113863,10 +114327,10 @@ const ListBrowser = ({ title, items, renderItem, onSelect, emptyMessage = "No it
 		flexDirection: "column",
 		children: [
 			/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-				color: "cyan",
+				color: colors.accent,
 				children: title
 			}), items.length > maxItems && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
-				color: "gray",
+				color: colors.muted,
 				children: [
 					" ",
 					"(",
@@ -113877,13 +114341,13 @@ const ListBrowser = ({ title, items, renderItem, onSelect, emptyMessage = "No it
 				]
 			})] }),
 			hasMoreAbove && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-				color: "gray",
+				color: colors.muted,
 				children: INDICATOR.ELLIPSIS
 			}),
 			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
 				flexDirection: "column",
 				children: displayItems.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-					color: "gray",
+					color: colors.muted,
 					children: emptyMessage
 				}) : displayItems.map((item, index) => {
 					const actualIndex = scrollOffset + index;
@@ -113891,7 +114355,7 @@ const ListBrowser = ({ title, items, renderItem, onSelect, emptyMessage = "No it
 				})
 			}),
 			hasMoreBelow && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-				color: "gray",
+				color: colors.muted,
 				children: INDICATOR.ELLIPSIS
 			})
 		]
@@ -113914,7 +114378,7 @@ const BrowsingCheckpointsInput = ({ job, checkpoints, onCheckpointSelect, onChec
 		return false;
 	},
 	renderItem: (cp, isSelected) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
-		color: isSelected ? "cyan" : "gray",
+		color: isSelected ? colors.accent : colors.muted,
 		children: [
 			isSelected ? ">" : " ",
 			" Step ",
@@ -113949,29 +114413,29 @@ const BrowsingEventDetailInput = ({ event, onBack }) => {
 			marginLeft: 2,
 			children: [
 				/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-					color: "gray",
+					color: colors.muted,
 					children: "Type: "
 				}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-					color: "cyan",
+					color: colors.accent,
 					children: event.type
 				})] }),
 				/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-					color: "gray",
+					color: colors.muted,
 					children: "Step: "
 				}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { children: event.stepNumber })] }),
 				/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-					color: "gray",
+					color: colors.muted,
 					children: "Timestamp: "
 				}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { children: formatTimestamp(event.timestamp) })] }),
 				/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-					color: "gray",
+					color: colors.muted,
 					children: "ID: "
 				}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
 					dimColor: true,
 					children: event.id
 				})] }),
 				/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-					color: "gray",
+					color: colors.muted,
 					children: "Run ID: "
 				}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
 					dimColor: true,
@@ -113991,7 +114455,7 @@ const BrowsingEventsInput = ({ checkpoint, events, onEventSelect, onBack }) => /
 	onBack,
 	emptyMessage: "No events found",
 	renderItem: (ev, isSelected) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
-		color: isSelected ? "cyan" : "gray",
+		color: isSelected ? colors.accent : colors.muted,
 		children: [
 			isSelected ? ">" : " ",
 			" [",
@@ -114673,17 +115137,17 @@ const useExpertSelector = (options) => {
 const ExpertList = ({ experts, selectedIndex, showSource = false, inline = false, maxItems }) => {
 	const displayExperts = maxItems ? experts.slice(0, maxItems) : experts;
 	if (displayExperts.length === 0) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-		color: "gray",
+		color: colors.muted,
 		children: "No experts found."
 	});
 	const items = displayExperts.map((expert, index) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
-		color: index === selectedIndex ? "cyan" : "gray",
+		color: index === selectedIndex ? colors.accent : colors.muted,
 		children: [
 			index === selectedIndex ? ">" : " ",
 			" ",
 			showSource ? expert.key : expert.name,
 			showSource && expert.source && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [" ", /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
-				color: expert.source === "configured" ? "green" : "yellow",
+				color: expert.source === "configured" ? colors.success : colors.warn,
 				children: [
 					"[",
 					expert.source === "configured" ? "config" : "recent",
@@ -114713,7 +115177,7 @@ const ExpertSelectorBase = ({ experts, hint, onExpertSelect, showSource = false,
 		children: [!inputMode && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
 			flexDirection: "column",
 			children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-				color: "cyan",
+				color: colors.accent,
 				children: hint
 			}) }), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ExpertList, {
 				experts,
@@ -114724,15 +115188,15 @@ const ExpertSelectorBase = ({ experts, hint, onExpertSelect, showSource = false,
 			})]
 		}), inputMode && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, { children: [
 			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-				color: "gray",
+				color: colors.muted,
 				children: "Expert: "
 			}),
 			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-				color: "white",
+				color: colors.primary,
 				children: input
 			}),
 			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-				color: "cyan",
+				color: colors.accent,
 				children: "_"
 			})
 		] })]
@@ -114778,7 +115242,7 @@ const BrowsingHistoryInput = ({ jobs, onJobSelect, onJobResume, onSwitchToExpert
 		return false;
 	},
 	renderItem: (job, isSelected) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
-		color: isSelected ? "cyan" : "gray",
+		color: isSelected ? colors.accent : colors.muted,
 		children: [
 			isSelected ? ">" : " ",
 			" ",
@@ -114860,12 +115324,13 @@ function renderParallelGroup(group) {
 	});
 }
 function renderReasoning(text) {
+	const lines = text.split("\n");
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ActionRow, {
-		indicatorColor: "white",
+		indicatorColor: colors.primary,
 		label: "Reasoning",
 		children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
 			flexDirection: "column",
-			children: text.split("\n").map((line, idx) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+			children: lines.map((line, idx) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
 				dimColor: true,
 				wrap: "wrap",
 				children: line
@@ -114874,11 +115339,11 @@ function renderReasoning(text) {
 	});
 }
 function renderAction(action) {
-	const color = action.type === "error" || "error" in action && action.error ? "red" : "green";
+	const color = action.type === "error" || "error" in action && action.error ? colors.destructive : colors.success;
 	switch (action.type) {
 		case "query": return renderQuery(action.text, action.runId);
 		case "retry": return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ActionRow, {
-			indicatorColor: "yellow",
+			indicatorColor: colors.warn,
 			label: "Retry",
 			children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
 				dimColor: true,
@@ -114886,22 +115351,22 @@ function renderAction(action) {
 			})
 		});
 		case "complete": return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ActionRow, {
-			indicatorColor: "green",
+			indicatorColor: colors.success,
 			label: "Run Results",
 			children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { children: action.text })
 		});
 		case "attemptCompletion": {
 			if (action.error) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ActionRow, {
-				indicatorColor: "red",
+				indicatorColor: colors.destructive,
 				label: "Completion Failed",
 				children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-					color: "red",
+					color: colors.destructive,
 					children: action.error
 				})
 			});
 			const remaining = action.remainingTodos?.filter((t) => !t.completed) ?? [];
 			if (remaining.length > 0) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ActionRow, {
-				indicatorColor: "yellow",
+				indicatorColor: colors.warn,
 				label: "Completion Blocked",
 				children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
 					dimColor: true,
@@ -114913,7 +115378,7 @@ function renderAction(action) {
 				})
 			});
 			return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ActionRowSimple, {
-				indicatorColor: "green",
+				indicatorColor: colors.success,
 				text: "Completion Accepted"
 			});
 		}
@@ -114945,7 +115410,7 @@ function renderAction(action) {
 		});
 		case "exec": return renderExec(action, color);
 		case "delegate": return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ActionRow, {
-			indicatorColor: "yellow",
+			indicatorColor: colors.warn,
 			label: action.delegateExpertKey,
 			children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
 				dimColor: true,
@@ -114953,17 +115418,49 @@ function renderAction(action) {
 			})
 		});
 		case "delegationComplete": return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ActionRowSimple, {
-			indicatorColor: "green",
+			indicatorColor: colors.success,
 			text: `Delegation Complete (${action.count} delegate${action.count > 1 ? "s" : ""} returned)`
 		});
 		case "interactiveTool": return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ActionRow, {
-			indicatorColor: "yellow",
+			indicatorColor: colors.warn,
 			label: `Interactive: ${action.toolName}`,
 			children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
 				dimColor: true,
 				children: truncateText(JSON.stringify(action.args), UI_CONSTANTS.TRUNCATE_TEXT_MEDIUM)
 			})
 		});
+		case "addSkill": {
+			const skillColor = action.error ? colors.destructive : colors.accent;
+			const toolsSummary = action.tools ? `${action.tools.length} tool${action.tools.length !== 1 ? "s" : ""}: ${action.tools.join(", ")}` : void 0;
+			if (toolsSummary) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ActionRow, {
+				indicatorColor: skillColor,
+				label: `Add Skill ${action.name}`,
+				children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
+					dimColor: true,
+					children: truncateText(toolsSummary, UI_CONSTANTS.TRUNCATE_TEXT_MEDIUM)
+				})
+			});
+			return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ActionRowSimple, {
+				indicatorColor: skillColor,
+				text: `Add Skill ${action.name}`
+			});
+		}
+		case "removeSkill": return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ActionRowSimple, {
+			indicatorColor: action.error ? colors.destructive : colors.accent,
+			text: `Remove Skill ${action.skillName}`
+		});
+		case "addDelegate": return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ActionRowSimple, {
+			indicatorColor: action.error ? colors.destructive : colors.accent,
+			text: `Add Delegate ${action.targetExpertKey}`
+		});
+		case "removeDelegate": return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ActionRowSimple, {
+			indicatorColor: action.error ? colors.destructive : colors.accent,
+			text: `Remove Delegate ${action.expertName}`
+		});
+		case "createExpert": return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ActionRowSimple, {
+			indicatorColor: action.error ? colors.destructive : colors.accent,
+			text: `Create Expert ${action.description ? `${action.targetKey} - ${truncateText(action.description, UI_CONSTANTS.TRUNCATE_TEXT_MEDIUM)}` : action.targetKey}`
+		});
 		case "generalTool": return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ActionRow, {
 			indicatorColor: color,
 			label: action.toolName,
@@ -114973,10 +115470,10 @@ function renderAction(action) {
 			})
 		});
 		case "error": return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ActionRow, {
-			indicatorColor: "red",
+			indicatorColor: colors.destructive,
 			label: action.errorName ?? "Error",
 			children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-				color: "red",
+				color: colors.destructive,
 				children: action.error ?? "Unknown error"
 			})
 		});
@@ -115048,7 +115545,7 @@ function renderReadTextFile(action, color) {
 				flexDirection: "row",
 				gap: 1,
 				children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-					color: "white",
+					color: colors.primary,
 					dimColor: true,
 					children: line
 				})
@@ -115069,11 +115566,11 @@ function renderWriteTextFile(action, color) {
 				flexDirection: "row",
 				gap: 1,
 				children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-					color: "green",
+					color: colors.success,
 					dimColor: true,
 					children: "+"
 				}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-					color: "white",
+					color: colors.primary,
 					dimColor: true,
 					children: line
 				})]
@@ -115095,11 +115592,11 @@ function renderEditTextFile(action, color) {
 				flexDirection: "row",
 				gap: 1,
 				children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-					color: "red",
+					color: colors.destructive,
 					dimColor: true,
 					children: "-"
 				}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-					color: "white",
+					color: colors.primary,
 					dimColor: true,
 					children: line
 				})]
@@ -115107,7 +115604,7 @@ function renderEditTextFile(action, color) {
 				flexDirection: "row",
 				gap: 1,
 				children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-					color: "green",
+					color: colors.success,
 					dimColor: true,
 					children: "+"
 				}), /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
@@ -115144,10 +115641,11 @@ function renderExec(action, color) {
 }
 function renderQuery(text, runId) {
 	const lines = text.split("\n");
+	const shortRunId = runId.slice(0, 8);
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ActionRow, {
-		indicatorColor: "cyan",
+		indicatorColor: colors.accent,
 		label: "Query",
-		summary: `(${runId.slice(0, 8)})`,
+		summary: `(${shortRunId})`,
 		children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box, {
 			flexDirection: "column",
 			children: lines.map((line, idx) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
@@ -115254,15 +115752,15 @@ const InterfacePanel = ({ runtimeInfo, runStatus, streaming, onSubmit }) => {
 	useInput(handleInput);
 	let statusLabel;
 	if (runStatus === "waiting") statusLabel = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-		color: "cyan",
+		color: colors.accent,
 		children: "Waiting for query..."
 	});
 	else if (runStatus === "completed") statusLabel = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-		color: "green",
+		color: colors.success,
 		children: "Completed"
 	});
 	else if (runStatus === "stopped") statusLabel = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-		color: "yellow",
+		color: colors.warn,
 		children: "Stopped"
 	});
 	else if (streamingPhase === "reasoning") statusLabel = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { children: "Streaming Reasoning..." });
@@ -115274,14 +115772,14 @@ const InterfacePanel = ({ runtimeInfo, runStatus, streaming, onSubmit }) => {
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
 		flexDirection: "column",
 		borderStyle: "single",
-		borderColor: "gray",
+		borderColor: colors.muted,
 		borderTop: true,
 		borderBottom: false,
 		borderLeft: false,
 		borderRight: false,
 		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { children: [
 			spinner ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, {
-				color: "cyan",
+				color: colors.accent,
 				children: [spinner, " "]
 			}) : null,
 			statusLabel,
@@ -115302,12 +115800,12 @@ const InterfacePanel = ({ runtimeInfo, runStatus, streaming, onSubmit }) => {
 			/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { children: [usagePercent, "%"] })
 		] }), /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { children: [
 			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-				color: "gray",
+				color: colors.muted,
 				children: "> "
 			}),
 			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { children: input }),
 			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, {
-				color: "cyan",
+				color: colors.accent,
 				children: "_"
 			})
 		] })]
@@ -115335,7 +115833,7 @@ function extractLogEntriesFromEvent(event) {
 	return entries;
 }
 const useExecutionState = (options) => {
-	const { expertKey, query, config, continueTimeoutMs, historicalEvents, onReady, onComplete, onQueryReady } = options;
+	const { expertKey, query, config, historicalEvents, onReady, onComplete, onQueryReady } = options;
 	const runState = useRun();
 	const { runtimeInfo, handleEvent, setQuery } = useRuntimeInfo({
 		initialExpertName: expertKey,
@@ -115343,24 +115841,7 @@ const useExecutionState = (options) => {
 	});
 	const [runStatus, setRunStatus] = (0, import_react.useState)(query ? "running" : "waiting");
 	const [staticItems, setStaticItems] = (0, import_react.useState)([]);
-	const timeoutRef = (0, import_react.useRef)(null);
 	const lastSyncedCountRef = (0, import_react.useRef)(0);
-	const clearTimeoutIfExists = (0, import_react.useCallback)(() => {
-		if (timeoutRef.current) {
-			clearTimeout(timeoutRef.current);
-			timeoutRef.current = null;
-		}
-	}, []);
-	const startExitTimeout = (0, import_react.useCallback)(() => {
-		clearTimeoutIfExists();
-		timeoutRef.current = setTimeout(() => {
-			onComplete({ nextQuery: null });
-		}, continueTimeoutMs);
-	}, [
-		clearTimeoutIfExists,
-		continueTimeoutMs,
-		onComplete
-	]);
 	(0, import_react.useEffect)(() => {
 		if (query) setQuery(query);
 	}, [query, setQuery]);
@@ -115386,25 +115867,16 @@ const useExecutionState = (options) => {
 			const result = handleEvent(event);
 			const logEntries = extractLogEntriesFromEvent(event);
 			if (logEntries.length > 0) setStaticItems((prev) => [...prev, ...logEntries]);
-			if (result?.completed) {
-				setRunStatus("completed");
-				startExitTimeout();
-			} else if (result?.stopped) {
-				setRunStatus("stopped");
-				startExitTimeout();
-			}
+			if (result?.stopped) setRunStatus("stopped");
 		});
 	}, [
 		onReady,
 		runState.addEvent,
-		handleEvent,
-		startExitTimeout
+		handleEvent
 	]);
 	(0, import_react.useEffect)(() => {
-		return () => {
-			clearTimeoutIfExists();
-		};
-	}, [clearTimeoutIfExists]);
+		if (runState.isComplete) setRunStatus("completed");
+	}, [runState.isComplete]);
 	const handleSubmit = (0, import_react.useCallback)((newQuery) => {
 		if (!newQuery.trim()) return;
 		if (runStatus === "waiting") {
@@ -115414,13 +115886,9 @@ const useExecutionState = (options) => {
 			onQueryReady?.(trimmed);
 			return;
 		}
-		if (runStatus !== "running") {
-			clearTimeoutIfExists();
-			onComplete({ nextQuery: newQuery.trim() });
-		}
+		if (runStatus !== "running") onComplete({ nextQuery: newQuery.trim() });
 	}, [
 		runStatus,
-		clearTimeoutIfExists,
 		onComplete,
 		setQuery,
 		onQueryReady
@@ -115430,15 +115898,14 @@ const useExecutionState = (options) => {
 		streaming: runState.streaming,
 		runtimeInfo,
 		runStatus,
-		handleSubmit,
-		clearTimeout: clearTimeoutIfExists
+		handleSubmit
 	};
 };
 
 //#endregion
 //#region ../../packages/tui-components/src/execution/app.tsx
 const ExecutionApp = (props) => {
-	const { expertKey, query, config, continueTimeoutMs, historicalEvents, onReady, onComplete, onQueryReady } = props;
+	const { expertKey, query, config, historicalEvents, onReady, onComplete, onQueryReady } = props;
 	const { exit } = useApp();
 	const [exitResult, setExitResult] = (0, import_react.useState)(null);
 	const handleComplete = (0, import_react.useCallback)((result) => {
@@ -115458,17 +115925,13 @@ const ExecutionApp = (props) => {
 		expertKey,
 		query,
 		config,
-		continueTimeoutMs,
 		historicalEvents,
 		onReady,
 		onComplete: handleComplete,
 		onQueryReady
 	});
 	useInput((input, key) => {
-		if (key.ctrl && input === "c") {
-			state.clearTimeout();
-			exit();
-		}
+		if (key.ctrl && input === "c") exit();
 	});
 	if (exitResult) return null;
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box, {
@@ -115731,7 +116194,6 @@ async function renderSelection(params) {
 
 //#endregion
 //#region ../../packages/tui/src/start-handler.ts
-const CONTINUE_TIMEOUT_MS = 6e4;
 async function startHandler(expertKey, query, options, handlerOptions) {
 	const input = parseWithFriendlyError(startCommandInputSchema, {
 		expertKey,
@@ -115815,7 +116277,6 @@ async function startHandler(expertKey, query, options, handlerOptions) {
 				timeout,
 				contextWindowUsage: currentCheckpoint?.contextWindowUsage ?? 0
 			},
-			continueTimeoutMs: CONTINUE_TIMEOUT_MS,
 			historicalEvents
 		});
 		const resolvedQuery = await queryReady;
@@ -115864,7 +116325,7 @@ async function startHandler(expertKey, query, options, handlerOptions) {
 //#endregion
 //#region package.json
 var name = "create-expert";
-var version = "0.0.37";
+var version = "0.0.39";
 var description = "Create and modify Perstack expert definitions";
 
 //#endregion