Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion apps/server/src/provider/Layers/DroidAdapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2052,7 +2052,6 @@ export function makeDroidAdapter(
cwd,
clientName: "Scient Model Discovery",
});
yield* runtime.start();
const result = yield* discoverDroidAcpModels(runtime);
const commands = yield* runtime.getAvailableCommands;
setDroidDiscoveryCacheEntry(commandDiscoveryCache, cacheKey, {
Expand Down
22 changes: 20 additions & 2 deletions apps/server/src/provider/acp/DroidAcpSupport.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,9 @@ describe("applyDroidAcpInteractionMode", () => {
});

describe("discoverDroidAcpModels", () => {
it("reads each model's reasoning choices from session config options", async () => {
it("starts the session before reading each model's reasoning choices", async () => {
let startCalls = 0;
let started = false;
let currentModel = "model-a";
const configOptions = (): ReadonlyArray<EffectAcpSchema.SessionConfigOption> => [
{
Expand Down Expand Up @@ -283,7 +285,22 @@ describe("discoverDroidAcpModels", () => {
},
];
const runtime = {
getConfigOptions: Effect.sync(configOptions),
start: () =>
Effect.sync(() => {
startCalls += 1;
started = true;
return {
sessionId: "droid-model-discovery-test",
initializeResult: { protocolVersion: 1 },
sessionSetupResult: {
sessionId: "droid-model-discovery-test",
configOptions: configOptions(),
},
modelConfigId: "model",
sessionSetupMethod: "new" as const,
};
}),
getConfigOptions: Effect.sync(() => (started ? configOptions() : [])),
setConfigOption: (configId: string, value: string | boolean) => {
if (configId === "model") {
currentModel = String(value);
Expand All @@ -293,6 +310,7 @@ describe("discoverDroidAcpModels", () => {
};

const result = await Effect.runPromise(discoverDroidAcpModels(runtime));
expect(startCalls).toBe(1);
expect(result.models).toEqual([
expect.objectContaining({
slug: "model-a",
Expand Down
11 changes: 8 additions & 3 deletions apps/server/src/provider/acp/DroidAcpSupport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -400,13 +400,18 @@ function droidModelDescriptor(
}

/**
* Reads the model catalog from ACP and reselects each model so Droid returns that
* model's current reasoning choices. Discovery runs in a disposable session.
* Starts the disposable ACP session, reads its model catalog, and reselects each
* model so Droid returns that model's current reasoning choices.
*
* Owning startup here keeps every discovery caller on the same lifecycle path;
* reading configuration before `session/new` completes always produces an empty
* inventory.
*/
export function discoverDroidAcpModels(
runtime: Pick<AcpSessionRuntimeShape, "getConfigOptions" | "setConfigOption">,
runtime: Pick<AcpSessionRuntimeShape, "start" | "getConfigOptions" | "setConfigOption">,
): Effect.Effect<ProviderListModelsResult, EffectAcpErrors.AcpError> {
return Effect.gen(function* () {
yield* runtime.start();
const initialOptions = yield* runtime.getConfigOptions;
const modelConfig = findDroidSelectConfig(initialOptions, {
id: DROID_MODEL_CONFIG_ID,
Expand Down
Loading