Skip to content

Commit 7f3e188

Browse files
James Canesheetsync
authored andcommitted
fix(projects): retain action RPC services after upstream cleanup
1 parent f991891 commit 7f3e188

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import { TestClock } from "effect/testing";
1313
import * as Deferred from "effect/Deferred";
1414
import * as Fiber from "effect/Fiber";
1515
import * as Layer from "effect/Layer";
16-
import * as Option from "effect/Option";
1716

1817
import * as TerminalManager from "../terminal/Manager.ts";
1918
import * as ServerSettings from "../serverSettings.ts";
@@ -73,7 +72,7 @@ it.effect("ReservedScript-overlappingStarts-reusesOwnerAndRetriesAfterCompletion
7372
Layer.provide(
7473
Layer.mergeAll(
7574
Layer.mock(ProjectService.ProjectService)({
76-
getById: () => Effect.succeed(Option.some(project)),
75+
getById: () => Effect.succeedSome(project),
7776
}),
7877
Layer.mock(ProjectScriptPorts.ProjectScriptPorts)({
7978
reserve: () => Effect.succeed(43123),
@@ -403,7 +402,7 @@ const makeHarness = Effect.fn(function* (options: {
403402
terminals,
404403
Layer.mock(ProjectScriptPorts.ProjectScriptPorts)({ reserve: () => Effect.succeed(43123) }),
405404
Layer.mock(ProjectService.ProjectService)({
406-
getById: () => Effect.succeed(Option.some(project)),
405+
getById: () => Effect.succeedSome(project),
407406
}),
408407
ServerSettings.layerTest(),
409408
NodeCrypto.layer,

‎apps/server/src/ws.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ import * as DatabaseStorage from "./persistence/DatabaseStorage.ts";
187187
import * as StorageCleanup from "./storageCleanup.ts";
188188
import * as TerminalManager from "./terminal/Manager.ts";
189189
import * as ProjectScriptPorts from "./project/ProjectScriptPorts.ts";
190+
import * as ProjectSetupScriptRunner from "./project/ProjectSetupScriptRunner.ts";
190191
import { terminalOutputStream, withTerminalOutputWindow } from "./terminal/OutputProtocol.ts";
191192
import * as PreviewAutomationBroker from "./mcp/PreviewAutomationBroker.ts";
192193
import * as ServerBrowser from "./preview/ServerBrowser.ts";
@@ -1328,6 +1329,7 @@ export const layerWsRpc = (
13281329
const vcsStatusBroadcaster = yield* VcsStatusBroadcaster.VcsStatusBroadcaster;
13291330
const terminalManager = yield* TerminalManager.TerminalManager;
13301331
const projectScriptPorts = yield* ProjectScriptPorts.ProjectScriptPorts;
1332+
const projectSetupScriptRunner = yield* ProjectSetupScriptRunner.ProjectSetupScriptRunner;
13311333
const previewManager = yield* PreviewManager.PreviewManager;
13321334
const portDiscovery = yield* PortScanner.PortDiscovery;
13331335
const providerRegistry = yield* ProviderRegistry.ProviderRegistry;

0 commit comments

Comments
 (0)