Skip to content

Commit afede16

Browse files
SARAsBooksclaudecodex
committed
fix(server): providers find a shell PATH that arrives after startup
The desktop now starts the server before it knows the user's shell PATH and sends it later. The server applied it to process.env, but provider drivers copy the environment when built (Claude, Muse, OpenCode with instance env), and a managed policy hands drivers a filtered copy made at startup. So a CLI only on the shell PATH stayed "not found" for the session, and Refresh couldn't help. When the desktop's shell environment changes the server's PATH, let pending provider checks finish, then rebuild the enabled instances whose completed check still can't find their CLI, and check them again. The registry rebuilds an instance only if it is still the one that was selected, so a replacement made meanwhile is left alone, and instances that found their CLI keep running. ACP Registry is excluded, since it reports installed:false for setup states. Under a managed policy, drivers now get a live filtered view of the host environment instead of a startup copy. Co-Authored-By: Claude Opus 5.5 <[email protected]> Co-Authored-By: GPT-6.1 Sol (Codex) <[email protected]>
1 parent df70f50 commit afede16

12 files changed

Lines changed: 311 additions & 10 deletions

‎apps/server/src/policy/ManagedPolicy.test.ts‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,15 @@ it.layer(NodeServices.layer)("ManagedPolicy.load", (it) => {
187187
]);
188188
// The host variable that replaces Codex's launch arguments is ignored too.
189189
const host = { PATH: "/usr/bin", T3CODE_CODEX_LAUNCH_ARGS: "-c mcp_servers.x.command=sh" };
190-
assert.deepEqual(providerHostEnvironment(policy.summary, host), { PATH: "/usr/bin" });
190+
const view = providerHostEnvironment(policy.summary, host);
191+
assert.deepEqual({ ...view }, { PATH: "/usr/bin" });
192+
host.PATH = "/late/bin";
193+
Object.assign(host, { NEW_VARIABLE: "late", t3code_codex_launch_args: "hidden" });
194+
assert.deepEqual({ ...view }, { PATH: "/late/bin", NEW_VARIABLE: "late" });
195+
assert.isUndefined(view.T3CODE_CODEX_LAUNCH_ARGS);
196+
assert.isFalse("t3code_codex_launch_args" in view);
197+
assert.isFalse(Reflect.set(view, "PATH", "/replaced"));
198+
assert.equal(host.PATH, "/late/bin");
191199
assert.strictEqual(providerHostEnvironment(undefined, host), host);
192200
}),
193201
);

‎apps/server/src/policy/managedProviders.ts‎

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,29 @@ export const providerHostEnvironment = (
162162
environment: NodeJS.ProcessEnv,
163163
): NodeJS.ProcessEnv => {
164164
if (summary === undefined) return environment;
165-
const next = { ...environment };
166-
for (const name of Object.keys(next)) {
167-
if (LAUNCH_OVERRIDE_VARIABLES.some((override) => override === name.toUpperCase())) {
168-
delete next[name];
169-
}
170-
}
171-
return next;
165+
const allowed = (name: string | symbol) =>
166+
typeof name !== "string" ||
167+
!LAUNCH_OVERRIDE_VARIABLES.some((override) => override === name.toUpperCase());
168+
return new Proxy(
169+
{},
170+
{
171+
get: (_, name) => (allowed(name) ? Reflect.get(environment, name) : undefined),
172+
has: (_, name) => allowed(name) && Reflect.has(environment, name),
173+
ownKeys: () => Reflect.ownKeys(environment).filter(allowed),
174+
getOwnPropertyDescriptor: (_, name) =>
175+
allowed(name) && Reflect.has(environment, name)
176+
? {
177+
configurable: true,
178+
enumerable: true,
179+
value: Reflect.get(environment, name),
180+
writable: false,
181+
}
182+
: undefined,
183+
set: () => false,
184+
deleteProperty: () => false,
185+
defineProperty: () => false,
186+
},
187+
);
172188
};
173189

