Skip to content

Commit 81c3da3

Browse files
fix(server): removed thread worktrees keep their project's skills in the picker (#32471)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent 20723d6 commit 81c3da3

8 files changed

Lines changed: 308 additions & 3 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ function makeHarness(options: HarnessOptions = {}) {
197197
: Option.none(),
198198
),
199199
getByWorkspaceRoot: () => Effect.succeedSome(project),
200+
workspaceScanDirectory: () => Effect.die("unused"),
200201
snapshot: Effect.die("unused"),
201202
getShell: () => Effect.die("unused"),
202203
listShells: () => Effect.die("unused"),

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,8 @@ const layerProjectServiceDependencies = Layer.mergeAll(
205205
Layer.provideMerge(layerMetadata),
206206
Layer.provideMerge(SqlitePersistence.layerMemory),
207207
Layer.provideMerge(ServerSettings.layerTest()),
208-
Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "project-service-race-" })),
209-
Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
208+
Layer.provideMerge(ServerConfig.layerTest(process.cwd(), { prefix: "project-service-race-" })),
209+
Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
210210
);
211211

212212
const waitForProject = Effect.fn("ProjectServiceTest.waitForProject")(function* (

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import * as KeyedLock from "@t3tools/shared/KeyedLock";
1212
import * as Context from "effect/Context";
1313
import * as DateTime from "effect/DateTime";
1414
import * as Effect from "effect/Effect";
15+
import * as FileSystem from "effect/FileSystem";
1516
import * as Layer from "effect/Layer";
1617
import * as Option from "effect/Option";
1718
import * as Result from "effect/Result";
@@ -32,6 +33,7 @@ import * as ProjectStore from "../orchestration-v2/ProjectStore.ts";
3233
import * as ThreadCommandExecutor from "../orchestration-v2/ThreadCommandExecutor.ts";
3334
import { planThreadDeletion } from "../orchestration-v2/ThreadDeletion.ts";
3435
import * as ServerSettings from "../serverSettings.ts";
36+
import { makeIsManagedWorktreePath } from "../worktreesDirectory.ts";
3537
import * as ProjectEnrichmentService from "./ProjectEnrichmentService.ts";
3638
import * as WorkspacePaths from "../workspace/WorkspacePaths.ts";
3739

@@ -142,6 +144,11 @@ export class ProjectService extends Context.Service<
142144
workspaceRoot: string,
143145
options?: { readonly includeDeleted?: boolean },
144146
) => Effect.Effect<Option.Option<Project>, ProjectOperationError>;
147+
/**
148+
* Where to scan `cwd`'s workspace inventory. A thread's removed managed worktree scans its
149+
* project, which turn start recreates the worktree from; anything else, or a failure, is `cwd`.
150+
*/
151+
readonly workspaceScanDirectory: (cwd: string) => Effect.Effect<string>;
145152
readonly snapshot: Effect.Effect<ProjectSnapshot, ProjectOperationError>;
146153
/**
147154
* A page of active projects in creation order, each with its repository
@@ -173,6 +180,8 @@ export const make = Effect.gen(function* () {
173180
const legacyImporter = yield* LegacyV1ThreadImporter.LegacyV1ThreadImporter;
174181
const threadCommands = yield* ThreadCommandExecutor.ThreadCommandExecutor;
175182
const serverSettings = yield* ServerSettings.ServerSettingsService;
183+
const fileSystem = yield* FileSystem.FileSystem;
184+
const isManagedWorktreePath = yield* makeIsManagedWorktreePath;
176185
const projectLocks = yield* KeyedLock.make<ProjectId>();
177186
const workspaceLocks = yield* KeyedLock.make<string>();
178187

@@ -331,6 +340,22 @@ export const make = Effect.gen(function* () {
331340
},
332341
);
333342

343+
const workspaceScanDirectory = Effect.fn("ProjectService.workspaceScanDirectory")(
344+
function* (cwd: string) {
345+
if (yield* fileSystem.exists(cwd).pipe(Effect.orElseSucceed(() => true))) return cwd;
346+
if (!(yield* isManagedWorktreePath(cwd))) return cwd;
347+
const snapshot = yield* Effect.flatten(
348+
threadProjections.readShellSnapshot({ worktreePath: cwd }),
349+
);
350+
const thread = [...snapshot.threads, ...snapshot.archivedThreads].find(
351+
(candidate) => candidate.branch !== null,
352+
);
353+
if (thread === undefined) return cwd;
354+
return Option.getOrUndefined(yield* readRow(thread.projectId))?.workspaceRoot ?? cwd;
355+
},
356+
(effect, cwd) => Effect.orElseSucceed(effect, () => cwd),
357+
);
358+
334359
const getByWorkspaceRoot: ProjectService["Service"]["getByWorkspaceRoot"] = Effect.fn(
335360
"ProjectService.getByWorkspaceRoot",
336361
)(function* (workspaceRoot, options) {
@@ -611,6 +636,7 @@ export const make = Effect.gen(function* () {
611636
delete: deleteProject,
612637
getById,
613638
getByWorkspaceRoot,
639+
workspaceScanDirectory,
614640
snapshot,
615641
listPage,
616642
getShell,

‎apps/server/src/provider/ProviderRegistry.test.ts‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1737,6 +1737,97 @@ it.layer(
17371737
}),
17381738
);
17391739

1740+
it.effect("scans scanCwd and keys the workspace snapshot by cwd", () =>
1741+
Effect.gen(function* () {
1742+
const driver = ProviderDriverKind.make("codex");
1743+
const instanceId = ProviderInstanceId.make("codex");
1744+
const provider = {
1745+
instanceId,
1746+
driver,
1747+
status: "ready",
1748+
enabled: true,
1749+
installed: true,
1750+
auth: { status: "authenticated" },
1751+
checkedAt: "2026-06-10T00:00:00.000Z",
1752+
version: "1.0.0",
1753+
models: [],
1754+
slashCommands: [],
1755+
skills: [],
1756+
} as const satisfies ServerProvider;
1757+
const scannedDirectories = yield* Ref.make<ReadonlyArray<string>>([]);
1758+
const instance: ProviderInstance = {
1759+
instanceId,
1760+
driverKind: driver,
1761+
continuationIdentity: { driverKind: driver, continuationKey: "codex:instance:codex" },
1762+
displayName: undefined,
1763+
enabled: true,
1764+
snapshot: {
1765+
resolveMaintenance: () =>
1766+
Effect.succeed(
1767+
makeManualOnlyProviderMaintenanceCapabilities({
1768+
provider: driver,
1769+
packageName: null,
1770+
}),
1771+
),
1772+
getSnapshot: Effect.succeed(provider),
1773+
refresh: Effect.succeed(provider),
1774+
streamChanges: Stream.empty,
1775+
applyUsageLimits: () => Effect.void,
1776+
},
1777+
snapshotForCwd: (directory) =>
1778+
Ref.update(scannedDirectories, (directories) => [...directories, directory]).pipe(
1779+
Effect.as({
1780+
...provider,
1781+
skills: [{ name: "finalize", path: `${directory}/finalize`, enabled: true }],
1782+
}),
1783+
),
1784+
orchestrationAdapter: {} as ProviderInstance["orchestrationAdapter"],
1785+
textGeneration: {} as ProviderInstance["textGeneration"],
1786+
};
1787+
const layerInstanceRegistry = Layer.succeed(
1788+
ProviderInstanceRegistry.ProviderInstanceRegistry,
1789+
{
1790+
getInstance: (requestedId) =>
1791+
Effect.succeed(requestedId === instanceId ? instance : undefined),
1792+
listInstances: Effect.succeed([instance]),
1793+
listUnavailable: Effect.succeed([]),
1794+
streamChanges: Stream.empty,
1795+
subscribeChanges: Effect.flatMap(PubSub.unbounded<void>(), PubSub.subscribe),
1796+
},
1797+
);
1798+
const scope = yield* Scope.make();
1799+
yield* Effect.addFinalizer(() => Scope.close(scope, Exit.void));
1800+
const runtimeServices = yield* Layer.build(
1801+
ProviderRegistry.layer.pipe(
1802+
Layer.provide(layerUnusedMutator),
1803+
Layer.provideMerge(layerInstanceRegistry),
1804+
Layer.provideMerge(
1805+
ServerConfig.layerTest(process.cwd(), {
1806+
prefix: "t3-provider-registry-scan-cwd-",
1807+
}),
1808+
),
1809+
Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1810+
),
1811+
).pipe(Scope.provide(scope));
1812+
1813+
yield* Effect.gen(function* () {
1814+
const registry = yield* ProviderRegistry.ProviderRegistry;
1815+
const providers = yield* registry.refreshWorkspaceSnapshot({
1816+
instanceId,
1817+
cwd: "/worktree",
1818+
scanCwd: "/project",
1819+
});
1820+
assert.deepStrictEqual(yield* Ref.get(scannedDirectories), ["/project"]);
1821+
assert.deepStrictEqual(
1822+
providers[0]?.workspaceSnapshots
1823+
?.find((snapshot) => snapshot.cwd === "/worktree")
1824+
?.skills?.map((skill) => skill.path),
1825+
["/project/finalize"],
1826+
);
1827+
}).pipe(Effect.provide(runtimeServices));
1828+
}),
1829+
);
1830+
17401831
it.effect("publishes workspace skills while machine health is in error", () =>
17411832
Effect.gen(function* () {
17421833
const driver = ProviderDriverKind.make("codex");

‎apps/server/src/provider/ProviderRegistry.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ export class ProviderRegistry extends Context.Service<
7878
readonly refreshWorkspaceSnapshot: (input: {
7979
readonly instanceId: ProviderInstanceId;
8080
readonly cwd: string;
81+
/** Directory the driver scans; the snapshot stays keyed by `cwd`. Defaults to `cwd`. */
82+
readonly scanCwd?: string;
8183
readonly fresh?: boolean;
8284
}) => Effect.Effect<ReadonlyArray<ServerProvider>>;
8385

