npm - @xopcai/xopc - Versions diffs - 0.0.179 → 0.0.180 - Mend

@xopcai/xopc 0.0.179 → 0.0.180

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (221) hide show

package/dist/gateway/static/root/index.html CHANGED Viewed

@@ -11,7 +11,7 @@
     <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png?v=20260713-1" />
     <link rel="manifest" href="/site.webmanifest?v=20260713-1" />
     <title>XOPC — Turn goals into loops. Keep what matters moving.</title>
-    <script type="module" crossorigin src="/assets/index-BDzspHrg.js"></script>
+    <script type="module" crossorigin src="/assets/index-BA56bQ68.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/rolldown-runtime-aKtaBQYM.js">
     <link rel="modulepreload" crossorigin href="/assets/preload-helper-zJ_50EbN.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-react-BOUWij0V.js">
@@ -23,16 +23,16 @@
     <link rel="modulepreload" crossorigin href="/assets/createLucideIcon-DPHK1VkS.js">
     <link rel="modulepreload" crossorigin href="/assets/check-DUBLcKHA.js">
     <link rel="modulepreload" crossorigin href="/assets/middleware-Pd0e8Igk.js">
-    <link rel="modulepreload" crossorigin href="/assets/messages-DYqBwJAK.js">
-    <link rel="modulepreload" crossorigin href="/assets/locale-store-DIVc0AQs.js">
+    <link rel="modulepreload" crossorigin href="/assets/messages-H_iJjnEM.js">
+    <link rel="modulepreload" crossorigin href="/assets/locale-store-BNC8HUCI.js">
     <link rel="modulepreload" crossorigin href="/assets/cn-JdwAhgNB.js">
     <link rel="modulepreload" crossorigin href="/assets/schemas-C6onAggk.js">
     <link rel="modulepreload" crossorigin href="/assets/product-delivery-BVG-eWQO.js">
     <link rel="modulepreload" crossorigin href="/assets/config-reload-event-Bjh2zoKp.js">
     <link rel="modulepreload" crossorigin href="/assets/copy-to-clipboard-HOJ79TWv.js">
-    <link rel="modulepreload" crossorigin href="/assets/gateway-startup-retry-CKKL96r_.js">
-    <link rel="modulepreload" crossorigin href="/assets/activity-store-A5FUMjeV.js">
-    <link rel="modulepreload" crossorigin href="/assets/theme-store-DtwI_VLT.js">
+    <link rel="modulepreload" crossorigin href="/assets/gateway-startup-retry-CSU7UvzG.js">
+    <link rel="modulepreload" crossorigin href="/assets/activity-store-DFKtQDgE.js">
+    <link rel="modulepreload" crossorigin href="/assets/theme-store-ClDa_Bci.js">
     <link rel="stylesheet" crossorigin href="/assets/index-B0Tdge_q.css">
   </head>
   <body>

package/dist/package.js CHANGED Viewed

@@ -1,4 +1,4 @@
 //#region package.json
-var version = "0.0.179";
+var version = "0.0.180";
 //#endregion
 export { version };

package/dist/src/agent/agent-manager.d.ts CHANGED Viewed

