Skip to content

Commit fa5488c

Browse files
committed
fix(server): keep Codex workspace skills when account health fails
1 parent 611132c commit fa5488c

5 files changed

Lines changed: 127 additions & 4 deletions

File tree

‎apps/server/src/provider/Drivers/CodexDriver.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,11 @@ export const CodexDriver: ProviderDriver<CodexSettings, CodexDriverEnv> = {
289289
Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
290290
),
291291
]).pipe(
292-
Effect.map(([machineSnapshot, skills]) => ({ ...machineSnapshot, skills })),
292+
Effect.map(([machineSnapshot, skills]) => ({
293+
...machineSnapshot,
294+
skills,
295+
workspaceDiscoverySucceeded: true as const,
296+
})),
293297
Effect.mapError(
294298
(cause) =>
295299
new ProviderDriverError({

‎apps/server/src/provider/Drivers/CodexManagedProvider.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,13 @@ export const makeManagedCodexProvider = Effect.fn("makeManagedCodexProvider")(fu
282282
}),
283283
),
284284
Effect.flatMap((skills) =>
285-
snapshot.getSnapshot.pipe(Effect.map((draft) => ({ ...draft, skills }))),
285+
snapshot.getSnapshot.pipe(
286+
Effect.map((draft) => ({
287+
...draft,
288+
skills,
289+
workspaceDiscoverySucceeded: true as const,
290+
})),
291+
),
286292
),
287293
Effect.scoped,
288294
Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,10 @@ export interface ProviderDriverMetadata {
6161
}
6262

6363
export type ProviderWorkspaceSnapshot = ServerProvider &
64-
Pick<ServerProviderWorkspaceSnapshot, "slashCommandsPending">;
64+
Pick<ServerProviderWorkspaceSnapshot, "slashCommandsPending"> & {
65+
/** Workspace discovery can succeed independently of machine-level account health. */
66+
readonly workspaceDiscoverySucceeded?: true;
67+
};
6568

6669
/**
6770
* One materialized provider instance. Held by the registry, looked up by

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

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1588,6 +1588,114 @@ it.layer(
15881588
}),
15891589
);
15901590

1591+
it.effect(
1592+
"publishes successful workspace discovery without clearing provider health errors",
1593+
() =>
1594+
Effect.gen(function* () {
1595+
const driver = ProviderDriverKind.make("codex");
1596+
const instanceId = ProviderInstanceId.make("codex");
1597+
const machineProvider = {
1598+
instanceId,
1599+
driver,
1600+
status: "error",
1601+
enabled: true,
1602+
installed: true,
1603+
auth: { status: "unknown" },
1604+
checkedAt: "2026-06-10T00:00:00.000Z",
1605+
message: "Codex account read failed",
1606+
version: "0.160.1",
1607+
models: [],
1608+
slashCommands: [],
1609+
skills: [],
1610+
} as const satisfies ServerProvider;
1611+
const skills = [{ name: "project", path: "/workspace/SKILL.md", enabled: true }];
1612+
const scopedResult = yield* Ref.make<ProviderWorkspaceSnapshot>({
1613+
...machineProvider,
1614+
skills,
1615+
workspaceDiscoverySucceeded: true,
1616+
});
1617+
const instance = {
1618+
instanceId,
1619+
driverKind: driver,
1620+
continuationIdentity: { driverKind: driver, continuationKey: "codex:instance:codex" },
1621+
displayName: undefined,
1622+
enabled: true,
1623+
snapshot: {
1624+
resolveMaintenance: () =>
1625+
Effect.succeed(
1626+
makeManualOnlyProviderMaintenanceCapabilities({
1627+
provider: driver,
1628+
packageName: null,
1629+
}),
1630+
),
1631+
getSnapshot: Effect.succeed(machineProvider),
1632+
refresh: Effect.succeed(machineProvider),
1633+
streamChanges: Stream.empty,
1634+
applyUsageLimits: () => Effect.void,
1635+
},
1636+
snapshotForCwd: () => Ref.get(scopedResult),
1637+
orchestrationAdapter: {} as ProviderInstance["orchestrationAdapter"],
1638+
textGeneration: {} as ProviderInstance["textGeneration"],
1639+
} satisfies ProviderInstance;
1640+
const layerInstanceRegistry = Layer.succeed(
1641+
ProviderInstanceRegistry.ProviderInstanceRegistry,
1642+
{
1643+
getInstance: (requestedId) =>
1644+
Effect.succeed(requestedId === instanceId ? instance : undefined),
1645+
listInstances: Effect.succeed([instance]),
1646+
listUnavailable: Effect.succeed([]),
1647+
streamChanges: Stream.empty,
1648+
subscribeChanges: Effect.flatMap(PubSub.unbounded<void>(), PubSub.subscribe),
1649+
},
1650+
);
1651+
const scope = yield* Scope.make();
1652+
yield* Effect.addFinalizer(() => Scope.close(scope, Exit.void));
1653+
const runtimeServices = yield* Layer.build(
1654+
ProviderRegistry.layer.pipe(
1655+
Layer.provideMerge(layerInstanceRegistry),
1656+
Layer.provideMerge(
1657+
ServerConfig.layerTest(process.cwd(), { prefix: "t3-workspace-health-" }),
1658+
),
1659+
Layer.provideMerge(NodeServices.layer),
1660+
),
1661+
).pipe(Scope.provide(scope));
1662+
yield* Effect.gen(function* () {
1663+
const registry = yield* ProviderRegistry.ProviderRegistry;
1664+
yield* registry.refreshWorkspaceSnapshot({ instanceId, cwd: "/workspace" });
1665+
const discovered = (yield* registry.getProviders)[0]!;
1666+
assert.deepStrictEqual(discovered.workspaceSnapshots?.[0]?.skills, skills);
1667+
assert.strictEqual(discovered.status, "error");
1668+
assert.deepStrictEqual(discovered.auth, machineProvider.auth);
1669+
assert.strictEqual(discovered.message, machineProvider.message);
1670+
assert.deepStrictEqual(discovered.skills, []);
1671+
1672+
// A failed probe's machine fallback must retain the last successful inventory.
1673+
yield* Ref.set(scopedResult, machineProvider);
1674+
yield* registry.refreshWorkspaceSnapshot({
1675+
instanceId,
1676+
cwd: "/workspace",
1677+
fresh: true,
1678+
});
1679+
assert.deepStrictEqual(
1680+
(yield* registry.getProviders)[0]?.workspaceSnapshots,
1681+
discovered.workspaceSnapshots,
1682+
);
1683+
1684+
// An empty successful scan removes skills that are no longer installed.
1685+
yield* Ref.set(scopedResult, { ...machineProvider, workspaceDiscoverySucceeded: true });
1686+
yield* registry.refreshWorkspaceSnapshot({
1687+
instanceId,
1688+
cwd: "/workspace",
1689+
fresh: true,
1690+
});
1691+
const emptied = (yield* registry.getProviders)[0]!;
1692+
assert.deepStrictEqual(emptied.workspaceSnapshots?.[0]?.skills, []);
1693+
assert.strictEqual(emptied.status, "error");
1694+
assert.strictEqual(emptied.message, machineProvider.message);
1695+
}).pipe(Effect.provide(runtimeServices));
1696+
}),
1697+
);
1698+
15911699
it.effect("deduplicates cwd probes and clears snapshots when an instance rebuilds", () =>
15921700
Effect.gen(function* () {
15931701
const driver = ProviderDriverKind.make("codex");

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1084,7 +1084,9 @@ export const layer = Layer.effect(
10841084
return yield* refreshMachineSnapshot.pipe(
10851085
Effect.andThen(instance.snapshotForCwd(input.cwd)),
10861086
Effect.flatMap((scopedSnapshot) =>
1087-
scopedSnapshot.status === "error" && scopedSnapshot.slashCommandsPending === undefined
1087+
scopedSnapshot.status === "error" &&
1088+
scopedSnapshot.slashCommandsPending === undefined &&
1089+
!scopedSnapshot.workspaceDiscoverySucceeded
10881090
? Ref.get(providersRef)
10891091
: instanceRegistry.getInstance(input.instanceId).pipe(
10901092
Effect.flatMap((currentInstance) => {

0 commit comments

Comments
 (0)