@@ -951,6 +953,7 @@ export const layer = Layer.effect(
951953
const refreshWorkspaceSnapshot = Effect.fn("refreshWorkspaceSnapshot")(function* (input: {
952954
readonly instanceId: ProviderInstanceId;
953955
readonly cwd: string;
956+
readonly scanCwd?: string;
954957
readonly fresh?: boolean;
955958
}) {
956959
if (input.fresh) {
@@ -989,7 +992,7 @@ export const layer = Layer.effect(
989992
)
990993
: Effect.void;
991994
const runScan = refreshMachineSnapshot.pipe(
992-
Effect.andThen(instance.snapshotForCwd(input.cwd)),
995+
Effect.andThen(instance.snapshotForCwd(input.scanCwd ?? input.cwd)),
993996
// Scans fail on error; returned inventory remains valid even when provider health reports an error.
994997
Effect.flatMap((scopedSnapshot) =>
995998
instanceRegistry.getInstance(input.instanceId).pipe(

‎apps/server/src/relay/AgentAwarenessRelay.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,7 @@ const makeTestRelay = Effect.fnUntraced(function* (
318318
update: unused,
319319
delete: unused,
320320
getByWorkspaceRoot: unused,
321+
workspaceScanDirectory: unused,
321322
snapshot: Effect.succeed({ projects: [project], updatedAt: NOW }),
322323
listPage: unused,
323324
getShell: unused,

0 commit comments

Comments
 (0)