@agimon-ai/doompi-computer-use 0.0.1-alpha.49 → 0.0.1-alpha.51

package/dist/extensions/server.mjs

@@ -1,10 +1,11 @@
 import { a as COMMAND_NAME, i as COMMAND_DESCRIPTION, r as ComputerScriptRunner, t as DefaultComputerUseExtensionService } from "../extensionService-BSqhP2uB.mjs";
-import { a as computerScriptOutput, d as COMPUTER_USE_ROUTES, f as COMPUTER_USE_STATUS_KEY, i as computerScriptFailure, l as COMPUTER_USE_MODE_ID, m as computerUseChannelType, n as modeState, o as API_BASE_PATH, p as COMPUTER_USE_WAKE_LIMIT, r as computerObservationOutput, s as COMPUTER_USE_CONFIRMATION_WINDOW_MS } from "../computerUseMode-C1r5mG7K.mjs";
+import { a as computerScriptOutput, d as COMPUTER_USE_ROUTES, f as COMPUTER_USE_STATUS_KEY, i as computerScriptFailure, l as COMPUTER_USE_MODE_ID, m as computerUseChannelType, n as modeState, o as API_BASE_PATH, p as COMPUTER_USE_WAKE_LIMIT, r as computerObservationOutput, s as COMPUTER_USE_CONFIRMATION_WINDOW_MS } from "../computerUseMode-QSRNQAYf.mjs";
 import path from "node:path";
 import { composeRootHooks, defineChannel, defineRoot, defineRoutedContribution } from "@agimon-ai/doompi-core/extensionFile";
 import { defineMinorMode, serverMinorModes } from "@agimon-ai/doompi-minor-mode";
 import { defineServerPlugin } from "@agimon-ai/doompi-core/serverFacet";
 import { randomUUID } from "node:crypto";
+import { doomApiCallerFrom } from "@agimon-ai/doompi-core/packageApi";
 import { apiResponse, defineApiRoutes } from "@agimon-ai/doompi-core/web";
 //#region src/services/mcpTools/index.ts
 const COMPUTER_USE_MCP_TOOLS_SERVICE = "doom/computer-use-mcp-tools";
