@xopcai/xopc 0.0.303 → 0.0.307

package/dist/src/connectors/providers.js

@@ -1,4 +1,5 @@
 import { BUILTIN_CONNECTORS } from "./builtin-catalog.js";
+import { CHINA_CONNECTORS } from "./china-catalog.js";
 import { COMPOSIO_CONNECTORS } from "./composio.js";
 //#region src/connectors/providers.ts
 const builtinConnectorProvider = {
@@ -15,7 +16,18 @@ const composioConnectorProvider = {
 		return COMPOSIO_CONNECTORS;
 	}
 };
-const CONNECTOR_PROVIDERS = [builtinConnectorProvider, composioConnectorProvider];
+const chinaConnectorProvider = {
+	id: "china",
+	displayName: "China connectors",
+	listConnectors() {
+		return CHINA_CONNECTORS;
+	}
+};
+const CONNECTOR_PROVIDERS = [
+	builtinConnectorProvider,
+	chinaConnectorProvider,
+	composioConnectorProvider
+];
 function listConnectorProviders() {
 	return [...CONNECTOR_PROVIDERS];
 }
@@ -23,4 +35,4 @@ function listConnectorProviderDefinitions() {
 	return CONNECTOR_PROVIDERS.flatMap((provider) => provider.listConnectors());
 }
 //#endregion
-export { builtinConnectorProvider, composioConnectorProvider, listConnectorProviderDefinitions, listConnectorProviders };
+export { builtinConnectorProvider, chinaConnectorProvider, composioConnectorProvider, listConnectorProviderDefinitions, listConnectorProviders };

package/dist/src/connectors/runtime-adapter-registry.js

@@ -2,7 +2,6 @@ import { isXopcDatabaseOpen } from "../storage/sqlite/connection.js";
 import { deleteConnectorInstallation, getConnectorInstallation, upsertConnectorInstallation } from "../storage/sqlite/connector-repository.js";
 import "../storage/sqlite/index.js";
 import { assertComposioAccessConfigured } from "./composio-sessions.js";
-import { saveComposioApiKey } from "./composio.js";
 import { saveConnectorSecrets } from "./secret-store.js";
 import { isManagedConnectorServer, materializeConnectorMcpServer } from "./materialize.js";
 import { appendConnectorAuditRecord } from "./usage.js";