174190
/** Each driver's home variable, and the settings that rewrite it at launch. */
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import * as Effect from "effect/Effect";
2+
import * as Layer from "effect/Layer";
3+
import * as Stream from "effect/Stream";
4+
5+
import * as DesktopTelemetryReceiver from "../resourceTelemetry/DesktopTelemetryReceiver.ts";
6+
import * as ProviderRegistry from "./ProviderRegistry.ts";
7+
8+
/** The desktop's shell PATH can arrive after drivers were built and checked against a bare one. */
9+
export const layer = Layer.effectDiscard(
10+
Effect.gen(function* () {
11+
const receiver = yield* DesktopTelemetryReceiver.DesktopTelemetryReceiver;
12+
const providers = yield* ProviderRegistry.ProviderRegistry;
13+
yield* receiver.pathChanges.pipe(
14+
Stream.runForEach(() => providers.rebuildMissingAndRefresh),
15+
Effect.forkScoped,
16+
);
17+
}),
18+
);

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -944,6 +944,23 @@ describe("ProviderInstanceRegistry secret environment", () => {
944944
}).pipe(Effect.scoped);
945945
});
946946

947+
it.effect("does not rebuild an instance replaced after selection", () => {
948+
const fixture = setup({ [secret.reference]: "sk-live" });
949+
return Effect.gen(function* () {
950+
const { registry, mutator } = yield* fixture.make;
951+
const selected = yield* registry.listInstances;
952+
fixture.vault.set(secret.reference, "sk-rotated");
953+
yield* mutator.reloadSecrets();
954+
const replacement = yield* registry.getInstance(instanceId);
955+
expect(replacement).not.toBe(selected[0]);
956+
yield* mutator.rebuild(selected);
957+
expect(yield* registry.getInstance(instanceId)).toBe(replacement);
958+
expect(fixture.created).toHaveLength(2);
959+
yield* mutator.rebuild([replacement!]);
960+
expect(fixture.created).toHaveLength(3);
961+
}).pipe(Effect.scoped);
962+
});
963+
947964
it.effect("reads a config field typed SettingsSecretValue and rebuilds when it rotates", () => {
948965
const apiKey: SecretReference = { ...secret, reference: "op://Private/Gateway/key" };
949966
const fixture = setup(

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -504,6 +504,22 @@ export const makeProviderInstanceRegistry = Effect.fn(
504504
Effect.provideContext(driverContext),
505505
);
506506

507+
const rebuild: ProviderInstanceRegistryMutator.ProviderInstanceRegistryMutatorShape["rebuild"] =
508+
Effect.fn("ProviderInstanceRegistry.rebuild")(
509+
function* (instances) {
510+
const live = yield* Ref.get(entries);
511+
const ids = new Set(
512+
instances
513+
.filter((instance) => live.get(instance.instanceId)?.instance === instance)
514+
.map((instance) => instance.instanceId),
515+
);
516+
if (ids.size === 0) return;
517+
yield* reconcileWithR(yield* Ref.get(configMapRef), ids);
518+
},
519+
(effect) => semaphore.withPermits(1)(effect),
520+
Effect.provideContext(driverContext),
521+
);
522+
507523
// Reading secrets can wait on a vault unlock, so the server does not wait for it to start.
508524
yield* semaphore.withPermits(1)(
509525
Ref.set(configMapRef, input.configMap).pipe(
@@ -554,6 +570,7 @@ export const makeProviderInstanceRegistry = Effect.fn(
554570
const mutator: ProviderInstanceRegistryMutator.ProviderInstanceRegistryMutatorShape = {
555571
reconcile,
556572
reloadSecrets,
573+
rebuild,
557574
};
558575

559576
return { registry, mutator };

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
/** Reconcile closes removed/replaced scopes before creating replacements: at most one live instance per id. */
22
import type { ProviderInstanceConfigMap, ProviderInstanceId } from "@t3tools/contracts";
3+
import type { ProviderInstance } from "@t3tools/provider-core/server/driver";
34
import * as Context from "effect/Context";
45
import type * as Effect from "effect/Effect";
56

67
export interface ProviderInstanceRegistryMutatorShape {
78
readonly reconcile: (configMap: ProviderInstanceConfigMap) => Effect.Effect<void>;
89
/** Re-reads the secrets of every instance, or one, and rebuilds those whose secrets changed. */
910
readonly reloadSecrets: (instanceId?: ProviderInstanceId) => Effect.Effect<void>;
11+
/** Rebuilds these instances from their current config, so their drivers read the environment again. */
12+
readonly rebuild: (instances: ReadonlyArray<ProviderInstance>) => Effect.Effect<void>;
1013
}
1114

1215
export class ProviderInstanceRegistryMutator extends Context.Service<

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

Lines changed: 164 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ import {
6868
} from "./providerStatusCache.ts";
6969
import { COMPACT_SLASH_COMMAND } from "@t3tools/provider-core/server/snapshotProbe";
7070
import type {
71+
AnyProviderDriver,
7172
ProviderInstance,
7273
ProviderWorkspaceSnapshot,
7374
} from "@t3tools/provider-core/server/driver";
@@ -76,6 +77,10 @@ import * as ProviderInstanceRegistryMutator from "./ProviderInstanceRegistryMuta
7677
import * as ProviderRegistry from "./ProviderRegistry.ts";
7778
import { mergeProviderInstanceEnvironment } from "@t3tools/provider-core/server/instanceEnvironment";
7879
import { makeManualOnlyProviderMaintenanceCapabilities } from "@t3tools/provider-core/server/maintenanceResolver";
80+
import * as SecretResolver from "@t3tools/secret-provider-core/server/SecretResolver";
81+
import * as ProviderHostPathWatcher from "./ProviderHostPathWatcher.ts";
82+
import * as DesktopTelemetryReceiver from "../resourceTelemetry/DesktopTelemetryReceiver.ts";
83+
import { providerHostEnvironment } from "../policy/managedProviders.ts";
7984
vi.mock("@anthropic-ai/claude-agent-sdk", { spy: true });
8085

8186
const decodeServerProvider = Schema.decodeSync(ServerProvider);
@@ -1156,6 +1161,165 @@ it.layer(
11561161
);
11571162
});
11581163

1164+
it.effect.each(["replay", "in-flight missing", "in-flight installed"] as const)(
1165+
"recovers a copied driver environment after late PATH (%s)",
1166+
(mode) =>
1167+
Effect.gen(function* () {
1168+
const host = { PATH: "/early/bin", T3CODE_CODEX_LAUNCH_ARGS: "hidden" };
1169+
const environment = providerHostEnvironment(
1170+
{ organization: "PATH test", lockedSettings: [] },
1171+
host,
1172+
);
1173+
const updates = yield* DesktopTelemetryReceiver.makeDesktopShellEnvironmentUpdates(
1174+
host,
1175+
"linux",
1176+
);
1177+
const entered = yield* Deferred.make<void>();
1178+
const release = yield* Deferred.make<void>();
1179+
const finished = yield* Deferred.make<void>();
1180+
const paths: Array<string | undefined> = [];
1181+
let first = true;
1182+
const driverKind = ProviderDriverKind.make("pi");
1183+
const instanceId = ProviderInstanceId.make("late-path");
1184+
const driver: AnyProviderDriver = {
1185+
driverKind,
1186+
metadata: { displayName: "PATH fixture" },
1187+
configSchema: Schema.Unknown,
1188+
defaultConfig: () => ({}),
1189+
create: (input) =>
1190+
Effect.gen(function* () {
1191+
const copied = { ...environment };
1192+
paths.push(copied.PATH);
1193+
const installed =
1194+
mode === "in-flight installed" || copied.PATH?.includes("/late/bin") === true;
1195+
const snapshot: ServerProvider = {
1196+
instanceId,
1197+
driver: driverKind,
1198+
enabled: true,
1199+
installed: false,
1200+
status: "warning",
1201+
auth: { status: "unknown" },
1202+
version: null,
1203+
checkedAt: "2026-10-03T00:00:00.000Z",
1204+
models: [],
1205+
slashCommands: [],
1206+
skills: [],
1207+
};
1208+
const current = yield* Ref.make(snapshot);
1209+
return {
1210+
instanceId: input.instanceId,
1211+
driverKind,
1212+
enabled: true,
1213+
displayName: undefined,
1214+
continuationIdentity: { driverKind, continuationKey: "pi:late-path" },
1215+
snapshot: {
1216+
resolveMaintenance: () =>
1217+
Effect.succeed(
1218+
makeManualOnlyProviderMaintenanceCapabilities({
1219+
provider: driverKind,
1220+
packageName: null,
1221+
}),
1222+
),
1223+
getSnapshot: Ref.get(current),
1224+
refresh: Effect.gen(function* () {
1225+
if (first && mode !== "replay") {
1226+
first = false;
1227+
yield* Deferred.succeed(entered, undefined);
1228+
yield* Deferred.await(release);
1229+
}
1230+
const checked = {
1231+
...snapshot,
1232+
installed,
1233+
status: installed ? ("ready" as const) : ("error" as const),
1234+
};
1235+
yield* Ref.set(current, checked);
1236+
return checked;
1237+
}),
1238+
streamChanges: Stream.empty,
1239+
applyUsageLimits: () => Effect.void,
1240+
},
1241+
orchestrationAdapter: {} as ProviderInstance["orchestrationAdapter"],
1242+
textGeneration: {} as ProviderInstance["textGeneration"],
1243+
} satisfies ProviderInstance;
1244+
}),
1245+
};
1246+
const built = yield* ProviderInstanceRegistry.makeProviderInstanceRegistry({
1247+
drivers: [driver],
1248+
configMap: { [instanceId]: { driver: driverKind, enabled: true } },
1249+
}).pipe(Effect.provide(Layer.mock(SecretResolver.SecretResolver)({})));
1250+
yield* Effect.gen(function* () {
1251+
const registry = yield* ProviderRegistry.ProviderRegistry;
1252+
const running =
1253+
mode === "replay" ? undefined : yield* registry.refresh().pipe(Effect.forkScoped);
1254+
if (running) yield* Deferred.await(entered);
1255+
yield* updates.apply({
1256+
version: 1,
1257+
type: "shellEnvironment",
1258+
platform: "linux",
1259+
discovered: true,
1260+
environment: { PATH: "/early/bin:/late/bin" },
1261+
});
1262+
expect(paths).toEqual(["/early/bin"]);
1263+
if (mode === "replay") {
1264+
yield* Layer.build(
1265+
ProviderHostPathWatcher.layer.pipe(
1266+
Layer.provide(
1267+
DesktopTelemetryReceiver.layerTest({ pathChanges: updates.pathChanges }),
1268+
),
1269+
Layer.provide(
1270+
Layer.succeed(ProviderRegistry.ProviderRegistry, {
1271+
...registry,
1272+
rebuildMissingAndRefresh: registry.rebuildMissingAndRefresh.pipe(
1273+
Effect.tap(() => Deferred.succeed(finished, undefined)),
1274+
),
1275+
}),
1276+
),
1277+
),
1278+
);
1279+
} else {
1280+
yield* registry.rebuildMissingAndRefresh.pipe(
1281+
Effect.tap(() => Deferred.succeed(finished, undefined)),
1282+
Effect.forkScoped({ startImmediately: true }),
1283+
);
1284+
expect(paths).toEqual(["/early/bin"]);
1285+
}
1286+
yield* Deferred.succeed(release, undefined);
1287+
if (running) yield* Fiber.join(running);
1288+
yield* Deferred.await(finished);
1289+
expect(
1290+
(yield* registry.getProviders).find((row) => row.instanceId === instanceId)
1291+
?.installed,
1292+
).toBe(true);
1293+
expect(paths).toEqual(
1294+
mode === "in-flight installed"
1295+
? ["/early/bin"]
1296+
: ["/early/bin", "/early/bin:/late/bin"],
1297+
);
1298+
}).pipe(
1299+
Effect.provide(
1300+
ProviderRegistry.layer.pipe(
1301+
Layer.provide(
1302+
Layer.succeed(ProviderInstanceRegistry.ProviderInstanceRegistry, built.registry),
1303+
),
1304+
Layer.provide(
1305+
Layer.succeed(
1306+
ProviderInstanceRegistryMutator.ProviderInstanceRegistryMutator,
1307+
built.mutator,
1308+
),
1309+
),
1310+
),
1311+
),
1312+
);
1313+
}).pipe(
1314+
Effect.scoped,
1315+
Effect.provide(
1316+
ServerConfig.layerTest(process.cwd(), { prefix: "t3-late-path-" }).pipe(
1317+
Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1318+
),
1319+
),
1320+
),
1321+
);
1322+
11591323
describe("Codex model inventories", () => {
11601324
const cachedProvider = {
11611325
instanceId: ProviderInstanceId.make("codex-personal"),

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,12 @@ export class ProviderRegistry extends Context.Service<
6969
instanceId?: ProviderInstanceId,
7070
) => Effect.Effect<ReadonlyArray<ServerProvider>>;
7171

72+
/**
73+
* Rebuilds and re-checks enabled instances not yet found installed, after the host environment
74+
* changed. Drivers copy the environment when built, so only a rebuild sees a later PATH.
75+
*/
76+
readonly rebuildMissingAndRefresh: Effect.Effect<ReadonlyArray<ServerProvider>>;
77+
7278
/** Only refreshed instances can verify an update; the published list still includes every row. */
7379
readonly refreshAfterUpdate: (
7480
provider: ProviderDriverKind,
@@ -692,6 +698,28 @@ export const layer = Layer.effect(
692698
return yield* instanceId === undefined ? refresh() : refreshInstance(instanceId);
693699
});
694700

701+
// Instances that found their CLI keep running; restarting them could end live sessions.
702+
const rebuildMissingAndRefresh = Effect.fn("rebuildMissingAndRefresh")(function* () {
703+
const instances = yield* instanceRegistry.listInstances;
704+
yield* refresh();
705+
const missing = yield* Effect.filter(instances, (instance) =>
706+
Effect.gen(function* () {
707+
// ACP also reports installed:false for setup states unrelated to executable discovery.
708+
if (
709+
!instance.enabled ||
710+
instance.driverKind === "acpRegistry" ||
711+
!(yield* isCurrentInstance(instance))
712+
)
713+
return false;
714+
const snapshot = yield* instance.snapshot.getSnapshot;
715+
return !snapshot.installed;
716+
}),
717+
);
718+
if (missing.length === 0) return yield* Ref.get(providersRef);
719+
yield* instanceRegistryMutator.rebuild(missing);
720+
return yield* refresh();
721+
});
722+
695723
const refreshAfterUpdate = Effect.fn("refreshAfterUpdate")(function* (
696724
provider: ProviderDriverKind,
697725
selectedInstanceId: ProviderInstanceId,
@@ -1077,6 +1105,9 @@ export const layer = Layer.effect(
10771105
refreshInstance(instanceId).pipe(Effect.catchCause(recoverRefreshFailure)),
10781106
reloadSecretsAndRefresh: (instanceId?: ProviderInstanceId) =>
10791107
reloadSecretsAndRefresh(instanceId).pipe(Effect.catchCause(recoverRefreshFailure)),
1108+
rebuildMissingAndRefresh: rebuildMissingAndRefresh().pipe(
1109+
Effect.catchCause(recoverRefreshFailure),
1110+
),
10801111
refreshWorkspaceSnapshot: (input) =>
10811112
refreshWorkspaceSnapshot(input).pipe(Effect.catchCause(recoverRefreshFailure)),
10821113
refreshAfterUpdate,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ function makeRegistry(
198198
refresh: () => Ref.get(providersRef),
199199
refreshInstance: () => Ref.get(providersRef),
200200
reloadSecretsAndRefresh: () => Ref.get(providersRef),
201+
rebuildMissingAndRefresh: Ref.get(providersRef),
201202
refreshAfterUpdate: () => {
202203
const version = options?.installedVersionAfterUpdate;
203204
if (version === undefined) {

‎apps/server/src/provider/testUtils/providerRegistryMock.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const makeProviderRegistryMock = (
1212
refresh: () => Effect.succeed(providers),
1313
refreshInstance: () => Effect.succeed(providers),
1414
reloadSecretsAndRefresh: () => Effect.succeed(providers),
15+
rebuildMissingAndRefresh: Effect.succeed(providers),
1516
refreshAfterUpdate: () => Effect.succeed(providers),
1617
refreshWorkspaceSnapshot: () => Effect.succeed(providers),
1718
invalidateModelCaches: () => Effect.void,

0 commit comments

Comments
 (0)