Skip to content

fix(server): give Prime Agent scoped browser tools #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rynfar merged 1 commit into from
Aug 25, 2026
Merged

fix(server): give Prime Agent scoped browser tools #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions apps/server/src/provider/Layers/PrimeAgentAdapter.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import * as Schema from "effect/Schema";
import * as Stream from "effect/Stream";

import {
EnvironmentId,
PrimeAgentSettings,
ProviderDriverKind,
ProviderInstanceId,
Expand All @@ -25,6 +26,7 @@ import {
} from "@t3tools/contracts";

import { ServerConfig } from "../../config.ts";
import * as McpProviderSession from "../../mcp/McpProviderSession.ts";
import {
makePrimeAgentAdapter,
parsePrimeAgentResumeMarker,
Expand Down Expand Up @@ -126,6 +128,19 @@ exec ${process.execPath} ${mockAgentPath} "$@"
assert.equal(rejectedLaunchArgs._tag, "Failure");

const threadId = ThreadId.make("resume/thread");
const mcpSession = {
providerSessionId: "provider-session-prime-acp-test",
threadId,
environmentId: EnvironmentId.make("environment-prime-acp-test"),
providerInstanceId: ProviderInstanceId.make("primeAgent"),
endpoint: "http://127.0.0.1:4321/mcp/provider-session-prime-acp-test",
authorizationHeader: "Bearer scoped-secret",
expiresAt: 4_000_000_000_000,
};
yield* Effect.acquireRelease(
Effect.sync(() => McpProviderSession.setMcpProviderSession(mcpSession)),
() => Effect.sync(() => McpProviderSession.clearMcpProviderSession(threadId)),
);
const startupWarning = yield* Deferred.make<void>();
const unavailableResources =
yield* Deferred.make<
Expand Down Expand Up @@ -316,6 +331,25 @@ exec ${process.execPath} ${mockAgentPath} "$@"
.map((line) => JSON.parse(line) as unknown),
),
);
const newSessionEntry = requestEntries.find(
(entry) =>
typeof entry === "object" &&
entry !== null &&
"method" in entry &&
entry.method === "session/new",
);
assert.isDefined(newSessionEntry);
const newSessionParams = (
newSessionEntry as { readonly params?: { readonly mcpServers?: unknown } }
).params;
assert.deepEqual(newSessionParams?.mcpServers, [
{
name: "t3-code",
type: "http",
url: mcpSession.endpoint,
headers: [{ name: "Authorization", value: mcpSession.authorizationHeader }],
},
]);
assert.isTrue(
requestEntries.some(
(entry) =>
Expand Down
19 changes: 19 additions & 0 deletions apps/server/src/provider/Layers/PrimeAgentAdapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import type * as EffectAcpSchema from "effect-acp/schema";

import { resolveAttachmentPath } from "../../attachmentStore.ts";
import { ServerConfig } from "../../config.ts";
import * as McpProviderSession from "../../mcp/McpProviderSession.ts";
import {
ProviderAdapterProcessError,
ProviderAdapterRequestError,
Expand Down Expand Up @@ -518,6 +519,7 @@ export function makePrimeAgentAdapter(
provider: PROVIDER,
threadId: input.threadId,
});
const mcpSession = McpProviderSession.readMcpProviderSession(input.threadId);
const acp = yield* makePrimeAgentAcpRuntime({
primeAgentSettings,
...(options?.environment ? { environment: options.environment } : {}),
Expand All @@ -526,6 +528,23 @@ export function makePrimeAgentAdapter(
sessionDir,
continueSession: parsePrimeAgentResumeMarker(input.resumeCursor),
model,
...(mcpSession === undefined
? {}
: {
mcpServers: [
{
type: "http" as const,
name: "t3-code",
url: mcpSession.endpoint,
headers: [
{
name: "Authorization",
value: mcpSession.authorizationHeader,
},
],
},
],
}),
clientInfo: { name: "pylon", version: "0.0.0" },
observeSessionUpdate: (notification) => {
const update = parsePrimeAgentAcpTerminalUpdate(notification);
Expand Down
144 changes: 120 additions & 24 deletions apps/server/src/provider/Layers/ProviderService.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import type {
} from "@t3tools/contracts";
import {
ApprovalRequestId,
EnvironmentId,
EventId,
ProviderDriverKind,
ProviderInstanceId,
Expand All @@ -29,6 +30,7 @@ import {
import { createModelSelection } from "@t3tools/shared/model";
import { it, assert, describe, vi } from "@effect/vitest";

import * as Deferred from "effect/Deferred";
import * as Effect from "effect/Effect";
import * as Exit from "effect/Exit";
import * as Fiber from "effect/Fiber";
Expand Down Expand Up @@ -59,6 +61,7 @@ import * as ProviderEventLoggers from "./ProviderEventLoggers.ts";
import { ProviderSessionDirectoryLive } from "./ProviderSessionDirectory.ts";
import * as NodeServices from "@effect/platform-node/NodeServices";
import * as ProviderSessionRuntime from "../../persistence/ProviderSessionRuntime.ts";
import * as McpProviderSession from "../../mcp/McpProviderSession.ts";
import {
makeSqlitePersistenceLive,
SqlitePersistenceMemory,
Expand Down Expand Up @@ -2551,40 +2554,46 @@ validation.layer("ProviderServiceLive validation", (it) => {
describe("agent browser access", () => {
const revokedThreads: Array<ThreadId> = [];

const makeAgentBrowserProviderLayer = (
enableAgentBrowserAccess: boolean,
codex: ReturnType<typeof makeFakeCodexAdapter>,
options: NonNullable<Parameters<typeof makeProviderServiceLive>[0]>,
) => {
const providerAdapterLayer = Layer.succeed(
ProviderAdapterRegistry.ProviderAdapterRegistry,
makeAdapterRegistryMock({ [CODEX_DRIVER]: codex.adapter }),
);
const runtimeRepositoryLayer = ProviderSessionRuntime.layer.pipe(
Layer.provide(SqlitePersistenceMemory),
);
const directoryLayer = ProviderSessionDirectoryLive.pipe(Layer.provide(runtimeRepositoryLayer));
return makeProviderServiceLive(options).pipe(
Layer.provide(providerAdapterLayer),
Layer.provide(directoryLayer),
Layer.provide(ServerSettings.ServerSettingsService.layerTest({ enableAgentBrowserAccess })),
Layer.provide(serverConfigTestLayer),
Layer.provide(AnalyticsService.layerTest),
Layer.provide(
Layer.succeed(
ProviderEventLoggers.ProviderEventLoggers,
ProviderEventLoggers.NoOpProviderEventLoggers,
),
),
);
};

const startSessionWith = (enableAgentBrowserAccess: boolean, threadId: ThreadId) =>
Effect.gen(function* () {
const issued: Array<ThreadId> = [];
const codex = makeFakeCodexAdapter();
const providerAdapterLayer = Layer.succeed(
ProviderAdapterRegistry.ProviderAdapterRegistry,
makeAdapterRegistryMock({ [CODEX_DRIVER]: codex.adapter }),
);
const runtimeRepositoryLayer = ProviderSessionRuntime.layer.pipe(
Layer.provide(SqlitePersistenceMemory),
);
const directoryLayer = ProviderSessionDirectoryLive.pipe(
Layer.provide(runtimeRepositoryLayer),
);
const providerLayer = makeProviderServiceLive({
const providerLayer = makeAgentBrowserProviderLayer(enableAgentBrowserAccess, codex, {
issueMcpCredential: (request) =>
Effect.sync(() => {
issued.push(request.threadId);
return undefined;
}),
revokeMcpCredential: (revoked) => Effect.sync(() => void revokedThreads.push(revoked)),
}).pipe(
Layer.provide(providerAdapterLayer),
Layer.provide(directoryLayer),
Layer.provide(ServerSettings.ServerSettingsService.layerTest({ enableAgentBrowserAccess })),
Layer.provide(serverConfigTestLayer),
Layer.provide(AnalyticsService.layerTest),
Layer.provide(
Layer.succeed(
ProviderEventLoggers.ProviderEventLoggers,
ProviderEventLoggers.NoOpProviderEventLoggers,
),
),
);
});

yield* Effect.gen(function* () {
const provider = yield* ProviderService.ProviderService;
Expand All @@ -2599,6 +2608,17 @@ describe("agent browser access", () => {
return issued;
});

const issuedBrowserCredential = (threadId: ThreadId) => ({
config: {
environmentId: EnvironmentId.make("environment-browser-test"),
threadId,
providerSessionId: `provider-session-${threadId}`,
providerInstanceId: codexInstanceId,
endpoint: `http://127.0.0.1:4321/mcp/provider-session-${threadId}`,
authorizationHeader: "Bearer scoped-secret",
},
});

// Credential issuance is the observable that matters: it is the only place a
// credential is minted, and `/mcp` accepts nothing else, so withholding it is
// what actually denies every provider and external MCP client.
Expand Down Expand Up @@ -2633,4 +2653,80 @@ describe("agent browser access", () => {
assert.deepEqual(issued, [threadId]);
}).pipe(Effect.provide(NodeServices.layer)),
);

it.effect("revokes the MCP credential when an adapter session exits on its own", () =>
Effect.gen(function* () {
const threadId = asThreadId("thread-browser-terminal");
const codex = makeFakeCodexAdapter();
const revoked = yield* Deferred.make<ThreadId>();
const providerLayer = makeAgentBrowserProviderLayer(true, codex, {
issueMcpCredential: (request) => Effect.succeed(issuedBrowserCredential(request.threadId)),
revokeMcpCredential: (revokedThreadId) =>
Deferred.succeed(revoked, revokedThreadId).pipe(Effect.asVoid),
});

yield* Effect.gen(function* () {
const provider = yield* ProviderService.ProviderService;
yield* provider.startSession(threadId, {
provider: CODEX_DRIVER,
providerInstanceId: codexInstanceId,
threadId,
runtimeMode: "full-access",
});
assert.isDefined(McpProviderSession.readMcpProviderSession(threadId));
yield* codex.stopSession(threadId);
yield* Effect.yieldNow;
codex.emit({
type: "session.exited",
eventId: asEventId("evt-browser-terminal"),
provider: CODEX_DRIVER,
createdAt: "2026-01-01T00:00:00.000Z",
threadId,
payload: { exitKind: "error" },
});

assert.equal(yield* Deferred.await(revoked), threadId);
assert.isUndefined(McpProviderSession.readMcpProviderSession(threadId));
}).pipe(Effect.provide(providerLayer));
}).pipe(Effect.provide(NodeServices.layer)),
);

it.effect("revokes the MCP credential even when explicit adapter stop fails", () =>
Effect.gen(function* () {
const threadId = asThreadId("thread-browser-stop-failure");
const codex = makeFakeCodexAdapter();
const revoked = yield* Deferred.make<ThreadId>();
codex.stopSession.mockImplementationOnce(() =>
Effect.fail(
new ProviderAdapterRequestError({
provider: CODEX_DRIVER,
method: "stopSession",
detail: "synthetic stop failure",
}),
),
);
const providerLayer = makeAgentBrowserProviderLayer(true, codex, {
issueMcpCredential: (request) => Effect.succeed(issuedBrowserCredential(request.threadId)),
revokeMcpCredential: (revokedThreadId) =>
Deferred.succeed(revoked, revokedThreadId).pipe(Effect.asVoid),
});

yield* Effect.gen(function* () {
const provider = yield* ProviderService.ProviderService;
yield* provider.startSession(threadId, {
provider: CODEX_DRIVER,
providerInstanceId: codexInstanceId,
threadId,
runtimeMode: "full-access",
});
assert.isDefined(McpProviderSession.readMcpProviderSession(threadId));

const stopped = yield* provider.stopSession({ threadId }).pipe(Effect.result);

assert.equal(stopped._tag, "Failure");
assert.equal(yield* Deferred.await(revoked), threadId);
assert.isUndefined(McpProviderSession.readMcpProviderSession(threadId));
}).pipe(Effect.provide(providerLayer));
}).pipe(Effect.provide(NodeServices.layer)),
);
});
Loading
Loading