Skip to content

Commit 685d7bb

Browse files
committed
fix(projects): validate preview lookups and reuse ready shells
1 parent 82c750e commit 685d7bb

8 files changed

Lines changed: 169 additions & 22 deletions

File tree

‎apps/server/src/project/ProjectScriptPorts.test.ts‎

Lines changed: 84 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
import { it, assert } from "@effect/vitest";
2+
import { ProjectId, ThreadId } from "@t3tools/contracts";
23
import * as Net from "@t3tools/shared/Net";
34
import * as Effect from "effect/Effect";
45
import * as Deferred from "effect/Deferred";
56
import * as Fiber from "effect/Fiber";
67
import * as Layer from "effect/Layer";
78
import * as Path from "effect/Path";
89
import * as ProjectScriptPorts from "./ProjectScriptPorts.ts";
10+
import * as ProjectService from "./ProjectService.ts";
11+
import * as ProjectionStore from "../orchestration-v2/ProjectionStore.ts";
12+
import * as ServerSettings from "../serverSettings.ts";
13+
import { liveThreadShell } from "../mcp/McpToolAccess.testkit.ts";
14+
15+
const threadId = ThreadId.make("preview-thread");
16+
const projectId = ProjectId.make("preview-project");
917

1018
const testLayer = (probe: (port: number) => Effect.Effect<boolean>) =>
1119
ProjectScriptPorts.layer.pipe(
@@ -15,7 +23,79 @@ const testLayer = (probe: (port: number) => Effect.Effect<boolean>) =>
1523
}),
1624
),
1725
Layer.provide(Path.layer),
26+
Layer.provide(ServerSettings.layerTest()),
27+
Layer.provide(
28+
Layer.mock(ProjectionStore.ProjectionStoreV2)({
29+
getThreadShell: (id) =>
30+
Effect.succeed(
31+
id === threadId
32+
? { ...liveThreadShell(id), projectId, worktreePath: "/worktree-119" }
33+
: null,
34+
),
35+
}),
36+
),
37+
Layer.provide(
38+
Layer.mock(ProjectService.ProjectService)({
39+
getShell: () =>
40+
Effect.succeedSome({
41+
id: projectId,
42+
title: "Project",
43+
workspaceRoot: "/repo",
44+
repositoryIdentity: null,
45+
defaultModelSelection: null,
46+
scripts: [
47+
{
48+
id: "dev",
49+
name: "Dev",
50+
command: "vp dev",
51+
icon: "play",
52+
runOnWorktreeCreate: false,
53+
previewUrl: "http://localhost:${T3CODE_PREVIEW_PORT}",
54+
},
55+
{
56+
id: "fixed",
57+
name: "Fixed",
58+
command: "vp dev",
59+
icon: "play",
60+
runOnWorktreeCreate: false,
61+
},
62+
],
63+
createdAt: "2026-01-01T00:00:00.000Z",
64+
updatedAt: "2026-01-01T00:00:00.000Z",
65+
}),
66+
}),
67+
),
68+
);
69+
70+
it.effect("ProjectScriptPorts-fabricatedLookup-reservesOnlySavedThreadActions", () => {
71+
const probes: number[] = [];
72+
return Effect.gen(function* () {
73+
const service = yield* ProjectScriptPorts.ProjectScriptPorts;
74+
for (const cwd of ["/fabricated-one", "/fabricated-two"]) {
75+
const input = { threadId, cwd, scriptIds: ["invented", "fixed"] };
76+
assert.deepEqual(yield* service.get(input), { ports: {} });
77+
}
78+
const input = { threadId, cwd: "/worktree-119", scriptIds: ["dev", "invented", "fixed"] };
79+
assert.deepEqual(yield* service.get(input), { ports: { dev: 27170 } });
80+
assert.deepEqual(yield* service.get(input), { ports: { dev: 27170 } });
81+
const missing = {
82+
threadId: ThreadId.make("missing"),
83+
cwd: "/fabricated-three",
84+
scriptIds: ["invented"],
85+
};
86+
assert.deepEqual(yield* service.get(missing), { ports: {} });
87+
assert.deepEqual(probes, [27170]);
88+
}).pipe(
89+
Effect.provide(
90+
testLayer((port) =>
91+
Effect.sync(() => {
92+
probes.push(port);
93+
return true;
94+
}),
95+
),
96+
),
1897
);
98+
});
1999