@@ -33,12 +34,28 @@ function mountMcpTools(tools) {
 * disagreement this file exists to prevent. The dispatcher now reads this
 * table, so the page, the broker and the hub all resolve one set of strings.
 *
-* Only `activate` is reachable from a browser. The `/agent/` and `/hub/` routes
+* Activation, status, cancellation and recording reads are reachable from a browser. The `/agent/` and `/hub/` routes
 * each demand a host-issued bearer token and answer 404 without one; they are
 * declared here because they are this API's surface, not because a page calls
 * them.
 */
 var apiRoutes_default = defineApiRoutes({
+	artifact: {
+		method: "GET",
+		path: COMPUTER_USE_ROUTES.artifact,
+		query: ["artifactId", "offset"],
+		raw: true
+	},
+	activationState: {
+		method: "GET",
+		path: COMPUTER_USE_ROUTES.activate,
+		response: apiResponse()
+	},
+	cancelActivation: {
+		method: "DELETE",
+		path: COMPUTER_USE_ROUTES.activate,
+		response: apiResponse()
+	},
 	activate: {
 		method: "POST",
 		path: COMPUTER_USE_ROUTES.activate,
@@ -154,6 +171,7 @@ function artifactView(value) {
 	return {
 		artifactId: input.artifactId,
 		status: input.status,
+		...typeof input.sizeBytes === "number" && Number.isSafeInteger(input.sizeBytes) && input.sizeBytes > 0 ? { sizeBytes: input.sizeBytes } : {},
 		...downloadUrl === void 0 ? {} : { downloadUrl },
 		...previewUrl === void 0 ? {} : { previewUrl },
 		...typeof input.actionCount === "number" ? { actionCount: input.actionCount } : {},
@@ -274,9 +292,10 @@ var ComputerUseRequestBroker = class ComputerUseRequestBroker {
 		return token !== void 0 && request.headers.get("authorization") === `Bearer ${token}`;
 	}
 	async requestActivation(request) {
-		if (!this.desktop?.available || !this.desktop.authorize(request.headers)) return jsonError("Not found.", 404);
+		if (!this.desktop?.available || !(this.desktop.authorizeActivation?.(request.headers) ?? this.desktop.authorize(request.headers))) return jsonError("Not found.", 404);
 		if (this.desktop.enabled === false) return jsonError("Enable computer use in global Desktop settings first.", 409);
-		const caller = {
+		const stamped = doomApiCallerFrom(request.headers);
+		const caller = stamped?.locality === "remote" ? stamped : {
 			locality: "local",
 			stepUp: "not-required"
 		};
@@ -284,10 +303,10 @@ var ComputerUseRequestBroker = class ComputerUseRequestBroker {
 		const input = await body(request);
 		const target = record$1(input.target);
 		const durationMs = input.durationMs;
-		if (target === void 0 || typeof target.windowId !== "string" || typeof target.bundleId !== "string") return jsonError("A Desktop target is required.", 400);
+		if (target === void 0 && (input.target !== void 0 || caller.locality !== "remote") || target !== void 0 && (typeof target.windowId !== "string" || typeof target.bundleId !== "string")) return jsonError("A Desktop target is required, or a remote request must leave selection to the Mac.", 400);
 		if (typeof durationMs !== "number" || !Number.isInteger(durationMs) || durationMs < 1e3 || durationMs > 18e5) return jsonError("The requested duration is invalid.", 400);
-		this.desktop.claim();
 		try {
+			this.desktop.claim(request.headers);
 			await this.beforeActivate?.();
 		} catch (error) {
 			return jsonError(error instanceof Error ? error.message : String(error), 409);
@@ -296,7 +315,7 @@ var ComputerUseRequestBroker = class ComputerUseRequestBroker {
 		const createdAt = Date.now();
 		this.activation = Object.freeze({
 			requestId: randomUUID(),
-			target: Object.freeze({ ...target }),
+			...target === void 0 ? {} : { target: Object.freeze({ ...target }) },
 			durationSeconds: durationMs / 1e3,
 			createdAt,
 			confirmationExpiresAt: createdAt + COMPUTER_USE_CONFIRMATION_WINDOW_MS,
@@ -358,7 +377,28 @@ var ComputerUseRequestBroker = class ComputerUseRequestBroker {
 	}
 	async fetch(request) {
 		if (this.closed) return jsonError("Computer-use broker is closed.", 503);
-		const path = new URL(request.url).pathname;
+		const url = new URL(request.url);
+		const path = url.pathname;
+		if (request.method === "GET" && path === apiRoutes_default.artifact.path) {
+			if (!(this.desktop?.authorizeRecording?.(request.headers) ?? this.desktop?.authorize(request.headers)) || !this.desktop?.fetchRecording) return jsonError("Not found.", 404);
+			const artifactId = url.searchParams.get("artifactId") ?? "";
+			const offsetText = url.searchParams.get("offset") ?? "";
+			const offset = Number(offsetText);
+			if (!/^[0-9]+$/u.test(offsetText) || !Number.isSafeInteger(offset) || offset < 0 || offset > 134217728) return jsonError("Invalid recording offset.", 400);
+			return this.desktop.fetchRecording(artifactId, `bytes=${offset}-${offset + 1048576 - 1}`);
+		}
+		if (path === apiRoutes_default.activate.path && request.method === "GET") {
+			if (!this.desktop?.authorizePending?.(request.headers) && !(this.desktop?.authorizeRecording?.(request.headers) ?? this.desktop?.authorize(request.headers))) return jsonError("Not found.", 404);
+			return Response.json(this.state());
+		}
+		if (path === apiRoutes_default.activate.path && request.method === "DELETE") {
+			if (!this.desktop?.authorizePending?.(request.headers)) return jsonError("Not found.", 404);
+			if (this.phase !== "awaiting_confirmation" && this.phase !== "activating") return jsonError("No activation is pending.", 409);
+			this.phase = "stopping";
+			this.rejectPending("The activation was cancelled.");
+			this.changed();
+			return Response.json(this.state(), { status: 202 });
+		}
 		if (request.method === "POST" && path === apiRoutes_default.activate.path) return this.requestActivation(request);
 		const agent = path.startsWith("/agent/");
 		const hub = path.startsWith("/hub/");
@@ -415,6 +455,11 @@ var ComputerUseRequestBroker = class ComputerUseRequestBroker {
 				} else {
 					const host = record$1(input.host);
 					if (typeof host?.grantId !== "string" || !Number.isFinite(host.expiresAt) || host.expiresAt <= Date.now()) return jsonError("Desktop did not issue a complete grant.", 502);
+					const selectedTarget = record$1(host.target);
+					if (this.activation !== void 0 && selectedTarget !== void 0) this.activation = Object.freeze({
+						...this.activation,
+						target: Object.freeze({ ...selectedTarget })
+					});
 					this.grantId = host.grantId;
 					this.expiresAt = host.expiresAt;
 					this.actionSequence = 0;
@@ -435,7 +480,7 @@ var ComputerUseRequestBroker = class ComputerUseRequestBroker {
 				this.grantId = void 0;
 				this.expiresAt = void 0;
 				this.activation = void 0;
-				this.artifact = artifactView(input.artifact);
+				this.artifact = artifactView(input.artifact) ?? this.artifact;
 			}
 			this.changed();
 			return Response.json(this.state());
@@ -965,10 +1010,10 @@ function createComputerUseChannel() {
 				const authorization = await responseJson(await sessionRequest(scope, COMPUTER_USE_ROUTES.hubAuthorization));
 				let artifact;
 				if (authorization !== null && host.computerUse?.available) try {
-					artifact = await host.computerUse.request(scope, {
+					artifact = record(await host.computerUse.request(scope, {
 						operation: "stop",
 						payload: { grantId: authorization.grantId }
-					});
+					}))?.artifact;
 				} catch (error) {
 					const message = error instanceof Error ? error.message : String(error);
 					artifact = {
@@ -1134,7 +1179,7 @@ function createComputerUseChannel() {
 			};
 		},
 		receive(scope, payload, connection) {
-			if (connection.desktopAuthorized !== true) return;
+			if (connection.desktopAuthorized !== true && connection.computerUseAuthorized !== true) return;
 			receiveCommand?.(scope, payload);
 		}
 	};