Skip to content

Commit ad0d620

Browse files
committed
Merge remote-tracking branch 'origin/main' into fix/cache-shell-discovery
2 parents 1555833 + ce9e016 commit ad0d620

10 files changed

Lines changed: 367 additions & 101 deletions

File tree

‎apps/server/src/mcp/toolkits/preview/handlers.test.ts‎

Lines changed: 92 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,107 @@
11
import { describe, expect, it } from "@effect/vitest";
22
import * as NodeServices from "@effect/platform-node/NodeServices";
3-
import { ThreadId } from "@t3tools/contracts";
3+
import {
4+
EnvironmentId,
5+
PreviewTabId,
6+
ProviderInstanceId,
7+
ThreadId,
8+
type PreviewAutomationRequest,
9+
} from "@t3tools/contracts";
10+
import * as Deferred from "effect/Deferred";
411
import * as Effect from "effect/Effect";
512
import * as FileSystem from "effect/FileSystem";
613
import * as Layer from "effect/Layer";
714
import * as Path from "effect/Path";
15+
import * as Stream from "effect/Stream";
816

917
import {
1018
createPendingAttachmentId,
1119
parseThreadSegmentFromAttachmentId,
1220
} from "../../../attachmentStore.ts";
1321
import * as ServerConfig from "../../../config.ts";
14-
import { claimPreviewRecording } from "./handlers.ts";
22+
import * as McpInvocationContext from "../../McpInvocationContext.ts";
23+
import * as McpToolAccess from "../../McpToolAccess.ts";
24+
import { liveThreadsLayer } from "../../McpToolAccess.testkit.ts";
25+
import * as PreviewAutomationBroker from "../../PreviewAutomationBroker.ts";
26+
import { claimPreviewRecording, layerStandard } from "./handlers.ts";
27+
import { PreviewStandardToolkit } from "./tools.ts";
28+
29+
it.effect("preview_open navigates the opened tab to a dev server in one tool call", () =>
30+
Effect.scoped(
31+
Effect.gen(function* () {
32+
const scope = yield* McpInvocationContext.McpInvocationContext;
33+
const broker = yield* PreviewAutomationBroker.PreviewAutomationBroker;
34+
const connected = yield* Deferred.make<void>();
35+
const tabId = PreviewTabId.make("opened-tab");
36+
const target = {
37+
kind: "environment-port" as const,
38+
port: 3000,
39+
path: "/settings?tab=account",
40+
};
41+
const requests: PreviewAutomationRequest[] = [];
42+
const status = {
43+
available: true,
44+
visible: false,
45+
tabId,
46+
url: "http://localhost:3000/settings?tab=account",
47+
title: "Settings",
48+
loading: false,
49+
};
50+
const events = yield* broker.connect({
51+
clientId: "client-1",
52+
environmentId: scope.environmentId,
53+
});
54+
yield* Stream.runForEach(events, (event) => {
55+
if (event.type === "connected") return Deferred.succeed(connected, undefined);
56+
requests.push(event.request);
57+
return broker.respond({
58+
clientId: "client-1",
59+
connectionId: event.connectionId,
60+
requestId: event.request.requestId,
61+
ok: true,
62+
result: event.request.operation === "open" ? { ...status, url: "about:blank" } : status,
63+
});
64+
}).pipe(Effect.forkScoped);
65+
yield* Deferred.await(connected);
66+
const toolkit = yield* PreviewStandardToolkit.pipe(
67+
Effect.provide(McpToolAccess.HandlersLayer.layer(layerStandard)),
68+
);
69+
const results = yield* toolkit
70+
.handle("preview_open", {
71+
url: "http://localhost:3000",
72+
target,
73+
open: false,
74+
reuseExistingTab: false,
75+
})
76+
.pipe(Stream.unwrap, Stream.runCollect);
77+
expect(results.at(-1)?.result).toEqual(status);
78+
expect(requests.map(({ operation, input }) => ({ operation, input }))).toEqual([
79+
{ operation: "open", input: { open: false, show: false, reuseExistingTab: false } },
80+
{ operation: "navigate", input: { target } },
81+
]);
82+
expect(requests[1]?.tabId).toBe(tabId);
83+
expect(requests[1]?.tabIdExplicit).toBe(true);
84+
}).pipe(
85+
Effect.provideService(McpInvocationContext.McpInvocationContext, {
86+
environmentId: EnvironmentId.make("environment-1"),
87+
requestNamespace: "provider-session-1",
88+
thread: {
89+
threadId: ThreadId.make("thread-1"),
90+
providerSessionId: "provider-session-1",
91+
providerInstanceId: ProviderInstanceId.make("codex"),
92+
},
93+
client: undefined,
94+
capabilities: new Set(["preview"] as const),
95+
issuedAt: 1,
96+
}),
97+
Effect.provide(
98+
Layer.mergeAll(PreviewAutomationBroker.layer, liveThreadsLayer).pipe(
99+
Layer.provide(NodeServices.layer),
100+
),
101+
),
102+
),
103+
),
104+
);
15105