20100
it.effect("ProjectScriptPorts-concurrentCollisions-keepsDistinctStableAssignments", () => {
21101
const probes: number[] = [];
@@ -63,12 +143,14 @@ it.effect("ProjectScriptPorts-occupiedPreferredPort-wrapsAndRestartsDeterministi
63143
const layer = testLayer((port) => Effect.succeed(port !== 29999));
64144
const allocate = Effect.gen(function* () {
65145
const service = yield* ProjectScriptPorts.ProjectScriptPorts;
66-
return yield* service.get({ cwd: "/repo", scriptIds: ["dev-7202", "dev", "test", "dev"] });
146+
return yield* Effect.forEach(["dev-7202", "dev", "test", "dev"], (scriptId) =>
147+
service.reserve({ cwd: "/repo", scriptId }),
148+
);
67149
});
68150
return Effect.gen(function* () {
69151
const first = yield* allocate.pipe(Effect.provide(layer));
70152
const restarted = yield* allocate.pipe(Effect.provide(layer));
71-
assert.deepEqual(first, { ports: { "dev-7202": 20000, dev: 24299, test: 27532 } });
153+
assert.deepEqual(first, [20000, 24299, 27532, 24299]);
72154
assert.deepEqual(restarted, first);
73155
});
74156
});

‎apps/server/src/project/ProjectScriptPorts.ts‎

Lines changed: 42 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,24 @@
11
import {
22
ProjectScriptPortUnavailableError,
3+
ProjectScriptPortsError,
34
type ProjectScriptPortsInput,
45
} from "@t3tools/contracts";
56
import * as Net from "@t3tools/shared/Net";
7+
import {
8+
projectScriptCwd,
9+
projectScriptReservesPort,
10+
resolveProjectScripts,
11+
} from "@t3tools/shared/projectScripts";
612
import * as Context from "effect/Context";
713
import * as Hash from "effect/Hash";
814
import * as Effect from "effect/Effect";
915
import * as Layer from "effect/Layer";
1016
import * as Path from "effect/Path";
1117
import * as Semaphore from "effect/Semaphore";
18+
import * as Option from "effect/Option";
19+
import * as ProjectionStore from "../orchestration-v2/ProjectionStore.ts";
20+
import * as ProjectService from "./ProjectService.ts";
21+
import * as ServerSettings from "../serverSettings.ts";
1222

1323
const FIRST_PORT = 20000;
1424
const PORT_COUNT = 10000;
@@ -22,16 +32,16 @@ export class ProjectScriptPorts extends Context.Service<
2232
}) => Effect.Effect<number, ProjectScriptPortUnavailableError>;
2333
readonly get: (
2434
input: ProjectScriptPortsInput,
25-
) => Effect.Effect<
26-
{ readonly ports: Record<string, number> },
27-
ProjectScriptPortUnavailableError
28-
>;
35+
) => Effect.Effect<{ readonly ports: Record<string, number> }, ProjectScriptPortsError>;
2936
}
3037
>()("t3/project/ProjectScriptPorts") {}
3138

