Skip to content

Commit 4892bef

Browse files
committed
fix(server): 保留 OpenCode 探测失败时的模型缓存
- 模型清单命令重试失败后返回探测错误,避免伪装成权威空清单。\n- Agent 元数据查询仍允许降级,不影响已成功获取的模型清单。\n- 更新本地探测回归测试,并通过目标测试、vp check 与类型检查。
1 parent d381546 commit 4892bef

2 files changed

Lines changed: 39 additions & 18 deletions

File tree

‎apps/server/src/provider/Layers/OpenCodeProvider.test.ts‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,13 @@ const OpenCodeRuntimeTestDouble: OpenCodeRuntimeShape = {
9797
: Effect.succeed(runtimeMock.state.inventory as OpenCodeInventory),
9898
loadInventoryFromCli: () =>
9999
runtimeMock.state.inventoryError
100-
? Effect.succeed({
101-
providerList: { all: [], default: {}, connected: [] as string[] },
102-
agents: [],
103-
} as OpenCodeInventory)
100+
? Effect.fail(
101+
new OpenCodeRuntimeError({
102+
operation: "loadInventoryFromCli",
103+
detail: runtimeMock.state.inventoryError.message,
104+
cause: runtimeMock.state.inventoryError,
105+
}),
106+
)
104107
: Effect.succeed(runtimeMock.state.inventory as OpenCodeInventory),
105108
};
106109

@@ -212,14 +215,18 @@ it.layer(testLayer)("checkOpenCodeProviderStatus", (it) => {
212215
}),
213216
);
214217

215-
it.effect("degrades gracefully on CLI failure for local installs", () =>
218+
it.effect("reports local model inventory failures without treating them as empty", () =>
216219
Effect.gen(function* () {
217220
runtimeMock.state.inventoryError = new Error("opencode models failed");
218221
const snapshot = yield* checkOpenCodeProviderStatus(makeOpenCodeSettings(), process.cwd());
219222

220-
NodeAssert.equal(snapshot.status, "warning");
223+
NodeAssert.equal(snapshot.status, "error");
221224
NodeAssert.equal(snapshot.installed, true);
222225
NodeAssert.equal(snapshot.models.length, 0);
226+
NodeAssert.equal(
227+
snapshot.message,
228+
"Failed to execute OpenCode CLI health check: opencode models failed",
229+
);
223230
}),
224231
);
225232
});

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

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -690,22 +690,36 @@ const makeOpenCodeRuntime = Effect.gen(function* () {
690690
agentsResult = a2;
691691
}
692692

693-
// Degrade gracefully on failure — return empty inventory (warning status, not error)
694-
let connected: string[] = [];
695-
let allProviders: ProviderListResponse["all"] = [];
696-
if (modelsResult._tag === "Success" && modelsResult.value.code === 0) {
697-
const parsed = parseModelsCliOutput(modelsResult.value.stdout);
698-
connected = [...parsed.connected];
699-
allProviders = [...parsed.providers.values()].map((p) => ({
700-
id: p.id,
701-
name: p.name,
693+
if (modelsResult._tag === "Failure") {
694+
const cause = Cause.squash(modelsResult.cause);
695+
return yield* ensureRuntimeError(
696+
"loadInventoryFromCli",
697+
`Failed to load OpenCode models: ${openCodeRuntimeErrorDetail(cause)}`,
698+
cause,
699+
);
700+
}
701+
if (modelsResult.value.code !== 0) {
702+
return yield* new OpenCodeRuntimeError({
703+
operation: "loadInventoryFromCli",
704+
detail: `OpenCode models command exited with code ${modelsResult.value.code}.`,
705+
});
706+
}
707+
708+
const parsed = parseModelsCliOutput(modelsResult.value.stdout);
709+
const connected = [...parsed.connected];
710+
const allProviders: ProviderListResponse["all"] = [...parsed.providers.values()].map(
711+
(provider) => ({
712+
id: provider.id,
713+
name: provider.name,
702714
source: "config" as const,
703715
env: [],
704716
options: {},
705-
models: p.models,
706-
}));
707-
}
717+
models: provider.models,
718+
}),
719+
);
708720

721+
// Agent metadata enriches model capabilities but is not required for an
722+
// authoritative model inventory, so it may still degrade to an empty list.
709723
let agents: ReadonlyArray<Agent> = [];
710724
if (agentsResult._tag === "Success" && agentsResult.value.code === 0) {
711725
agents = parseAgentListCliOutput(agentsResult.value.stdout);

0 commit comments

Comments
 (0)