Skip to content

Commit eb4c7f2

Browse files
committed
fix(projects): serialize reserved action launches
1 parent 831fc5b commit eb4c7f2

19 files changed

Lines changed: 713 additions & 336 deletions

‎apps/mobile/src/features/threads/ThreadRouteScreen.tsx‎

Lines changed: 33 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import {
3030
projectScriptCwd,
3131
projectScriptReservesPort,
3232
projectScriptRuntimeEnv,
33-
projectScriptTerminalId,
3433
resolveProjectScripts,
3534
} from "@t3tools/shared/projectScripts";
3635
import { Platform, ScrollView, View } from "react-native";
@@ -297,7 +296,7 @@ function ThreadRouteContent(
297296
const gitActions = useSelectedThreadGitActions();
298297
const requests = useSelectedThreadRequests();
299298
const interruptThreadTurn = useAtomCommand(threadEnvironment.interruptTurn, "thread interrupt");
300-
const getScriptPorts = useAtomCommand(projectEnvironment.getScriptPorts, "assign script port");
299+
const runScript = useAtomCommand(projectEnvironment.runScript, "run project script");
301300
const loadEarlierHistory = useAtomCommand(threadEnvironment.loadEarlierHistory, {
302301
label: "load earlier thread history",
303302
reportFailure: false,
@@ -364,6 +363,15 @@ function ThreadRouteContent(
364363
const threadId = firstRouteParam(params.threadId);
365364
const routeThreadIdentity =
366365
environmentIdRaw !== null && threadId !== null ? `${environmentIdRaw}:${threadId}` : null;
366+
const focusedThreadIdentityRef = useRef<string | null>(null);
367+
useFocusEffect(
368+
useCallback(() => {
369+
focusedThreadIdentityRef.current = routeThreadIdentity;
370+
return () => {
371+
focusedThreadIdentityRef.current = null;
372+
};
373+
}, [routeThreadIdentity]),
374+
);
367375
const [inspectorSelection, setInspectorSelection] = useState<ThreadInspectorSelection | null>(
368376
() => (props.renderInspector ? { routeThreadIdentity, mode: "route" } : null),
369377
);
@@ -455,10 +463,6 @@ function ThreadRouteContent(
455463
environmentId: selectedThread?.environmentId ?? null,
456464
threadId: selectedThread?.id ?? null,
457465
});
458-
const { sessions: knownEnvironmentTerminalSessions } = useKnownTerminalSessions({
459-
environmentId: selectedThread?.environmentId ?? null,
460-
threadId: null,
461-
});
462466
const terminalMenuSessions = useMemo(
463467
() =>
464468
buildTerminalMenuSessions({
@@ -729,44 +733,26 @@ function ThreadRouteContent(
729733
project: { cwd: selectedThreadProject.workspaceRoot },
730734
worktreePath: preferredWorktreePath,
731735
});
732-
let port: number | undefined;
733736
if (projectScriptReservesPort(script)) {
734-
const result = await getScriptPorts({
737+
const result = await runScript({
735738
environmentId: selectedThread.environmentId,
736-
input: { cwd, scriptIds: [script.id] },
739+
input: {
740+
threadId: selectedThread.id,
741+
projectId: selectedThreadProject.id,
742+
worktreePath: preferredWorktreePath,
743+
scriptId: script.id,
744+
},
737745
});
746+
if (focusedThreadIdentityRef.current !== routeThreadIdentity) return;
738747
if (result._tag !== "Success") {
739748
if (!isAtomCommandInterrupted(result)) {
740749
Dialog.alert("Couldn't run script", String(squashAtomCommandFailure(result)));
741750
}
742751
return;
743752
}
744-
port = result.value.ports[script.id];
745-
}
746-
const targetTerminalId =
747-
port !== undefined
748-
? projectScriptTerminalId(port)
749-
: resolveProjectScriptTerminalId({
750-
existingTerminalIds: terminalMenuSessions.map((session) => session.terminalId),
751-
...(knownTerminalSessions === null ||
752-
!readEnvironmentScope(selectedThread.environmentId, AuthTerminalReadScope)
753-
? { uniqueSuffix: uuidv4() }
754-
: {}),
755-
hasRunningTerminal: terminalMenuSessions.some(
756-
(session) => session.status === "running" || session.status === "starting",
757-
),
758-
});
759-
const runningScriptTerminal =
760-
port === undefined
761-
? undefined
762-
: knownEnvironmentTerminalSessions?.find(
763-
(session) =>
764-
session.target.terminalId === targetTerminalId &&
765-
(session.state.status === "starting" || session.state.hasRunningSubprocess),
766-
);
767-
if (runningScriptTerminal) {
768-
if (runningScriptTerminal.target.threadId === selectedThread.id) {
769-
handleOpenTerminal(targetTerminalId);
753+
if (result.value.status === "no-script") return;
754+
if (result.value.threadId === selectedThread.id) {
755+
handleOpenTerminal(result.value.terminalId);
770756
} else {
771757
Dialog.alert(
772758
"Already running",
@@ -775,10 +761,19 @@ function ThreadRouteContent(
775761
}
776762
return;
777763
}
764+
const targetTerminalId = resolveProjectScriptTerminalId({
765+
existingTerminalIds: terminalMenuSessions.map((session) => session.terminalId),
766+
...(knownTerminalSessions === null ||
767+
!readEnvironmentScope(selectedThread.environmentId, AuthTerminalReadScope)
768+
? { uniqueSuffix: uuidv4() }
769+
: {}),
770+
hasRunningTerminal: terminalMenuSessions.some(
771+
(session) => session.status === "running" || session.status === "starting",
772+
),
773+
});
778774
const env = projectScriptRuntimeEnv({
779775
project: { cwd: selectedThreadProject.workspaceRoot },
780776
worktreePath: preferredWorktreePath,
781-
...(port !== undefined ? { extraEnv: { T3CODE_PREVIEW_PORT: String(port) } } : {}),
782777
});
783778
stagePendingTerminalLaunch({
784779
target: {
@@ -807,15 +802,15 @@ function ThreadRouteContent(
807802
});
808803
},
809804
[
810-
getScriptPorts,
805+
runScript,
811806
handleOpenTerminal,
812807
navigation,
808+
routeThreadIdentity,
813809
selectedThread,
814810
selectedThreadDetailWorktreePath,
815811
selectedThreadProject,
816812
terminalMenuSessions,
817813
knownTerminalSessions,
818-
knownEnvironmentTerminalSessions,
819814
],
820815
);
821816
const threadGitControlProps = {

‎apps/server/src/auth/RpcAuthorization.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ describe("RPC authorization scopes", () => {
186186
WS_METHODS.terminalClear,
187187
WS_METHODS.terminalRestart,
188188
WS_METHODS.terminalClose,
189+
WS_METHODS.projectsRunScript,
189190
]) {
190191
expect(requiredScopeForRpcMethod(method)).toBe(AuthTerminalOperateScope);
191192
}

‎apps/server/src/auth/RpcAuthorization.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ export const RPC_REQUIRED_SCOPES = {
145145
[WS_METHODS.projectsSearchContents]: AuthFilesystemReadScope,
146146
[WS_METHODS.projectsSearchEntries]: AuthFilesystemReadScope,
147147
[WS_METHODS.projectsGetScriptPorts]: AuthTerminalOperateScope,
148+
[WS_METHODS.projectsRunScript]: AuthTerminalOperateScope,
148149
[WS_METHODS.projectsWriteFile]: AuthFilesystemWriteScope,
149150
[WS_METHODS.projectsEnsureScratch]: AuthOrchestrationOperateScope,
150151
[WS_METHODS.projectsCreateNew]: AuthOrchestrationOperateScope,

‎apps/server/src/git/GitManager.test.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,10 @@ function makeManager(input?: {
715715
sourceControlProvider?: SourceControlProvider["Service"];
716716
textGeneration?: Partial<FakeGitTextGeneration>;
717717
serverSettings?: Parameters<typeof ServerSettings.layerTest>[0];
718-
setupScriptRunner?: ProjectSetupScriptRunner.ProjectSetupScriptRunner["Service"];
718+
setupScriptRunner?: Pick<
719+
ProjectSetupScriptRunner.ProjectSetupScriptRunner["Service"],
720+
"runForThread"
721+
>;
719722
gitConfigReads?: string[];
720723
gitCommands?: string[];
721724
gitSpawnGate?: {
@@ -823,8 +826,7 @@ function makeManager(input?: {
823826
Layer.mock(ProviderRegistry.ProviderRegistry)({
824827
getProviders: Effect.succeed([]),
825828
}),
826-
Layer.succeed(
827-
ProjectSetupScriptRunner.ProjectSetupScriptRunner,
829+
Layer.mock(ProjectSetupScriptRunner.ProjectSetupScriptRunner)(
828830
input?.setupScriptRunner ?? {
829831
runForThread: () => Effect.succeed({ status: "no-script" as const }),
830832
},

‎apps/server/src/mcp/WorktreeMcpService.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ const makeHarness = (options: HarnessOptions = {}) => {
265265
}),
266266
);
267267
const refreshStatus = vi.fn((_: string) => Effect.die("refreshStatus stub"));
268-
const runForThread = vi.fn((input: { readonly worktreePath: string }) => {
268+
const runForThread = vi.fn((input: { readonly worktreePath: string | null }) => {
269269
switch (options.setupScript ?? "started") {
270270
case "no-script":
271271
return Effect.succeed({ status: "no-script" } as const);
@@ -286,7 +286,7 @@ const makeHarness = (options: HarnessOptions = {}) => {
286286
scriptName: "Setup",
287287
scriptCommand: "vp install",
288288
terminalId: "setup-terminal",
289-
cwd: input.worktreePath,
289+
cwd: input.worktreePath ?? workspaceRoot,
290290
} as const);
291291
}
292292
});

‎apps/server/src/observability/RpcInstrumentation.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ const RPC_AGGREGATES = {
141141
[WS_METHODS.projectsSearchContents]: "workspace",
142142
[WS_METHODS.projectsSearchEntries]: "workspace",
143143
[WS_METHODS.projectsGetScriptPorts]: "workspace",
144+
[WS_METHODS.projectsRunScript]: "workspace",
144145
[WS_METHODS.projectsWriteFile]: "workspace",
145146
[WS_METHODS.projectsEnsureScratch]: "orchestration",
146147
[WS_METHODS.projectsCreateNew]: "orchestration",

‎apps/server/src/orchestration-v2/ThreadLaunchService.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ function makeHarness(options: HarnessOptions = {}) {
190190
Effect.succeed({ commitSha: "remote-main-sha", remoteRefName: "origin/main" }),
191191
...options.git,
192192
}),
193-
Layer.succeed(ProjectSetupScriptRunner.ProjectSetupScriptRunner, {
193+
Layer.mock(ProjectSetupScriptRunner.ProjectSetupScriptRunner)({
194194
runForThread: runSetup,
195195
}),
196196
Layer.mock(TextGeneration.TextGeneration)({
Lines changed: 44 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
import { it, assert } from "@effect/vitest";
22
import * as Net from "@t3tools/shared/Net";
33
import * as Effect from "effect/Effect";
4+
import * as Deferred from "effect/Deferred";
5+
import * as Fiber from "effect/Fiber";
46
import * as Layer from "effect/Layer";
57
import * as Path from "effect/Path";
68
import * as ProjectScriptPorts from "./ProjectScriptPorts.ts";
79

8-
const testLayer = (probe: (port: number) => boolean) =>
10+
const testLayer = (probe: (port: number) => Effect.Effect<boolean>) =>
911
ProjectScriptPorts.layer.pipe(
1012
Layer.provide(
1113
Layer.mock(Net.NetService)({
12-
isPortAvailableOnLoopback: (port) => Effect.sync(() => probe(port)),
14+
isPortAvailableOnLoopback: probe,
1315
}),
1416
),
1517
Layer.provide(Path.layer),
@@ -19,32 +21,46 @@ it.effect("ProjectScriptPorts-concurrentCollisions-keepsDistinctStableAssignment
1921
const probes: number[] = [];
2022
let available = true;
2123
return Effect.gen(function* () {
22-
const service = yield* ProjectScriptPorts.ProjectScriptPorts;
23-
const ports = yield* Effect.all(
24-
[
25-
service.reserve({ cwd: "/worktree-119", scriptId: "dev" }),
26-
service.reserve({ cwd: "/worktree-151", scriptId: "dev" }),
27-
service.reserve({ cwd: "/worktree-119/../worktree-119", scriptId: "dev" }),
28-
],
29-
{ concurrency: "unbounded" },
30-
);
31-
assert.deepEqual(ports, [27170, 27171, 27170]);
32-
assert.deepEqual(probes, [27170, 27171]);
33-
available = false;
34-
assert.equal(yield* service.reserve({ cwd: "/worktree-119", scriptId: "dev" }), 27170);
35-
assert.equal(probes.length, 2);
36-
}).pipe(
37-
Effect.provide(
38-
testLayer((port) => {
24+
const probeEntered = yield* Deferred.make<void>();
25+
const releaseProbe = yield* Deferred.make<void>();
26+
const layer = testLayer((port) =>
27+
Effect.gen(function* () {
3928
probes.push(port);
29+
if (probes.length === 1) {
30+
yield* Deferred.succeed(probeEntered, undefined);
31+
yield* Deferred.await(releaseProbe);
32+
}
4033
return available;
4134
}),
42-
),
43-
);
35+
);
36+
return yield* Effect.gen(function* () {
37+
const service = yield* ProjectScriptPorts.ProjectScriptPorts;
38+
const first = yield* service
39+
.reserve({ cwd: "/worktree-119", scriptId: "dev" })
40+
.pipe(Effect.forkChild);
41+
yield* Deferred.await(probeEntered);
42+
const contenders = yield* Effect.all(
43+
[
44+
service.reserve({ cwd: "/worktree-151", scriptId: "dev" }),
45+
service.reserve({ cwd: "/worktree-119/../worktree-119", scriptId: "dev" }),
46+
],
47+
{ concurrency: "unbounded" },
48+
).pipe(Effect.forkChild);
49+
yield* Effect.yieldNow;
50+
assert.deepEqual(probes, [27170]);
51+
yield* Deferred.succeed(releaseProbe, undefined);
52+
const ports = [yield* Fiber.join(first), ...(yield* Fiber.join(contenders))];
53+
assert.deepEqual(ports, [27170, 27171, 27170]);
54+
assert.deepEqual(probes, [27170, 27171]);
55+
available = false;
56+
assert.equal(yield* service.reserve({ cwd: "/worktree-119", scriptId: "dev" }), 27170);
57+
assert.equal(probes.length, 2);
58+
}).pipe(Effect.provide(layer));
59+
});
4460
});
4561

4662
it.effect("ProjectScriptPorts-occupiedPreferredPort-wrapsAndRestartsDeterministically", () => {
47-
const layer = testLayer((port) => port !== 29999);
63+
const layer = testLayer((port) => Effect.succeed(port !== 29999));
4864
const allocate = Effect.gen(function* () {
4965
const service = yield* ProjectScriptPorts.ProjectScriptPorts;
5066
return yield* service.get({ cwd: "/repo", scriptIds: ["dev-7202", "dev", "test", "dev"] });
@@ -72,10 +88,12 @@ it.effect("ProjectScriptPorts-exhaustedRange-failsWithoutPoisoningRetries", () =
7288
assert.equal(yield* service.reserve(input), 24299);
7389
}).pipe(
7490
Effect.provide(
75-
testLayer(() => {
76-
probes++;
77-
return available;
78-
}),
91+
testLayer(() =>
92+
Effect.sync(() => {
93+
probes++;
94+
return available;
95+
}),
96+
),
7997
),
8098
);
8199
});

0 commit comments

Comments
 (0)