3239
const make = Effect.gen(function* () {
3340
const net = yield* Net.NetService;
3441
const path = yield* Path.Path;
42+
const projections = yield* ProjectionStore.ProjectionStoreV2;
43+
const projects = yield* ProjectService.ProjectService;
44+
const settings = yield* ServerSettings.ServerSettingsService;
3545
const lock = yield* Semaphore.make(1);
3646
const assignments = new Map<string, number>();
3747
const assignedPorts = new Set<number>();
@@ -59,12 +69,34 @@ const make = Effect.gen(function* () {
5969

6070
return ProjectScriptPorts.of({
6171
reserve,
62-
get: Effect.fn("ProjectScriptPorts.get")(function* (input) {
63-
const entries = yield* Effect.forEach([...new Set(input.scriptIds)], (scriptId) =>
64-
reserve({ cwd: input.cwd, scriptId }).pipe(Effect.map((port) => [scriptId, port] as const)),
65-
);
66-
return { ports: Object.fromEntries(entries) };
67-
}),
72+
get: Effect.fn("ProjectScriptPorts.get")(
73+
function* (input) {
74+
const thread = yield* projections.getThreadShell(input.threadId);
75+
if (!thread || thread.deletedAt !== null) return { ports: {} };
76+
const project = yield* projects.getShell(thread.projectId);
77+
if (Option.isNone(project)) return { ports: {} };
78+
const cwd = projectScriptCwd({
79+
project: { cwd: project.value.workspaceRoot },
80+
worktreePath: thread.worktreePath,
81+
});
82+
if (path.resolve(input.cwd) !== path.resolve(cwd)) return { ports: {} };
83+
const requested = new Set(input.scriptIds);
84+
const scripts = resolveProjectScripts(yield* settings.getSettings, project.value).filter(
85+
(script) => requested.has(script.id) && projectScriptReservesPort(script),
86+
);
87+
const entries = yield* Effect.forEach(scripts, (script) =>
88+
reserve({ cwd, scriptId: script.id }).pipe(
89+
Effect.map((port) => [script.id, port] as const),
90+
),
91+
);
92+
return { ports: Object.fromEntries(entries) };
93+
},
94+
(effect, input) =>
95+
Effect.mapError(
96+
effect,
97+
(cause) => new ProjectScriptPortsError({ threadId: input.threadId, cause }),
98+
),
99+
),
68100
});
69101
});
70102

‎apps/server/src/project/ProjectSetupScriptRunner.test.ts‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,16 @@ const setup = Effect.fn(function* (options: { readonly history?: string } = {})
447447
});
448448

449449
describe("ProjectSetupScriptRunner", () => {
450+
it.effect("ReservedScript-idleTerminalSnapshot-deliversWithoutNewOutput", () =>
451+
Effect.gen(function* () {
452+
const harness = yield* makeHarness({ reserved: true, history: "% \x1b[?2004h" });
453+
yield* harness.start;
454+
expect(yield* Queue.size(harness.writes)).toBe(1);
455+
expect(yield* harness.runManual).toMatchObject({ status: "started", port: 43123 });
456+
expect(harness.openCount()).toBe(1);
457+
}),
458+
);
459+
450460
it.effect(
451461
"shares a reserved launch while startup waits and reports delivery to manual callers",
452462
() =>
@@ -527,7 +537,9 @@ describe("ProjectSetupScriptRunner", () => {
527537

528538
it.effect("ignores line editor state restored from an earlier shell", () =>
529539
Effect.gen(function* () {
530-
const { writes, emit } = yield* setup({ history: "old run\r\n% \x1b[?2004h" });
540+
const { writes, emit } = yield* setup({
541+
history: "old run\r\n% \x1b[?2004h\x1b[?1;9;66;67;1000;2004l",
542+
});
531543
yield* emit({ ...event, type: "activity", hasRunningSubprocess: true, label: "fnm" });
532544
yield* TestClock.adjust("1 minute");
533545
expect(yield* Queue.size(writes)).toBe(0);

‎apps/server/src/project/ProjectSetupScriptRunner.ts‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,14 +162,14 @@ function stripTerminalControl(text: string): string {
162162

163163
// Line editors (zsh, fish, bash 5.1+) enable bracketed paste when they start reading a command.
164164
const BRACKETED_PASTE_ON = "\x1b[?2004h";
165-
const BRACKETED_PASTE_OFF = "\x1b[?2004l";
166165
// Longer than one subprocess poll plus its ps timeout, so a startup prompt is seen as busy first.
167166
const SHELL_QUIET_FALLBACK = "3 seconds";
168167

169168
function lineEditorReading(text: string, previous: boolean): boolean {
170-
const on = text.lastIndexOf(BRACKETED_PASTE_ON);
171-
const off = text.lastIndexOf(BRACKETED_PASTE_OFF);
172-
return on === off ? previous : on > off;
169+
for (const match of text.matchAll(/\x1b\[\?([\d;]+)([hl])/g)) {
170+
if (match[1]?.split(";").includes("2004")) previous = match[2] === "h";
171+
}
172+
return previous;
173173
}
174174

175175
type CompletionShell = "posix" | "fish" | "powershell";
@@ -379,9 +379,12 @@ export const make = Effect.gen(function* () {
379379
yield* input.onStartupPrompt;
380380
}
381381
});
382-
// Restored history can hold a previous shell's line editor state, so only live output counts.
383382
const wait = Deferred.await(outcome).pipe(Effect.raceFirst(quiet));
384-
return { wait, unsubscribe };
383+
return {
384+
wait,
385+
unsubscribe,
386+
markReady: Deferred.succeed(outcome, "ready").pipe(Effect.asVoid),
387+
};
385388
},
386389
);
387390

@@ -537,6 +540,8 @@ export const make = Effect.gen(function* () {
537540
});
538541
}
539542
if (port !== undefined) observed?.trackReplacements();
543+
// Restored history ends with a mode reset; a live idle shell keeps its line editor enabled.
544+
if (readiness && lineEditorReading(opened.history, false)) yield* readiness.markReady;
540545

541546
return yield* Effect.uninterruptible(
542547
Effect.gen(function* () {

‎apps/server/src/server.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,12 @@ const layerRuntimeCoreDependenciesBase = Layer.mergeAll(
624624
Layer.provideMerge(layerGit),
625625
Layer.provideMerge(layerVcs),
626626
Layer.provideMerge(Layer.mergeAll(layerTerminal, layerPreview, layerDevice)),
627-
Layer.provideMerge(ProjectScriptPorts.layer),
627+
Layer.provideMerge(
628+
ProjectScriptPorts.layer.pipe(
629+
Layer.provide(Layer.mergeAll(RuntimeLayer.layerProjectService, ProjectionStoreV2.layer)),
630+
Layer.provide(layerServerSettings),
631+
),
632+
),
628633
Layer.provideMerge(layerPersistence),
629634
Layer.provideMerge(
630635
Layer.mergeAll(Keybindings.layer, EnvironmentTheme.layer, UsageLimitSources.layer),

‎apps/web/src/components/ChatView.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,6 +1087,7 @@ export default function ChatView(props: ChatViewProps) {
10871087
? projectEnvironment.scriptPorts({
10881088
environmentId: activeThreadRef.environmentId,
10891089
input: {
1090+
threadId: activeThreadRef.threadId,
10901091
cwd: projectScriptCwd({
10911092
project: { cwd: activeProject.workspaceRoot },
10921093
worktreePath: activeThread?.worktreePath ?? null,

‎packages/contracts/src/projectScriptPorts.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export class ProjectRunScriptError extends Schema.TaggedError<ProjectRunScriptEr
3030
}
3131

3232
export const ProjectScriptPortsInput = Schema.Struct({
33+
threadId: ThreadId,
3334
cwd: TrimmedNonEmptyString,
3435
scriptIds: Schema.Array(TrimmedNonEmptyString).check(Schema.isMaxLength(100)),
3536
});
@@ -39,6 +40,15 @@ export const ProjectScriptPortsResult = Schema.Struct({
3940
ports: Schema.Record(Schema.String, PortSchema),
4041
});
4142

43+
export class ProjectScriptPortsError extends Schema.TaggedError<ProjectScriptPortsError>()(
44+
"ProjectScriptPortsError",
45+
{ threadId: ThreadId, cause: Schema.Defect() },
46+
) {
47+
override get message(): string {
48+
return "Could not load preview ports for this thread.";
49+
}
50+
}
51+
4252
export class ProjectScriptPortUnavailableError extends Schema.TaggedError<ProjectScriptPortUnavailableError>()(
4353
"ProjectScriptPortUnavailableError",
4454
{ startPort: Schema.Int, attempts: Schema.Int },

‎packages/contracts/src/rpc.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import * as Schema from "effect/Schema";
2727
import {
2828
ProjectScriptPortsInput,
2929
ProjectScriptPortsResult,
30-
ProjectScriptPortUnavailableError,
30+
ProjectScriptPortsError,
3131
ProjectRunScriptInput,
3232
ProjectRunScriptResult,
3333
ProjectRunScriptError,
@@ -1233,7 +1233,7 @@ const WsProjectsSearchEntriesRpc = Rpc.make(WS_METHODS.projectsSearchEntries, {
12331233
const WsProjectsGetScriptPortsRpc = Rpc.make(WS_METHODS.projectsGetScriptPorts, {
12341234
payload: ProjectScriptPortsInput,
12351235
success: ProjectScriptPortsResult,
1236-
error: Schema.Union([ProjectScriptPortUnavailableError, EnvironmentAuthorizationError]),
1236+
error: Schema.Union([ProjectScriptPortsError, EnvironmentAuthorizationError]),
12371237
});
12381238

12391239
const WsProjectsRunScriptRpc = Rpc.make(WS_METHODS.projectsRunScript, {

0 commit comments

Comments
 (0)