@xopcai/xopc 0.0.253 → 0.0.255

package/dist/src/gateway/hono/routes/browser.js

@@ -1,9 +1,52 @@
 import { decideBrowserApproval, listBrowserApprovals } from "../../../browser/policy/approval-store.js";
+import { createBrowserDriver } from "../../../browser/drivers/create-driver.js";
+import { checkBrowserReadiness } from "../../../browser/readiness.js";
 import { isLoopbackClientIp } from "../../security/loopback.js";
 import { getConnInfo } from "@hono/node-server/conninfo";
 //#region src/gateway/hono/routes/browser.ts
 /** Browser Control status, approvals, and driver diagnostics. */
 const EXTENSION_ENDPOINT = "http://127.0.0.1:19820/";
+async function extensionStatus() {
+	const { getExtensionBrowserServerSnapshot } = await import("../../../browser/providers/extension-ws-acquire.js");
+	const snapshot = getExtensionBrowserServerSnapshot();
+	let running = snapshot.active;
+	let socketConnected = false;
+	let connected = false;
+	let protocolVersion = null;
+	let expectedProtocolVersion = null;
+	let extensionVersion = null;
+	try {
+		const payload = await (await fetch(EXTENSION_ENDPOINT, { signal: AbortSignal.timeout(2e3) })).json();
+		running ||= payload.ok === true;
+		socketConnected = payload.socketConnected ?? payload.connected === true;
+		connected = payload.connected === true;
+		protocolVersion = typeof payload.protocolVersion === "number" ? payload.protocolVersion : null;
+		expectedProtocolVersion = typeof payload.expectedProtocolVersion === "number" ? payload.expectedProtocolVersion : null;
+		extensionVersion = typeof payload.extensionVersion === "string" ? payload.extensionVersion : null;
+	} catch {}
+	const { browserExtDoctor } = await import("../../../browser/providers/browser-ext-install.js");
+	const doctor = await browserExtDoctor({ runtimeExtensionVersion: extensionVersion ?? void 0 });
+	return {
+		running,
+		socketConnected,
+		connected,
+		driverKind: "extension",
+		protocolVersion,
+		expectedProtocolVersion,
+		extensionVersion,
+		artifacts: {
+			installed: doctor.installed,
+			bundledAvailable: doctor.bundledAvailable,
+			extensionDir: doctor.extensionDir,
+			xopcVersion: doctor.xopcVersion,
+			installedVersion: doctor.installedVersion,
+			needsRefresh: doctor.needsRefresh,
+			needsChromeReload: doctor.needsChromeReload || socketConnected && !connected
+		},
+		bridgeHeld: snapshot.active,
+		refCount: snapshot.refCount
+	};
+}
 function isLocalOwnerRequest(c, service) {
 	if (service.currentConfig.gateway?.bind === "loopback") return true;
 	try {
@@ -15,37 +58,116 @@ function isLocalOwnerRequest(c, service) {
 function registerBrowserRoutes(authenticated, deps) {
 	const { service, strictRateLimitMiddleware } = deps;
 	authenticated.get("/api/browser/extension-status", async (c) => {
-		const { getExtensionBrowserServerSnapshot } = await import("../../../browser/providers/extension-ws-acquire.js");
-		const snapshot = getExtensionBrowserServerSnapshot();
-		let running = snapshot.active;
-		let connected = false;
 		try {
-			const payload = await (await fetch(EXTENSION_ENDPOINT, { signal: AbortSignal.timeout(2e3) })).json();
-			running ||= payload.ok === true;
-			connected = payload.connected === true;
-		} catch {}
-		let artifacts;
-		try {
-			const { browserExtDoctor } = await import("../../../browser/providers/browser-ext-install.js");
-			const doctor = await browserExtDoctor();
-			artifacts = {
-				installed: doctor.installed,
-				extensionDir: doctor.extensionDir,
-				xopcVersion: doctor.xopcVersion,
-				installedVersion: doctor.installedVersion,
-				needsRefresh: doctor.needsRefresh,
-				needsChromeReload: doctor.needsChromeReload
-			};
-		} catch {}
+			return c.json(await extensionStatus());
+		} catch (error) {
+			return c.json({
+				running: false,
+				connected: false,
+				driverKind: "extension",
+				error: error instanceof Error ? error.message : String(error)
+			});
+		}
+	});
+	authenticated.get("/api/browser/status", async (c) => {
+		const config = service.currentConfig.browser;
+		if (!config.enabled) return c.json({
+			ok: true,
+			payload: {
+				enabled: false,
+				driverKind: config.driver.kind,
+				state: "disabled"
+			}
+		});
+		const readiness = await checkBrowserReadiness(service.currentConfig);
+		const driverStatus = config.driver.kind === "extension" ? await extensionStatus().catch((error) => ({ error: error instanceof Error ? error.message : String(error) })) : config.driver.kind === "playwright" ? await import("../../../browser/providers/playwright-doctor.js").then(({ playwrightChromiumDoctor }) => playwrightChromiumDoctor()) : void 0;
+		const extensionConnected = config.driver.kind === "extension" ? driverStatus.connected === true : true;
+		const extensionProtocolDetail = config.driver.kind === "extension" && "socketConnected" in driverStatus && driverStatus.socketConnected && !driverStatus.connected ? `Chrome extension protocol ${driverStatus.protocolVersion ?? "unknown"} does not match ${driverStatus.expectedProtocolVersion ?? "the gateway"}. Reload the extension in Chrome.` : void 0;
 		return c.json({
-			running,
-			connected,
-			driverKind: "extension",
-			artifacts,
-			bridgeHeld: snapshot.active,
-			refCount: snapshot.refCount
+			ok: true,
+			payload: {
+				enabled: true,
+				driverKind: config.driver.kind,
+				state: !readiness && extensionConnected ? "ready" : "needs_attention",
+				reason: readiness?.hint.reason ?? (extensionConnected ? void 0 : "extension_not_connected"),
+				detail: readiness?.hint.detail ?? extensionProtocolDetail,
+				driverStatus
+			}
 		});
 	});
+	authenticated.post("/api/browser/test", strictRateLimitMiddleware, async (c) => {
+		if (!isLocalOwnerRequest(c, service)) return c.json({
+			ok: false,
+			error: "Local owner access required."
+		}, 403);
+		if (!service.currentConfig.browser.enabled) return c.json({
+			ok: false,
+			error: "Browser Control is disabled."
+		}, 400);
+		const startedAt = Date.now();
+		let driver;
+		try {
+			driver = await createBrowserDriver(service.currentConfig.browser);
+			await driver.connect();
+			return c.json({
+				ok: true,
+				payload: {
+					driverKind: service.currentConfig.browser.driver.kind,
+					durationMs: Date.now() - startedAt
+				}
+			});
+		} catch (error) {
+			return c.json({
+				ok: false,
+				error: error instanceof Error ? error.message : String(error)
+			}, 400);
+		} finally {
+			await driver?.disconnect().catch(() => {});
+		}
+	});
+	authenticated.post("/api/browser/extension/install", strictRateLimitMiddleware, async (c) => {
+		if (!isLocalOwnerRequest(c, service)) return c.json({
+			ok: false,
+			error: "Local owner access required."
+		}, 403);
+		const body = await c.req.json().catch(() => ({}));
+		try {
+			const { browserExtDoctor, ensureBrowserExtensionArtifacts } = await import("../../../browser/providers/browser-ext-install.js");
+			const result = await ensureBrowserExtensionArtifacts({ force: body.force === true });
+			return c.json({
+				ok: true,
+				payload: {
+					...result,
+					doctor: await browserExtDoctor()
+				}
+			});
+		} catch (error) {
+			return c.json({
+				ok: false,
+				error: error instanceof Error ? error.message : String(error)
+			}, 500);
+		}
+	});
+	authenticated.post("/api/browser/extension/open", strictRateLimitMiddleware, async (c) => {
+		if (!isLocalOwnerRequest(c, service)) return c.json({
+			ok: false,
+			error: "Local owner access required."
+		}, 403);
+		const body = await c.req.json().catch(() => ({}));
+		const action = body.action === "chrome" || body.action === "folder" || body.action === "both" ? body.action : "both";
+		try {
+			const { openBrowserExtensionInstallUi } = await import("../../../browser/providers/browser-ext-install.js");
+			return c.json({
+				ok: true,
+				payload: await openBrowserExtensionInstallUi({ action })
+			});
+		} catch (error) {
+			return c.json({
+				ok: false,
+				error: error instanceof Error ? error.message : String(error)
+			}, 400);
+		}
+	});
 	authenticated.get("/api/browser/approvals", (c) => {
 		if (!isLocalOwnerRequest(c, service)) return c.json({
 			ok: false,

package/dist/src/gateway/hono/routes/lazy-bundles.js

@@ -53,7 +53,7 @@ const AUTHENTICATED_LAZY_ROUTE_BUNDLES = [
 	},
 	{
 		id: "browser-install",
-		match: (path) => path === "/api/browser/playwright/install/stream",
+		match: (path) => path === "/api/browser/playwright/install/stream" || path === "/api/browser/playwright/install/cancel",
 		load: async () => {
 			const { registerBrowserInstallRoutes } = await import("./browser-install.js");
 			return { register: registerBrowserInstallRoutes };
@@ -192,7 +192,7 @@ const AUTHENTICATED_LAZY_ROUTE_BUNDLES = [
 	},
 	{
 		id: "notes",
-		match: (path) => startsWithAny(path, ["/api/notes"]),
+		match: (path) => startsWithAny(path, ["/api/notes"]) && !/^\/api\/notes\/[^/]+\/hosted-publications(?:\/.*)?$/.test(path),
 		load: async () => {
 			const { registerNotesRoutes } = await import("./notes.js");
 			return { register: registerNotesRoutes };
@@ -224,7 +224,7 @@ const AUTHENTICATED_LAZY_ROUTE_BUNDLES = [
 	},
 	{
 		id: "shares",
-		match: (path) => startsWithAny(path, ["/api/shares"]) || /^\/api\/sessions\/[^/]+\/(?:share-preview|shares|hosted-shares)(?:\/.*)?$/.test(path),
+		match: (path) => startsWithAny(path, ["/api/shares", "/api/hosted-publications"]) || /^\/api\/notes\/[^/]+\/hosted-publications(?:\/.*)?$/.test(path) || /^\/api\/sessions\/[^/]+\/(?:share-preview|shares|hosted-shares)(?:\/.*)?$/.test(path),
 		load: async () => {
 			const { registerShareRoutes } = await import("./shares.js");
 			return { register: registerShareRoutes };

package/dist/src/gateway/hono/routes/models.js

@@ -1,5 +1,5 @@
-import { resolveModelsJsonPath } from "../../../config/paths.js";
 import { init_resolve_config_value, testApiKeyResolution } from "../../../config/resolve-config-value.js";
+import { resolveModelsJsonPath } from "../../../config/paths.js";
 import { init_models_json, loadModelsJson, saveModelsJson, validateModelsConfig } from "../../../config/models-json.js";
 import { getModelCatalogStore, init_model_catalog_store } from "../../../providers/model-catalog-store.js";
 import { getModelRegistry } from "../../../providers/model-registry.js";

package/dist/src/gateway/hono/routes/sessions.js

@@ -1,9 +1,9 @@
 import { buildSessionKey, init_session_key } from "../../../routing/session-key.js";
 import { resolveProjectAgentId } from "../../../projects/project-agent.js";
 import "../../../projects/index.js";
+import { messagesToClientHistory } from "../../../session/client-history.js";
 import { evictEmbeddedSessionRunner } from "../../../agent/embedded/session-runner.js";
 import { SessionEnvironmentService } from "../../../execution-environments/session-environment-service.js";
-import { messagesToClientHistory } from "../../../session/client-history.js";
 import { deleteMediaUrisNoLongerReferenced } from "../../../media/session-references.js";
 import { getGatewayPrincipal } from "../../security/gateway-principal.js";
 import { createGatewayRouteLogger, logRouteError } from "../lib/route-logger.js";