16106
describe("claimPreviewRecording", () => {
17107
it.effect("overlapping and repeated claims return the same retained recording", () =>

‎apps/server/src/mcp/toolkits/preview/handlers.ts‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,21 @@ const handlers = {
195195
preview_status: McpToolAccess.readsAsCaller((input) =>
196196
invokeTargeted<PreviewAutomationStatus>("status", input ?? {}),
197197
),
198-
preview_open: McpToolAccess.actsAsCaller((input) =>
199-
invokeTargeted<PreviewAutomationStatus>("open", normalizePreviewOpenInput(input)),
198+
// Models often pass a dev server as both `url` and `target`; the target knows the environment.
199+
preview_open: McpToolAccess.actsAsCaller(({ target, url, ...input }) =>
200+
Effect.gen(function* () {
201+
const opened = yield* invokeTargeted<PreviewAutomationStatus>(
202+
"open",
203+
normalizePreviewOpenInput(
204+
target === undefined && url !== undefined ? { ...input, url } : input,
205+
),
206+
);
207+
if (target === undefined || opened.tabId === null) return opened;
208+
return yield* invokeTargeted<PreviewAutomationStatus>("navigate", {
209+
target,
210+
tabId: opened.tabId,
211+
});
212+
}),
200213
),
201214
preview_navigate: McpToolAccess.actsAsCaller((input) =>
202215
invokeTargeted<PreviewAutomationStatus>("navigate", input, input.timeoutMs),

‎apps/server/src/mcp/toolkits/preview/tools.test.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { expect, it } from "@effect/vitest";
2+
import * as Schema from "effect/Schema";
23
import { Tool } from "effect/ai";
34

45
import { PreviewToolkit } from "./tools.ts";
@@ -36,3 +37,17 @@ it("exports provider-compatible object schemas", () => {
3637
).toBeDefined();
3738
}
3839
});
40+
41+
it("preview_open accepts a target while preserving open input constraints", () => {
42+
const decode = Schema.decodeUnknownSync(PreviewToolkit.tools.preview_open.parametersSchema);
43+
const target = { kind: "environment-port", port: 3000 };
44+
expect(decode({ target })).toEqual({ target });
45+
expect(decode({})).toEqual({});
46+
expect(decode({ url: "https://example.com" })).toEqual({ url: "https://example.com" });
47+
expect(decode({ url: "http://localhost:3000", target })).toEqual({
48+
url: "http://localhost:3000",
49+
target,
50+
});
51+
expect(() => decode({ target: { ...target, port: 0 } })).toThrow();
52+
expect(() => decode({ target, tabId: "tab-1", reuseExistingTab: false })).toThrow();
53+
});

‎apps/server/src/mcp/toolkits/preview/tools.ts‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import {
2+
BrowserNavigationTarget,
23
OrchestratorMcpFailure,
34
ToolActivityIcon,
45
PreviewAutomationActInput,
@@ -62,11 +63,17 @@ const PreviewStatusTool = Tool.make("preview_status", {
6263
.annotate(Tool.Destructive, false)
6364
.annotate(Tool.Idempotent, true);
6465

66+
// `url` already covers websites, so open only adds the dev-server target.
67+
const EnvironmentPortTarget = BrowserNavigationTarget.members[1];
68+
6569
const PreviewOpenTool = browserTool(
6670
Tool.make("preview_open", {
6771
description:
68-
"Open a preview tab in this thread and show it. `open=false` keeps it in the background. Reuses your current tab unless `tabId` or `reuseExistingTab=false` says otherwise. Parallel subagents in one session must each use `reuseExistingTab=false`, then their own returned `tabId`.",
69-
parameters: PreviewAutomationOpenInput,
72+
"Open a preview tab in this thread and show it. For a dev server, pass `target` instead of `url`. `open=false` keeps it in the background. Reuses your current tab unless `tabId` or `reuseExistingTab=false` says otherwise. Parallel subagents in one session must each use `reuseExistingTab=false`, then their own returned `tabId`.",
73+
parameters: PreviewAutomationOpenInput.mapFields(
74+
(fields) => ({ ...fields, target: Schema.optional(EnvironmentPortTarget) }),
75+
{ unsafePreserveChecks: true },
76+
),
7077
success: PreviewAutomationStatus,
7178
failure: PreviewToolFailure,
7279
dependencies,
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"claudeSystemAppendBytes": 5153,
33
"codexAdditionalContextBytes": 6883,
4-
"mcpToolListJsonBytes": 47074
4+
"mcpToolListJsonBytes": 47538
55
}

‎apps/server/src/scheduledTasks/ScheduledTaskService.test.ts‎

Lines changed: 69 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as Scheduler from "../scheduling/Scheduler.ts";
22
import * as NodeUtil from "node:util";
33

44
import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
5-
import { assert, it } from "@effect/vitest";
5+
import { assert, it, vi } from "@effect/vitest";
66
import {
77
ProjectId,
88
ProviderInstanceId,
@@ -12,6 +12,7 @@ import {
1212
} from "@t3tools/contracts";
1313
import * as DateTime from "effect/DateTime";
1414
import * as Effect from "effect/Effect";
15+
import * as Exit from "effect/Exit";
1516
import * as Layer from "effect/Layer";
1617
import * as Logger from "effect/Logger";
1718
import * as SqlClient from "effect/sql/SqlClient";
@@ -476,3 +477,70 @@ it.effect("a bound run follows its thread when promotion moves it mid-send", ()
476477
}).pipe(Effect.provide(layer));
477478
}).pipe(Effect.provide(SqlitePersistence.layerMemory)),
478479
);
480+
481+
it.effect("a run interrupted right after it reserves the task does not block the next run", () =>
482+
Effect.gen(function* () {
483+
const launches = yield* Ref.make(0);
484+
const layer = ScheduledTaskService.layer.pipe(
485+
Layer.provide(
486+
Layer.mergeAll(
487+
Layer.mock(ThreadLaunchService.ThreadLaunchService)({
488+
launch: () =>
489+
Ref.update(launches, (n) => n + 1).pipe(
490+
Effect.as({ threadId: ThreadId.make("thread:launched"), resumed: false } as never),
491+
),
492+
}),
493+
Layer.mock(ThreadManagementService.ThreadManagementService)({}),
494+
Layer.mock(SecretRequests.SecretRequests)({}),
495+
Layer.mock(ManagedProjectFolders.ManagedProjectFolders)({
496+
namedProjectsRoot: "/projects",
497+
isScratchProject: () => Effect.succeed(false),
498+
}),
499+
NodeCrypto.layer,
500+
Layer.succeed(Scheduler.Scheduler, { register: () => Effect.void }),
501+
),
502+
),
503+
);
504+
yield* Effect.gen(function* () {
505+
const service = yield* ScheduledTaskService.ScheduledTaskService;
506+
const { task } = yield* service.upsert({
507+
id: ScheduledTaskId.make("task:interrupted-reservation"),
508+
title: "Check in",
509+
prompt: "Check progress",
510+
enabled: true,
511+
schedule: { type: "interval", everyMs: 60_000 },
512+
projectId: ProjectId.make("project:test"),
513+
workspaceStrategy: { type: "root" },
514+
modelSelection: { instanceId: ProviderInstanceId.make("codex"), model: "gpt-5.4" },
515+
runtimeMode: "full-access",
516+
interactionMode: "default",
517+
});
518+
519+
// The reservation is the first Set.add of the task id; interrupt the run right there.
520+
const add = Set.prototype.add;
521+
let interrupted = false;
522+
const first = yield* Effect.gen(function* () {
523+
using _reserve = vi.spyOn(Set.prototype, "add").mockImplementation(function (
524+
this: Set<unknown>,
525+
value: unknown,
526+
) {
527+
const result = add.call(this, value);
528+
if (value === task.id && !interrupted) {
529+
interrupted = true;
530+
Fiber.getCurrent()?.interruptUnsafe();
531+
}
532+
return result;
533+
});
534+
return yield* service
535+
.runNow({ id: task.id })
536+
.pipe(Effect.forkChild, Effect.flatMap(Fiber.await));
537+
});
538+
assert.isTrue(interrupted);
539+
assert.isTrue(Exit.hasInterrupts(first));
540+
541+
const second = yield* service.runNow({ id: task.id });
542+
assert.equal(second.threadId, ThreadId.make("thread:launched"));
543+
assert.equal(yield* Ref.get(launches), 1);
544+
}).pipe(Effect.provide(layer));
545+
}).pipe(Effect.provide(SqlitePersistence.layerMemory)),
546+
);

0 commit comments

Comments
 (0)