fix opencing in browser

Rhys Sullivan committed 8 months ago

Commit e7159681 parent f93d2873 files · +93 −14Browse files

Unified · Split

3 files

apps/executor/src/cli/interaction-handling.test.ts +37 −0
apps/executor/src/cli/interaction-handling.ts +18 −0
apps/executor/src/cli/main.ts +38 −14

apps/executor/src/cli/interaction-handling.test.ts+37−0

@@ -0,0 +1,37 @@
	1	import { describe, expect, it } from "@effect/vitest";
	2
	3	import { decideInteractionHandling } from "./interaction-handling";
	4
	5	describe("interaction-handling", () => {
	6	it("keeps URL interactions distinct when the terminal is non-interactive", () => {
	7	expect(decideInteractionHandling({
	8	parsed: {
	9	mode: "url",
	10	message: "Connect Axiom",
	11	url: "https://mcp.axiom.co/authorize",
	12	},
	13	isInteractiveTerminal: false,
	14	})).toBe("url_paused");
	15	});
	16
	17	it("waits on URL interactions in an interactive terminal", () => {
	18	expect(decideInteractionHandling({
	19	parsed: {
	20	mode: "url",
	21	message: "Connect Axiom",
	22	url: "https://mcp.axiom.co/authorize",
	23	},
	24	isInteractiveTerminal: true,
	25	})).toBe("url_interactive");
	26	});
	27
	28	it("falls back to form pause handling for non-interactive prompts", () => {
	29	expect(decideInteractionHandling({
	30	parsed: {
	31	mode: "form",
	32	message: "Approve tool call",
	33	},
	34	isInteractiveTerminal: false,
	35	})).toBe("form_paused");
	36	});
	37	});

apps/executor/src/cli/interaction-handling.ts+18−0

@@ -0,0 +1,18 @@
	1	import type { ParsedInteractionPayload } from "./pending-interaction-output";
	2
	3	export type InteractionHandling =
	4	\| "url_interactive"
	5	\| "url_paused"
	6	\| "form_interactive"
	7	\| "form_paused";
	8
	9	export const decideInteractionHandling = (input: {
	10	parsed: ParsedInteractionPayload \| null;
	11	isInteractiveTerminal: boolean;
	12	}): InteractionHandling => {
	13	if (input.parsed?.mode === "url") {
	14	return input.isInteractiveTerminal ? "url_interactive" : "url_paused";
	15	}
	16
	17	return input.isInteractiveTerminal ? "form_interactive" : "form_paused";
	18	};

apps/executor/src/cli/main.ts+38−14

   buildPausedExecutionOutput,
   parseInteractionPayload,
 } from "./pending-interaction-output";
+import { decideInteractionHandling } from "./interaction-handling";
 const toError = (cause: unknown): Error =>
   cause instanceof Error ? cause : new Error(String(cause));
       }
       const parsed = parseInteractionPayload(pending);
-      const isInteractiveTerminal = process.stdin.isTTY && process.stdout.isTTY;
+      const handling = decideInteractionHandling({
-      if (!isInteractiveTerminal) {
+        parsed,
+        isInteractiveTerminal: process.stdin.isTTY && process.stdout.isTTY,
+      });
+      if (handling === "url_interactive" && parsed?.mode === "url") {
+        yield* printUrlInteraction({
+          message: parsed.message,
+          url: parsed.url ?? null,
+          shouldOpen: input.shouldOpenUrls,
+        });
+        current = yield* waitForExecutionProgress({
+          client: input.client,
+          workspaceId: input.workspaceId,
+          executionId: current.execution.id,
+          pendingInteractionId: pending.id,
+        });
+        continue;
+      }
+      if (handling === "url_paused") {
+        if (input.shouldOpenUrls && parsed?.mode === "url" && parsed.url) {
+          yield* openUrlInBrowser(parsed.url);
+        }
         const paused = buildPausedExecutionOutput({
           executionId: current.execution.id,
           interaction: pending,
         return current;
       }
-      if (parsed?.mode === "url") {
+      if (handling === "form_paused") {
-        yield* printUrlInteraction({
+        const paused = buildPausedExecutionOutput({
-          message: parsed.message,
-          url: parsed.url ?? null,
-          shouldOpen: input.shouldOpenUrls,
-        });
-        current = yield* waitForExecutionProgress({
-          client: input.client,
-          workspaceId: input.workspaceId,
           executionId: current.execution.id,
-          pendingInteractionId: pending.id,
+          interaction: pending,
+          baseUrl: input.baseUrl,
+          shouldOpenUrls: input.shouldOpenUrls,
+          cliName: CLI_NAME,
         });
-        continue;
+        yield* Effect.sync(() => {
+          console.log(JSON.stringify(paused));
+          process.exitCode = 20;
+        });
+        return current;
       }
       const responseJson = yield* promptInteraction({