@@ -106,7 +105,7 @@ registerConnectorRuntimeAdapter({
 	type: "composio",
 	async install({ config, definition, input, resolver }) {
 		if (definition.runtime.type !== "composio") throw new Error(`Invalid Composio connector definition: ${definition.id}`);
-		if (definition.runtime.role === "credential") await saveComposioApiKey(input, resolver);
+		if (definition.runtime.role !== "toolkit") throw new Error("Configure Composio in connection service settings.");
 		if (definition.runtime.role === "toolkit") await assertComposioAccessConfigured(resolver);
 		const instance = installRecord(config, definition, definition.runtime.role === "toolkit" ? { scope: "read" } : {}, definition.runtime.role === "toolkit" ? { config: input.config ?? {} } : {});
 		if (definition.runtime.role === "toolkit" && isXopcDatabaseOpen()) {
@@ -120,7 +119,7 @@ registerConnectorRuntimeAdapter({
 				allowedAgentIds: existing?.allowedAgentIds ?? [],
 				maxScope: "read",
 				confirmationPolicy: existing?.confirmationPolicy ?? "writes",
-				selectedConnectionIds: existing?.selectedConnectionIds ?? [],
+				selectedAccountIds: existing?.selectedAccountIds ?? null,
 				createdAt: existing?.createdAt
 			});
 		}
@@ -145,12 +144,8 @@ registerConnectorRuntimeAdapter({
 		return installedInstance(config, instanceId, definition.id);
 	}
 });
-for (const type of [
-	"channel",
-	"nativeTool",
-	"memorySource"
-]) registerConnectorRuntimeAdapter({
-	type,
+registerConnectorRuntimeAdapter({
+	type: "memorySource",
 	async install({ config, definition, input }) {
 		return installRecord(config, definition, {}, { config: input.config ?? {} });
 	},

package/dist/src/connectors/secret-store.d.ts

@@ -1,7 +1,10 @@
 import { CredentialResolver } from '../auth/credentials.js';
 import type { ConnectorDefinition, ConnectorInstallInput, ConnectorSecretReference } from './types.js';
 export declare function connectorSecretProviderId(connectorId: string, fieldKey: string): string;
-export declare function createConnectorSecretReference(connectorId: string, fieldKey: string): ConnectorSecretReference;
+export declare function createConnectorSecretReference(connectorId: string, fieldKey: string, affixes?: {
+    prefix?: string;
+    suffix?: string;
+}): ConnectorSecretReference;
 export declare function isConnectorSecretReference(value: unknown): value is ConnectorSecretReference;
 export declare function saveConnectorSecrets(definition: ConnectorDefinition, input: ConnectorInstallInput, resolver?: CredentialResolver): Promise<void>;
 export declare function resolveConnectorSecretReferences(value: unknown, resolver?: CredentialResolver): Promise<unknown>;

package/dist/src/connectors/secret-store.js

@@ -8,10 +8,12 @@ function normalizeSecretSegment(value) {
 function connectorSecretProviderId(connectorId, fieldKey) {
 	return `connector-${normalizeSecretSegment(connectorId)}-${normalizeSecretSegment(fieldKey)}`;
 }
-function createConnectorSecretReference(connectorId, fieldKey) {
+function createConnectorSecretReference(connectorId, fieldKey, affixes = {}) {
 	return { xopcSecretRef: {
 		provider: connectorSecretProviderId(connectorId, fieldKey),
-		fieldKey
+		fieldKey,
+		...affixes.prefix ? { prefix: affixes.prefix } : {},
+		...affixes.suffix ? { suffix: affixes.suffix } : {}
 	} };
 }
 function isConnectorSecretReference(value) {
@@ -28,7 +30,9 @@ async function saveConnectorSecrets(definition, input, resolver = new Credential
 	}
 }
 async function resolveSecretReference(reference, resolver) {
-	return await resolver.resolveApiKey(reference.xopcSecretRef.provider) ?? void 0;
+	const value = await resolver.resolveApiKey(reference.xopcSecretRef.provider);
+	if (!value) return void 0;
+	return `${reference.xopcSecretRef.prefix ?? ""}${value}${reference.xopcSecretRef.suffix ?? ""}`;
 }
 async function resolveConnectorSecretReferences(value, resolver = new CredentialResolver()) {
 	if (isConnectorSecretReference(value)) return resolveSecretReference(value, resolver);

package/dist/src/connectors/source-change-publisher.js

@@ -1,10 +1,12 @@
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
+import { getConnectorAccount, init_connector_account_repository } from "../storage/sqlite/connector-account-repository.js";
+import { init_connector_repository, listConnectorConnections } from "../storage/sqlite/connector-repository.js";
 import { getKnowledgeConsumerWatermark, getKnowledgeSourceItem, listKnowledgeSourceChanges, setKnowledgeConsumerWatermark } from "../storage/sqlite/knowledge-repository.js";
-import { listConnectorConnections } from "../storage/sqlite/connector-repository.js";
-import { getConnectorAccount } from "../storage/sqlite/connector-account-repository.js";
 import { getConnectorSyncPolicyForConnection } from "../storage/sqlite/connector-sync-policy-repository.js";
 //#region src/connectors/source-change-publisher.ts
+init_connector_account_repository();
+init_connector_repository();
 init_logger();
 const log = createLogger("Connector:SourceChanges");
 const CONSUMER_ID = "proactive-connected-source-v1";

package/dist/src/connectors/types.d.ts

@@ -1,4 +1,4 @@
-export type ConnectorKind = 'mcp' | 'cli' | 'http' | 'channel' | 'browser' | 'extension' | 'builtin' | 'composio' | 'nativeTool' | 'memorySource';
+export type ConnectorKind = 'mcp' | 'cli' | 'http' | 'browser' | 'extension' | 'builtin' | 'composio' | 'memorySource';
 export type ConnectorCategory = 'code' | 'docs' | 'browser' | 'data' | 'automation' | 'custom';
 export type ConnectorCapability = 'tools' | 'resources' | 'prompts' | 'context' | 'channel' | 'events' | 'ui' | 'memory_source' | 'workflows' | 'auth.apiKey' | 'auth.oauth' | 'runtime.mcp.stdio' | 'runtime.mcp.sse' | 'runtime.mcp.streamableHttp';
 export type ConnectorAuthMode = 'none' | 'apiKey' | 'oauth';
@@ -17,7 +17,6 @@ export type ConnectorBenefit = 'understand' | 'act' | 'reach';
 export type ConnectorBranding = {
     logoUrl?: string;
     source?: 'builtin' | 'composio-catalog' | 'registry' | 'extension' | 'custom';
-    backgroundColor?: string;
     fetchedAt?: string;
 };
 export type ConnectorConfirmationPolicy = 'always' | 'writes' | 'admin' | 'never';
@@ -40,6 +39,8 @@ export type ConnectorSecretReference = {
     xopcSecretRef: {
         provider: string;
         fieldKey: string;
+        prefix?: string;
+        suffix?: string;
     };
 };
 export type ConnectorSecretField = {
@@ -48,6 +49,11 @@ export type ConnectorSecretField = {
     description?: string;
     required: boolean;
 };
+export type ConnectorSetupLink = {
+    label: string;
+    href: string;
+    external?: boolean;
+};
 export type ConnectorConfigField = {
     key: string;
     label: string;
@@ -66,17 +72,10 @@ export type ConnectorRuntimeDefinition = {
         name: string;
         version: string;
     };
-} | {
-    type: 'channel';
-    channelId: string;
-    pluginId: string;
 } | {
     type: 'composio';
     toolkit: string;
     role: 'credential' | 'toolkit';
-} | {
-    type: 'nativeTool';
-    toolsetId: string;
 } | {
     type: 'memorySource';
     sourceKind: string;
@@ -103,6 +102,7 @@ export type ConnectorDefinition = {
     setup: {
         secrets?: ConnectorSecretField[];
         config?: ConnectorConfigField[];
+        links?: ConnectorSetupLink[];
     };
     runtime: ConnectorRuntimeDefinition;
     permissions?: ConnectorPermissions;
@@ -120,7 +120,7 @@ export type ConnectorInstallationPolicy = {
     allowedAgentIds: string[];
     maxScope: ConnectorScope;
     confirmationPolicy: ConnectorConfirmationPolicy;
-    selectedConnectionIds: string[];
+    selectedAccountIds: string[] | null;
     createdAt: string;
     updatedAt: string;
 };
@@ -149,8 +149,12 @@ export type ConnectorAccount = {
     connectorId: string;
     principalId: string;
     identityKey?: string;
+    backendId?: string;
     identity: Record<string, unknown>;
     currentConnectionId?: string;
+    label?: string;
+    enabled: boolean;
+    allowedAgentIds: string[] | null;
     createdAt: string;
     updatedAt: string;
 };
@@ -184,6 +188,7 @@ export type ConnectorExecutionAuditRecord = {
 export type ConnectorApprovalStatus = 'pending' | 'approved' | 'denied' | 'expired' | 'consumed';
 export type ConnectorApprovalRecord = {
     id: string;
+    waitId?: string;
     principalId: string;
     connectorId: string;
     connectionId?: string;
@@ -240,7 +245,7 @@ export type ConnectorInstance = {
         toolkit: string;
         role: 'credential' | 'toolkit';
     } | {
-        type: 'channel' | 'nativeTool' | 'memorySource';
+        type: 'memorySource';
         id: string;
     };
     usage: ConnectorUsageRecord;

package/dist/src/connectors/workflow-preflight.d.ts

@@ -1,6 +1,6 @@
 import type { Config } from '../config/schema.js';
 import type { WorkflowDefinition } from '../workflows/domain/definition.js';
-export type ConnectorPreflightIssueCode = 'not_installed' | 'disabled' | 'agent_not_allowed' | 'scope_too_narrow' | 'connection_missing' | 'reauthorization_required';
+export type ConnectorPreflightIssueCode = 'not_installed' | 'disabled' | 'agent_not_allowed' | 'scope_too_narrow' | 'connection_missing' | 'account_selection_required' | 'reauthorization_required';
 export type ConnectorPreflightIssue = {
     connectorId: string;
     code: ConnectorPreflightIssueCode;
@@ -9,6 +9,7 @@ export type ConnectorPreflightIssue = {
 };
 export type ConnectorPreflightResult = {
     ok: boolean;
+    accounts: Record<string, string[]>;
     issues: ConnectorPreflightIssue[];
     optionalIssues: ConnectorPreflightIssue[];
 };

package/dist/src/connectors/workflow-preflight.js

@@ -1,8 +1,10 @@
-import { getConnectorInstallation, listConnectorConnections } from "../storage/sqlite/connector-repository.js";
+import { getConnectorInstallation, init_connector_repository, listConnectorConnections } from "../storage/sqlite/connector-repository.js";
+import { canAccessConnectorAccount, currentAccountConnections } from "./account-access.js";
 import { getComposioToolkitScope } from "./composio.js";
 import { getConnectorDefinition } from "./catalog.js";
 import { listConnectorInstances } from "./instances.js";
 //#region src/connectors/workflow-preflight.ts
+init_connector_repository();
 const SCOPE_ORDER = {
 	read: 1,
 	write: 2,
@@ -20,6 +22,7 @@ function preflightWorkflowConnectors(input) {
 	const principalId = input.principalId ?? "local-owner";
 	const instances = listConnectorInstances(input.config);
 	const issues = [];
+	const accounts = {};
 	const optionalIssues = [];
 	const add = (requirement, value) => {
 		(requirement.optional ? optionalIssues : issues).push(value);
@@ -53,13 +56,27 @@ function preflightWorkflowConnectors(input) {
 			principalId,
 			connectorId: requirement.connectorId
 		});
-		const selected = installation?.selectedConnectionIds.length ? connections.filter((connection) => installation.selectedConnectionIds.includes(connection.id)) : connections;
-		if (selected.some((connection) => connection.status === "active")) continue;
+		const selected = installation && installation.selectedAccountIds !== null ? connections.filter((connection) => connection.accountId && installation.selectedAccountIds.includes(connection.accountId)) : connections;
+		const active = currentAccountConnections(selected.filter((connection) => installation && canAccessConnectorAccount(connection, installation, input.agentId)));
+		if (requirement.accountIds) {
+			if (!requirement.accountIds.length || requirement.accountIds.some((id) => !active.some((connection) => connection.accountId === id))) add(requirement, issue(requirement, "connection_missing", `${requirement.connectorId} has an unavailable selected account. Reconnect or update its permissions; no other account will be substituted.`));
+			else accounts[requirement.connectorId] = [...requirement.accountIds];
+			continue;
+		}
+		if (active.length > 1) {
+			add(requirement, issue(requirement, "account_selection_required", `${requirement.connectorId} has multiple available accounts. Select the intended account before unattended execution.`));
+			continue;
+		}
+		if (active.length === 1) {
+			accounts[requirement.connectorId] = [active[0].accountId];
+			continue;
+		}
 		const needsAuthorization = selected.some((connection) => connection.status === "expired" || connection.status === "failed");
 		add(requirement, issue(requirement, needsAuthorization ? "reauthorization_required" : "connection_missing", needsAuthorization ? `${requirement.connectorId} needs to be reconnected.` : `${requirement.connectorId} has no active account connection.`));
 	}
 	return {
 		ok: issues.length === 0,
+		accounts,
 		issues,
 		optionalIssues
 	};

package/dist/src/execution-environments/local-worktree-manager.js

@@ -3,8 +3,9 @@ import { init_logger } from "../utils/logger.js";
 import { ExecutionEnvironmentConflictError } from "./types.js";
 import { ExecutionEnvironmentStore } from "./store.js";
 import { findGitWorktree, inspectGitRepository, resolveGitCommit, runGit } from "./git.js";
-import { resolveExecutionWorktreesRoot, resolveManagedWorktreePath } from "./paths.js";
-import { dirname, relative, resolve } from "node:path";
+import { resolveManagedWorktreePath } from "./paths.js";
+import { assertManagedWorktreePath, assertNoNestedRegisteredWorktrees, readDirectoryIdentity, sameDirectoryIdentity } from "./worktree-safety.js";
+import { dirname, resolve } from "node:path";
 import { existsSync } from "node:fs";
 import { randomUUID } from "node:crypto";
 import { mkdir, rm, stat } from "node:fs/promises";
@@ -40,12 +41,6 @@ async function isDirectory(path) {
 		return false;
 	}
 }
-function assertManagedPath(rootPath, stateDir) {
-	const managedRoot = resolveExecutionWorktreesRoot(stateDir);
-	const candidate = resolve(rootPath);
-	const child = relative(managedRoot, candidate);
-	if (!child || child.startsWith("..") || resolve(managedRoot, child) !== candidate) throw new Error(`Refusing to manage worktree outside ${managedRoot}`);
-}
 var LocalWorktreeManager = class {
 	store;
 	stateDir;
@@ -89,7 +84,7 @@ var LocalWorktreeManager = class {
 		const baseSha = await resolveGitCommit(repository.repositoryRoot, baseRef);
 		const environmentId = input.environmentId?.trim() || randomUUID();
 		const rootPath = resolveManagedWorktreePath(input.projectId, environmentId, this.stateDir);
-		assertManagedPath(rootPath, this.stateDir);
+		assertManagedWorktreePath(rootPath, this.stateDir, repository.repositoryRoot);
 		if (existsSync(rootPath)) throw new ExecutionEnvironmentConflictError(`Worktree path already exists: ${rootPath}`);
 		const environment = this.store.create({
 			id: environmentId,
@@ -107,12 +102,15 @@ var LocalWorktreeManager = class {
 			toStatus: "provisioning",
 			reason: "managed worktree provisioning started"
 		});
+		let createdDirectory;
 		try {
 			await withRepositoryLock(repository.gitCommonDir, async () => {
 				await mkdir(dirname(rootPath), {
 					recursive: true,
 					mode: 448
 				});
+				await mkdir(rootPath, { mode: 448 });
+				createdDirectory = await readDirectoryIdentity(rootPath);
 				await runGit(repository.repositoryRoot, [
 					"worktree",
 					"add",
@@ -137,7 +135,7 @@ var LocalWorktreeManager = class {
 			}, "Managed worktree ready");
 			return ready;
 		} catch (error) {
-			await this.cleanupFailedProvision(repository.repositoryRoot, repository.gitCommonDir, rootPath);
+			await this.cleanupFailedProvision(repository.repositoryRoot, repository.gitCommonDir, rootPath, createdDirectory);
 			const failed = this.store.transition({
 				environmentId: environment.id,
 				expectedVersion: provisioning.version,
@@ -235,7 +233,8 @@ var LocalWorktreeManager = class {
 			return deleted;
 		}
 		if (environment.kind !== "managed_worktree" || !environment.repositoryRoot || !environment.gitCommonDir) throw new Error(`Execution environment ${environmentId} is not a managed worktree`);
-		assertManagedPath(environment.rootPath, this.stateDir);
+		if (environment.ownership !== "xopc_created") throw new ExecutionEnvironmentConflictError(`Managed worktree ${environmentId} is not owned by xopc`);
+		assertManagedWorktreePath(environment.rootPath, this.stateDir, environment.repositoryRoot);
 		if (this.store.listBindings(environmentId).some((binding) => binding.conversationId !== options?.releaseConversationId)) throw new ExecutionEnvironmentConflictError(`Managed worktree ${environmentId} still has active bindings`);
 		const deleting = environment.status === "deleting" ? environment : this.store.transition({
 			environmentId,
@@ -245,6 +244,8 @@ var LocalWorktreeManager = class {
 		});
 		try {
 			await withRepositoryLock(environment.gitCommonDir, async () => {
+				await readDirectoryIdentity(environment.rootPath);
+				await assertNoNestedRegisteredWorktrees(environment.repositoryRoot, environment.rootPath);
 				const registered = await findGitWorktree(environment.repositoryRoot, environment.rootPath);
 				if (!registered && existsSync(environment.rootPath)) throw new ExecutionEnvironmentConflictError("Refusing to delete a directory no longer registered as this worktree");
 				if (registered) {
@@ -301,7 +302,7 @@ var LocalWorktreeManager = class {
 			throw error;
 		}
 	}
-	async cleanupFailedProvision(repositoryRoot, gitCommonDir, rootPath) {
+	async cleanupFailedProvision(repositoryRoot, gitCommonDir, rootPath, createdDirectory) {
 		await withRepositoryLock(gitCommonDir, async () => {
 			if (await findGitWorktree(repositoryRoot, rootPath).catch(() => void 0)) {
 				await runGit(repositoryRoot, [
@@ -309,14 +310,15 @@ var LocalWorktreeManager = class {
 					"unlock",
 					rootPath
 				]).catch(() => "");
-				await runGit(repositoryRoot, [
+				if (!await runGit(repositoryRoot, [
 					"worktree",
 					"remove",
 					"--force",
 					rootPath
-				]).catch(() => "");
+				]).then(() => true, () => false) || await findGitWorktree(repositoryRoot, rootPath).catch(() => void 0)) return;
 			}
-			if (existsSync(rootPath)) await rm(rootPath, {
+			const currentDirectory = await readDirectoryIdentity(rootPath);
+			if (createdDirectory && sameDirectoryIdentity(createdDirectory, currentDirectory)) await rm(rootPath, {
 				recursive: true,
 				force: true
 			});

package/dist/src/execution-environments/store.js

@@ -17,6 +17,7 @@ function environmentFromRow(row) {
 		id: row.environment_id,
 		...row.project_id ? { projectId: row.project_id } : {},
 		kind: row.kind,
+		ownership: row.ownership,
 		status: row.status,
 		rootPath: row.root_path,
 		...row.repository_root ? { repositoryRoot: row.repository_root } : {},
@@ -63,13 +64,14 @@ var ExecutionEnvironmentStore = class {
 		const repositoryRoot = optionalText(input.repositoryRoot);
 		const gitCommonDir = optionalText(input.gitCommonDir);
 		if (input.kind === "managed_worktree" && (!repositoryRoot || !gitCommonDir)) throw new Error("managed_worktree requires repositoryRoot and gitCommonDir");
+		const ownership = input.kind === "managed_worktree" ? "xopc_created" : "registered";
 		const now = Date.now();
 		runSqliteWriteTransaction((db) => {
 			db.prepare(`INSERT INTO execution_environments (
-          environment_id, project_id, kind, status, root_path,
+          environment_id, project_id, kind, ownership, status, root_path,
           repository_root, git_common_dir, base_ref, base_sha, branch_ref,
           version, created_at, updated_at
-        ) VALUES (?, ?, ?, 'requested', ?, ?, ?, ?, ?, ?, 1, ?, ?)`).run(id, projectId ?? null, input.kind, rootPath, repositoryRoot ? resolve(repositoryRoot) : null, gitCommonDir ? resolve(gitCommonDir) : null, optionalText(input.baseRef) ?? null, optionalText(input.baseSha) ?? null, optionalText(input.branchRef) ?? null, now, now);
+        ) VALUES (?, ?, ?, ?, 'requested', ?, ?, ?, ?, ?, ?, 1, ?, ?)`).run(id, projectId ?? null, input.kind, ownership, rootPath, repositoryRoot ? resolve(repositoryRoot) : null, gitCommonDir ? resolve(gitCommonDir) : null, optionalText(input.baseRef) ?? null, optionalText(input.baseSha) ?? null, optionalText(input.branchRef) ?? null, now, now);
 			db.prepare(`INSERT INTO execution_environment_events (
           event_id, environment_id, from_status, to_status, reason, metadata_json, created_at
         ) VALUES (?, ?, NULL, 'requested', 'created', '{}', ?)`).run(randomUUID(), id, now);

package/dist/src/execution-environments/types.d.ts

@@ -1,11 +1,14 @@
 export declare const EXECUTION_ENVIRONMENT_KINDS: readonly ["local_checkout", "managed_worktree"];
 export type ExecutionEnvironmentKind = (typeof EXECUTION_ENVIRONMENT_KINDS)[number];
+export declare const EXECUTION_ENVIRONMENT_OWNERSHIPS: readonly ["registered", "xopc_created"];
+export type ExecutionEnvironmentOwnership = (typeof EXECUTION_ENVIRONMENT_OWNERSHIPS)[number];
 export declare const EXECUTION_ENVIRONMENT_STATUSES: readonly ["requested", "provisioning", "ready", "degraded", "deleting", "deleted", "error"];
 export type ExecutionEnvironmentStatus = (typeof EXECUTION_ENVIRONMENT_STATUSES)[number];
 export interface ExecutionEnvironment {
     id: string;
     projectId?: string;
     kind: ExecutionEnvironmentKind;
+    ownership: ExecutionEnvironmentOwnership;
     status: ExecutionEnvironmentStatus;
     rootPath: string;
     repositoryRoot?: string;

package/dist/src/execution-environments/types.js

@@ -1,5 +1,6 @@
 //#region src/execution-environments/types.ts
 const EXECUTION_ENVIRONMENT_KINDS = ["local_checkout", "managed_worktree"];
+const EXECUTION_ENVIRONMENT_OWNERSHIPS = ["registered", "xopc_created"];
 const EXECUTION_ENVIRONMENT_STATUSES = [
 	"requested",
 	"provisioning",
@@ -51,4 +52,4 @@ function canTransitionExecutionEnvironment(fromStatus, toStatus) {
 	return STATUS_TRANSITIONS[fromStatus].includes(toStatus);
 }
 //#endregion
-export { EXECUTION_ENVIRONMENT_KINDS, EXECUTION_ENVIRONMENT_STATUSES, ExecutionEnvironmentConflictError, ExecutionEnvironmentNotFoundError, canTransitionExecutionEnvironment };
+export { EXECUTION_ENVIRONMENT_KINDS, EXECUTION_ENVIRONMENT_OWNERSHIPS, EXECUTION_ENVIRONMENT_STATUSES, ExecutionEnvironmentConflictError, ExecutionEnvironmentNotFoundError, canTransitionExecutionEnvironment };

package/dist/src/execution-environments/worktree-safety.d.ts

@@ -0,0 +1,8 @@
+export interface DirectoryIdentity {
+    dev: number;
+    ino: number;
+}
+export declare function assertManagedWorktreePath(rootPath: string, stateDir?: string, repositoryRoot?: string): void;
+export declare function readDirectoryIdentity(path: string): Promise<DirectoryIdentity | undefined>;
+export declare function assertNoNestedRegisteredWorktrees(repositoryRoot: string, rootPath: string): Promise<void>;
+export declare function sameDirectoryIdentity(expected: DirectoryIdentity, actual: DirectoryIdentity | undefined): boolean;

package/dist/src/execution-environments/worktree-safety.js

@@ -0,0 +1,43 @@
+import { listGitWorktrees } from "./git.js";
+import { resolveExecutionWorktreesRoot } from "./paths.js";
+import { homedir } from "node:os";
+import { isAbsolute, relative, resolve, sep } from "node:path";
+import { lstat } from "node:fs/promises";
+//#region src/execution-environments/worktree-safety.ts
+function isInside(parent, candidate) {
+	const child = relative(parent, candidate);
+	return Boolean(child) && !isAbsolute(child) && child !== ".." && !child.startsWith(`..${sep}`) && resolve(parent, child) === candidate;
+}
+function assertManagedWorktreePath(rootPath, stateDir, repositoryRoot) {
+	const managedRoot = resolve(resolveExecutionWorktreesRoot(stateDir));
+	const candidate = resolve(rootPath);
+	if (!isInside(managedRoot, candidate)) throw new Error(`Refusing to manage worktree outside ${managedRoot}`);
+	if (candidate === resolve(homedir()) || candidate === resolve("/")) throw new Error(`Refusing to manage protected path ${candidate}`);
+	if (repositoryRoot && candidate === resolve(repositoryRoot)) throw new Error("Refusing to manage the repository root as a worktree");
+}
+async function readDirectoryIdentity(path) {
+	try {
+		const value = await lstat(path);
+		if (value.isSymbolicLink()) throw new Error(`Refusing to manage symlinked worktree path: ${path}`);
+		if (!value.isDirectory()) throw new Error(`Worktree path is not a directory: ${path}`);
+		return {
+			dev: value.dev,
+			ino: value.ino
+		};
+	} catch (error) {
+		if (error.code === "ENOENT") return void 0;
+		throw error;
+	}
+}
+async function assertNoNestedRegisteredWorktrees(repositoryRoot, rootPath) {
+	const candidate = resolve(rootPath);
+	for (const worktree of await listGitWorktrees(repositoryRoot)) {
+		const registered = resolve(worktree.path);
+		if (registered !== candidate && isInside(candidate, registered)) throw new Error(`Refusing to remove worktree containing registered worktree ${registered}`);
+	}
+}
+function sameDirectoryIdentity(expected, actual) {
+	return actual?.dev === expected.dev && actual.ino === expected.ino;
+}
+//#endregion
+export { assertManagedWorktreePath, assertNoNestedRegisteredWorktrees, readDirectoryIdentity, sameDirectoryIdentity };

package/dist/src/extensions/activation-planner.d.ts

@@ -25,7 +25,7 @@ export declare class ActivationPlanner {
     getActivatedIds(context: ActivationContext): string[];
     /**
      * Split activated ids by manifest `activation.onStartup`.
-     * Extensions without the field remain on the startup path (backward compatible).
+     * Extensions without the field load during startup.
      */
     filterActivatedIdsByLoadPhase(activatedIds: readonly string[], phase: ActivationLoadPhase): string[];
     explainPlan(context: ActivationContext): string;

package/dist/src/extensions/activation-planner.js

@@ -131,7 +131,7 @@ var ActivationPlanner = class {
 	}
 	/**
 	* Split activated ids by manifest `activation.onStartup`.
-	* Extensions without the field remain on the startup path (backward compatible).
+	* Extensions without the field load during startup.
 	*/
 	filterActivatedIdsByLoadPhase(activatedIds, phase) {
 		return activatedIds.filter((extensionId) => {

package/dist/src/extensions/api-version.d.ts

@@ -0,0 +1,4 @@
+import { type EngineCheckResult } from './engine-check.js';
+export declare const EXTENSION_API_VERSION = "1.0.0";
+export declare const EXTENSION_UI_API_VERSION = "1.0.0";
+export declare function checkExtensionApiCompatibility(requiredRange: string | undefined, currentVersion: string, engineName: 'extensionApi' | 'extensionUiApi'): EngineCheckResult;

package/dist/src/extensions/api-version.js

@@ -0,0 +1,15 @@
+import { checkEngineCompatibility } from "./engine-check.js";
+//#region src/extensions/api-version.ts
+const EXTENSION_API_VERSION = "1.0.0";
+const EXTENSION_UI_API_VERSION = "1.0.0";
+function checkExtensionApiCompatibility(requiredRange, currentVersion, engineName) {
+	if (!requiredRange) return { compatible: true };
+	const result = checkEngineCompatibility(currentVersion, requiredRange);
+	if (!result.compatible || result.parseWarning) return {
+		...result,
+		reason: result.parseWarning ? `Could not parse engines.${engineName} range: "${requiredRange}"` : `${engineName} version ${currentVersion} does not satisfy engines.${engineName}: "${requiredRange}"`
+	};
+	return result;
+}
+//#endregion
+export { EXTENSION_API_VERSION, EXTENSION_UI_API_VERSION, checkExtensionApiCompatibility };

package/dist/src/extensions/api.d.ts

@@ -5,7 +5,7 @@
  */
 import type { AgentTool } from '@earendil-works/pi-agent-core';
 import type { Command } from 'commander';
-import type { ExtensionApi, ExtensionLogger, ExtensionRuntime, GatewayMethodHandler, HttpRequestHandler, ExtensionCommand, ExtensionCommandHandler, ExtensionReloadHandler, ExtensionService, FlagConfig, FlagValue, ShortcutConfig, HookHandlerMap, ExtensionHookEvent, TuiExtensionRegistrar, ExtensionSendUserMessageOptions, ExtensionUserMessageContent, ExtensionCustomMessage, ExtensionSendMessageOptions } from './types/index.js';
+import type { ExtensionApi, ExtensionLogger, ExtensionRuntime, GatewayMethodHandler, HttpRequestHandler, ExtensionCommand, ExtensionCommandHandler, ExtensionReloadHandler, ExtensionService, HookHandlerMap, ExtensionHookEvent, TuiExtensionRegistrar, ExtensionSendUserMessageOptions, ExtensionUserMessageContent, ExtensionCustomMessage, ExtensionSendMessageOptions } from './types/index.js';
 import type { CommandContribution, ContractDeclaration } from './types/manifest.js';
 import type { ChannelPlugin } from '../channels/plugin-types.js';
 import type { Config } from '../config/config-surface.js';
@@ -38,6 +38,7 @@ export declare class ExtensionApiImpl implements ExtensionApi {
     private _registeredSpeechProviderIds;
     private _registeredMediaUnderstandingProviderIds;
     private _registeredMarketplaceAdapterIds;
+    private _providerCleanup;
     private readonly _manifestCommands;
     constructor(id: string, name: string, version: string | undefined, source: string, config: Config, extensionConfig: Record<string, unknown>, _logger: ExtensionLogger, _resolvePath: (input: string) => string, _coreRegistry?: ExtensionRegistryImpl, _contracts?: ContractDeclaration, runtime?: ExtensionRuntime);
     get logger(): ExtensionLogger;
@@ -58,7 +59,7 @@ export declare class ExtensionApiImpl implements ExtensionApi {
      *   return { systemPrompt: event.systemPrompt };
      * });
      */
-    onHook<K extends ExtensionHookEvent>(hookName: K, handler: HookHandlerMap[K], _opts?: {
+    onHook<K extends ExtensionHookEvent>(hookName: K, handler: HookHandlerMap[K], opts?: {
         priority?: number;
     }): void;
     /**
@@ -94,10 +95,6 @@ export declare class ExtensionApiImpl implements ExtensionApi {
      * Register a full ProviderPlugin
      */
     registerProvider(plugin: import('./types/providers.js').ProviderPlugin): void;
-    /**
-     * Register a full ProviderPlugin (alias for registerProvider)
-     */
-    registerProviderPlugin(plugin: import('./types/providers.js').ProviderPlugin): void;
     registerSpeechProvider(plugin: SpeechProviderPlugin): void;
     /** Speech provider ids registered through this extension API instance. */
     getRegisteredSpeechProviderIds(): readonly string[];
@@ -111,9 +108,6 @@ export declare class ExtensionApiImpl implements ExtensionApi {
         adapter: import('../agent/skills/marketplace/adapter.types.js').SkillsMarketplaceAdapter;
         displayName?: string;
     }): void;
-    registerFlag(_name: string, _config: FlagConfig): void;
-    getFlag(_name: string): FlagValue;
-    registerShortcut(_key: string, _config: ShortcutConfig): void;
     registerTui(register: TuiExtensionRegistrar): void;
     setLabel(entryId: string, label: string | undefined): void;
     sendUserMessage(content: ExtensionUserMessageContent, options?: ExtensionSendUserMessageOptions): void;