@nextclaw/kernel 0.3.3 → 0.4.0-beta.1

package/dist/index.js

@@ -15,6 +15,7 @@ import { BUILTIN_PROVIDER_PLUGINS } from "@nextclaw/runtime";
 import { McpRegistryService, McpServerLifecycleManager } from "@nextclaw/mcp";
 import { McpNcpToolRegistryAdapter } from "@nextclaw/ncp-mcp";
 import { DefaultNcpAgentConversationStateManager } from "@nextclaw/ncp-toolkit";
+import { createRuntimeChildEnv } from "@nextclaw/core/child-process-env";
 import { parse } from "yaml";
 import { HttpRuntimeConfigResolver, HttpRuntimeNcpAgentRuntime } from "@nextclaw/nextclaw-ncp-runtime-http-client";
 import { StdioRuntimeConfigResolver, StdioRuntimeNcpAgentRuntime, probeStdioRuntime } from "@nextclaw/nextclaw-ncp-runtime-stdio-client";
@@ -627,16 +628,6 @@ function readOptionalString$9(value) {
 	if (typeof value !== "string") return;
 	return value.trim() || void 0;
 }
-function toSessionMessageRequest(payload) {
-	return {
-		sessionId: payload.sessionId,
-		message: {
-			...payload.message,
-			sessionId: payload.sessionId
-		},
-		correlationId: payload.requestId
-	};
-}
 function toRunHandle(accepted) {
 	return {
 		sessionId: accepted.sessionId,
@@ -684,7 +675,14 @@ var AgentRunRequestManager = class {
 	};
 	handleSessionMessageRequest = async (envelope) => {
 		if (!envelope.payload) throw new Error("Invalid agent run session message request.");
-		return toRunHandle(await this.send(toSessionMessageRequest(envelope.payload)));
+		return toRunHandle(await this.send({
+			sessionId: envelope.payload.sessionId,
+			message: {
+				...envelope.payload.message,
+				sessionId: envelope.payload.sessionId
+			},
+			correlationId: envelope.payload.requestId
+		}));
 	};
 	send = async (request) => {
 		const session = await this.sessionManager.getOrCreateAgentRunSession({
@@ -710,7 +708,26 @@ var AgentRunRequestManager = class {
 			message
 		};
 		sessionRun.inbox.enqueue(message);
-		const activeRun = sessionRun.beginRun();
+		let stopPublishingRunStatus = () => void 0;
+		stopPublishingRunStatus = sessionRun.onStatusChange((status) => {
+			this.eventBus.emit(eventKeys.sessionRunStatus, {
+				sessionKey: sessionRun.sessionId,
+				status
+			}, {
+				emittedAt: (/* @__PURE__ */ new Date()).toISOString(),
+				source: "agent-run-request"
+			});
+			if (status === "idle") stopPublishingRunStatus();
+		});
+		this.cleanups.push(stopPublishingRunStatus);
+		const activeRun = (() => {
+			try {
+				return sessionRun.beginRun();
+			} catch (error) {
+				stopPublishingRunStatus();
+				throw error;
+			}
+		})();
 		const model = request.model ?? session.model ?? this.configManager.getDefaultModel();
 		const agentId = request.agentId ?? session.agentId ?? resolveDefaultAgentProfileId(this.configManager.loadConfig());
 		const spec = {
@@ -2511,11 +2528,11 @@ var ExtensionManager = class {
 //#endregion
 //#region src/utils/model-message-vision.utils.ts
 const IMAGE_OMITTED_TEXT = "[Image omitted: the selected model is not configured for vision input.]";
-function isRecord$10(value) {
+function isRecord$11(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function isImageContentPart(value) {
-	if (!isRecord$10(value)) return false;
+	if (!isRecord$11(value)) return false;
 	const type = value.type;
 	return type === "image_url" || type === "input_image";
 }
@@ -2531,7 +2548,7 @@ function normalizeContentWithoutVision(content) {
 		};
 	});
 	if (!sawImage) return content;
-	const textParts = parts.filter((part) => isRecord$10(part) && part.type === "text" && typeof part.text === "string").map((part) => part.text.trim()).filter(Boolean);
+	const textParts = parts.filter((part) => isRecord$11(part) && part.type === "text" && typeof part.text === "string").map((part) => part.text.trim()).filter(Boolean);
 	if (textParts.length === parts.length) return textParts.join("\n\n");
 	return parts;
 }
@@ -3070,7 +3087,7 @@ function safeNcpSessionFilename(value) {
 function normalizeNcpAgentId(agentId) {
 	return agentId?.trim().toLowerCase() || void 0;
 }
-function isRecord$9(value) {
+function isRecord$10(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function toIsoString(value, fallback) {
@@ -3690,7 +3707,7 @@ var PanelAppStateStore = class {
 };
 //#endregion
 //#region src/stores/panel-app-capability-grant.store.ts
-const EMPTY_GRANTS$1 = {
+const EMPTY_GRANTS$2 = {
 	version: 1,
 	grants: {}
 };
@@ -3725,9 +3742,9 @@ var PanelAppCapabilityGrantStore = class {
 	};
 	load = async () => {
 		try {
-			return normalizeStoreData$1(JSON.parse(await readFile(this.filePath, "utf8")));
+			return normalizeStoreData$2(JSON.parse(await readFile(this.filePath, "utf8")));
 		} catch (error) {
-			if (isMissingFileError$2(error)) return structuredClone(EMPTY_GRANTS$1);
+			if (isMissingFileError$3(error)) return structuredClone(EMPTY_GRANTS$2);
 			throw error;
 		}
 	};
@@ -3736,13 +3753,13 @@ var PanelAppCapabilityGrantStore = class {
 		await writeFile(this.filePath, `${JSON.stringify(data, null, 2)}\n`, "utf8");
 	};
 };
-function normalizeStoreData$1(value) {
-	if (!isRecord$8(value) || value.version !== 1 || !isRecord$8(value.grants)) return structuredClone(EMPTY_GRANTS$1);
+function normalizeStoreData$2(value) {
+	if (!isRecord$9(value) || value.version !== 1 || !isRecord$9(value.grants)) return structuredClone(EMPTY_GRANTS$2);
 	const grants = {};
 	for (const [callerKey, callerValue] of Object.entries(value.grants)) {
-		if (!isRecord$8(callerValue) || !isRecord$8(callerValue.capabilities)) continue;
+		if (!isRecord$9(callerValue) || !isRecord$9(callerValue.capabilities)) continue;
 		const capabilities = {};
-		for (const [capability, grantValue] of Object.entries(callerValue.capabilities)) if (isRecord$8(grantValue) && typeof grantValue.grantedAt === "string") capabilities[capability] = { grantedAt: grantValue.grantedAt };
+		for (const [capability, grantValue] of Object.entries(callerValue.capabilities)) if (isRecord$9(grantValue) && typeof grantValue.grantedAt === "string") capabilities[capability] = { grantedAt: grantValue.grantedAt };
 		grants[callerKey] = { capabilities };
 	}
 	return {
@@ -3753,11 +3770,65 @@ function normalizeStoreData$1(value) {
 function getCallerKey(caller) {
 	return `${caller.surface}:${caller.appId}`;
 }
+function isRecord$9(value) {
+	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+function isMissingFileError$3(error) {
+	return Boolean(error) && typeof error === "object" && error.code === "ENOENT";
+}
+//#endregion
+//#region src/stores/panel-app-client-grant.store.ts
+const EMPTY_GRANTS$1 = {
+	grants: {},
+	version: 1
+};
+var PanelAppClientGrantStore = class {
+	constructor(filePath) {
+		this.filePath = filePath;
+	}
+	isGranted = async (appId) => {
+		const data = await this.load();
+		return Boolean(data.grants[appId]);
+	};
+	grant = async (params) => {
+		const data = await this.load();
+		data.grants[params.appId] = { grantedAt: params.grantedAt };
+		await this.save(data);
+		return params;
+	};
+	revoke = async (appId) => {
+		const data = await this.load();
+		if (!data.grants[appId]) return;
+		delete data.grants[appId];
+		await this.save(data);
+	};
+	load = async () => {
+		try {
+			return normalizeStoreData$1(JSON.parse(await readFile(this.filePath, "utf8")));
+		} catch (error) {
+			if (isMissingFileError$2(error)) return structuredClone(EMPTY_GRANTS$1);
+			throw error;
+		}
+	};
+	save = async (data) => {
+		await mkdir(dirname(this.filePath), { recursive: true });
+		await writeFile(this.filePath, `${JSON.stringify(data, null, 2)}\n`, "utf8");
+	};
+};
+function normalizeStoreData$1(value) {
+	if (!isRecord$8(value) || value.version !== 1 || !isRecord$8(value.grants)) return structuredClone(EMPTY_GRANTS$1);
+	const grants = {};
+	for (const [appId, grant] of Object.entries(value.grants)) if (isRecord$8(grant) && typeof grant.grantedAt === "string") grants[appId] = { grantedAt: grant.grantedAt };
+	return {
+		grants,
+		version: 1
+	};
+}
 function isRecord$8(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function isMissingFileError$2(error) {
-	return Boolean(error) && typeof error === "object" && error.code === "ENOENT";
+	return isRecord$8(error) && error.code === "ENOENT";
 }
 //#endregion
 //#region src/services/agent-run-client.service.ts
@@ -3953,162 +4024,465 @@ var AgentRunClient = class {
 	};
 };
 //#endregion
-//#region src/utils/panel-app-bridge.utils.ts
-const PANEL_APP_BRIDGE_MARKER = "nextclaw:panel-app-service-actions:request";
-function injectPanelAppBridgeScript(html) {
-	if (html.includes(PANEL_APP_BRIDGE_MARKER)) return html;
-	const script = `<script>${getPanelAppBridgeScript()}<\/script>`;
-	const headMatch = /<head(?:\s[^>]*)?>/i.exec(html);
-	if (headMatch?.index !== void 0) {
-		const insertAt = headMatch.index + headMatch[0].length;
-		return `${html.slice(0, insertAt)}${script}${html.slice(insertAt)}`;
+//#region src/tools/structured-result.tools.ts
+const STRUCTURED_RESULT_TOOL_NAME = "nextclaw_submit_result";
+var StructuredResultSubmitTool = class {
+	name = STRUCTURED_RESULT_TOOL_NAME;
+	description = "Submit the structured object result for this request.";
+	constructor(contract) {
+		this.contract = contract;
 	}
-	return `${script}${html}`;
-}
-function getPanelAppBridgeScript() {
-	return `
-(() => {
-  const requestType = "nextclaw:panel-app-service-actions:request";
-  const responseType = "nextclaw:panel-app-service-actions:response";
-  const pending = new Map();
-  let counter = 0;
-
-  function createRequestId() {
-    counter += 1;
-    return "panel-bridge-" + Date.now().toString(36) + "-" + counter.toString(36);
-  }
-
-  function request(method, payload) {
-    const requestId = createRequestId();
-    return new Promise((resolve, reject) => {
-      pending.set(requestId, { method, resolve, reject });
-      window.parent.postMessage({ type: requestType, requestId, method, payload }, "*");
-    });
-  }
-
-  function unwrapServiceActionResult(result) {
-    if (!result || typeof result !== "object") {
-      return result;
-    }
-    if (Object.prototype.hasOwnProperty.call(result, "structuredContent") && result.structuredContent !== undefined) {
-      return result.structuredContent;
-    }
-    const content = Array.isArray(result.content) ? result.content : undefined;
-    if (content && content.length === 1 && content[0]?.type === "text" && typeof content[0].text === "string") {
-      try {
-        return JSON.parse(content[0].text);
-      } catch {
-        return content[0].text;
-      }
-    }
-    return result;
-  }
-
-  function resolveBridgeData(entry, data) {
-    if (entry.method === "list") {
-      return Array.isArray(data.data?.actions) ? data.data.actions : [];
-    }
-    if (entry.method === "invoke") {
-      return unwrapServiceActionResult(data.data?.result);
-    }
-    if (entry.method === "agent.generateObject") {
-      return data.data?.result;
-    }
-    return data.data;
-  }
-
-  window.addEventListener("message", (event) => {
-    const data = event.data;
-    if (!data || data.type !== responseType || typeof data.requestId !== "string") {
-      return;
-    }
-    const entry = pending.get(data.requestId);
-    if (!entry) {
-      return;
-    }
-    pending.delete(data.requestId);
-    if (data.ok) {
-      entry.resolve(resolveBridgeData(entry, data));
-      return;
-    }
-    const error = new Error(data.error?.message || "NextClaw panel bridge request failed.");
-    error.code = data.error?.code;
-    error.details = data.error?.details;
-    entry.reject(error);
-  });
-
-  const existing = window.nextclaw && typeof window.nextclaw === "object" ? window.nextclaw : {};
-  Object.defineProperty(window, "nextclaw", {
-    configurable: true,
-    value: {
-      ...existing,
-      serviceActions: {
-        list: () => request("list", {}),
-        invoke: (actionId, input) => request("invoke", { actionId, input }),
-        requestGrant: (actionId) => request("requestGrant", { actionId }),
-        revokeGrant: (actionId) => request("revokeGrant", { actionId })
-      },
-      agent: {
-        send: (input) => request("agent.send", { request: input }),
-        generateObject: (input) => request("agent.generateObject", { input })
-      }
-    }
-  });
-})();
-`.trim();
-}
-//#endregion
-//#region src/utils/panel-app-manifest.utils.ts
-const PANEL_APP_ID_PATTERN = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
-function parsePanelAppManifest(html) {
-	return {
-		...readHtmlTitle(html),
-		...readStandardIcon(html),
-		...readPanelAppMeta(html),
-		capabilities: readPanelAppCapabilities(html),
-		serviceActions: readPanelAppServiceActions(html)
-	};
-}
-function parsePanelAppFolderManifest(raw) {
-	let parsed;
-	try {
-		parsed = JSON.parse(raw);
-	} catch (error) {
-		throw new Error(`panel-app.json is not valid JSON: ${error instanceof Error ? error.message : String(error)}`);
+	get parameters() {
+		return this.contract.schema;
 	}
-	if (!isRecord$7(parsed)) throw new Error("panel-app.json must contain an object.");
-	const id = readOptionalString$6(parsed, "id");
-	if (id && !PANEL_APP_ID_PATTERN.test(id)) throw new Error("panel app id must be kebab-case.");
+	validateArgs = (args) => validateToolArgs(args, this.contract.schema);
+	execute = async (args) => args;
+};
+//#endregion
+//#region src/utils/panel-app-agent.utils.ts
+const PANEL_APP_AGENT_DEFAULT_TIMEOUT_MS = 6e4;
+const PANEL_APP_AGENT_MAX_TIMEOUT_MS = 12e4;
+const PANEL_APP_AGENT_MAX_PROMPT_CHARS = 2e4;
+const PANEL_APP_AGENT_MAX_CONTEXT_CHARS = 8e4;
+function normalizePanelAppGenerateObjectInput(input) {
+	const peerId = input.peerId.trim();
+	const prompt = input.prompt.trim();
+	if (!peerId || !prompt || !isRecord$7(input.schema)) throw new PanelAppError("PANEL_APP_AGENT_REQUEST_INVALID", "invalid generateObject request");
+	if (prompt.length > PANEL_APP_AGENT_MAX_PROMPT_CHARS) throw new PanelAppError("PANEL_APP_AGENT_REQUEST_INVALID", "generateObject prompt is too large");
+	if (stringifyJsonValue(input.context ?? null).length > PANEL_APP_AGENT_MAX_CONTEXT_CHARS) throw new PanelAppError("PANEL_APP_AGENT_REQUEST_INVALID", "generateObject context is too large");
 	return {
-		id,
-		title: readRequiredString$3(parsed, "title"),
-		description: readOptionalString$6(parsed, "description"),
-		icon: readOptionalString$6(parsed, "icon"),
-		entry: readRequiredString$3(parsed, "entry"),
-		capabilities: readStringArray$1(parsed.capabilities, "capabilities"),
-		serviceActions: readStringArray$1(parsed.actions, "actions")
+		context: input.context,
+		peerId,
+		prompt,
+		schema: input.schema,
+		timeoutMs: normalizeTimeoutMs(input.timeoutMs),
+		title: input.title?.trim() || void 0
 	};
 }
-function readPanelAppMeta(html) {
+function createPanelAppGenerateObjectMessage(params) {
+	const { bridgeSession, request, requestId } = params;
 	return {
-		...readPanelAppMetaField(html, "title"),
-		...readPanelAppMetaField(html, "description"),
-		...readPanelAppMetaField(html, "icon")
+		id: `panel-app-agent-message-${randomUUID()}`,
+		metadata: {
+			...createPanelAppAgentMetadata(bridgeSession),
+			panel_app_peer_id: request.peerId,
+			structured_result: {
+				request_id: requestId,
+				schema: structuredClone(request.schema),
+				tool_name: STRUCTURED_RESULT_TOOL_NAME
+			}
+		},
+		parts: [{
+			type: "text",
+			text: buildGenerateObjectPrompt(bridgeSession, request)
+		}],
+		role: "user",
+		status: "final",
+		timestamp: (/* @__PURE__ */ new Date()).toISOString()
 	};
 }
-function readPanelAppMetaField(html, field) {
-	const content = readMetaContent(html, `nextclaw-panel-${field}`, field === "icon" ? "attribute" : "text");
-	const manifest = {};
-	if (content) manifest[field] = content;
-	return manifest;
-}
-function readHtmlTitle(html) {
-	const title = normalizeTextValue(html.match(/<title[^>]*>([\s\S]*?)<\/title>/i)?.[1]);
-	return title ? { title } : {};
-}
-function readStandardIcon(html) {
-	const icon = readLinkHref(html, (relTokens) => relTokens.includes("icon"));
-	const appleTouchIcon = readLinkHref(html, (relTokens) => relTokens.some((token) => token === "apple-touch-icon" || token === "apple-touch-icon-precomposed"));
+async function waitForPanelAppStructuredResult(agentRunClient, params) {
+	const iterator = agentRunClient.sendAndStreamEvents(params.payload)[Symbol.asyncIterator]();
+	let timeoutId;
+	const timeout = new Promise((_, reject) => {
+		timeoutId = setTimeout(() => reject(new PanelAppError("AGENT_OBJECT_RESULT_TIMEOUT", "agent object result timed out")), params.timeoutMs);
+	});
+	let resultToolCallId = null;
+	try {
+		while (true) {
+			const next = await Promise.race([iterator.next(), timeout]);
+			if (next.done) break;
+			const result = readStructuredResultEvent(next.value, resultToolCallId);
+			if (result.matchedToolCallId) resultToolCallId = result.matchedToolCallId;
+			if (result.submitted) return result.content;
+			throwIfTerminalError(next.value);
+		}
+	} finally {
+		if (timeoutId) clearTimeout(timeoutId);
+		await iterator.return?.(void 0);
+	}
+	throw new PanelAppError("AGENT_OBJECT_RESULT_NOT_SUBMITTED", "agent did not submit a structured object result");
+}
+function withPanelAppAgentMetadata(payload, bridgeSession) {
+	const panelAppMetadata = createPanelAppAgentMetadata(bridgeSession);
+	const peerId = readOptionalPeerId(payload.peerId);
+	const sessionId = readOptionalSessionId(payload.sessionId);
+	if (peerId && sessionId) throw new PanelAppError("PANEL_APP_AGENT_REQUEST_INVALID", "agent send request cannot include both sessionId and peerId");
+	const metadata = {
+		...payload.metadata ?? {},
+		...panelAppMetadata
+	};
+	if (peerId) metadata.panel_app_peer_id = peerId;
+	if (Array.isArray(payload.content)) return {
+		content: structuredClone(payload.content),
+		metadata,
+		peerId,
+		sessionId
+	};
+	if (!payload.message) throw new PanelAppError("PANEL_APP_AGENT_REQUEST_INVALID", "agent send request is required");
+	return {
+		message: {
+			...structuredClone(payload.message),
+			metadata: {
+				...payload.message.metadata ?? {},
+				...panelAppMetadata
+			}
+		},
+		metadata,
+		peerId,
+		sessionId
+	};
+}
+function createPanelAppAgentMetadata(bridgeSession) {
+	return {
+		agent_peer_scope: `panel-app:${bridgeSession.appId}`,
+		panel_app_bridge_request_id: randomUUID(),
+		panel_app_id: bridgeSession.appId,
+		source_kind: "panel_app"
+	};
+}
+function normalizeTimeoutMs(timeoutMs) {
+	if (!Number.isFinite(timeoutMs) || typeof timeoutMs !== "number") return PANEL_APP_AGENT_DEFAULT_TIMEOUT_MS;
+	return Math.min(PANEL_APP_AGENT_MAX_TIMEOUT_MS, Math.max(1e3, Math.trunc(timeoutMs)));
+}
+function readOptionalPeerId(value) {
+	if (typeof value !== "string") return;
+	const peerId = value.trim();
+	if (!peerId) throw new PanelAppError("PANEL_APP_AGENT_REQUEST_INVALID", "agent peerId cannot be empty");
+	return peerId;
+}
+function readOptionalSessionId(value) {
+	if (typeof value !== "string") return;
+	const sessionId = value.trim();
+	if (!sessionId) throw new PanelAppError("PANEL_APP_AGENT_REQUEST_INVALID", "agent sessionId cannot be empty");
+	return sessionId;
+}
+function buildGenerateObjectPrompt(bridgeSession, request) {
+	return [
+		"Panel App generateObject request",
+		"",
+		`Panel App ID: ${bridgeSession.appId}`,
+		`Peer ID: ${request.peerId}`,
+		"",
+		"Context JSON:",
+		stringifyJsonValue(request.context ?? null),
+		"",
+		"Task:",
+		request.prompt,
+		"",
+		"Result contract:",
+		`Call the ${STRUCTURED_RESULT_TOOL_NAME} tool exactly once with an object matching the provided schema.`,
+		"Do not use natural language as the result."
+	].join("\n");
+}
+function readStructuredResultEvent(event, resultToolCallId) {
+	if (event.type === NcpEventType.MessageToolCallStart && event.payload.toolName === "nextclaw_submit_result") return {
+		matchedToolCallId: event.payload.toolCallId,
+		submitted: false
+	};
+	if (event.type !== NcpEventType.MessageToolCallResult || event.payload.toolCallId !== resultToolCallId) return { submitted: false };
+	assertToolResultContent(event.payload.content);
+	return {
+		content: event.payload.content,
+		submitted: true
+	};
+}
+function assertToolResultContent(content) {
+	if (!isRecord$7(content) || content.ok !== false || !isRecord$7(content.error)) return;
+	if (content.error.code === "invalid_tool_arguments") throw new PanelAppError("AGENT_OBJECT_RESULT_SCHEMA_INVALID", "agent object result did not match the schema");
+	throw new PanelAppError("AGENT_OBJECT_REQUEST_FAILED", typeof content.error.message === "string" ? content.error.message : "agent object request failed");
+}
+function throwIfTerminalError(event) {
+	if (event.type === NcpEventType.MessageFailed) throw new PanelAppError("AGENT_OBJECT_REQUEST_FAILED", event.payload.error.message);
+	if (event.type === NcpEventType.RunError) throw new PanelAppError("AGENT_OBJECT_REQUEST_FAILED", event.payload.error ?? "agent object request failed");
+	if (event.type === NcpEventType.RunFinished) throw new PanelAppError("AGENT_OBJECT_RESULT_NOT_SUBMITTED", "agent did not submit a structured object result");
+}
+function stringifyJsonValue(value) {
+	try {
+		return JSON.stringify(value, null, 2);
+	} catch {
+		throw new PanelAppError("PANEL_APP_AGENT_REQUEST_INVALID", "value is not JSON serializable");
+	}
+}
+function isRecord$7(value) {
+	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+//#endregion
+//#region src/services/panel-app-agent-bridge.service.ts
+var PanelAppAgentBridgeService = class {
+	constructor(params) {
+		this.params = params;
+	}
+	sendAgentMessage = async (bridgeSession, payload) => {
+		await this.assertAgentCapabilityGranted(bridgeSession, "agent:send");
+		return await this.requireAgentRunClient().send(withPanelAppAgentMetadata(payload, bridgeSession));
+	};
+	generateAgentObject = async (bridgeSession, input) => {
+		await this.assertAgentCapabilityGranted(bridgeSession, "agent:generateObject");
+		const request = normalizePanelAppGenerateObjectInput(input);
+		const message = createPanelAppGenerateObjectMessage({
+			bridgeSession,
+			request,
+			requestId: randomUUID()
+		});
+		return { result: await waitForPanelAppStructuredResult(this.requireAgentRunClient(), {
+			payload: {
+				message,
+				metadata: {
+					...createPanelAppAgentMetadata(bridgeSession),
+					panel_app_peer_id: request.peerId
+				},
+				peerId: request.peerId
+			},
+			timeoutMs: request.timeoutMs
+		}) };
+	};
+	grantAgentCapability = async (bridgeSession, capability) => {
+		if (!isPanelAppAgentCapability(capability)) throw new PanelAppError("PANEL_APP_AGENT_REQUEST_INVALID", "unknown panel app agent capability");
+		this.assertDeclaredCapability(bridgeSession, capability);
+		return await this.params.createCapabilityGrantStore().grant({
+			caller: bridgeSession.caller,
+			capability,
+			grantedAt: (/* @__PURE__ */ new Date()).toISOString()
+		});
+	};
+	assertAgentCapabilityGranted = async (bridgeSession, capability) => {
+		this.assertDeclaredCapability(bridgeSession, capability);
+		if (!await this.params.createCapabilityGrantStore().isGranted(bridgeSession.caller, capability)) throw new PanelAppError("AUTHORIZATION_REQUIRED", `This panel app needs permission to use ${capability}.`);
+	};
+	assertDeclaredCapability = (bridgeSession, capability) => {
+		if (!bridgeSession.declaredCapabilities.includes(capability)) throw new PanelAppError("PANEL_APP_CAPABILITY_NOT_DECLARED", this.describeMissingAgentCapability(bridgeSession.declaredCapabilities, capability));
+	};
+	describeMissingAgentCapability = (declaredCapabilities, capability) => {
+		const declared = declaredCapabilities.length > 0 ? declaredCapabilities.join(", ") : "none";
+		const valid = PANEL_APP_AGENT_CAPABILITIES.join(", ");
+		const hint = declaredCapabilities.includes(capability.replace(":", ".")) ? ` Use ${capability}, not ${capability.replace(":", ".")}.` : "";
+		return [
+			`panel app did not declare ${capability}.`,
+			`Declared: ${declared}.`,
+			`Valid capabilities: ${valid}.`,
+			`Declare it with nextclaw-panel-capabilities or panel-app.json capabilities.`,
+			hint.trim()
+		].filter(Boolean).join(" ");
+	};
+	requireAgentRunClient = () => {
+		if (!this.params.agentRunClient) throw new PanelAppError("PANEL_APP_AGENT_REQUEST_INVALID", "panel app agent client is not configured");
+		return this.params.agentRunClient;
+	};
+};
+//#endregion
+//#region src/utils/panel-app-bridge.utils.ts
+const PANEL_APP_BRIDGE_MARKER = "nextclaw:panel-app-service-actions:request";
+function injectPanelAppBridgeScript(html, params) {
+	if (html.includes(PANEL_APP_BRIDGE_MARKER)) return html;
+	const script = `<script>${getPanelAppBridgeScript(params)}<\/script>`;
+	const headMatch = /<head(?:\s[^>]*)?>/i.exec(html);
+	if (headMatch?.index !== void 0) {
+		const insertAt = headMatch.index + headMatch[0].length;
+		return `${html.slice(0, insertAt)}${script}${html.slice(insertAt)}`;
+	}
+	return `${script}${html}`;
+}
+function getPanelAppBridgeScript(params = {
+	appId: "",
+	runtimeToken: ""
+}) {
+	return `
+(() => {
+  const requestType = "nextclaw:panel-app-service-actions:request";
+  const responseType = "nextclaw:panel-app-service-actions:response";
+  const appId = ${JSON.stringify(params.appId)};
+  const runtimeToken = ${JSON.stringify(params.runtimeToken)};
+  const pending = new Map();
+  let counter = 0;
+
+  function createRequestId() {
+    counter += 1;
+    return "panel-bridge-" + Date.now().toString(36) + "-" + counter.toString(36);
+  }
+
+  function request(method, payload) {
+    const requestId = createRequestId();
+    return new Promise((resolve, reject) => {
+      pending.set(requestId, { method, resolve, reject });
+      window.parent.postMessage({ type: requestType, requestId, appId, runtimeToken, method, payload }, "*");
+    });
+  }
+
+  function unwrapServiceActionResult(result) {
+    if (!result || typeof result !== "object") {
+      return result;
+    }
+    if (Object.prototype.hasOwnProperty.call(result, "structuredContent") && result.structuredContent !== undefined) {
+      return result.structuredContent;
+    }
+    const content = Array.isArray(result.content) ? result.content : undefined;
+    if (content && content.length === 1 && content[0]?.type === "text" && typeof content[0].text === "string") {
+      try {
+        return JSON.parse(content[0].text);
+      } catch {
+        return content[0].text;
+      }
+    }
+    return result;
+  }
+
+  function resolveBridgeData(entry, data) {
+    if (entry.method === "list") {
+      return Array.isArray(data.data?.actions) ? data.data.actions : [];
+    }
+    if (entry.method === "invoke") {
+      return unwrapServiceActionResult(data.data?.result);
+    }
+    if (entry.method === "agent.generateObject") {
+      return data.data?.result;
+    }
+    return data.data;
+  }
+
+  window.addEventListener("message", (event) => {
+    const data = event.data;
+    if (!data || data.type !== responseType || typeof data.requestId !== "string") {
+      return;
+    }
+    const entry = pending.get(data.requestId);
+    if (!entry) {
+      return;
+    }
+    pending.delete(data.requestId);
+    if (data.ok) {
+      entry.resolve(resolveBridgeData(entry, data));
+      return;
+    }
+    const error = new Error(data.error?.message || "NextClaw panel bridge request failed.");
+    error.code = data.error?.code;
+    error.details = data.error?.details;
+    entry.reject(error);
+  });
+
+  const existing = window.nextclaw && typeof window.nextclaw === "object" ? window.nextclaw : {};
+  Object.defineProperty(window, "nextclaw", {
+    configurable: true,
+    value: {
+      ...existing,
+      serviceActions: {
+        list: () => request("list", {}),
+        invoke: (actionId, input) => request("invoke", { actionId, input }),
+        requestGrant: (actionId) => request("requestGrant", { actionId }),
+        revokeGrant: (actionId) => request("revokeGrant", { actionId })
+      },
+      agent: {
+        send: (input) => request("agent.send", { request: input }),
+        generateObject: (input) => request("agent.generateObject", { input })
+      }
+    }
+  });
+})();
+`.trim();
+}
+//#endregion
+//#region src/utils/panel-app-client-injection.utils.ts
+const PANEL_APP_CLIENT_MARKER = "nextclaw:panel-app-client:init";
+const PANEL_APP_CLIENT_SDK_PATH = "/api/panel-app-client-sdk.js";
+function injectPanelAppClientScript(html, params) {
+	if (html.includes(PANEL_APP_CLIENT_MARKER)) return html;
+	const script = [`<script src="${PANEL_APP_CLIENT_SDK_PATH}"><\/script>`, `<script>${getPanelAppClientInitScript(params)}<\/script>`].join("");
+	const headMatch = /<head(?:\s[^>]*)?>/i.exec(html);
+	if (headMatch?.index !== void 0) {
+		const insertAt = headMatch.index + headMatch[0].length;
+		return `${html.slice(0, insertAt)}${script}${html.slice(insertAt)}`;
+	}
+	return `${script}${html}`;
+}
+function getPanelAppClientInitScript(params) {
+	return `
+(() => {
+  const marker = "${PANEL_APP_CLIENT_MARKER}";
+  if (typeof window.NextClawClient !== "function") {
+    console.error("[NextClaw] Panel App client SDK failed to load.");
+    return;
+  }
+  if (typeof window.createNextClawAppClient !== "function") {
+    console.error("[NextClaw] Panel App client projection failed to load.");
+    return;
+  }
+  const existing = window.nextclaw && typeof window.nextclaw === "object" ? window.nextclaw : {};
+  const hostClient = new window.NextClawClient({
+    baseUrl: window.location.origin,
+    headers: {
+      "x-nextclaw-panel-bridge-session": ${JSON.stringify(params.runtimeToken)}
+    }
+  });
+  const client = window.createNextClawAppClient(hostClient);
+  Object.defineProperty(window, "nextclaw", {
+    configurable: true,
+    value: {
+      ...existing,
+      client
+    }
+  });
+  Object.defineProperty(window.nextclaw, "__clientInitMarker", {
+    configurable: true,
+    enumerable: false,
+    value: marker
+  });
+})();
+`.trim();
+}
+//#endregion
+//#region src/utils/panel-app-manifest.utils.ts
+const PANEL_APP_ID_PATTERN = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
+function parsePanelAppManifest(html) {
+	return {
+		...readHtmlTitle(html),
+		...readStandardIcon(html),
+		...readPanelAppMeta(html),
+		capabilities: readPanelAppCapabilities(html),
+		client: false,
+		serviceActions: readPanelAppServiceActions(html)
+	};
+}
+function parsePanelAppFolderManifest(raw) {
+	let parsed;
+	try {
+		parsed = JSON.parse(raw);
+	} catch (error) {
+		throw new Error(`panel-app.json is not valid JSON: ${error instanceof Error ? error.message : String(error)}`);
+	}
+	if (!isRecord$6(parsed)) throw new Error("panel-app.json must contain an object.");
+	const id = readOptionalString$6(parsed, "id");
+	if (id && !PANEL_APP_ID_PATTERN.test(id)) throw new Error("panel app id must be kebab-case.");
+	return {
+		id,
+		title: readRequiredString$3(parsed, "title"),
+		description: readOptionalString$6(parsed, "description"),
+		icon: readOptionalString$6(parsed, "icon"),
+		entry: readRequiredString$3(parsed, "entry"),
+		capabilities: readStringArray$1(parsed.capabilities, "capabilities"),
+		client: readOptionalBoolean$2(parsed, "client"),
+		serviceActions: readStringArray$1(parsed.actions, "actions")
+	};
+}
+function readPanelAppMeta(html) {
+	return {
+		...readPanelAppMetaField(html, "title"),
+		...readPanelAppMetaField(html, "description"),
+		...readPanelAppMetaField(html, "icon")
+	};
+}
+function readPanelAppMetaField(html, field) {
+	const content = readMetaContent(html, `nextclaw-panel-${field}`, field === "icon" ? "attribute" : "text");
+	const manifest = {};
+	if (content) manifest[field] = content;
+	return manifest;
+}
+function readHtmlTitle(html) {
+	const title = normalizeTextValue(html.match(/<title[^>]*>([\s\S]*?)<\/title>/i)?.[1]);
+	return title ? { title } : {};
+}
+function readStandardIcon(html) {
+	const icon = readLinkHref(html, (relTokens) => relTokens.includes("icon"));
+	const appleTouchIcon = readLinkHref(html, (relTokens) => relTokens.some((token) => token === "apple-touch-icon" || token === "apple-touch-icon-precomposed"));
 	const href = normalizeIconHref(icon ?? appleTouchIcon);
 	return href ? { icon: href } : {};
 }
@@ -4151,12 +4525,18 @@ function readRequiredString$3(record, key) {
 function readOptionalString$6(record, key) {
 	return typeof record[key] === "string" && record[key].trim() ? record[key].trim() : void 0;
 }
+function readOptionalBoolean$2(record, key) {
+	const value = record[key];
+	if (value === void 0) return false;
+	if (typeof value !== "boolean") throw new Error(`panel app ${key} must be a boolean.`);
+	return value;
+}
 function readStringArray$1(value, key) {
 	if (value === void 0) return [];
 	if (!Array.isArray(value) || value.some((entry) => typeof entry !== "string")) throw new Error(`panel app ${key} must be a string array.`);
 	return [...new Set(value.map((entry) => entry.trim()).filter(Boolean))];
 }
-function isRecord$7(value) {
+function isRecord$6(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function normalizeTextValue(value) {
@@ -4236,296 +4616,168 @@ function resolvePanelAppIconUrl(id, icon) {
 	if (icon.startsWith("data:image/") || icon.startsWith("http://") || icon.startsWith("https://") || icon.startsWith("/") || isLikelyTextIcon(icon)) return icon;
 	return `/api/panel-apps/${encodeURIComponent(id)}/assets/${encodePanelAppAssetPath(icon)}`;
 }
-function injectPanelAppAssetBase(html, baseHref) {
-	const base = `<base href="${baseHref}">`;
-	if (/<base\b/i.test(html)) return html;
-	if (/<head[^>]*>/i.test(html)) return html.replace(/<head[^>]*>/i, (head) => `${head}${base}`);
-	return `${base}${html}`;
-}
-function encodePanelAppAssetPath(path) {
-	return path.split("/").filter(Boolean).map((segment) => encodeURIComponent(segment)).join("/");
-}
-function hasSafeBaseName(name) {
-	return !name.includes("/") && !name.includes("\\") && !name.includes("\0");
-}
-function isLikelyTextIcon(icon) {
-	return !icon.includes("/") && !icon.includes(".") && icon.length <= 4;
-}
-function escapeRegExp(value) {
-	return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-//#endregion
-//#region src/services/panel-app-source.service.ts
-var PanelAppSourceService = class {
-	listSources = async (panelsPath) => {
-		try {
-			const entries = await readdir(panelsPath, { withFileTypes: true });
-			const sources = [];
-			for (const entry of entries.filter(isPanelAppSourceEntry)) try {
-				sources.push(await this.readSource(panelsPath, entry.name));
-			} catch (error) {
-				if (!isPanelAppError(error) || error.code !== "PANEL_APP_NOT_FOUND") throw error;
-			}
-			return sources;
-		} catch (error) {
-			if (isPanelAppError(error)) throw error;
-			if (isMissingFileError$1(error)) return [];
-			throw new PanelAppError("PANEL_APP_READ_FAILED", error instanceof Error ? error.message : String(error));
-		}
-	};
-	resolveSource = async (panelsPath, id) => {
-		const sourceName = decodePanelAppId(id);
-		try {
-			return await this.readSource(panelsPath, sourceName);
-		} catch (error) {
-			if (isPanelAppError(error)) throw error;
-			if (isMissingFileError$1(error)) throw new PanelAppError("PANEL_APP_NOT_FOUND", "panel app not found");
-			throw new PanelAppError("PANEL_APP_READ_FAILED", error instanceof Error ? error.message : String(error));
-		}
-	};
-	getAsset = async (panelsPath, id, assetPath) => {
-		const source = await this.resolveSource(panelsPath, id);
-		if (source.kind !== "folder") throw new PanelAppError("PANEL_APP_NOT_FOUND", "panel app asset not found");
-		const filePath = resolvePanelAppRelativePath(source.sourcePath, assetPath);
-		try {
-			if (!(await stat(filePath)).isFile()) throw new PanelAppError("PANEL_APP_NOT_FOUND", "panel app asset not found");
-			return {
-				content: await readFile(filePath),
-				contentType: resolvePanelAppAssetContentType(filePath)
-			};
-		} catch (error) {
-			if (isPanelAppError(error)) throw error;
-			if (isMissingFileError$1(error)) throw new PanelAppError("PANEL_APP_NOT_FOUND", "panel app asset not found");
-			throw new PanelAppError("PANEL_APP_READ_FAILED", error instanceof Error ? error.message : String(error));
-		}
-	};
-	readSource = async (panelsPath, sourceName) => {
-		const sourcePath = join(panelsPath, sourceName);
-		const sourceStat = await stat(sourcePath);
-		if (sourceStat.isFile() && isPanelAppFileName(sourceName)) return {
-			kind: "single-file",
-			sourceName,
-			sourcePath,
-			entryPath: sourcePath,
-			sourceStat
-		};
-		if (sourceStat.isDirectory() && isPanelAppDirName(sourceName)) return await this.readFolderSource(sourcePath, sourceName, sourceStat);
-		throw new PanelAppError("PANEL_APP_NOT_FOUND", "panel app not found");
-	};
-	readFolderSource = async (sourcePath, sourceName, sourceStat) => {
-		try {
-			const manifest = await readPanelAppFolderManifest(sourcePath, sourceName);
-			const entryPath = resolvePanelAppRelativePath(sourcePath, manifest.entry);
-			if (!(await stat(entryPath)).isFile()) throw new PanelAppError("PANEL_APP_NOT_FOUND", "panel app entry not found");
-			return {
-				kind: "folder",
-				sourceName,
-				sourcePath,
-				entryPath,
-				manifest,
-				sourceStat
-			};
-		} catch (error) {
-			if (isPanelAppError(error)) throw error;
-			if (isMissingFileError$1(error)) throw new PanelAppError("PANEL_APP_NOT_FOUND", "panel app not found");
-			throw new PanelAppError("PANEL_APP_MANIFEST_INVALID", error instanceof Error ? error.message : String(error));
-		}
-	};
-};
-function isMissingFileError$1(error) {
-	return typeof error === "object" && error !== null && "code" in error && error.code === "ENOENT";
-}
-//#endregion
-//#region src/utils/panel-app-time.utils.ts
-function resolvePanelAppCreatedAt(fileStat) {
-	return fileStat.birthtimeMs > 0 ? fileStat.birthtime.toISOString() : fileStat.mtime.toISOString();
-}
-function resolvePanelAppActivityMs(entry) {
-	return Math.max(new Date(entry.lastOpenedAt ?? 0).getTime(), new Date(entry.createdAt).getTime(), new Date(entry.updatedAt).getTime());
-}
-//#endregion
-//#region src/tools/structured-result.tools.ts
-const STRUCTURED_RESULT_TOOL_NAME = "nextclaw_submit_result";
-var StructuredResultSubmitTool = class {
-	name = STRUCTURED_RESULT_TOOL_NAME;
-	description = "Submit the structured object result for this request.";
-	constructor(contract) {
-		this.contract = contract;
-	}
-	get parameters() {
-		return this.contract.schema;
-	}
-	validateArgs = (args) => validateToolArgs(args, this.contract.schema);
-	execute = async (args) => args;
-};
-//#endregion
-//#region src/utils/panel-app-agent.utils.ts
-const PANEL_APP_AGENT_DEFAULT_TIMEOUT_MS = 6e4;
-const PANEL_APP_AGENT_MAX_TIMEOUT_MS = 12e4;
-const PANEL_APP_AGENT_MAX_PROMPT_CHARS = 2e4;
-const PANEL_APP_AGENT_MAX_CONTEXT_CHARS = 8e4;
-function normalizePanelAppGenerateObjectInput(input) {
-	const peerId = input.peerId.trim();
-	const prompt = input.prompt.trim();
-	if (!peerId || !prompt || !isRecord$6(input.schema)) throw new PanelAppError("PANEL_APP_AGENT_REQUEST_INVALID", "invalid generateObject request");
-	if (prompt.length > PANEL_APP_AGENT_MAX_PROMPT_CHARS) throw new PanelAppError("PANEL_APP_AGENT_REQUEST_INVALID", "generateObject prompt is too large");
-	if (stringifyJsonValue(input.context ?? null).length > PANEL_APP_AGENT_MAX_CONTEXT_CHARS) throw new PanelAppError("PANEL_APP_AGENT_REQUEST_INVALID", "generateObject context is too large");
-	return {
-		context: input.context,
-		peerId,
-		prompt,
-		schema: input.schema,
-		timeoutMs: normalizeTimeoutMs(input.timeoutMs),
-		title: input.title?.trim() || void 0
-	};
-}
-function createPanelAppGenerateObjectMessage(params) {
-	const { bridgeSession, request, requestId } = params;
-	return {
-		id: `panel-app-agent-message-${randomUUID()}`,
-		metadata: {
-			...createPanelAppAgentMetadata(bridgeSession),
-			panel_app_peer_id: request.peerId,
-			structured_result: {
-				request_id: requestId,
-				schema: structuredClone(request.schema),
-				tool_name: STRUCTURED_RESULT_TOOL_NAME
-			}
-		},
-		parts: [{
-			type: "text",
-			text: buildGenerateObjectPrompt(bridgeSession, request)
-		}],
-		role: "user",
-		status: "final",
-		timestamp: (/* @__PURE__ */ new Date()).toISOString()
-	};
-}
-async function waitForPanelAppStructuredResult(agentRunClient, params) {
-	const iterator = agentRunClient.sendAndStreamEvents(params.payload)[Symbol.asyncIterator]();
-	let timeoutId;
-	const timeout = new Promise((_, reject) => {
-		timeoutId = setTimeout(() => reject(new PanelAppError("AGENT_OBJECT_RESULT_TIMEOUT", "agent object result timed out")), params.timeoutMs);
-	});
-	let resultToolCallId = null;
-	try {
-		while (true) {
-			const next = await Promise.race([iterator.next(), timeout]);
-			if (next.done) break;
-			const result = readStructuredResultEvent(next.value, resultToolCallId);
-			if (result.matchedToolCallId) resultToolCallId = result.matchedToolCallId;
-			if (result.submitted) return result.content;
-			throwIfTerminalError(next.value);
-		}
-	} finally {
-		if (timeoutId) clearTimeout(timeoutId);
-		await iterator.return?.(void 0);
-	}
-	throw new PanelAppError("AGENT_OBJECT_RESULT_NOT_SUBMITTED", "agent did not submit a structured object result");
-}
-function withPanelAppAgentMetadata(payload, bridgeSession) {
-	const panelAppMetadata = createPanelAppAgentMetadata(bridgeSession);
-	const peerId = readOptionalPeerId(payload.peerId);
-	const sessionId = readOptionalSessionId(payload.sessionId);
-	if (peerId && sessionId) throw new PanelAppError("PANEL_APP_AGENT_REQUEST_INVALID", "agent send request cannot include both sessionId and peerId");
-	const metadata = {
-		...payload.metadata ?? {},
-		...panelAppMetadata
-	};
-	if (peerId) metadata.panel_app_peer_id = peerId;
-	if (Array.isArray(payload.content)) return {
-		content: structuredClone(payload.content),
-		metadata,
-		peerId,
-		sessionId
-	};
-	if (!payload.message) throw new PanelAppError("PANEL_APP_AGENT_REQUEST_INVALID", "agent send request is required");
-	return {
-		message: {
-			...structuredClone(payload.message),
-			metadata: {
-				...payload.message.metadata ?? {},
-				...panelAppMetadata
-			}
-		},
-		metadata,
-		peerId,
-		sessionId
-	};
-}
-function createPanelAppAgentMetadata(bridgeSession) {
-	return {
-		agent_peer_scope: `panel-app:${bridgeSession.panelAppId}`,
-		panel_app_bridge_request_id: randomUUID(),
-		panel_app_id: bridgeSession.panelAppId,
-		source_kind: "panel_app"
-	};
+function injectPanelAppAssetBase(html, baseHref) {
+	const base = `<base href="${baseHref}">`;
+	if (/<base\b/i.test(html)) return html;
+	if (/<head[^>]*>/i.test(html)) return html.replace(/<head[^>]*>/i, (head) => `${head}${base}`);
+	return `${base}${html}`;
 }
-function normalizeTimeoutMs(timeoutMs) {
-	if (!Number.isFinite(timeoutMs) || typeof timeoutMs !== "number") return PANEL_APP_AGENT_DEFAULT_TIMEOUT_MS;
-	return Math.min(PANEL_APP_AGENT_MAX_TIMEOUT_MS, Math.max(1e3, Math.trunc(timeoutMs)));
+function encodePanelAppAssetPath(path) {
+	return path.split("/").filter(Boolean).map((segment) => encodeURIComponent(segment)).join("/");
 }
-function readOptionalPeerId(value) {
-	if (typeof value !== "string") return;
-	const peerId = value.trim();
-	if (!peerId) throw new PanelAppError("PANEL_APP_AGENT_REQUEST_INVALID", "agent peerId cannot be empty");
-	return peerId;
+function hasSafeBaseName(name) {
+	return !name.includes("/") && !name.includes("\\") && !name.includes("\0");
 }
-function readOptionalSessionId(value) {
-	if (typeof value !== "string") return;
-	const sessionId = value.trim();
-	if (!sessionId) throw new PanelAppError("PANEL_APP_AGENT_REQUEST_INVALID", "agent sessionId cannot be empty");
-	return sessionId;
+function isLikelyTextIcon(icon) {
+	return !icon.includes("/") && !icon.includes(".") && icon.length <= 4;
 }
-function buildGenerateObjectPrompt(bridgeSession, request) {
-	return [
-		"Panel App generateObject request",
-		"",
-		`Panel App ID: ${bridgeSession.panelAppId}`,
-		`Peer ID: ${request.peerId}`,
-		"",
-		"Context JSON:",
-		stringifyJsonValue(request.context ?? null),
-		"",
-		"Task:",
-		request.prompt,
-		"",
-		"Result contract:",
-		`Call the ${STRUCTURED_RESULT_TOOL_NAME} tool exactly once with an object matching the provided schema.`,
-		"Do not use natural language as the result."
-	].join("\n");
+function escapeRegExp(value) {
+	return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
-function readStructuredResultEvent(event, resultToolCallId) {
-	if (event.type === NcpEventType.MessageToolCallStart && event.payload.toolName === "nextclaw_submit_result") return {
-		matchedToolCallId: event.payload.toolCallId,
-		submitted: false
+//#endregion
+//#region src/services/panel-app-source.service.ts
+var PanelAppSourceService = class {
+	listSources = async (panelsPath) => {
+		try {
+			const entries = await readdir(panelsPath, { withFileTypes: true });
+			const sources = [];
+			for (const entry of entries.filter(isPanelAppSourceEntry)) try {
+				sources.push(await this.readSource(panelsPath, entry.name));
+			} catch (error) {
+				if (!isPanelAppError(error) || error.code !== "PANEL_APP_NOT_FOUND") throw error;
+			}
+			return sources;
+		} catch (error) {
+			if (isPanelAppError(error)) throw error;
+			if (isMissingFileError$1(error)) return [];
+			throw new PanelAppError("PANEL_APP_READ_FAILED", error instanceof Error ? error.message : String(error));
+		}
 	};
-	if (event.type !== NcpEventType.MessageToolCallResult || event.payload.toolCallId !== resultToolCallId) return { submitted: false };
-	assertToolResultContent(event.payload.content);
-	return {
-		content: event.payload.content,
-		submitted: true
+	resolveSource = async (panelsPath, id) => {
+		const sourceName = decodePanelAppId(id);
+		try {
+			return await this.readSource(panelsPath, sourceName);
+		} catch (error) {
+			if (isPanelAppError(error)) throw error;
+			if (isMissingFileError$1(error)) throw new PanelAppError("PANEL_APP_NOT_FOUND", "panel app not found");
+			throw new PanelAppError("PANEL_APP_READ_FAILED", error instanceof Error ? error.message : String(error));
+		}
+	};
+	getAsset = async (panelsPath, id, assetPath) => {
+		const source = await this.resolveSource(panelsPath, id);
+		if (source.kind !== "folder") throw new PanelAppError("PANEL_APP_NOT_FOUND", "panel app asset not found");
+		const filePath = resolvePanelAppRelativePath(source.sourcePath, assetPath);
+		try {
+			if (!(await stat(filePath)).isFile()) throw new PanelAppError("PANEL_APP_NOT_FOUND", "panel app asset not found");
+			return {
+				content: await readFile(filePath),
+				contentType: resolvePanelAppAssetContentType(filePath)
+			};
+		} catch (error) {
+			if (isPanelAppError(error)) throw error;
+			if (isMissingFileError$1(error)) throw new PanelAppError("PANEL_APP_NOT_FOUND", "panel app asset not found");
+			throw new PanelAppError("PANEL_APP_READ_FAILED", error instanceof Error ? error.message : String(error));
+		}
+	};
+	readSource = async (panelsPath, sourceName) => {
+		const sourcePath = join(panelsPath, sourceName);
+		const sourceStat = await stat(sourcePath);
+		if (sourceStat.isFile() && isPanelAppFileName(sourceName)) return {
+			kind: "single-file",
+			sourceName,
+			sourcePath,
+			entryPath: sourcePath,
+			sourceStat
+		};
+		if (sourceStat.isDirectory() && isPanelAppDirName(sourceName)) return await this.readFolderSource(sourcePath, sourceName, sourceStat);
+		throw new PanelAppError("PANEL_APP_NOT_FOUND", "panel app not found");
+	};
+	readFolderSource = async (sourcePath, sourceName, sourceStat) => {
+		try {
+			const manifest = await readPanelAppFolderManifest(sourcePath, sourceName);
+			const entryPath = resolvePanelAppRelativePath(sourcePath, manifest.entry);
+			if (!(await stat(entryPath)).isFile()) throw new PanelAppError("PANEL_APP_NOT_FOUND", "panel app entry not found");
+			return {
+				kind: "folder",
+				sourceName,
+				sourcePath,
+				entryPath,
+				manifest,
+				sourceStat
+			};
+		} catch (error) {
+			if (isPanelAppError(error)) throw error;
+			if (isMissingFileError$1(error)) throw new PanelAppError("PANEL_APP_NOT_FOUND", "panel app not found");
+			throw new PanelAppError("PANEL_APP_MANIFEST_INVALID", error instanceof Error ? error.message : String(error));
+		}
 	};
+};
+function isMissingFileError$1(error) {
+	return typeof error === "object" && error !== null && "code" in error && error.code === "ENOENT";
 }
-function assertToolResultContent(content) {
-	if (!isRecord$6(content) || content.ok !== false || !isRecord$6(content.error)) return;
-	if (content.error.code === "invalid_tool_arguments") throw new PanelAppError("AGENT_OBJECT_RESULT_SCHEMA_INVALID", "agent object result did not match the schema");
-	throw new PanelAppError("AGENT_OBJECT_REQUEST_FAILED", typeof content.error.message === "string" ? content.error.message : "agent object request failed");
+//#endregion
+//#region src/utils/panel-app-time.utils.ts
+function resolvePanelAppCreatedAt(fileStat) {
+	return fileStat.birthtimeMs > 0 ? fileStat.birthtime.toISOString() : fileStat.mtime.toISOString();
 }
-function throwIfTerminalError(event) {
-	if (event.type === NcpEventType.MessageFailed) throw new PanelAppError("AGENT_OBJECT_REQUEST_FAILED", event.payload.error.message);
-	if (event.type === NcpEventType.RunError) throw new PanelAppError("AGENT_OBJECT_REQUEST_FAILED", event.payload.error ?? "agent object request failed");
-	if (event.type === NcpEventType.RunFinished) throw new PanelAppError("AGENT_OBJECT_RESULT_NOT_SUBMITTED", "agent did not submit a structured object result");
+function resolvePanelAppActivityMs(entry) {
+	return Math.max(new Date(entry.lastOpenedAt ?? 0).getTime(), new Date(entry.createdAt).getTime(), new Date(entry.updatedAt).getTime());
 }
-function stringifyJsonValue(value) {
+//#endregion
+//#region src/utils/panel-app-content-source.utils.ts
+async function readPanelAppContentSource(params) {
+	const { createAssetBaseHref, id, panelsPath, sourceService } = params;
+	const source = await sourceService.resolveSource(panelsPath, id);
+	const html = await readFile(source.entryPath, "utf8");
+	const manifest = source.manifest ?? parsePanelAppManifest(html);
+	const sourceId = encodePanelAppId(source.sourceName);
+	return {
+		appId: resolvePanelAppAppId(source, manifest),
+		sourceId,
+		source,
+		manifest,
+		html,
+		htmlWithBase: source.kind === "folder" ? injectPanelAppAssetBase(html, createAssetBaseHref(source)) : html
+	};
+}
+async function readPanelAppContentSourceByIdOrAppId(params) {
+	const { appIdOrSourceId, createAssetBaseHref, panelsPath, sourceService } = params;
 	try {
-		return JSON.stringify(value, null, 2);
-	} catch {
-		throw new PanelAppError("PANEL_APP_AGENT_REQUEST_INVALID", "value is not JSON serializable");
+		return await readPanelAppContentSource({
+			createAssetBaseHref,
+			id: appIdOrSourceId,
+			panelsPath,
+			sourceService
+		});
+	} catch (error) {
+		if (!isPanelAppError(error)) throw error;
+		if (error.code !== "PANEL_APP_INVALID_ID" && error.code !== "PANEL_APP_NOT_FOUND") throw error;
+	}
+	const sources = await sourceService.listSources(panelsPath);
+	for (const source of sources) {
+		const html = await readFile(source.entryPath, "utf8");
+		if (resolvePanelAppAppId(source, source.manifest ?? parsePanelAppManifest(html)) === appIdOrSourceId) return await readPanelAppContentSource({
+			createAssetBaseHref,
+			id: encodePanelAppId(source.sourceName),
+			panelsPath,
+			sourceService
+		});
 	}
+	throw new PanelAppError("PANEL_APP_NOT_FOUND", "panel app not found");
 }
-function isRecord$6(value) {
-	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+function resolvePanelAppAppId(source, manifest) {
+	return manifest.id ?? encodePanelAppId(source.sourceName);
+}
+async function assertPanelAppDeclaresClient(params) {
+	const { appId, panelsPath, sourceService } = params;
+	const sources = await sourceService.listSources(panelsPath);
+	for (const source of sources) {
+		const manifest = source.manifest ?? parsePanelAppManifest(await readFile(source.entryPath, "utf8"));
+		if (resolvePanelAppAppId(source, manifest) !== appId) continue;
+		if (!manifest.client) throw new PanelAppError("PANEL_APP_CLIENT_NOT_DECLARED", "panel app did not declare client access");
+		return;
+	}
+	throw new PanelAppError("PANEL_APP_NOT_FOUND", "panel app not found");
 }
 //#endregion
 //#region src/managers/panel-app.manager.ts
@@ -4533,9 +4785,12 @@ const PANEL_APP_CONTENT_BASE_PATH = "/api/panel-apps";
 const PANEL_APP_TOKENIZED_ASSET_BASE_PATH = "/api/panel-app-assets";
 const PANEL_APP_CONTENT_TYPE = "text/html; charset=utf-8";
 const PANEL_APP_CAPABILITY_GRANTS_FILE_NAME = ".panel-app-capability-grants.json";
+const PANEL_APP_CLIENT_GRANTS_FILE_NAME = ".panel-app-client-grants.json";
+const PANEL_APP_RUNTIME_TOKEN_TTL_MS = 1440 * 60 * 1e3;
 var PanelAppManager = class {
 	bridgeSessions = /* @__PURE__ */ new Map();
 	agentRunClient;
+	agentBridgeService;
 	assetTokenService = new PanelAppAssetTokenService();
 	sourceService = new PanelAppSourceService();
 	constructor(params) {
@@ -4544,6 +4799,10 @@ var PanelAppManager = class {
 			eventBus: params.eventBus,
 			ingress: params.ingress
 		}) : null);
+		this.agentBridgeService = new PanelAppAgentBridgeService({
+			agentRunClient: this.agentRunClient,
+			createCapabilityGrantStore: this.createCapabilityGrantStore
+		});
 	}
 	listPanelApps = async () => {
 		const workspacePath = this.getWorkspacePath();
@@ -4557,20 +4816,35 @@ var PanelAppManager = class {
 		};
 	};
 	getPanelAppContent = async (id) => {
-		const panelsPath = this.getPanelsPath(this.getWorkspacePath());
 		try {
-			const source = await this.sourceService.resolveSource(panelsPath, id);
-			const html = await readFile(source.entryPath, "utf8");
-			const manifest = source.manifest ?? parsePanelAppManifest(html);
-			const sourceId = encodePanelAppId(source.sourceName);
-			const htmlWithBase = source.kind === "folder" ? injectPanelAppAssetBase(html, this.createAssetBaseHref(source)) : html;
+			const resolved = await readPanelAppContentSource({
+				createAssetBaseHref: this.createAssetBaseHref,
+				id,
+				panelsPath: this.getPanelsPath(this.getWorkspacePath()),
+				sourceService: this.sourceService
+			});
+			const clientGranted = await this.isPanelAppClientGranted(resolved.appId, resolved.manifest.client);
+			const session = this.createPanelAppRuntimeTokenSession({
+				appId: resolved.appId,
+				clientDeclared: resolved.manifest.client,
+				declaredActions: resolved.manifest.serviceActions,
+				declaredCapabilities: resolved.manifest.capabilities
+			});
+			const htmlWithBridge = injectPanelAppBridgeScript(resolved.htmlWithBase, {
+				appId: resolved.appId,
+				runtimeToken: session.token
+			});
+			const html = resolved.manifest.client && clientGranted ? injectPanelAppClientScript(htmlWithBridge, { runtimeToken: session.token }) : htmlWithBridge;
 			return {
-				id: sourceId,
-				fileName: source.sourceName,
-				html: injectPanelAppBridgeScript(htmlWithBase),
-				capabilities: manifest.capabilities,
+				id: resolved.sourceId,
+				appId: resolved.appId,
+				fileName: resolved.source.sourceName,
+				html,
+				capabilities: resolved.manifest.capabilities,
+				clientDeclared: resolved.manifest.client,
+				clientGranted,
 				contentType: PANEL_APP_CONTENT_TYPE,
-				serviceActions: manifest.serviceActions
+				serviceActions: resolved.manifest.serviceActions
 			};
 		} catch (error) {
 			if (isPanelAppError(error)) throw error;
@@ -4588,27 +4862,58 @@ var PanelAppManager = class {
 		const panelsPath = this.getPanelsPath(this.getWorkspacePath());
 		return await this.sourceService.getAsset(panelsPath, claims.panelAppId, assetPath);
 	};
-	getPanelAppBridgeScript = () => getPanelAppBridgeScript();
-	createPanelAppBridgeSession = async (params) => {
-		const content = await this.getPanelAppContent(params.id);
+	getPanelAppBridgeScript = () => getPanelAppBridgeScript({
+		appId: "",
+		runtimeToken: ""
+	});
+	createPanelAppRuntimeTokenSession = (params) => {
+		const { appId, clientDeclared, declaredActions, declaredCapabilities } = params;
 		const now = /* @__PURE__ */ new Date();
 		const session = {
 			id: randomUUID(),
 			token: randomUUID(),
-			panelAppId: content.id,
-			tabId: params.tabId,
+			appId,
 			caller: {
 				surface: "panel-app",
-				appId: content.id
+				appId
 			},
-			declaredCapabilities: content.capabilities,
-			declaredActions: content.serviceActions,
+			declaredCapabilities,
+			declaredActions,
+			clientDeclared,
 			createdAt: now.toISOString(),
-			expiresAt: new Date(now.getTime() + 3600 * 1e3).toISOString()
+			expiresAt: new Date(now.getTime() + PANEL_APP_RUNTIME_TOKEN_TTL_MS).toISOString()
 		};
 		this.bridgeSessions.set(session.token, session);
 		return session;
 	};
+	createPanelAppBridgeSession = async (params) => {
+		const resolved = await readPanelAppContentSourceByIdOrAppId({
+			appIdOrSourceId: params.id,
+			createAssetBaseHref: this.createAssetBaseHref,
+			panelsPath: this.getPanelsPath(this.getWorkspacePath()),
+			sourceService: this.sourceService
+		});
+		return this.createPanelAppRuntimeTokenSession({
+			appId: resolved.appId,
+			clientDeclared: resolved.manifest.client,
+			declaredActions: resolved.manifest.serviceActions,
+			declaredCapabilities: resolved.manifest.capabilities
+		});
+	};
+	grantPanelAppClient = async (appId) => {
+		await assertPanelAppDeclaresClient({
+			appId,
+			panelsPath: this.getPanelsPath(this.getWorkspacePath()),
+			sourceService: this.sourceService
+		});
+		return await this.createClientGrantStore().grant({
+			appId,
+			grantedAt: (/* @__PURE__ */ new Date()).toISOString()
+		});
+	};
+	revokePanelAppClient = async (appId) => {
+		await this.createClientGrantStore().revoke(appId);
+	};
 	resolvePanelAppBridgeSession = (token) => {
 		this.deleteExpiredBridgeSessions();
 		const session = this.bridgeSessions.get(token.trim());
@@ -4620,39 +4925,15 @@ var PanelAppManager = class {
 	};
 	sendAgentMessage = async (bridgeSessionToken, payload) => {
 		const bridgeSession = this.resolvePanelAppBridgeSession(bridgeSessionToken);
-		await this.assertAgentCapabilityGranted(bridgeSession, "agent:send");
-		return await this.requireAgentRunClient().send(withPanelAppAgentMetadata(payload, bridgeSession));
+		return await this.agentBridgeService.sendAgentMessage(bridgeSession, payload);
 	};
 	generateAgentObject = async (bridgeSessionToken, input) => {
 		const bridgeSession = this.resolvePanelAppBridgeSession(bridgeSessionToken);
-		await this.assertAgentCapabilityGranted(bridgeSession, "agent:generateObject");
-		const request = normalizePanelAppGenerateObjectInput(input);
-		const message = createPanelAppGenerateObjectMessage({
-			bridgeSession,
-			request,
-			requestId: randomUUID()
-		});
-		return { result: await waitForPanelAppStructuredResult(this.requireAgentRunClient(), {
-			payload: {
-				message,
-				metadata: {
-					...createPanelAppAgentMetadata(bridgeSession),
-					panel_app_peer_id: request.peerId
-				},
-				peerId: request.peerId
-			},
-			timeoutMs: request.timeoutMs
-		}) };
+		return await this.agentBridgeService.generateAgentObject(bridgeSession, input);
 	};
 	grantAgentCapability = async (bridgeSessionToken, capability) => {
 		const bridgeSession = this.resolvePanelAppBridgeSession(bridgeSessionToken);
-		if (!isPanelAppAgentCapability(capability)) throw new PanelAppError("PANEL_APP_AGENT_REQUEST_INVALID", "unknown panel app agent capability");
-		this.assertDeclaredCapability(bridgeSession, capability);
-		return await this.createCapabilityGrantStore().grant({
-			caller: bridgeSession.caller,
-			capability,
-			grantedAt: (/* @__PURE__ */ new Date()).toISOString()
-		});
+		return await this.agentBridgeService.grantAgentCapability(bridgeSession, capability);
 	};
 	updatePanelAppPreferences = async (id, preferences) => {
 		const fileName = await this.resolvePanelAppFileName(id);
@@ -4670,42 +4951,21 @@ var PanelAppManager = class {
 		const panelsPath = this.getPanelsPath(this.getWorkspacePath());
 		const source = await this.sourceService.resolveSource(panelsPath, id);
 		const panelAppId = encodePanelAppId(source.sourceName);
+		const appId = resolvePanelAppAppId(source, source.manifest ?? parsePanelAppManifest(await readFile(source.entryPath, "utf8")));
 		await rm(source.sourcePath, { recursive: source.kind === "folder" });
 		await this.createStateStore(panelsPath).deleteEntry(panelAppId);
 		await this.createCapabilityGrantStore().deleteCaller({
 			surface: "panel-app",
-			appId: panelAppId
+			appId
 		});
-		this.deleteBridgeSessionsByPanelAppId(panelAppId);
+		await this.createClientGrantStore().revoke(appId);
+		this.deleteBridgeSessionsByPanelAppId(appId);
 		return {
 			deleted: true,
 			fileName: source.sourceName,
 			id: panelAppId
 		};
 	};
-	assertAgentCapabilityGranted = async (bridgeSession, capability) => {
-		this.assertDeclaredCapability(bridgeSession, capability);
-		if (!await this.createCapabilityGrantStore().isGranted(bridgeSession.caller, capability)) throw new PanelAppError("AUTHORIZATION_REQUIRED", `This panel app needs permission to use ${capability}.`);
-	};
-	assertDeclaredCapability = (bridgeSession, capability) => {
-		if (!bridgeSession.declaredCapabilities.includes(capability)) throw new PanelAppError("PANEL_APP_CAPABILITY_NOT_DECLARED", this.describeMissingAgentCapability(bridgeSession.declaredCapabilities, capability));
-	};
-	describeMissingAgentCapability = (declaredCapabilities, capability) => {
-		const declared = declaredCapabilities.length > 0 ? declaredCapabilities.join(", ") : "none";
-		const valid = PANEL_APP_AGENT_CAPABILITIES.join(", ");
-		const hint = declaredCapabilities.includes(capability.replace(":", ".")) ? ` Use ${capability}, not ${capability.replace(":", ".")}.` : "";
-		return [
-			`panel app did not declare ${capability}.`,
-			`Declared: ${declared}.`,
-			`Valid capabilities: ${valid}.`,
-			`Declare it with nextclaw-panel-capabilities or panel-app.json capabilities.`,
-			hint.trim()
-		].filter(Boolean).join(" ");
-	};
-	requireAgentRunClient = () => {
-		if (!this.agentRunClient) throw new PanelAppError("PANEL_APP_AGENT_REQUEST_INVALID", "panel app agent client is not configured");
-		return this.agentRunClient;
-	};
 	getWorkspacePath = () => getWorkspacePathFromConfig(this.params.configManager.config);
 	getPanelsPath = (workspacePath) => join(workspacePath, DEFAULT_PANELS_DIR);
 	createAssetBaseHref = (source) => {
@@ -4717,13 +4977,16 @@ var PanelAppManager = class {
 	};
 	createStateStore = (panelsPath) => new PanelAppStateStore(panelsPath);
 	createCapabilityGrantStore = () => new PanelAppCapabilityGrantStore(join(this.getPanelsPath(this.getWorkspacePath()), PANEL_APP_CAPABILITY_GRANTS_FILE_NAME));
+	createClientGrantStore = () => new PanelAppClientGrantStore(join(this.getPanelsPath(this.getWorkspacePath()), PANEL_APP_CLIENT_GRANTS_FILE_NAME));
 	buildPanelAppEntry = async (source, state) => {
 		const manifest = source.manifest ?? parsePanelAppManifest(await readFile(source.entryPath, "utf8"));
 		const id = encodePanelAppId(source.sourceName);
+		const appId = resolvePanelAppAppId(source, manifest);
 		const createdAt = resolvePanelAppCreatedAt(source.sourceStat);
 		const updatedAt = source.sourceStat.mtime.toISOString();
 		const entry = {
 			id,
+			appId,
 			fileName: source.sourceName,
 			kind: source.kind,
 			title: manifest.title ?? toPanelAppTitle(source.sourceName),
@@ -4732,6 +4995,8 @@ var PanelAppManager = class {
 			updatedAt,
 			sizeBytes: source.sourceStat.size,
 			favorite: state.favorite ?? false,
+			clientDeclared: manifest.client,
+			clientGranted: await this.isPanelAppClientGranted(appId, manifest.client),
 			openCount: state.openCount ?? 0
 		};
 		if (manifest.description) entry.description = manifest.description;
@@ -4748,7 +5013,11 @@ var PanelAppManager = class {
 		for (const [token, session] of this.bridgeSessions) if (new Date(session.expiresAt).getTime() <= now) this.bridgeSessions.delete(token);
 	};
 	deleteBridgeSessionsByPanelAppId = (panelAppId) => {
-		for (const [token, session] of this.bridgeSessions) if (session.panelAppId === panelAppId) this.bridgeSessions.delete(token);
+		for (const [token, session] of this.bridgeSessions) if (session.appId === panelAppId) this.bridgeSessions.delete(token);
+	};
+	isPanelAppClientGranted = async (appId, clientDeclared) => {
+		if (!clientDeclared) return false;
+		return await this.createClientGrantStore().isGranted(appId);
 	};
 	isMissingFileError = (error) => typeof error === "object" && error !== null && "code" in error && error.code === "ENOENT";
 };
@@ -4860,7 +5129,7 @@ var McpServiceAppRuntimeService = class {
 				command: manifest.command,
 				args: manifest.args,
 				cwd: app.dirPath,
-				env: {},
+				env: createRuntimeChildEnv(process.env),
 				stderr: "pipe"
 			},
 			scope: {
@@ -5139,7 +5408,7 @@ var ServiceAppManager = class {
 		return record;
 	};
 	listServiceActions = async (params = {}) => {
-		const actions = (params.appId ? [await this.requireServiceApp(params.appId)] : await this.listValidServiceApps()).flatMap(({ manifest, record }) => this.listManifestActions(record, manifest));
+		const actions = (params.appId ? [await this.requireServiceApp(params.appId)] : await this.listValidServiceApps()).flatMap(({ manifest, record }) => listServiceAppManifestActions(record, manifest));
 		return await Promise.all(actions.map(async (action) => await this.withGrantState(action, params)));
 	};
 	discoverServiceAppActions = async (appId) => {
@@ -5234,7 +5503,7 @@ var ServiceAppManager = class {
 	};
 	requireServiceAction = async (actionId) => {
 		const { manifest, record } = await this.requireServiceAppForAction(actionId);
-		const action = this.listManifestActions(record, manifest).find((entry) => entry.id === actionId);
+		const action = listServiceAppManifestActions(record, manifest).find((entry) => entry.id === actionId);
 		if (!action) throw new ServiceAppError("SERVICE_APP_ACTION_NOT_FOUND", "service action not found");
 		return action;
 	};
@@ -5243,7 +5512,6 @@ var ServiceAppManager = class {
 		if (!appId) throw new ServiceAppError("SERVICE_APP_INVALID_ACTION", "service action id is invalid");
 		return await this.requireServiceApp(appId);
 	};
-	listManifestActions = (record, manifest) => listServiceAppManifestActions(record, manifest);
 	requireServiceApp = async (appId) => {
 		const dirPath = join(this.getServiceAppsPath(this.getWorkspacePath()), appId);
 		try {
@@ -5299,9 +5567,10 @@ var ServiceAppManager = class {
 	};
 	toServiceAppRecord = (dirPath, manifest) => {
 		const runtimeStatus = this.runtimeService.getStatus(manifest.id);
-		const record = {
+		return {
 			id: manifest.id,
 			title: manifest.title,
+			description: manifest.description,
 			dirPath,
 			manifestPath: getServiceAppManifestPath(dirPath),
 			command: manifest.command,
@@ -5309,14 +5578,12 @@ var ServiceAppManager = class {
 			cwd: dirPath,
 			enabled: manifest.enabled,
 			protocol: manifest.protocol,
-			status: manifest.enabled ? runtimeStatus.status : "stopped"
+			status: manifest.enabled ? runtimeStatus.status : "stopped",
+			lastError: runtimeStatus.lastError,
+			lastStartedAt: runtimeStatus.lastStartedAt,
+			lastReadyAt: runtimeStatus.lastReadyAt,
+			lastFailedAt: runtimeStatus.lastFailedAt
 		};
-		if (manifest.description) record.description = manifest.description;
-		if (runtimeStatus.lastError) record.lastError = runtimeStatus.lastError;
-		if (runtimeStatus.lastStartedAt) record.lastStartedAt = runtimeStatus.lastStartedAt;
-		if (runtimeStatus.lastReadyAt) record.lastReadyAt = runtimeStatus.lastReadyAt;
-		if (runtimeStatus.lastFailedAt) record.lastFailedAt = runtimeStatus.lastFailedAt;
-		return record;
 	};
 	assertCaller = (caller) => {
 		if (caller.surface !== "panel-app" || !caller.appId.trim()) throw new ServiceAppError("SERVICE_APP_INVALID_CALLER", "service action caller is invalid");
@@ -5336,7 +5603,7 @@ var ServiceAppManager = class {
 			throw new ServiceAppError("SERVICE_APP_READ_FAILED", error instanceof Error ? error.message : String(error));
 		}
 	};
-	isMissingFileError = (error) => Boolean(error) && typeof error === "object" && error.code === "ENOENT";
+	isMissingFileError = (error) => typeof error === "object" && error !== null && error.code === "ENOENT";
 };
 function toTitle(value) {
 	return basename(value).replace(/[-_]+/g, " ").trim() || value;
@@ -5351,7 +5618,6 @@ var MessageInbox = class {
 	drain = () => {
 		return this.messages.splice(0, this.messages.length);
 	};
-	isEmpty = () => this.messages.length === 0;
 };
 function isConversationStateEvent(event) {
 	return event.type !== NcpEventType.ContextWindowUpdated;
@@ -5359,10 +5625,10 @@ function isConversationStateEvent(event) {
 var SessionRun = class {
 	inbox = new MessageInbox();
 	sessionId;
+	statusListeners = /* @__PURE__ */ new Set();
 	activeRunId = null;
 	activeRunController = null;
-	constructor(seed, eventBus, stateManager = new DefaultNcpAgentConversationStateManager()) {
-		this.eventBus = eventBus;
+	constructor(seed, stateManager = new DefaultNcpAgentConversationStateManager()) {
 		this.stateManager = stateManager;
 		this.sessionId = seed.sessionId;
 		this.stateManager.hydrate({
@@ -5379,19 +5645,20 @@ var SessionRun = class {
 		const conversationEvents = events.filter(isConversationStateEvent);
 		if (conversationEvents.length > 0) await this.stateManager.dispatchBatch(conversationEvents);
 	};
-	applyAndPublishEvents = async (events, meta) => {
-		await this.applyEvents(events);
-		for (const event of events) this.eventBus?.emit(eventKeys.ncpEvent, event, {
-			emittedAt: meta.emittedAt ?? (/* @__PURE__ */ new Date()).toISOString(),
-			source: meta.source
-		});
+	onStatusChange = (listener) => {
+		this.statusListeners.add(listener);
+		return () => {
+			this.statusListeners.delete(listener);
+		};
 	};
 	beginRun = () => {
 		if (this.activeRunId) throw new Error(`Session ${this.sessionId} already has an active run.`);
+		const wasRunning = this.isRunning();
 		const runId = `agent-run-${randomUUID()}`;
 		const controller = new AbortController();
 		this.activeRunId = runId;
 		this.activeRunController = controller;
+		this.emitStatusChangeIfNeeded(wasRunning);
 		return {
 			runId,
 			signal: controller.signal
@@ -5400,30 +5667,43 @@ var SessionRun = class {
 	abortRun = (runId) => {
 		if (!this.activeRunId || !this.activeRunController) return false;
 		if (runId && this.activeRunId !== runId) return false;
+		const wasRunning = this.isRunning();
 		this.activeRunController.abort();
+		this.activeRunController = null;
+		this.activeRunId = null;
+		this.emitStatusChangeIfNeeded(wasRunning);
 		return true;
 	};
 	isRunning = () => this.activeRunId !== null;
 	dispose = () => {
+		const wasRunning = this.isRunning();
 		this.activeRunController?.abort();
 		this.activeRunController = null;
 		this.activeRunId = null;
+		this.emitStatusChangeIfNeeded(wasRunning);
+		this.statusListeners.clear();
 	};
 	applyRunEvents = (events) => {
+		const wasRunning = this.isRunning();
 		for (const event of events) {
 			if (event.type === NcpEventType.RunStarted && event.payload.runId) this.activeRunId = event.payload.runId;
-			if (event.type === NcpEventType.MessageAbort || (event.type === NcpEventType.RunFinished || event.type === NcpEventType.RunError) && (!event.payload.runId || event.payload.runId === this.activeRunId)) {
+			if ((event.type === NcpEventType.RunFinished || event.type === NcpEventType.RunError) && (!event.payload.runId || event.payload.runId === this.activeRunId)) {
 				this.activeRunId = null;
 				this.activeRunController = null;
 			}
 		}
+		this.emitStatusChangeIfNeeded(wasRunning);
+	};
+	emitStatusChangeIfNeeded = (wasRunning) => {
+		const running = this.isRunning();
+		if (running === wasRunning) return;
+		for (const listener of [...this.statusListeners]) listener(running ? "running" : "idle");
 	};
 };
 var SessionRunManager = class {
 	runs = /* @__PURE__ */ new Map();
-	constructor(sessionManager, eventBus) {
+	constructor(sessionManager) {
 		this.sessionManager = sessionManager;
-		this.eventBus = eventBus;
 	}
 	getSessionRun = (sessionId) => this.runs.get(sessionId) ?? null;
 	isSessionRunning = (sessionId) => this.runs.get(sessionId.trim())?.isRunning() ?? false;
@@ -5432,7 +5712,7 @@ var SessionRunManager = class {
 		const run = new SessionRun({
 			messages: await this.sessionManager.listSessionMessages(sessionId),
 			sessionId
-		}, this.eventBus);
+		});
 		this.runs.set(sessionId, run);
 		return run;
 	};
@@ -5684,7 +5964,7 @@ var NcpAgentSessionMetadataStore = class {
 	read = async (sessionId, activitySnapshot) => {
 		try {
 			const parsed = JSON.parse(await readFile(this.metadataPath(sessionId), "utf-8"));
-			if (!isRecord$9(parsed) || parsed._type !== "metadata" || !isRecord$9(parsed.metadata)) throw new Error(`invalid ncp agent session metadata sidecar: ${sessionId}`);
+			if (!isRecord$10(parsed) || parsed._type !== "metadata" || !isRecord$10(parsed.metadata)) throw new Error(`invalid ncp agent session metadata sidecar: ${sessionId}`);
 			const createdAt = toIsoString(parsed.created_at, activitySnapshot.createdAt);
 			const agentId = normalizeNcpAgentId(typeof parsed.agent_id === "string" ? parsed.agent_id : void 0);
 			return {
@@ -5785,7 +6065,7 @@ var NcpAgentSessionSummaryIndexStore = class {
 function serializeJournalEntry(entry) {
 	const serialized = JSON.stringify(entry);
 	if (!serialized) throw new Error("ncp agent session journal entry serialization produced empty output");
-	if (!isRecord$9(JSON.parse(serialized))) throw new Error("ncp agent session journal entry serialization produced a non-object entry");
+	if (!isRecord$10(JSON.parse(serialized))) throw new Error("ncp agent session journal entry serialization produced a non-object entry");
 	return serialized;
 }
 var NcpAgentSessionJournalStore = class {
@@ -6001,15 +6281,15 @@ var NcpAgentSessionJournalStore = class {
 				console.warn(`[ncp-agent-session-journal] skipped corrupted journal line ${index + 1}: ${error instanceof Error ? error.message : String(error)}`);
 				continue;
 			}
-			if (!isRecord$9(parsed)) continue;
+			if (!isRecord$10(parsed)) continue;
 			if (parsed._type === "metadata") {
-				metadata = isRecord$9(parsed.metadata) ? structuredClone(parsed.metadata) : {};
+				metadata = isRecord$10(parsed.metadata) ? structuredClone(parsed.metadata) : {};
 				agentId = normalizeNcpAgentId(typeof parsed.agent_id === "string" ? parsed.agent_id : void 0);
 				createdAt = toIsoString(parsed.created_at, createdAt);
 				updatedAt = toIsoString(parsed.updated_at, updatedAt);
 				continue;
 			}
-			if (parsed._type === "event" && isRecord$9(parsed.event)) {
+			if (parsed._type === "event" && isRecord$10(parsed.event)) {
 				const seq = Number(parsed.seq);
 				nextSeq = Math.max(nextSeq, Number.isFinite(seq) ? Math.trunc(seq) + 1 : nextSeq);
 				updatedAt = toIsoString(parsed.timestamp, updatedAt);
@@ -7785,11 +8065,19 @@ function formatErrorStatus(error) {
 	}
 	return "运行出错";
 }
-function createSessionActivityPreviewFromNcpEvent(event, timestamp) {
+function readToolCallId(value) {
+	if (typeof value !== "string") return null;
+	const trimmed = value.trim();
+	return trimmed.length > 0 ? trimmed : null;
+}
+function formatToolDoneStatus(toolName) {
+	return toolName ? `工具调用完成：${toolName}` : "工具调用完成";
+}
+function createSessionActivityPreviewFromNcpEvent(event, timestamp, options = {}) {
 	switch (event.type) {
 		case NcpEventType.RunStarted: return createProjection(readSessionId(event.payload.sessionId), {
 			state: "running",
-			statusText: "正在处理...",
+			statusText: "正在思考",
 			timestamp
 		});
 		case NcpEventType.RunFinished: return createProjection(readSessionId(event.payload.sessionId), {
@@ -7830,11 +8118,15 @@ function createSessionActivityPreviewFromNcpEvent(event, timestamp) {
 			timestamp
 		});
 		case NcpEventType.MessageToolCallEnd:
-		case NcpEventType.MessageToolCallResult: return createProjection(readSessionId(event.payload.sessionId), {
-			state: "running",
-			statusText: "工具调用完成",
-			timestamp
-		});
+		case NcpEventType.MessageToolCallResult: {
+			const sessionId = readSessionId(event.payload.sessionId);
+			const toolCallId = readToolCallId(event.payload.toolCallId);
+			return createProjection(sessionId, {
+				state: "running",
+				statusText: formatToolDoneStatus(sessionId && toolCallId ? options.readToolName?.(sessionId, toolCallId) ?? null : null),
+				timestamp
+			});
+		}
 		default: return null;
 	}
 }
@@ -7902,13 +8194,16 @@ function writeSessionActivityPreviewMetadata(metadata, projection) {
 var SessionActivityPreviewContribution = class {
 	unsubscribeNcpEvent = null;
 	metadataWriteChains = /* @__PURE__ */ new Map();
+	toolNames = /* @__PURE__ */ new Map();
 	constructor(kernel) {
 		this.kernel = kernel;
 	}
 	start = () => {
 		if (this.unsubscribeNcpEvent) return;
 		this.unsubscribeNcpEvent = this.kernel.eventBus.on(eventKeys.ncpEvent, (event) => {
-			const projection = createSessionActivityPreviewFromNcpEvent(event, (/* @__PURE__ */ new Date()).toISOString());
+			this.rememberToolName(event);
+			const projection = createSessionActivityPreviewFromNcpEvent(event, (/* @__PURE__ */ new Date()).toISOString(), { readToolName: this.readToolName });
+			this.clearFinishedRunToolNames(event);
 			if (!projection) return;
 			this.updatePreview(projection);
 		});
@@ -7917,7 +8212,29 @@ var SessionActivityPreviewContribution = class {
 		this.unsubscribeNcpEvent?.();
 		this.unsubscribeNcpEvent = null;
 		this.metadataWriteChains.clear();
+		this.toolNames.clear();
+	};
+	rememberToolName = (event) => {
+		if (event.type !== NcpEventType.MessageToolCallStart) return;
+		const sessionId = event.payload.sessionId.trim();
+		const toolCallId = event.payload.toolCallId.trim();
+		const toolName = event.payload.toolName.trim();
+		if (!sessionId || !toolCallId || !toolName) return;
+		this.toolNames.set(this.createToolNameKey(sessionId, toolCallId), toolName);
+	};
+	readToolName = (sessionId, toolCallId) => this.toolNames.get(this.createToolNameKey(sessionId, toolCallId)) ?? null;
+	clearFinishedRunToolNames = (event) => {
+		if (event.type !== NcpEventType.RunFinished && event.type !== NcpEventType.RunError) return;
+		const sessionId = this.readNonEmptyString(event.payload.sessionId);
+		if (!sessionId) return;
+		for (const key of this.toolNames.keys()) if (key.startsWith(`${sessionId}:`)) this.toolNames.delete(key);
+	};
+	readNonEmptyString = (value) => {
+		if (typeof value !== "string") return null;
+		const trimmed = value.trim();
+		return trimmed.length > 0 ? trimmed : null;
 	};
+	createToolNameKey = (sessionId, toolCallId) => `${sessionId}:${toolCallId}`;
 	updatePreview = (projection) => {
 		const next = (this.metadataWriteChains.get(projection.sessionId) ?? Promise.resolve()).then(() => this.updatePreviewMetadata(projection));
 		this.metadataWriteChains.set(projection.sessionId, next.catch(() => void 0));
@@ -8630,7 +8947,7 @@ var NextclawKernel = class {
 			})
 		});
 		this.contextCompactionManager = new AgentRunContextCompactionManager(this.configManager, this.llmProviders, this.sessionManager);
-		this.sessionRunManager = new SessionRunManager(this.sessionManager, this.eventBus);
+		this.sessionRunManager = new SessionRunManager(this.sessionManager);
 		this.agentRunRequestManager = new AgentRunRequestManager(this.agentRuntimeManager, this.configManager, this.contextProviderManager, this.eventBus, this.ingress, this.sessionManager, this.sessionRunManager, this.toolProviderManager);
 		this.contributions = [
 			new ToolProviderContribution(this),