@@ -30,8 +30,10 @@ export interface SkillCatalogEntry {
     description: string;
     category?: string;
     source: Skill['source'];
+    origin: Skill['origin']['id'];
     path: string;
     managed: boolean;
+    writable: boolean;
     /** User toggle in ~/.xopc/skills.json (`entries[name].enabled`). Default true. */
     enabled: boolean;
     /** When true, skill is never injected into `<available_skills>` (SKILL.md frontmatter). */
@@ -230,7 +232,8 @@ export declare class AgentManager implements AgentInstanceGateway {
     /**
      * Reload skills from disk and refresh system prompt on all active Agent instances.
      */
-    refreshSkillsAfterDiskChange(source?: 'explicit' | 'watch'): void;
+    refreshSkillsAfterDiskChange(source?: 'explicit' | 'watch' | 'trust'): void;
+    refreshSkillsAfterTrustChange(): void;
     private scheduleSkillsUpdated;
     private applySkillsAfterDiskChange;
     /**

package/dist/src/agent/agent-manager.js CHANGED Viewed

@@ -2,15 +2,15 @@ import { resolveStateDir } from "../config/paths-state.js";
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
 import { getAgentDefaultModelRef, init_schema } from "../config/schema.js";
-import { applyConfigOverrides } from "../config/runtime-overrides.js";
 import { expandWorkspacePathString, init_workspace_path } from "../config/workspace-path.js";
 import { init_agent_scope, resolveAgentProfileDir } from "./agent-scope.js";
-import { resolveEffectiveAgentProfile, resolveEffectiveAgentProfileForSession } from "../config/agent-profile.js";
 import { init_paths, resolveBundledSkillsDir, resolveUserProfilePath } from "../config/paths.js";
-import { init_sync_provider_auth, resolveProviderApiKeySync } from "../auth/sync-provider-auth.js";
 import { CredentialResolver, init_credentials } from "../auth/credentials.js";
+import { init_sync_provider_auth, resolveProviderApiKeySync } from "../auth/sync-provider-auth.js";
 import { getApiKeySync, getDefaultModelSync, init_providers, resolveModel } from "../providers/index.js";
 import { createExtensionAwareStreamFn } from "../providers/extension-stream-bridge.js";
+import { applyConfigOverrides } from "../config/runtime-overrides.js";
+import { resolveEffectiveAgentProfile, resolveEffectiveAgentProfileForSession } from "../config/agent-profile.js";
 import { extractTextContent } from "./context/workspace.js";
 import { buildExecutionScopeContextForPrompt } from "./context/execution-scope.js";
 import { clearBootstrapSnapshot } from "./bootstrap/bootstrap-cache.js";
@@ -117,6 +117,7 @@ var AgentManager = class {
 		this.workspaceRuntimes = new WorkspaceRuntimeRegistry({
 			getConfig: () => this.config.config,
 			bundledSkillsDir: resolveBundledSkillsDir(),
+			isWorkspaceTrusted: (resolvedPath) => this.isProjectWorkspaceTrusted(resolvedPath),
 			onRuntimeCreated: (resolvedPath) => {
 				this.skillFilesystemWatcher.watchWorkspace(resolvedPath);
 			}
@@ -224,6 +225,11 @@ var AgentManager = class {
 			getCurrentContext: this.config.getCurrentContext,
 			hookRunner: this.config.hookRunner,
 			bus: this.config.bus,
+			toolExecutorConfig: { resolveTimeoutMs: (toolName) => {
+				const config = this.mergedConfig();
+				const sessionKey = this.config.getCurrentContext?.()?.sessionKey;
+				return resolveEffectiveAgentProfileForSession(config, sessionKey).manifest.tools.builtin[toolName]?.limits?.timeoutMs;
+			} },
 			getConfig: () => this.mergedConfig(),
 			getPrimaryModel: () => this.resolveModelStringToModel(this.pickDefaultModelRef()),
 			getMemoryManager: () => this.getCurrentWorkspaceRuntime().memoryManager,
@@ -454,7 +460,9 @@ var AgentManager = class {
 		const base = resolve(s.baseDir);
 		const workspaceRoot = workspaceDir ? resolveWorkspaceSkillsDir(workspaceDir) : "";
 		const workspaceManaged = workspaceRoot ? s.source === "workspace" && base.startsWith(resolve(workspaceRoot) + sep) : false;
-		const managed = isUnderManagedSkillsDir(s.baseDir) || workspaceManaged;
+		const globalManaged = isUnderManagedSkillsDir(s.baseDir);
+		const managed = s.origin.managed && (globalManaged || workspaceManaged);
+		const writable = managed && s.origin.writable;
 		const directoryId = base.split(sep).filter(Boolean).pop() || s.name;
 		const enabled = !(skillsConfig.entries?.[s.name]?.enabled === false);
 		const hubKey = managed ? basename(base) : "";
@@ -465,8 +473,10 @@ var AgentManager = class {
 			description: s.description,
 			category: s.category,
 			source: s.source,
+			origin: s.origin.id,
 			path: s.baseDir,
 			managed,
+			writable,
 			enabled,
 			disableModelInvocation: s.disableModelInvocation,
 			...hub ? { hub } : {}
@@ -570,6 +580,7 @@ var AgentManager = class {
 			return;
 		}
 		if (source === "explicit") this.lastExplicitSkillDiskRefreshAt = now;
+		this.skillFilesystemWatcher.refreshPrimaryWorkspace(this.baseWorkspacePath);
 		if (this.skillDiskRefreshInProgress) {
 			this.skillDiskRefreshPending = true;
 			return;
@@ -579,7 +590,7 @@ var AgentManager = class {
 		try {
 			do {
 				this.skillDiskRefreshPending = false;
-				this.applySkillsAfterDiskChange();
+				this.applySkillsAfterDiskChange(source === "trust" ? "trust" : "disk");
 				refreshed = true;
 			} while (this.skillDiskRefreshPending);
 		} finally {
@@ -587,6 +598,9 @@ var AgentManager = class {
 		}
 		if (refreshed) this.scheduleSkillsUpdated("disk");
 	}
+	refreshSkillsAfterTrustChange() {
+		this.refreshSkillsAfterDiskChange("trust");
+	}
 	scheduleSkillsUpdated(reason) {
 		this.pendingSkillsUpdatedReason = reason === "disk" ? "disk" : this.pendingSkillsUpdatedReason ?? "config";
 		if (this.skillsUpdatedTimer) clearTimeout(this.skillsUpdatedTimer);
@@ -597,9 +611,9 @@ var AgentManager = class {
 			this.config.onSkillsUpdated?.({ reason: nextReason });
 		}, 250);
 	}
-	applySkillsAfterDiskChange() {
+	applySkillsAfterDiskChange(reason = "disk") {
 		const cfg = this.config.config;
-		for (const rt of this.workspaceRuntimes.values()) rt.skillManager.reload();
+		for (const rt of this.workspaceRuntimes.values()) rt.skillManager.reload(reason);
 		for (const instance of this.agents.values()) {
 			const resolvedWorkspacePath = this.getResolvedWorkspaceForSession(instance.sessionKey);
 			const rt = this.workspaceRuntimes.getOrCreate(resolvedWorkspacePath, instance.effectiveProfile.agentId);

package/dist/src/agent/bootstrap/filter-bootstrap-files.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import { isCronSessionKey, isSubagentSessionKey } from "../../routing/session-key-utils.js";
-import { init_session_key } from "../../routing/session-key.js";
 import { USER_PROFILE_FILENAME, init_paths } from "../../config/paths.js";
+import { init_session_key } from "../../routing/session-key.js";
 import { DEFAULT_AGENTS_FILENAME, DEFAULT_IDENTITY_FILENAME, DEFAULT_SOUL_FILENAME, DEFAULT_TOOLS_FILENAME } from "../context/workspace.js";
 //#region src/agent/bootstrap/filter-bootstrap-files.ts
 init_paths();

package/dist/src/agent/embedded/model-runtime.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import { init_paths, resolveModelsJsonPath } from "../../config/paths.js";
-import { init_sync_provider_auth, resolveProviderApiKeySync } from "../../auth/sync-provider-auth.js";
 import { CredentialResolver, init_credentials } from "../../auth/credentials.js";
+import { init_sync_provider_auth, resolveProviderApiKeySync } from "../../auth/sync-provider-auth.js";
 import { XopcModelCredentialStore, init_model_credential_store } from "../../auth/model-credential-store.js";
 import { init_register_bundled_oauth_flows, registerBundledOAuthFlows } from "../../providers/register-bundled-oauth-flows.js";
 import { init_register_runtime_providers, registerRuntimeProviders } from "../../providers/register-runtime-providers.js";

package/dist/src/agent/embedded/run-for-session.d.ts CHANGED Viewed

@@ -14,6 +14,8 @@ export type RunEmbeddedForSessionParams = {
     modelManager: ModelManager;
     thinkingOverride?: string | null;
     abortSignal?: AbortSignal;
+    /** Absolute parent deadline. The turn's own timeout is capped to the remaining budget. */
+    deadlineAtMs?: number;
     onEvent?: (event: EmbeddedStreamEvent) => void;
     getConfig?: () => Config | undefined;
     beforeTurn?: () => void | Promise<void>;

package/dist/src/agent/embedded/run-for-session.js CHANGED Viewed

@@ -48,6 +48,8 @@ async function runEmbeddedTurnForSession(params) {
 	const thinkingLevel = params.thinkingOverride ?? agent.state.thinkingLevel;
 	const workspaceDir = agentManager.getResolvedWorkspaceForSession(sessionKey);
 	const config = params.getConfig?.();
+	const configuredTurnTimeoutMs = resolveAgentTurnTimeoutMs(config, sessionKey);
+	const turnTimeoutMs = params.deadlineAtMs === void 0 ? configuredTurnTimeoutMs : Math.max(1, Math.min(configuredTurnTimeoutMs, params.deadlineAtMs - Date.now()));
 	let userMessageForTurn = userMessage;
 	if (params.applyStartupContext !== false) userMessageForTurn = await applyStartupContextToUserMessage({
 		userMessage,
@@ -123,7 +125,7 @@ async function runEmbeddedTurnForSession(params) {
 						thinkingLevel,
 						workspaceDir,
 						sessionStore,
-						timeoutMs: resolveAgentTurnTimeoutMs(config),
+						timeoutMs: turnTimeoutMs,
 						abortSignal: params.abortSignal,
 						onEvent: params.onEvent,
 						resumeLastUserMessage

package/dist/src/agent/goals/post-turn.js CHANGED Viewed

@@ -1,10 +1,10 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { getAgentDefaultModelRef, init_schema } from "../../config/schema.js";
+import { resolveGoalUiLocale } from "./goal-locale.js";
 import { resolveEffectiveAgentProfileForSession } from "../../config/agent-profile.js";
 import { GoalService } from "../../goals/goal-service.js";
 import { OutcomeRepository } from "../../work/outcome-repository.js";
-import { resolveGoalUiLocale } from "./goal-locale.js";
 import { evaluateAfterTurnHermesLike } from "./evaluate-turn.js";
 import "../../goals/index.js";
 //#region src/agent/goals/post-turn.ts

package/dist/src/agent/image/tool-model-config.js CHANGED Viewed

@@ -1,7 +1,7 @@
 import { getAgentDefaultImageModelConfig, getAgentDefaultModelRef, init_schema, parseModelRef } from "../../config/schema.js";
 import { init_agent_scope, resolveDefaultAgentId } from "../agent-scope.js";
-import { resolveEffectiveAgentManifestForAgent } from "../../config/agent-profile.js";
 import { getDefaultModelSync, getModelsByProvider, init_providers, isProviderConfiguredSync, resolveModel } from "../../providers/index.js";
+import { resolveEffectiveAgentManifestForAgent } from "../../config/agent-profile.js";
 import { resolveAgentModelFallbackValues, resolveAgentModelPrimaryValue } from "../../config/model-input.js";
 //#region src/agent/image/tool-model-config.ts
 init_schema();

package/dist/src/agent/inbound/turn-dispatcher.d.ts CHANGED Viewed

@@ -57,12 +57,17 @@ export interface TurnDispatcherConfig {
     sourceContextResolver?: AgentSourceContextResolver;
 }
 export type DirectAttachment = InboundAttachmentInput;
+export interface ProcessDirectOptions {
+    signal?: AbortSignal;
+    runId?: string;
+    deadlineAtMs?: number;
+}
 export declare class TurnDispatcher {
     private readonly cfg;
     private readonly log;
     constructor(cfg: TurnDispatcherConfig);
     /** One-shot direct turn (CLI / embedded TUI). */
-    processDirect(content: string, sessionKey?: string, attachments?: DirectAttachment[], thinking?: string): Promise<string>;
+    processDirect(content: string, sessionKey?: string, attachments?: DirectAttachment[], thinking?: string, options?: ProcessDirectOptions): Promise<string>;
     /** Streaming direct turn (webchat SSE / CLI streaming). */
     processDirectStreaming(content: string, sessionKey?: string, attachments?: DirectAttachment[], thinking?: string, options?: {
         signal?: AbortSignal;

package/dist/src/agent/inbound/turn-dispatcher.js CHANGED Viewed

@@ -12,12 +12,15 @@ var TurnDispatcher = class {
 		this.log = cfg.log;
 	}
 	/** One-shot direct turn (CLI / embedded TUI). */
-	processDirect(content, sessionKey = "agent:main:main", attachments, thinking) {
+	processDirect(content, sessionKey = "agent:main:main", attachments, thinking, options) {
 		return runProcessDirect(this.buildOneShotDeps(), {
 			content,
 			sessionKey,
 			attachments,
-			thinking
+			thinking,
+			signal: options?.signal,
+			runId: options?.runId,
+			deadlineAtMs: options?.deadlineAtMs
 		});
 	}
 	/** Streaming direct turn (webchat SSE / CLI streaming). */

package/dist/src/agent/ipc/inbox.js CHANGED Viewed

@@ -1,7 +1,7 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { init_paths, resolveAgentDir } from "../../config/paths.js";
 import { init_write_file_atomic, writeTextAtomic } from "../../infra/write-file-atomic.js";
+import { init_paths, resolveAgentDir } from "../../config/paths.js";
 import { join } from "path";
 import { existsSync, watch } from "fs";
 import { mkdir, readFile, readdir, rename } from "fs/promises";

package/dist/src/agent/lifecycle/timeout-wrapper.d.ts CHANGED Viewed

@@ -26,6 +26,8 @@ export interface ToolTimeoutConfig {
     toolName: string;
     timeoutMs?: number;
     description?: string;
+    signal?: AbortSignal;
+    onTimeout?: (error: TimeoutError) => void;
 }
 /**
  * Execute function with timeout protection

package/dist/src/agent/lifecycle/timeout-wrapper.js CHANGED Viewed

@@ -40,6 +40,31 @@ async function executeWithTimeout(operation, config) {
 	let timeoutId = null;
 	let isSettled = false;
 	return new Promise((resolve, reject) => {
+		const cleanup = () => {
+			if (timeoutId) {
+				clearTimeout(timeoutId);
+				timeoutId = null;
+			}
+			config.signal?.removeEventListener("abort", onAbort);
+		};
+		const onAbort = () => {
+			if (isSettled) return;
+			isSettled = true;
+			cleanup();
+			const reason = config.signal?.reason;
+			if (reason instanceof Error) {
+				reject(reason);
+				return;
+			}
+			const error = /* @__PURE__ */ new Error("Tool execution was aborted");
+			error.name = "AbortError";
+			reject(error);
+		};
+		if (config.signal?.aborted) {
+			onAbort();
+			return;
+		}
+		config.signal?.addEventListener("abort", onAbort, { once: true });
 		timeoutId = setTimeout(() => {
 			if (isSettled) return;
 			isSettled = true;
@@ -51,15 +76,23 @@ async function executeWithTimeout(operation, config) {
 				executionTimeMs: executionTime,
 				description: config.description
 			}, `Tool "${config.toolName}" timed out after ${timeoutMs}ms (elapsed ${executionTime}ms)${desc}`);
-			reject(new TimeoutError(config.toolName, timeoutMs, config.description, executionTime));
+			const error = new TimeoutError(config.toolName, timeoutMs, config.description, executionTime);
+			try {
+				config.onTimeout?.(error);
+			} catch (callbackError) {
+				log.warn({
+					err: callbackError,
+					toolName: config.toolName
+				}, "Tool timeout cancellation callback failed");
+			} finally {
+				cleanup();
+				reject(error);
+			}
 		}, timeoutMs);
 		operation().then((result) => {
 			if (isSettled) return;
 			isSettled = true;
-			if (timeoutId) {
-				clearTimeout(timeoutId);
-				timeoutId = null;
-			}
+			cleanup();
 			const executionTime = Date.now() - startTime;
 			log.debug({
 				toolName: config.toolName,
@@ -69,10 +102,7 @@ async function executeWithTimeout(operation, config) {
 		}).catch((error) => {
 			if (isSettled) return;
 			isSettled = true;
-			if (timeoutId) {
-				clearTimeout(timeoutId);
-				timeoutId = null;
-			}
+			cleanup();
 			reject(error);
 		});
 	});

package/dist/src/agent/mcp/bundle-mcp-materialize.js CHANGED Viewed

@@ -138,9 +138,9 @@ async function materializeBundleMcpToolsForRun(params) {
 			label: tool.title ?? tool.toolName,
 			description: tool.description || tool.title || tool.fallbackDescription,
 			parameters: tool.inputSchema,
-			execute: async (_toolCallId, input) => {
+			execute: async (_toolCallId, input, signal) => {
 				params.runtime.markUsed();
-				const result = await params.runtime.callTool(tool.serverName, tool.toolName, input);
+				const result = await params.runtime.callTool(tool.serverName, tool.toolName, input, signal);
 				return toAgentToolResult({
 					serverName: tool.serverName,
 					toolName: tool.toolName,

package/dist/src/agent/mcp/bundle-mcp-runtime.js CHANGED Viewed

@@ -192,6 +192,7 @@ function createSessionMcpRuntime(params) {
 						client,
 						transport: resolved.transport,
 						transportType: resolved.transportType,
+						requestTimeoutMs: resolved.requestTimeoutMs,
 						detachStderr: resolved.detachStderr
 					};
 					sessions.set(serverName, session);
@@ -312,7 +313,7 @@ function createSessionMcpRuntime(params) {
 		markUsed() {
 			lastUsedAt = Date.now();
 		},
-		async callTool(serverName, toolName, input) {
+		async callTool(serverName, toolName, input, signal) {
 			failIfDisposed();
 			await getCatalog();
 			const session = sessions.get(serverName);
@@ -320,6 +321,10 @@ function createSessionMcpRuntime(params) {
 			return await session.client.callTool({
 				name: toolName,
 				arguments: isMcpConfigRecord(input) ? input : {}
+			}, void 0, {
+				signal,
+				timeout: session.requestTimeoutMs,
+				maxTotalTimeout: session.requestTimeoutMs
 			});
 		},
 		async dispose() {

package/dist/src/agent/mcp/bundle-mcp-types.d.ts CHANGED Viewed

@@ -56,7 +56,7 @@ export type SessionMcpRuntime = {
     acquireLease?: () => () => void;
     getCatalog: () => Promise<McpToolCatalog>;
     markUsed: () => void;
-    callTool: (serverName: string, toolName: string, input: unknown) => Promise<CallToolResult>;
+    callTool: (serverName: string, toolName: string, input: unknown, signal?: AbortSignal) => Promise<CallToolResult>;
     dispose: () => Promise<void>;
 };
 export type SessionMcpRuntimeManager = {

package/dist/src/agent/mcp/mcp-transport-config.d.ts CHANGED Viewed

@@ -2,6 +2,7 @@ import { type HttpMcpTransportType } from "./mcp-http.js";
 type ResolvedBaseMcpTransportConfig = {
     description: string;
     connectionTimeoutMs: number;
+    requestTimeoutMs: number;
 };
 export type ResolvedStdioMcpTransportConfig = ResolvedBaseMcpTransportConfig & {
     kind: "stdio";
@@ -18,5 +19,6 @@ export type ResolvedHttpMcpTransportConfig = ResolvedBaseMcpTransportConfig & {
     headers?: Record<string, string>;
 };
 export type ResolvedMcpTransportConfig = ResolvedStdioMcpTransportConfig | ResolvedHttpMcpTransportConfig;
+export declare const DEFAULT_MCP_REQUEST_TIMEOUT_MS = 60000;
 export declare function resolveMcpTransportConfig(serverName: string, rawServer: unknown): ResolvedMcpTransportConfig | null;
 export {};

package/dist/src/agent/mcp/mcp-transport-config.js CHANGED Viewed

@@ -10,10 +10,15 @@ init_logger();
 init_string_coerce();
 const log = createLogger("Mcp:Bundle");
 const DEFAULT_CONNECTION_TIMEOUT_MS = 3e4;
+const DEFAULT_MCP_REQUEST_TIMEOUT_MS = 6e4;
 function getConnectionTimeoutMs(rawServer) {
 	if (rawServer && typeof rawServer === "object" && typeof rawServer.connectionTimeoutMs === "number" && rawServer.connectionTimeoutMs > 0) return rawServer.connectionTimeoutMs;
 	return DEFAULT_CONNECTION_TIMEOUT_MS;
 }
+function getRequestTimeoutMs(rawServer) {
+	if (rawServer && typeof rawServer === "object" && typeof rawServer.requestTimeoutMs === "number" && rawServer.requestTimeoutMs > 0) return rawServer.requestTimeoutMs;
+	return DEFAULT_MCP_REQUEST_TIMEOUT_MS;
+}
 function getRequestedTransport(rawServer) {
 	if (!rawServer || typeof rawServer !== "object" || typeof rawServer.transport !== "string") return "";
 	return normalizeLowercaseStringOrEmpty(rawServer.transport);
@@ -46,7 +51,8 @@ function resolveHttpTransportConfig(serverName, rawServer, transportType) {
 		url: launch.config.url,
 		headers: launch.config.headers,
 		description: describeHttpMcpServerLaunchConfig(launch.config),
-		connectionTimeoutMs: getConnectionTimeoutMs(rawServer)
+		connectionTimeoutMs: getConnectionTimeoutMs(rawServer),
+		requestTimeoutMs: getRequestTimeoutMs(rawServer)
 	};
 }
 function resolveMcpTransportConfig(serverName, rawServer) {
@@ -65,7 +71,8 @@ function resolveMcpTransportConfig(serverName, rawServer) {
 		env: stdioLaunch.config.env,
 		cwd: stdioLaunch.config.cwd,
 		description: describeStdioMcpServerLaunchConfig(stdioLaunch.config),
-		connectionTimeoutMs: getConnectionTimeoutMs(rawServer)
+		connectionTimeoutMs: getConnectionTimeoutMs(rawServer),
+		requestTimeoutMs: getRequestTimeoutMs(rawServer)
 	};
 	if (effectiveTransport && effectiveTransport !== "sse" && effectiveTransport !== "streamable-http") {
 		log.warn(`bundle-mcp: skipped server "${logServerName}" because transport "${sanitizeForLog(effectiveTransport)}" is not supported.`);
@@ -80,4 +87,4 @@ function resolveMcpTransportConfig(serverName, rawServer) {
 	return null;
 }
 //#endregion
-export { resolveMcpTransportConfig };
+export { DEFAULT_MCP_REQUEST_TIMEOUT_MS, resolveMcpTransportConfig };

package/dist/src/agent/mcp/mcp-transport.d.ts CHANGED Viewed

@@ -4,6 +4,7 @@ export type ResolvedMcpTransport = {
     description: string;
     transportType: "stdio" | "sse" | "streamable-http";
     connectionTimeoutMs: number;
+    requestTimeoutMs: number;
     detachStderr?: () => void;
 };
 export declare function resolveMcpTransport(serverName: string, rawServer: unknown): ResolvedMcpTransport | null;

package/dist/src/agent/mcp/mcp-transport.js CHANGED Viewed

@@ -60,6 +60,7 @@ function resolveMcpTransport(serverName, rawServer) {
 			description: resolved.description,
 			transportType: "stdio",
 			connectionTimeoutMs: resolved.connectionTimeoutMs,
+			requestTimeoutMs: resolved.requestTimeoutMs,
 			detachStderr: attachStderrLogging(serverName, transport)
 		};
 	}
@@ -70,7 +71,8 @@ function resolveMcpTransport(serverName, rawServer) {
 		}),
 		description: resolved.description,
 		transportType: "streamable-http",
-		connectionTimeoutMs: resolved.connectionTimeoutMs
+		connectionTimeoutMs: resolved.connectionTimeoutMs,
+		requestTimeoutMs: resolved.requestTimeoutMs
 	};
 	const headers = { ...resolved.headers };
 	const hasHeaders = Object.keys(headers).length > 0;
@@ -82,7 +84,8 @@ function resolveMcpTransport(serverName, rawServer) {
 		}),
 		description: resolved.description,
 		transportType: "sse",
-		connectionTimeoutMs: resolved.connectionTimeoutMs
+		connectionTimeoutMs: resolved.connectionTimeoutMs,
+		requestTimeoutMs: resolved.requestTimeoutMs
 	};
 }
 //#endregion

package/dist/src/agent/memory/dreaming/config.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { DEFAULT_DEEP_CRON, DEFAULT_LIGHT_CRON, DEFAULT_REM_CRON } from "./constants.js";
 import { buildMemoryRuntime } from "../../../agent-runtime/memory-runtime.js";
+import { DEFAULT_DEEP_CRON, DEFAULT_LIGHT_CRON, DEFAULT_REM_CRON } from "./constants.js";
 //#region src/agent/memory/dreaming/config.ts
 function clampScore(value, fallback) {
 	if (!Number.isFinite(value)) return fallback;

package/dist/src/agent/orchestration/run-agent-turn-with-timeout.d.ts CHANGED Viewed

@@ -10,6 +10,6 @@ export declare const MIN_AGENT_TURN_TIMEOUT_MS = 60000;
 export declare const MAX_AGENT_TURN_TIMEOUT_MS: number;
 /** Default per-turn timeout (30 minutes). */
 export declare const DEFAULT_AGENT_TURN_TIMEOUT_MS: number;
-export declare function resolveAgentTurnTimeoutMs(_config?: Config): number;
+export declare function resolveAgentTurnTimeoutMs(config?: Config, sessionKey?: string): number;
 export declare function isAgentTurnTimeoutError(err: unknown): boolean;
 export declare function runAgentTurnWithTimeout(agent: Agent, runTurn: () => Promise<void>, timeoutMs: number): Promise<void>;

package/dist/src/agent/orchestration/run-agent-turn-with-timeout.js CHANGED Viewed

@@ -1,3 +1,4 @@
+import { resolveEffectiveAgentManifestForSession } from "../../config/agent-profile.js";
 //#region src/agent/orchestration/run-agent-turn-with-timeout.ts
 /** Minimum per-turn timeout (1 minute). */
 const MIN_AGENT_TURN_TIMEOUT_MS = 6e4;
@@ -5,8 +6,11 @@ const MIN_AGENT_TURN_TIMEOUT_MS = 6e4;
 const MAX_AGENT_TURN_TIMEOUT_MS = 14400 * 1e3;
 /** Default per-turn timeout (30 minutes). */
 const DEFAULT_AGENT_TURN_TIMEOUT_MS = 1800 * 1e3;
-function resolveAgentTurnTimeoutMs(_config) {
-	return DEFAULT_AGENT_TURN_TIMEOUT_MS;
+function resolveAgentTurnTimeoutMs(config, sessionKey) {
+	if (!config) return DEFAULT_AGENT_TURN_TIMEOUT_MS;
+	const configured = resolveEffectiveAgentManifestForSession(config, sessionKey).runtime?.timeoutMs;
+	if (!configured) return DEFAULT_AGENT_TURN_TIMEOUT_MS;
+	return Math.min(MAX_AGENT_TURN_TIMEOUT_MS, Math.max(MIN_AGENT_TURN_TIMEOUT_MS, configured));
 }
 function isAgentTurnTimeoutError(err) {
 	return err instanceof Error && err.message.startsWith("Agent turn timed out after");

package/dist/src/agent/service/direct-turn-helpers.d.ts CHANGED Viewed

@@ -64,6 +64,7 @@ export interface RunDirectAgentTurnInput {
     runId?: string;
     userMessage: AgentMessage;
     abortSignal?: AbortSignal;
+    deadlineAtMs?: number;
     sourceImages?: ImageContent[];
     onEvent?: (event: EmbeddedStreamEvent) => void;
 }

package/dist/src/agent/service/direct-turn-helpers.js CHANGED Viewed

@@ -99,6 +99,7 @@ async function runDirectAgentTurn(deps, input) {
 		modelManager: deps.modelManager,
 		getConfig: () => deps.config,
 		abortSignal: input.abortSignal,
+		deadlineAtMs: input.deadlineAtMs,
 		beforeTurn: () => deps.agentManager.beginBackgroundReviewUserTurn(input.sessionKey),
 		onEvent: input.onEvent
 	});

package/dist/src/agent/service/process-direct-one-shot.d.ts CHANGED Viewed

@@ -33,4 +33,7 @@ export declare function runProcessDirect(deps: RunProcessDirectDeps, input: {
     sessionKey: string;
     attachments?: InboundAttachmentInput[];
     thinking?: string;
+    signal?: AbortSignal;
+    runId?: string;
+    deadlineAtMs?: number;
 }): Promise<string>;

package/dist/src/agent/service/process-direct-one-shot.js CHANGED Viewed

@@ -61,7 +61,10 @@ async function runProcessDirect(deps, input) {
 					config: deps.config
 				}, {
 					sessionKey: input.sessionKey,
-					userMessage
+					runId: input.runId,
+					userMessage,
+					abortSignal: input.signal,
+					deadlineAtMs: input.deadlineAtMs
 				}));
 			} finally {
 				clearPendingTranscriptUserMessage(input.sessionKey, pendingUserMessage);

package/dist/src/agent/service.d.ts CHANGED Viewed

@@ -113,6 +113,7 @@ export declare class AgentService {
     getCapabilityCatalog(sessionKey?: string): AgentCapabilityCatalogEntry[];
     getSkillMarkdownSource(skillName: string): SkillMarkdownPreviewPayload | null;
     refreshSkillsAfterDiskChange(): void;
+    refreshSkillsAfterTrustChange(): void;
     installSkillFromSource(opts: SkillInstallToolOptions): Promise<SkillInstallToolResult>;
     installSkillFromMarketplace(opts: MarketplaceSkillInstallToolOptions): Promise<MarketplaceSkillInstallToolResult>;
     refreshSkillsAfterSkillConfigChange(): void;

package/dist/src/agent/service.js CHANGED Viewed

@@ -2,10 +2,10 @@ import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
 import { parseNoteAttachmentTarget } from "../notes/attachment-ref.js";
 import { getAgentDefaultModelRef, init_schema } from "../config/schema.js";
-import { applyConfigOverrides } from "../config/runtime-overrides.js";
 import { init_agent_scope, resolveAgentHomeDir, resolveDefaultAgentId } from "./agent-scope.js";
-import { extractProfileAgentId } from "../config/agent-profile.js";
 import { init_paths, resolveUserProfilePath } from "../config/paths.js";
+import { applyConfigOverrides } from "../config/runtime-overrides.js";
+import { extractProfileAgentId } from "../config/agent-profile.js";
 import { extractTextContent } from "./context/workspace.js";
 import { effectiveWorkspacePathForSession } from "../session/session-workspace.js";
 import { getProjectForSession } from "../projects/workspace.js";
@@ -532,6 +532,9 @@ var AgentService = class {
 	refreshSkillsAfterDiskChange() {
 		this.agentManager.refreshSkillsAfterDiskChange();
 	}
+	refreshSkillsAfterTrustChange() {
+		this.agentManager.refreshSkillsAfterTrustChange();
+	}
 	async installSkillFromSource(opts) {
 		const target = normalizeSkillInstallTarget(opts.target);
 		const workspace = opts.workspace?.trim() || (opts.sessionKey ? this.agentManager.getResolvedWorkspaceForSession(opts.sessionKey) : void 0) || this.workspaceDir;

package/dist/src/agent/session/session-inspector.js CHANGED Viewed

@@ -1,8 +1,8 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { init_workspace_defaults, resolveDefaultAgentWorkspaceDir } from "../../config/workspace-defaults.js";
-import { resolveEffectiveAgentProfileForSession } from "../../config/agent-profile.js";
 import { init_providers, resolveModel } from "../../providers/index.js";
+import { resolveEffectiveAgentProfileForSession } from "../../config/agent-profile.js";
 import { effectiveWorkspacePathForSession, projectWorkspacePath } from "../../session/session-workspace.js";
 import { getProjectForSession } from "../../projects/workspace.js";
 import { resolveCompactionPolicy } from "../memory/compaction-policy.js";