@nextclaw/server 0.18.3 → 0.19.0

package/dist/index.js

@@ -8,10 +8,10 @@ import { lstat, mkdir, open, readFile, readdir, realpath, rename, rm, stat, writ
 import { basename, dirname, extname, isAbsolute, join, parse, relative, resolve, sep } from "node:path";
 import { createHash, randomBytes, randomUUID } from "node:crypto";
 import * as NextclawCore from "@nextclaw/core";
-import { ConfigSchema, DEFAULT_WORKSPACE_PATH, ProviderModelDiscoveryHttpError, buildConfigSchema, createAgentProfile, expandHome, findEffectiveAgentProfile, getDataDir, getPackageVersion, getProviderName, hasSecretRef, isSensitiveConfigPath, loadConfig, mergeExtensionConfigView, normalizeModelThinkingCapability, normalizeProviderModelConfig, probeFeishu, readAgentAvatarContent, removeAgentProfile, resolveEffectiveAgentProfiles, saveConfig, toExtensionConfigView, updateAgentProfile } from "@nextclaw/core";
+import { ConfigSchema, DEFAULT_WORKSPACE_PATH, McpServerDefinitionSchema, ProviderModelDiscoveryHttpError, buildConfigSchema, createAgentProfile, expandHome, findEffectiveAgentProfile, getDataDir, getPackageVersion, getProviderName, hasSecretRef, isSensitiveConfigPath, loadConfig, mergeExtensionConfigView, normalizeModelThinkingCapability, normalizeProviderModelConfig, probeFeishu, readAgentAvatarContent, removeAgentProfile, resolveEffectiveAgentProfiles, saveConfig, toExtensionConfigView, updateAgentProfile } from "@nextclaw/core";
 import { homedir, platform } from "node:os";
 import { findBuiltinProviderByName, listBuiltinProviders } from "@nextclaw/runtime";
-import { McpInstalledViewService } from "@nextclaw/mcp";
+import { McpInstalledViewService, McpMutationService, McpRegistryService, normalizeMcpServerName } from "@nextclaw/mcp";
 import { serveStatic } from "hono/serve-static";
 //#region src/features/auth/utils/auth-bridge.utils.ts
 const REMOTE_BRIDGE_DIR = join(getDataDir(), "remote");
@@ -67,7 +67,7 @@ async function readJson(req) {
 function isRecord$3(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function readErrorMessage(value, fallback) {
+function readErrorMessage$1(value, fallback) {
 	if (!isRecord$3(value)) return fallback;
 	const maybeError = value.error;
 	if (!isRecord$3(maybeError)) return fallback;
@@ -390,7 +390,7 @@ function readNcpEventChannel(event) {
 	return readString(metadata.channelId) ?? readString(metadata.channel) ?? parseAgentSessionChannel(readString(message.sessionId) ?? readString(payload.sessionId));
 }
 function canStreamAppEventToPrincipal(principal, event) {
-	if (event.type === "extension.request") {
+	if (event.type === "extension.request" || event.type === "extension.host.desktop.event") {
 		const target = readExtensionRequestTarget(event);
 		return hasGrant(principal, "event-stream:extension-requests") && hasScopeValue(principal, "extensionIds", target.extensionId) && hasScopeValue(principal, "extensionGenerations", target.extensionId && target.generation ? `${target.extensionId}:${target.generation}` : null);
 	}
@@ -478,7 +478,8 @@ const ingressKeys = {
 		channelCommandExecute: createTypedKey("extension.channel.command.execute"),
 		runtimeReady: createTypedKey("extension.runtime.ready"),
 		response: createTypedKey("extension.response"),
-		observationEvent: createTypedKey("extension.observation.event")
+		observationEvent: createTypedKey("extension.observation.event"),
+		desktopHostInvoke: createTypedKey("extension.host.desktop.invoke")
 	},
 	agentRun: {
 		send: createTypedKey("agent-run.send"),
@@ -1964,6 +1965,131 @@ var AppRoutesController = class {
 	extensionCatalog = (c) => c.json(ok(buildExtensionsView(this.options)));
 };
 //#endregion
+//#region src/app/controllers/capability-access.controller.ts
+var CapabilityAccessRoutesController = class {
+	constructor(options) {
+		this.options = options;
+	}
+	listGrants = async (c) => this.listDesktopGrants(c);
+	grant = async (c) => {
+		const body = await readJson(c.req.raw);
+		const request = body.ok ? readGrantRequest(body.data) : null;
+		if (!request) return c.json(err("INVALID_CAPABILITY_GRANT", "A valid capability grant request is required."), 400);
+		try {
+			if (request.resource.type !== "desktop.application") return c.json(err("INVALID_CAPABILITY_GRANT", "Generic capability grants must use their resource-specific authorization endpoint."), 400);
+			return c.json(ok(await this.options.getDesktopHost().grantAccess(request)), 201);
+		} catch (error) {
+			return c.json(err("INVALID_CAPABILITY_GRANT", readErrorMessage(error)), 400);
+		}
+	};
+	revoke = async (c) => {
+		const body = await readJson(c.req.raw);
+		const filter = body.ok ? readGrantFilter(body.data) : null;
+		if (!filter || !isExactGrantSelector(filter) || filter.resourceType !== "desktop.application") return c.json(err("INVALID_CAPABILITY_GRANT_FILTER", "An exact Desktop subject, resource type, and target selector is required."), 400);
+		return c.json(ok({ revoked: await this.options.capabilityGrantManager.revoke(filter) }));
+	};
+	getDesktopStatus = async (c) => c.json(ok(await this.options.getDesktopHost().status()));
+	getDesktopPermissions = async (c) => c.json(ok(await this.options.getDesktopHost().getPermissions()));
+	requestDesktopPermissions = async (c) => c.json(ok(await this.options.getDesktopHost().requestPermissions()));
+	openDesktopPermissionSettings = async (c) => c.json(ok(await this.options.getDesktopHost().openPermissionSettings()));
+	listDesktopGrants = async (c) => {
+		const filter = readGrantFilterFromQuery(c);
+		if (filter.resourceType !== void 0 && filter.resourceType !== "desktop.application") return c.json(err("INVALID_CAPABILITY_GRANT_FILTER", "Only Desktop capability grants can be listed from this endpoint."), 400);
+		if (filter.subject && (!filter.subject.type || !filter.subject.id)) return c.json(err("INVALID_CAPABILITY_GRANT_FILTER", "Desktop grant subject filters must include both type and id."), 400);
+		return c.json(ok(await this.options.capabilityGrantManager.list({
+			...filter,
+			resourceType: "desktop.application"
+		})));
+	};
+};
+function isExactGrantSelector(filter) {
+	return Boolean(filter.subject?.type && filter.subject.id && filter.resourceType && filter.access?.length && Object.hasOwn(filter, "target") && filter.target !== void 0);
+}
+function readGrantFilterFromQuery(c) {
+	const subjectType = readOptionalString(c.req.query("subjectType"));
+	const subjectId = readOptionalString(c.req.query("subjectId"));
+	const resourceType = readOptionalString(c.req.query("resourceType"));
+	return {
+		...subjectType || subjectId ? { subject: {
+			...subjectType ? { type: subjectType } : {},
+			...subjectId ? { id: subjectId } : {}
+		} } : {},
+		...resourceType ? { resourceType } : {}
+	};
+}
+function readGrantRequest(value) {
+	if (!isRecord$3(value) || !hasExactKeys(value, [
+		"access",
+		"declarationFingerprint",
+		"resource",
+		"subject"
+	])) return null;
+	const subject = readSubject(value.subject, false);
+	const resource = isRecord$3(value.resource) && hasExactKeys(value.resource, ["target", "type"]) ? value.resource : null;
+	if (!subject || !resource || !readOptionalString(resource.type) || !Array.isArray(value.access) || value.access.length === 0 || !value.access.every((entry) => Boolean(readOptionalString(entry))) || !readOptionalString(value.declarationFingerprint)) return null;
+	return {
+		subject: {
+			type: subject.type,
+			id: subject.id
+		},
+		resource: {
+			type: String(resource.type).trim(),
+			target: resource.target
+		},
+		access: value.access.map((entry) => String(entry).trim()),
+		declarationFingerprint: String(value.declarationFingerprint).trim()
+	};
+}
+function readGrantFilter(value) {
+	if (!isRecord$3(value) || !hasExactKeys(value, [
+		"access",
+		"resourceType",
+		"subject",
+		"target"
+	], true)) return null;
+	const subject = value.subject === void 0 ? void 0 : readSubject(value.subject, true);
+	if (value.subject !== void 0 && !subject) return null;
+	const resourceType = value.resourceType === void 0 ? void 0 : readOptionalString(value.resourceType);
+	if (value.resourceType !== void 0 && !resourceType) return null;
+	const access = value.access === void 0 ? void 0 : Array.isArray(value.access) && value.access.length > 0 && value.access.every((entry) => Boolean(readOptionalString(entry))) ? value.access.map((entry) => String(entry).trim()) : null;
+	if (access === null) return null;
+	return {
+		...subject ? { subject } : {},
+		...resourceType ? { resourceType } : {},
+		...Object.hasOwn(value, "target") ? { target: value.target } : {},
+		...access ? { access } : {}
+	};
+}
+function readSubject(value, partial) {
+	if (!isRecord$3(value) || !hasExactKeys(value, ["id", "type"], partial)) return null;
+	const type = value.type === void 0 ? void 0 : readOptionalString(value.type);
+	const id = value.id === void 0 ? void 0 : readOptionalString(value.id);
+	if (!partial && (!type || !id) || value.type !== void 0 && !type || value.id !== void 0 && !id) return null;
+	return {
+		...type ? { type } : {},
+		...id ? { id } : {}
+	};
+}
+function hasExactKeys(value, allowed, allowMissing = false) {
+	const keys = Object.keys(value);
+	return keys.every((key) => allowed.includes(key)) && (allowMissing || keys.length === allowed.length);
+}
+function readOptionalString(value) {
+	if (typeof value !== "string") return void 0;
+	return value.trim() || void 0;
+}
+function readErrorMessage(error) {
+	return error instanceof Error ? error.message : String(error);
+}
+//#endregion
+//#region src/features/feature-controls/controllers/feature-controls.controller.ts
+var FeatureControlsRoutesController = class {
+	constructor(featureControls) {
+		this.featureControls = featureControls;
+	}
+	get = async (c) => c.json(ok(await this.featureControls.get()));
+};
+//#endregion
 //#region src/features/app-packages/controllers/app-packages.controller.ts
 var AppPackagesRoutesController = class {
 	constructor(manager) {
@@ -4846,7 +4972,7 @@ async function fetchMarketplaceDataFromBase(params) {
 	if (!response.ok) return {
 		ok: false,
 		status: response.status,
-		message: readErrorMessage(payload, `marketplace request failed (${response.status})`)
+		message: readErrorMessage$1(payload, `marketplace request failed (${response.status})`)
 	};
 	if (!payload || typeof payload !== "object" || !("ok" in payload)) return {
 		ok: false,
@@ -4857,7 +4983,7 @@ async function fetchMarketplaceDataFromBase(params) {
 	if (!typed.ok) return {
 		ok: false,
 		status: 502,
-		message: readErrorMessage(payload, "marketplace response returned error")
+		message: readErrorMessage$1(payload, "marketplace response returned error")
 	};
 	return {
 		ok: true,
@@ -6038,6 +6164,88 @@ var NcpSessionRoutesController = class {
 	};
 };
 //#endregion
+//#region src/features/mcp/controllers/mcp.controller.ts
+var McpRoutesController = class {
+	constructor(options) {
+		this.options = options;
+	}
+	testConnection = async (c) => {
+		const parsed = await this.readConnectionRequest(c);
+		if (!parsed.ok) return parsed.response;
+		const config = structuredClone(loadConfig(this.options.configPath));
+		const result = new McpMutationService({
+			getConfig: () => config,
+			saveConfig: () => void 0
+		}).addServer(parsed.value.name, parsed.value.definition);
+		if (!result.changed) return c.json(err("MCP_CONNECTION_INVALID", result.message), 400);
+		const registry = new McpRegistryService({ getConfig: () => config });
+		try {
+			const warm = await registry.warmServer(result.name);
+			return c.json(ok({
+				name: warm.name,
+				transport: parsed.value.definition.transport.type,
+				accessible: warm.ok,
+				toolCount: warm.toolCount,
+				...warm.error ? { error: warm.error } : {}
+			}));
+		} finally {
+			await registry.close();
+		}
+	};
+	createConnection = async (c) => {
+		const parsed = await this.readConnectionRequest(c);
+		if (!parsed.ok) return parsed.response;
+		const result = new McpMutationService({
+			getConfig: () => loadConfig(this.options.configPath),
+			saveConfig: (config) => saveConfig(config, this.options.configPath)
+		}).addServer(parsed.value.name, parsed.value.definition);
+		if (!result.changed || !result.definition) return c.json(err("MCP_CONNECTION_INVALID", result.message), 400);
+		emitConfigUpdated(this.options, "mcp");
+		await this.options.applyLiveConfigReload?.();
+		return c.json(ok({
+			name: result.name,
+			transport: result.definition.transport.type,
+			message: result.message
+		}));
+	};
+	readConnectionRequest = async (c) => {
+		const body = await readJson(c.req.raw);
+		if (!body.ok || !body.data || typeof body.data !== "object") return {
+			ok: false,
+			response: c.json(err("INVALID_BODY", "invalid json body"), 400)
+		};
+		try {
+			const name = normalizeMcpServerName(body.data.name ?? "");
+			const definition = McpServerDefinitionSchema.parse(body.data.definition);
+			return {
+				ok: true,
+				value: {
+					name,
+					definition: {
+						...definition,
+						metadata: {
+							...definition.metadata,
+							source: "manual",
+							installedAt: (/* @__PURE__ */ new Date()).toISOString()
+						}
+					}
+				}
+			};
+		} catch (error) {
+			return {
+				ok: false,
+				response: c.json(err("MCP_CONNECTION_INVALID", error instanceof Error ? error.message : String(error)), 400)
+			};
+		}
+	};
+};
+//#endregion
+//#region src/features/mcp/routes/mcp.route.ts
+function mountMcpRoutes(app, controller) {
+	app.post("/api/mcp/servers/test", controller.testConnection);
+	app.post("/api/mcp/servers", controller.createConnection);
+}
+//#endregion
 //#region src/features/remote-access/controllers/remote.controller.ts
 const REMOTE_SERVICE_ACTIONS = new Set([
 	"start",
@@ -6748,6 +6956,11 @@ function createUiRouteControllers(options, authService, marketplaceBaseUrls, ser
 	const { kernel, panelAppClientSdkScript, remoteAccess, runtimeControl, runtimeUpdate } = options;
 	return {
 		app: new AppRoutesController(options),
+		capabilityAccess: new CapabilityAccessRoutesController({
+			capabilityGrantManager: kernel.capabilityGrants,
+			getDesktopHost: () => kernel.extensions.getDesktopHost()
+		}),
+		featureControls: new FeatureControlsRoutesController(kernel.featureControls),
 		appPackages: new AppPackagesRoutesController(kernel.appPackageManager),
 		appData: new AppDataRoutesController(kernel.appDataManager),
 		agents: new AgentsRoutesController(options),
@@ -6770,7 +6983,8 @@ function createUiRouteControllers(options, authService, marketplaceBaseUrls, ser
 		runtimeControl: runtimeControl ? new RuntimeControlRoutesController(runtimeControl) : null,
 		runtimeUpdate: runtimeUpdate ? new RuntimeUpdateRoutesController(runtimeUpdate) : null,
 		skillMarketplace: new SkillMarketplaceController(options, marketplaceBaseUrls),
-		mcpMarketplace: new McpMarketplaceController(options, marketplaceBaseUrls)
+		mcpMarketplace: new McpMarketplaceController(options, marketplaceBaseUrls),
+		mcp: new McpRoutesController(options)
 	};
 }
 function isRecord(value) {
@@ -6874,7 +7088,7 @@ var UiRouteRegistry = class {
 		]]);
 	};
 	mountResourceRoutes = () => {
-		const { appData, appPackages, ncpSession, inboxDeliveries, panelApps, preferences, projects, serviceApps, serverPath, systemObjectReferences } = this.controllers;
+		const { appData, appPackages, capabilityAccess, featureControls, ncpSession, inboxDeliveries, panelApps, preferences, projects, serviceApps, serverPath, systemObjectReferences } = this.controllers;
 		this.mountRoutes([
 			[
 				"get",
@@ -6981,6 +7195,46 @@ var UiRouteRegistry = class {
 				"/api/system-object-references/resolve",
 				systemObjectReferences.resolve
 			],
+			[
+				"get",
+				"/api/capability-grants",
+				capabilityAccess.listGrants
+			],
+			[
+				"post",
+				"/api/capability-grants",
+				capabilityAccess.grant
+			],
+			[
+				"delete",
+				"/api/capability-grants",
+				capabilityAccess.revoke
+			],
+			[
+				"get",
+				"/api/feature-controls",
+				featureControls.get
+			],
+			[
+				"get",
+				"/api/desktop-host/status",
+				capabilityAccess.getDesktopStatus
+			],
+			[
+				"get",
+				"/api/desktop-host/permissions",
+				capabilityAccess.getDesktopPermissions
+			],
+			[
+				"post",
+				"/api/desktop-host/permissions/request",
+				capabilityAccess.requestDesktopPermissions
+			],
+			[
+				"post",
+				"/api/desktop-host/permissions/open-settings",
+				capabilityAccess.openDesktopPermissionSettings
+			],
 			[
 				"get",
 				"/api/app-packages",
@@ -7650,6 +7904,7 @@ var UiRouteRegistry = class {
 			skill: this.controllers.skillMarketplace,
 			mcp: this.controllers.mcpMarketplace
 		});
+		mountMcpRoutes(this.app, this.controllers.mcp);
 	};
 };
 function createUiRouter(options, authServiceOverride, internal) {