@xopcai/xopc 0.0.396 → 0.0.398

package/dist/src/agent/embedded/codemode-extension.js

@@ -5,6 +5,10 @@ import { retainCodemodeOutput } from "./codemode-output.js";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { createCodemodeExtension } from "@earendil-works/pi-coding-agent";
 //#region src/agent/embedded/codemode-extension.ts
+const nestedCodemodePolicy = Symbol("nestedCodemodePolicy");
+function isNestedCodemodePolicy(context) {
+	return context[nestedCodemodePolicy] === true;
+}
 const MAX_STORE_BYTES = 64 * 1024;
 const MAX_SOURCE_BYTES = 64 * 1024;
 /** Public pi extension, restricted to core reads and the current xopc turn policy. */
@@ -26,6 +30,7 @@ function createXopcCodemodeExtension(policy, tools, getSession) {
 		const assistantMessage = session?.agent.state.messages.findLast((message) => message.role === "assistant");
 		if (!session || assistantMessage?.role !== "assistant") throw new Error("Codemode needs an active xopc turn");
 		return {
+			[nestedCodemodePolicy]: true,
 			assistantMessage,
 			toolCall: {
 				type: "toolCall",
@@ -229,4 +234,4 @@ function boundCodemodeSource(source, policy) {
 	})}\n${match ? source.slice(match[0].length) : source}`;
 }
 //#endregion
-export { boundCodemodeSource, createXopcCodemodeExtension };
+export { boundCodemodeSource, createXopcCodemodeExtension, isNestedCodemodePolicy };

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

@@ -196,7 +196,7 @@ async function runEmbeddedTurnForSessionInner(params) {
 			conversationId,
 			tools
 		}));
-		const mcp = config && executionToolPolicy.nativeMcp ? await prepareNativeMcpConfig(config, workspaceDir) : void 0;
+		const mcp = config && executionToolPolicy.nativeMcp ? await prepareNativeMcpConfig(config, workspaceDir, resolveEffectiveAgentProfileForSession(conversationId).agentId) : void 0;
 		const promptCachePolicy = resolvePromptCachePolicy(config ? resolveEffectiveAgentProfileForSession(conversationId).config.runtime.promptCache : void 0);
 		let userMessageForTurn = userMessage;
 		if (params.applyStartupContext !== false) {

package/dist/src/agent/embedded/run-turn.js

@@ -19,6 +19,7 @@ import { getAssistantTurnErrorMessage, isAssistantTurnAborted, isAssistantTurnFa
 import { allowsExecutionTool, filterExecutionTools, resolveExecutionToolPolicy } from "./execution-tool-policy.js";
 import { externalPolicyContext, getXopcToolMetadata } from "./tool-metadata.js";
 import { runWithEmbeddedExecutionSession } from "./execution-context.js";
+import { isNestedCodemodePolicy } from "./codemode-extension.js";
 import { isComputerControlActive, isComputerLeaseTool, stopComputerControl } from "../../computer/control-guard.js";
 import { EmbeddedRunConflictError, abortEmbeddedRun, acquireEmbeddedRunLease, queueEmbeddedSteer } from "./runs.js";
 import { lastAssistantPlainText, subscribeEmbeddedSessionEvents } from "./subscribe-session.js";
@@ -346,6 +347,7 @@ async function runXopcEmbeddedTurnInner(params) {
 	let restorePrepareNextTurn;
 	let restorePrepareRequest;
 	let restoreTransformContext;
+	let restoreToolHooks;
 	try {
 		runLease = acquireEmbeddedRunLease({
 			conversationId,
@@ -652,7 +654,9 @@ async function runXopcEmbeddedTurnInner(params) {
 		let clarificationStopped = false;
 		let sentVisibleMessage = false;
 		params.turnPolicy?.reset();
-		session.agent.beforeToolCall = async (context, signal) => {
+		const nativeBeforeTool = session.agent.beforeToolCall;
+		const nativeAfterTool = session.agent.afterToolCall;
+		const hostBeforeTool = async (context, signal) => {
 			if (!allowsExecutionTool(executionToolPolicy, context.toolCall.name)) return {
 				block: true,
 				reason: "Tool is outside this execution scope."
@@ -716,7 +720,7 @@ async function runXopcEmbeddedTurnInner(params) {
 			await verification.beforeTool(context.toolCall.id, context.toolCall.name);
 			return decision;
 		};
-		session.agent.afterToolCall = async (context) => {
+		const hostAfterTool = async (context) => {
 			connectionStopped ||= isConnectionSuspended(conversationId, runId);
 			clarificationStopped ||= isClarificationSuspended(conversationId, runId);
 			const scoped = context.toolCall.name === "read_file" ? await instructions.forTool(context.toolCall.name, context.args) : context.toolCall.name === "data_batch" ? await instructions.forDataResult(context.result.content) : "";
@@ -741,6 +745,33 @@ async function runXopcEmbeddedTurnInner(params) {
 				isError: checked.isError
 			};
 		};
+		const beforeTool = async (context, signal) => {
+			const decision = await hostBeforeTool(context, signal);
+			if (decision?.block || isNestedCodemodePolicy(context)) return decision;
+			return await nativeBeforeTool?.(context, signal) ?? decision;
+		};
+		const afterTool = async (context, signal) => {
+			const checked = await hostAfterTool(context, signal);
+			if (isNestedCodemodePolicy(context)) return checked;
+			const native = await nativeAfterTool?.({
+				...context,
+				result: {
+					...context.result,
+					...checked
+				},
+				isError: checked?.isError ?? context.isError
+			}, signal);
+			return native ? {
+				...checked,
+				...native
+			} : checked;
+		};
+		session.agent.beforeToolCall = beforeTool;
+		session.agent.afterToolCall = afterTool;
+		restoreToolHooks = () => {
+			if (session.agent.beforeToolCall === beforeTool) session.agent.beforeToolCall = nativeBeforeTool;
+			if (session.agent.afterToolCall === afterTool) session.agent.afterToolCall = nativeAfterTool;
+		};
 		const baseFinishTurn = session.agent.finishTurn;
 		session.agent.finishTurn = async (context, signal) => {
 			const baseDecision = await baseFinishTurn?.(context, signal);
@@ -1002,6 +1033,7 @@ async function runXopcEmbeddedTurnInner(params) {
 		restorePrepareNextTurn?.();
 		restorePrepareRequest?.();
 		restoreTransformContext?.();
+		restoreToolHooks?.();
 		runLease?.release();
 		unsubscribe?.();
 		try {

package/dist/src/agent/embedded/session-runner.js

@@ -3,13 +3,13 @@ import { init_logger } from "../../utils/logger.js";
 import { filterExecutionTools, resolveExecutionToolPolicy } from "./execution-tool-policy.js";
 import { deferredToolContract, getXopcToolMetadata } from "./tool-metadata.js";
 import { isCodemodeCoreRead } from "../tools/codemode-permissions.js";
+import { createXopcCodemodeExtension } from "./codemode-extension.js";
 import { abortEmbeddedRun } from "./runs.js";
 import { guardSessionManager } from "./session-tool-result-guard.js";
 import { transformUserMessageForPersistence } from "../inbound/attachment-pipeline.js";
 import { createEmbeddedModelRuntime, resolveEmbeddedProviderApiKeySync } from "./model-runtime.js";
 import { wrapStreamFnForXopcExtensions } from "./xopc-stream-bridge.js";
 import { xopcToolsToDefinitions } from "./xopc-tools-bridge.js";
-import { createXopcCodemodeExtension } from "./codemode-extension.js";
 import { TOOL_DISCOVERY_STATE, createXopcToolSearchExtension } from "./tool-search-extension.js";
 import { getNativePiAgentDir } from "../mcp/native-mcp.js";
 import { AGENT_PROFILE_CONTEXT_STATE, createAgentProfileContextExtension } from "./agent-profile-context.js";

package/dist/src/agent/external-tools/cliProvider.js

@@ -5,11 +5,11 @@ import { getConnectorAccount, init_connector_account_repository } from "../../st
 import { appendConnectorExecutionAudit, consumeConnectorApproval, createConnectorApproval, getConnectorApproval, getConnectorConnection, getConnectorInstallation, init_connector_repository } from "../../storage/sqlite/connector-repository.js";
 import { connectorObjectiveScope, init_connection_wait_repository, publishConnectionWait, requireSessionConnection } from "../../storage/sqlite/connection-wait-repository.js";
 import { init_sqlite } from "../../storage/sqlite/index.js";
+import { connectorArgumentsHash, connectorArgumentsPreview } from "../../connectors/approval.js";
+import { connectorPrincipalForSession } from "../../connectors/principal.js";
 import { CapabilityError } from "../../capabilities/runtime/errors.js";
 import { ExternalEffectNotAppliedError, executeExternalOperation } from "../../capabilities/runtime/external-operations.js";
 import "../../capabilities/runtime/dispatcher.js";
-import { connectorArgumentsHash, connectorArgumentsPreview } from "../../connectors/approval.js";
-import { connectorPrincipalForSession } from "../../connectors/principal.js";
 import { selectConnectorAccount } from "../../connectors/account-selection.js";
 import { cliContextPath } from "../../connectors/cli/process.js";
 import { validateActionInput } from "../../connectors/cli/protocol.js";

package/dist/src/agent/external-tools/composio-provider.js

@@ -5,11 +5,11 @@ import { getConnectorAccount } from "../../storage/sqlite/connector-account-repo
 import { consumeConnectorApproval, createConnectorApproval, getConnectorApproval, getConnectorConnection, getConnectorInstallation, listConnectorActionMetadata, listConnectorConnections, listConnectorInstallations, upsertConnectorActionMetadata, upsertConnectorInstallation } from "../../storage/sqlite/connector-repository.js";
 import { bindObjectiveAccount, connectionBinding, connectionBindings, connectorObjectiveScope, init_connection_wait_repository, publishConnectionWait, requireSessionConnection } from "../../storage/sqlite/connection-wait-repository.js";
 import { init_sqlite } from "../../storage/sqlite/index.js";
-import { CapabilityError } from "../../capabilities/runtime/errors.js";
-import { ExternalEffectNotAppliedError, executeExternalOperation } from "../../capabilities/runtime/external-operations.js";
 import { connectorArgumentsHash, connectorArgumentsPreview } from "../../connectors/approval.js";
 import { canAccessConnectorAccount, currentAccountConnections } from "../../connectors/account-access.js";
 import { connectorPrincipalForSession } from "../../connectors/principal.js";
+import { CapabilityError } from "../../capabilities/runtime/errors.js";
+import { ExternalEffectNotAppliedError, executeExternalOperation } from "../../capabilities/runtime/external-operations.js";
 import { connectorIdentitySummary } from "../../connectors/connector-identity.js";
 import { evaluateConnectorExecutionPolicy } from "../../connectors/policy.js";
 import { ComposioSessionsAdapter } from "../../connectors/composio-sessions.js";

package/dist/src/agent/external-tools/endpoint-provider.js

@@ -1,7 +1,7 @@
-import { ExternalEffectNotAppliedError, executeExternalOperation } from "../../capabilities/runtime/external-operations.js";
-import { canonicalCapabilityJson } from "../../capabilities/runtime/dispatcher.js";
 import { init_src } from "../../../packages/computer-control-contract/src/index.js";
 import "../../../packages/browser-control-contract/src/index.js";
+import { ExternalEffectNotAppliedError, executeExternalOperation } from "../../capabilities/runtime/external-operations.js";
+import { canonicalCapabilityJson } from "../../capabilities/runtime/dispatcher.js";
 import { externalToolRef, parseExternalToolRef } from "./refs.js";
 import { extractDocumentText } from "../../document-understanding/extract.js";
 import { prepareImageForModel } from "../image/prepare-image-for-model.js";

package/dist/src/agent/mcp/config.d.ts

@@ -14,5 +14,7 @@ export type MergedMcpConfig = {
 };
 export declare function loadMergedMcpConfig(params: {
     workspaceDir: string;
+    agentId?: string;
+    scope?: 'runtime' | 'management';
     cfg?: Config;
 }): MergedMcpConfig;

package/dist/src/agent/mcp/config.js

@@ -8,9 +8,9 @@ function loadMergedMcpConfig(params) {
 	const diagnostics = inspectExtensionConnectorDependencies({ cfg: params.cfg });
 	const store = new AgentPluginStore();
 	const plugins = Object.create(null);
-	for (const plugin of store.active()) try {
+	for (const plugin of params.scope === "management" ? store.list().filter((plugin) => plugin.readiness !== "blocked") : store.active(params.agentId, params.workspaceDir)) try {
 		const componentDiagnostics = [...plugin.diagnostics];
-		for (const [id, server] of Object.entries(materializePluginServers(plugin, store, componentDiagnostics))) {
+		for (const [id, server] of Object.entries(materializePluginServers(plugin, store, componentDiagnostics, params.scope === "management"))) {
 			if (configured[id]) throw new Error(`MCP server ID conflicts with plugin: ${id}`);
 			plugins[id] = server;
 		}

package/dist/src/agent/mcp/connection-setup.js

@@ -2,6 +2,7 @@ import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { isManagedConnectorServer } from "../../connectors/materialize.js";
 import { prepareNativeMcpConfig } from "./native-mcp.js";
+import { resolveMcpSetupConfig } from "./effective-server.js";
 import { classifyMcpConnectionError } from "./connection-errors.js";
 import { McpAuthenticationRequiredError, discoverMcpTools, signInNativeMcp } from "./tool-catalog.js";
 import { createHash, randomUUID } from "node:crypto";
@@ -83,6 +84,7 @@ async function advertisesOAuth(config, workspace, serverId, signal) {
 	return Boolean(legacy && legacy.issuer === url.origin && typeof legacy.authorization_endpoint === "string" && typeof legacy.token_endpoint === "string");
 }
 async function probeMcpConnection(config, workspace, serverId, options) {
+	config = resolveMcpSetupConfig(config, serverId);
 	try {
 		return {
 			state: "connected",
@@ -116,6 +118,7 @@ async function probeMcpConnection(config, workspace, serverId, options) {
 }
 const attempts = /* @__PURE__ */ new Map();
 function fingerprint(config, serverId) {
+	config = resolveMcpSetupConfig(config, serverId);
 	const server = config.mcp?.servers?.[serverId];
 	return createHash("sha256").update(JSON.stringify(server ? {
 		...server,
@@ -138,6 +141,7 @@ function cancel(attempt) {
 }
 /** A UI bridge to native pi's login command; no host-owned OAuth client or token store. */
 function startMcpAuthorization(config, workspace, serverId, owner, options) {
+	config = resolveMcpSetupConfig(config, serverId);
 	const server = config.mcp?.servers?.[serverId];
 	if (!server?.url || server.enabled === false || isManagedConnectorServer(server) && server.xopcConnector.enabled === false) throw new Error("An enabled HTTP MCP server is required.");
 	httpUrl(server.url);
@@ -227,7 +231,15 @@ function submitMcpRedirect(id, owner, redirectUrl, config) {
 	if (!expected) return false;
 	const target = new URL(expected);
 	const actual = httpUrl(redirectUrl);
-	if (actual.origin !== target.origin || actual.pathname !== target.pathname || actual.searchParams.get("state") !== authorization.searchParams.get("state") || !actual.searchParams.get("code")) return false;
+	if (actual.origin !== target.origin || actual.pathname !== target.pathname || actual.searchParams.get("state") !== authorization.searchParams.get("state")) return false;
+	if (actual.searchParams.has("error")) {
+		cancel(attempt);
+		attempt.result.state = "error";
+		attempt.result.error = "Sign-in was declined or could not be completed. Try again.";
+		delete attempt.result.authorizationUrl;
+		return true;
+	}
+	if (!actual.searchParams.get("code")) return false;
 	attempt.redirect(actual.href);
 	attempt.redirect = void 0;
 	return true;

package/dist/src/agent/mcp/effective-server.d.ts

@@ -0,0 +1,3 @@
+import type { Config } from '../../config/schema.js';
+/** Resolve a single explicit setup target without enabling it for any agent. */
+export declare function resolveMcpSetupConfig(config: Config, serverId: string): Config;

package/dist/src/agent/mcp/effective-server.js

@@ -0,0 +1,27 @@
+import { AgentPluginStore } from "../../extensions/agent-plugins/store.js";
+import { materializePluginServers } from "../../extensions/agent-plugins/mcp-adapter.js";
+//#region src/agent/mcp/effective-server.ts
+/** Resolve a single explicit setup target without enabling it for any agent. */
+function resolveMcpSetupConfig(config, serverId) {
+	if (Object.hasOwn(config.mcp?.servers ?? {}, serverId)) return config;
+	const store = new AgentPluginStore();
+	for (const installed of store.list()) {
+		const plugin = store.pending(installed.id) ?? installed;
+		if (plugin.readiness === "blocked") continue;
+		const servers = materializePluginServers(plugin, store, [], true);
+		if (!Object.hasOwn(servers, serverId)) continue;
+		return {
+			...config,
+			mcp: {
+				...config.mcp,
+				servers: {
+					...config.mcp?.servers,
+					[serverId]: servers[serverId]
+				}
+			}
+		};
+	}
+	return config;
+}
+//#endregion
+export { resolveMcpSetupConfig };

package/dist/src/agent/mcp/native-mcp.d.ts

@@ -8,4 +8,4 @@ export type NativeMcpConfig = LoadedMcpConfig & {
     credentialAliases?: Record<string, string>;
 };
 /** Only projects host configuration and secret references; all MCP execution belongs to pi. */
-export declare function prepareNativeMcpConfig(config: Config, workspaceDir: string): Promise<NativeMcpConfig>;
+export declare function prepareNativeMcpConfig(config: Config, workspaceDir: string, agentId?: string): Promise<NativeMcpConfig>;

package/dist/src/agent/mcp/native-mcp.js

@@ -1,6 +1,7 @@
 import { init_paths_state, resolveStateDir } from "../../config/paths-state.js";
 import { McpServerSchema, init_schema } from "../../config/schema.js";
 import { resolveConnectorSecretReferences } from "../../connectors/secret-store.js";
+import { validPluginOAuthReference } from "../../extensions/agent-plugins/connection-reuse.js";
 import { createNativeMcpCredentials, routeNativeMcpCredentials } from "./credential-store.js";
 import { loadMergedMcpConfig } from "./config.js";
 import { join } from "node:path";
@@ -20,17 +21,19 @@ function getNativePiAgentDir() {
 	return directory;
 }
 /** Only projects host configuration and secret references; all MCP execution belongs to pi. */
-async function prepareNativeMcpConfig(config, workspaceDir) {
+async function prepareNativeMcpConfig(config, workspaceDir, agentId) {
 	getNativePiAgentDir();
 	const merged = loadMergedMcpConfig({
 		cfg: config,
-		workspaceDir
+		workspaceDir,
+		agentId
 	});
 	const result = {
 		servers: [],
 		errors: merged.diagnostics.map((item) => item.message)
 	};
 	const names = /* @__PURE__ */ new Set();
+	const aliases = /* @__PURE__ */ new Map();
 	for (const [name, raw] of Object.entries(merged.config.mcpServers)) {
 		const normalized = name.replace(/-/g, "_");
 		if (!/^[a-zA-Z0-9_-]+$/.test(name) || names.has(normalized)) {
@@ -38,6 +41,12 @@ async function prepareNativeMcpConfig(config, workspaceDir) {
 			continue;
 		}
 		names.add(normalized);
+		const reference = raw.xopcPluginOAuthReference;
+		if (reference && !validPluginOAuthReference(reference, config, raw)) {
+			result.errors.push(`Shared MCP connection changed: ${name}. Reconnect this plugin.`);
+			continue;
+		}
+		if (typeof raw.xopcOAuthCredentialId === "string") aliases.set(name, raw.xopcOAuthCredentialId);
 		const parsed = McpServerSchema.safeParse(raw);
 		if (!parsed.success) {
 			result.errors.push(`Invalid MCP server ${name}: ${parsed.error.message}`);
@@ -61,14 +70,14 @@ async function prepareNativeMcpConfig(config, workspaceDir) {
 			"description"
 		].filter((key) => value[key] !== void 0).map((key) => [key, value[key]]));
 		if (projected.type === "streamable-http") projected.type = "http";
+		const plugin = raw.xopcPlugin;
 		result.servers.push({
 			name,
 			config: projected,
-			source: "xopc.json",
+			source: plugin?.revision ? `plugin:${plugin.id}@${plugin.revision}` : "xopc.json",
 			scope: "extension"
 		});
 	}
-	const aliases = new Map(Object.entries(config.mcp?.servers ?? {}).filter(([, value]) => typeof value.xopcOAuthCredentialId === "string").map(([name, value]) => [name, value.xopcOAuthCredentialId]));
 	if (aliases.size) {
 		result.credentials = routeNativeMcpCredentials(await createNativeMcpCredentials(), aliases);
 		result.credentialAliases = Object.fromEntries(aliases);

package/dist/src/agent/mcp/tool-catalog.js

@@ -1,5 +1,6 @@
 import { createEmbeddedModelRuntime } from "../embedded/model-runtime.js";
 import { getNativePiAgentDir, prepareNativeMcpConfig } from "./native-mcp.js";
+import { resolveMcpSetupConfig } from "./effective-server.js";
 import { join } from "node:path";
 import { InMemoryCredentialStore, InMemoryModelsStore } from "@earendil-works/pi-ai";
 import { DefaultResourceLoader, ModelRuntime, SessionManager, SettingsManager, createAgentSession, createMcpExtension, createToolSearchExtension } from "@earendil-works/pi-coding-agent";
@@ -16,7 +17,7 @@ async function signInNativeMcp(config, workspaceDir, serverId, interaction, opti
 async function runNativeMcpSession(config, workspaceDir, serverId, interaction, options) {
 	const signal = interaction?.signal ?? options?.signal;
 	signal?.throwIfAborted();
-	const loaded = await prepareNativeMcpConfig(config, workspaceDir);
+	const loaded = await prepareNativeMcpConfig(resolveMcpSetupConfig(config, serverId), workspaceDir);
 	signal?.throwIfAborted();
 	const entry = loaded.servers.find((server) => server.name === serverId);
 	if (!entry) throw new Error(`MCP server "${serverId}" is not configured or has invalid configuration.`);

package/dist/src/agent/service/process-direct-streaming.js

@@ -3,9 +3,9 @@ import { init_src } from "../../../packages/gateway-contract/src/index.js";
 import { init_session_input_repository, listTaskUpdateTriggers } from "../../storage/sqlite/session-input-repository.js";
 import { getClarificationResumeInput, init_clarification_wait_repository } from "../../storage/sqlite/clarification-wait-repository.js";
 import { getConnectionResumeInput, init_connection_wait_repository } from "../../storage/sqlite/connection-wait-repository.js";
-import { init_agent_scope, resolveDefaultAgentId } from "../agent-scope.js";
 import { init_agent_session_key, resolveAgentMainConversationId } from "../../routing/agent-session-key.js";
 import { init_model_usage, modelUsageOriginFromTurn, withModelUsageOrigin } from "../../providers/model-usage.js";
+import { init_agent_scope, resolveDefaultAgentId } from "../agent-scope.js";
 import { readAgentMessageContent } from "../memory/agent-message-access.js";
 import { abortEmbeddedRun } from "../embedded/runs.js";
 import { clearPendingTranscriptUserMessage, setPendingTranscriptUserMessage } from "../inbound/attachment-pipeline.js";

package/dist/src/agent/service.js

@@ -1,14 +1,14 @@
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
 import { init_attachment_ref, parseNoteAttachmentTarget } from "../notes/attachment-ref.js";
-import { init_agent_scope, resolveAgentHomeDir, resolveDefaultAgentId } from "./agent-scope.js";
-import { extractTextContent } from "./context/workspace.js";
 import { init_agent_session_key, resolveAgentIdFromConversationId } from "../routing/agent-session-key.js";
+import { init_agent_scope, resolveAgentHomeDir, resolveDefaultAgentId } from "./agent-scope.js";
 import { extractProfileAgentId, resolveEffectiveAgentConfigForSession } from "../config/agent-profile.js";
 import { getAgentDefaultModelRef, init_schema } from "../config/schema.js";
 import { init_providers, resolveModel } from "../providers/index.js";
 import { configureTracing, flushTracing } from "../observability/runtime.js";
 import { getUserTimezone } from "../user-model/repository.js";
+import { extractTextContent } from "./context/workspace.js";
 import { resolveAgentTurnTimeoutMs } from "./orchestration/run-agent-turn-with-timeout.js";
 import { applyConfigOverrides } from "../config/runtime-overrides.js";
 import { effectiveWorkspacePathForSession } from "../session/session-workspace.js";

package/dist/src/agent/skills/index.d.ts

@@ -40,6 +40,7 @@ export interface SkillLoader {
     getEnabledSkills: (config?: Record<string, SkillConfig>) => Skill[];
 }
 export interface SkillLoaderOptions {
+    agentId?: string;
     /** Re-evaluated on every load so trust changes take effect without recreating the runtime. */
     isWorkspaceTrusted?: (workspaceDir: string) => boolean;
 }

package/dist/src/agent/skills/index.js

@@ -1,8 +1,8 @@
 import { resolveStateDir } from "../../config/paths-state.js";
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { parseFrontmatter } from "../../markdown/frontmatter.js";
 import { init_paths } from "../../config/paths.js";
+import { parseFrontmatter } from "../../markdown/frontmatter.js";
 import { findInstallSpec, hasBinary, installSkill } from "./installer.js";
 import { applySkillEnvOverrides, createSkillConfigManager, getSkillEnvironment, isSkillEnabled, resolveSkillConfig, validateSkillConfig } from "./config.js";
 import { parseSkillToolConditions } from "./skill-tool-gating.js";
@@ -135,7 +135,10 @@ function discoverAndMergeSkills(sources, maxSkillFileBytes, limits = {}, initial
 			skills: source.skillFiles.slice(0, limits.maxSkillsLoadedPerSource).flatMap((path) => {
 				const result = loadSkillFromFile(path, source, source.rootDir, maxSkillFileBytes);
 				if (result.diagnostic) diagnostics.push(result.diagnostic);
-				return result.skill ? [result.skill] : [];
+				return result.skill ? [{
+					...result.skill,
+					name: source.skillAliases?.[path] ?? result.skill.name
+				}] : [];
 			}),
 			diagnostics: []
 		} : discoverSkills(source, maxSkillFileBytes, limits.maxSkillsLoadedPerSource, limits.maxCandidatesPerRoot);
@@ -320,7 +323,8 @@ function createSkillLoader(options = {}) {
 		return loadSkills({
 			workspaceDir,
 			builtinDir,
-			workspaceTrust
+			workspaceTrust,
+			agentId: options.agentId
 		});
 	}
 	return {

package/dist/src/agent/skills/managed-store.js

@@ -1,5 +1,5 @@
-import { parseFrontmatter } from "../../markdown/frontmatter.js";
 import { init_paths, resolveSkillsDir } from "../../config/paths.js";
+import { parseFrontmatter } from "../../markdown/frontmatter.js";
 import { loadSkillsLock } from "./hub-lock.js";
 import { dirname, join, resolve, sep } from "node:path";
 import { existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, writeFileSync } from "node:fs";

package/dist/src/agent/skills/skill-manage-ops.js

@@ -1,5 +1,5 @@
-import { parseFrontmatter } from "../../markdown/frontmatter.js";
 import { init_paths, resolveSkillsDir } from "../../config/paths.js";
+import { parseFrontmatter } from "../../markdown/frontmatter.js";
 import { resolveWorkspaceSkillsDir } from "./workspace-skills-dir.js";
 import { formatScanSummary, scanSkillDirectory } from "./scanner.js";
 import { fuzzyFindText, normalizeForFuzzyMatch, normalizeToLF, restoreLineEndings } from "../tools/edit-diff.js";

package/dist/src/agent/skills/skill-manager.d.ts

@@ -10,6 +10,7 @@ export interface SkillLoadResult {
     diagnostics: SkillDiagnostic[];
 }
 export interface SkillManagerOptions {
+    agentId?: string;
     isWorkspaceTrusted?: (workspaceDir: string) => boolean;
 }
 export declare class SkillManager {

package/dist/src/agent/skills/skill-manager.js

@@ -35,7 +35,10 @@ var SkillManager = class {
 	constructor(workspace, bundledSkillsDir, options = {}) {
 		this.workspace = workspace;
 		this.bundledSkillsDir = bundledSkillsDir || resolveBundledSkillsDir();
-		this.skillLoader = createSkillLoader({ isWorkspaceTrusted: options.isWorkspaceTrusted });
+		this.skillLoader = createSkillLoader({
+			agentId: options.agentId,
+			isWorkspaceTrusted: options.isWorkspaceTrusted
+		});
 		this.initialize();
 	}
 	/**
@@ -216,12 +219,14 @@ var SkillManager = class {
 	* Find a skill by name
 	*/
 	findSkill(name) {
+		this.refreshPlugins();
 		return this.skills.find((s) => s.name === name);
 	}
 	/**
 	* Check if a skill exists
 	*/
 	hasSkill(name) {
+		this.refreshPlugins();
 		return this.skills.some((s) => s.name === name);
 	}
 	/**

package/dist/src/agent/skills/skill-sources.d.ts

@@ -1,6 +1,7 @@
 import type { SkillDiagnostic, SkillSourceDescriptor, SkillsConfig } from './types.js';
 export interface ResolveSkillSourcesOptions {
     workspaceDir?: string;
+    agentId?: string;
     globalDir?: string;
     builtinDir?: string;
     agentsDir?: string;

package/dist/src/agent/skills/skill-sources.js

@@ -48,15 +48,16 @@ function resolveSkillSources(options, skillsConfig) {
 	const extraDirs = [...configuredExtraDirs, ...optionExtraDirs];
 	const sources = [];
 	const diagnostics = [];
-	for (const plugin of new AgentPluginStore().active()) {
+	for (const plugin of new AgentPluginStore().active(options.agentId, options.workspaceDir)) {
 		sources.push({
 			id: `plugin:${plugin.id}`,
-			rootDir: join(plugin.rootDir, "skills"),
+			rootDir: plugin.rootDir,
 			priority: 150,
 			scope: "global",
 			managed: false,
 			writable: false,
-			skillFiles: plugin.skills.map((skill) => skill.filePath)
+			skillFiles: plugin.skills.map((skill) => skill.filePath),
+			skillAliases: plugin.layout?.dialect !== "portable" ? Object.fromEntries(plugin.skills.map((skill) => [skill.filePath, `${plugin.id}.${skill.name}`])) : void 0
 		});
 		diagnostics.push(...plugin.diagnostics.map((diagnostic) => ({
 			type: "warning",

package/dist/src/agent/skills/types.d.ts

@@ -111,6 +111,7 @@ export interface SkillSourceDescriptor {
     writable: boolean;
     /** Validated portable plugin files; bypass recursive discovery. */
     skillFiles?: string[];
+    skillAliases?: Record<string, string>;
 }
 export type SkillOrigin = SkillSourceDescriptor;
 export interface SkillsLimitsConfig {

package/dist/src/agent/tools/factory.js

@@ -8,8 +8,8 @@ import { getSessionMetadata } from "../../storage/sqlite/session-read-repository
 import { patchSessionMetadata } from "../../storage/sqlite/session-repository.js";
 import { getSessionTaskPlan, setSessionTaskPlan } from "../../storage/sqlite/session-task-plan-repository.js";
 import { init_sqlite } from "../../storage/sqlite/index.js";
-import { init_agent_scope, resolveDefaultAgentId } from "../agent-scope.js";
 import { resolveUserContextSessionAccess } from "../../user-context/access-policy.js";
+import { init_agent_scope, resolveDefaultAgentId } from "../agent-scope.js";
 import { resolveEffectiveAgentConfigForAgent } from "../../config/agent-profile.js";
 import { PERSONAL_TOOL_DESCRIPTIONS } from "../../personal-agent/policy.js";
 import { TaskConversationRepository } from "../../tasks/task-conversation-repository.js";

package/dist/src/agent/tools/personal-read-tool.js

@@ -1,7 +1,7 @@
-import { CapabilityDispatcher } from "../../capabilities/runtime/dispatcher.js";
 import { isPersonalConversation } from "../../personal-agent/repository.js";
 import { LOCAL_READ_MAX_CHARS } from "./local-read-budget.js";
 import { getEmbeddedExecutionSession } from "../embedded/execution-context.js";
+import { CapabilityDispatcher } from "../../capabilities/runtime/dispatcher.js";
 import { registerNoteReadCapabilities } from "../../notes/capabilities/read.js";
 import { registerProjectReadCapabilities } from "../../projects/capabilities/read.js";
 import { registerAutomationReadCapabilities } from "../../automations/capabilities/read.js";

package/dist/src/agent/tools/xopc-use-tool.js

@@ -11,13 +11,13 @@ import { TaskRunRepository } from "../../tasks/task-run-repository.js";
 import { getSessionMetadata } from "../../storage/sqlite/session-read-repository.js";
 import { init_sqlite } from "../../storage/sqlite/index.js";
 import "../../activity/index.js";
-import { CapabilityError } from "../../capabilities/runtime/errors.js";
-import "../../capabilities/runtime/dispatcher.js";
 import { getDefaultAgentId, init_resolve_route } from "../../routing/resolve-route.js";
 import { hasUnlocalizedTaskText, resolveTaskLocale } from "../../tasks/task-language.js";
 import { TaskReadModelProjector } from "../../tasks/task-read-model-projector.js";
 import { TaskOriginRepository } from "../../tasks/task-origin-repository.js";
 import { TaskConversationRepository } from "../../tasks/task-conversation-repository.js";
+import { CapabilityError } from "../../capabilities/runtime/errors.js";
+import "../../capabilities/runtime/dispatcher.js";
 import { resolveProjectAgentId } from "../../projects/project-agent.js";
 import "../../projects/index.js";
 import { TaskCollaborationRepository } from "../../tasks/task-collaboration-repository.js";

package/dist/src/agent/workspace-runtime/registry.js

@@ -1,5 +1,5 @@
-import { init_agent_scope, resolveAgentIdForWorkspacePath } from "../agent-scope.js";
 import { init_agent_session_key, normalizeAgentId } from "../../routing/agent-session-key.js";
+import { init_agent_scope, resolveAgentIdForWorkspacePath } from "../agent-scope.js";
 import { SkillManager } from "../skills/skill-manager.js";
 import { SystemPromptBuilder } from "../prompt/service-prompt-builder.js";
 import { UserContextRuntimeRegistry } from "../../user-context/runtime.js";
@@ -23,11 +23,15 @@ var WorkspaceRuntimeRegistry = class {
 	/** Lazily construct and cache an agent-scoped runtime for a workspace. */
 	getOrCreate(resolvedPath, requestedAgentId) {
 		const cfg = this.getConfig();
-		const runtimeKey = `${normalizeAgentId(requestedAgentId?.trim() || resolveAgentIdForWorkspacePath(resolvedPath))}\u0000${resolvedPath}`;
+		const agentId = normalizeAgentId(requestedAgentId?.trim() || resolveAgentIdForWorkspacePath(resolvedPath));
+		const runtimeKey = `${agentId}\u0000${resolvedPath}`;
 		const existing = this.runtimes.get(runtimeKey);
 		if (existing) return existing;
 		const { memoryManager } = this.userContextRuntimes.getOrCreate(cfg);
-		const skillManager = new SkillManager(resolvedPath, this.bundledSkillsDir, { isWorkspaceTrusted: () => this.isWorkspaceTrusted?.(resolvedPath) === true });
+		const skillManager = new SkillManager(resolvedPath, this.bundledSkillsDir, {
+			agentId,
+			isWorkspaceTrusted: () => this.isWorkspaceTrusted?.(resolvedPath) === true
+		});
 		const rt = {
 			skillManager,
 			systemPromptBuilder: new SystemPromptBuilder({

package/dist/src/agent-catalog/capabilities.js

@@ -1,10 +1,10 @@
 import { AgentEntrySchema, EffectiveAgentConfigSchema } from "../agent-config/schema.js";
 import { resolveEffectiveAgentConfig } from "../agent-config/resolver.js";
 import { init_agent_config } from "../agent-config/index.js";
-import { CapabilityError } from "../capabilities/runtime/errors.js";
-import { defineAtomicCapability, defineReadCapability } from "../capabilities/runtime/dispatcher.js";
 import { AgentCatalogRepository, init_repository } from "./repository.js";
 import { init_agent_scope, resolveAgentWorkspaceDir } from "../agent/agent-scope.js";
+import { CapabilityError } from "../capabilities/runtime/errors.js";
+import { defineAtomicCapability, defineReadCapability } from "../capabilities/runtime/dispatcher.js";
 import { AgentCatalogService } from "./service.js";
 import { z } from "zod";
 //#region src/agent-catalog/capabilities.ts

package/dist/src/automations/capabilities/drafts.js

@@ -3,10 +3,10 @@ import { init_src } from "../../../packages/gateway-contract/src/index.js";
 import { init_trust_policy, resolveAutomationSafetyForTrust } from "../../user-context/trust-policy.js";
 import { getUserTrustPolicy } from "../../storage/sqlite/user-trust-repository.js";
 import { init_sqlite } from "../../storage/sqlite/index.js";
+import { init_agent_scope, resolveDefaultAgentId } from "../../agent/agent-scope.js";
 import { CapabilityError } from "../../capabilities/runtime/errors.js";
 import { ExternalEffectNotAppliedError } from "../../capabilities/runtime/external-operations.js";
 import { defineExternalCapability, defineReadCapability } from "../../capabilities/runtime/dispatcher.js";
-import { init_agent_scope, resolveDefaultAgentId } from "../../agent/agent-scope.js";
 import { AutomationCreateCapabilityInputSchema } from "./write.js";
 import { simulateAutomation } from "../draft/automation-draft-validator.js";
 import { AutomationDraftService } from "../draft/automation-draft-service.js";