@open-cr-agent/runtime-opencode 0.4.0 → 0.5.0

package/dist/runtime.d.ts

@@ -24,6 +24,7 @@ export declare class OpenCodeRuntime implements AgentRuntime {
     complete(request: CompletionRequest, signal: AbortSignal): Promise<CompletionResult>;
     dispose(): Promise<void>;
     private prompt;
+    private unprepared;
     private start;
     private launch;
 }
@@ -117,4 +118,5 @@ export declare function openCodeConfig(tools: Pick<ToolServer, "url" | "headers"
         };
     };
 };
+export declare function providersOf(options: Pick<RuntimeOptions, "models" | "agentModels">): string[];
 //# sourceMappingURL=runtime.d.ts.map

package/dist/runtime.js

@@ -3,7 +3,7 @@ import { mkdir, mkdtemp, rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { OcraError, } from "@open-cr-agent/core";
-import { completeWithFailback, MAX_AGENT_STEPS, ModelHealth, parseModel, RESUME_MESSAGE, REVIEW_TOOLS, reviewTools, withFailback, withoutSecrets, } from "@open-cr-agent/core/internal";
+import { callChain, completeWithFailback, MAX_AGENT_STEPS, ModelHealth, parseModel, RESUME_MESSAGE, REVIEW_TOOLS, reviewTools, withFailback, withoutSecrets, } from "@open-cr-agent/core/internal";
 import { createOpencodeClient } from "@opencode-ai/sdk/v2";
 import { resolveOpencodeBinary } from "./binary.js";
 import { startOpencodeServer } from "./opencode-server.js";
@@ -68,20 +68,17 @@ export class OpenCodeRuntime {
             throw new OcraError("INTERNAL", "An OpenCodeRuntime instance serves a single review run");
         }
         this.context = spec.context;
-        const chain = this.options.models[spec.modelTier] ?? [];
-        if (chain.length === 0) {
-            yield {
-                type: "error",
-                taskId: spec.taskId,
-                retryable: false,
-                error: noModel(spec.modelTier),
-            };
+        const chain = callChain(this.options.models, spec.modelTier, spec.models);
+        const refused = chain.length === 0 ? noModel(spec.modelTier) : this.unprepared(spec.models);
+        if (refused) {
+            yield { type: "error", taskId: spec.taskId, retryable: false, error: refused };
             return;
         }
         const infra = await this.start();
         yield* withFailback({
             taskId: spec.taskId,
             tier: spec.modelTier,
+            ...(spec.models?.length ? { agent: spec.reviewer } : {}),
             chain,
             health: this.health,
             signal,
@@ -98,12 +95,14 @@ export class OpenCodeRuntime {
         });
     }
     async complete(request, signal) {
-        const chain = this.options.models[request.tier] ?? [];
-        if (chain.length === 0)
-            throw new OcraError("CONFIG_INVALID", noModel(request.tier));
+        const chain = callChain(this.options.models, request.tier, request.models);
+        const refused = chain.length === 0 ? noModel(request.tier) : this.unprepared(request.models);
+        if (refused)
+            throw new OcraError("CONFIG_INVALID", refused);
         const infra = await this.start();
         return completeWithFailback({
             tier: request.tier,
+            ...(request.models?.length ? { agent: request.agent ?? request.tier } : {}),
             chain,
             health: this.health,
             signal,
@@ -138,13 +137,25 @@ export class OpenCodeRuntime {
             }
             : outcome);
     }
+    // The server holds the credentials of the providers it started with; an
+    // agent's own chain naming another would fail at OpenCode as "model not
+    // found". The tier chains are always among them.
+    unprepared(own) {
+        if (!own?.length)
+            return undefined;
+        const prepared = new Set(providersOf(this.options));
+        const model = own.find((m) => !prepared.has(parseModel(m).providerID));
+        return model === undefined
+            ? undefined
+            : `"${model}" is not among the models the runtime was started with (RuntimeOptions.models or agentModels)`;
+    }
     start() {
         this.infra ??= this.launch();
         return this.infra;
     }
     async launch() {
         const custom = this.options.providers ?? {};
-        const missing = missingCredentials(this.options.env, providersOf(this.options.models), custom);
+        const missing = missingCredentials(this.options.env, providersOf(this.options), custom);
         if (missing.length > 0)
             throw new OcraError("CONFIG_CREDENTIALS_MISSING", missing.join("; "));
         const root = await mkdtemp(join(tmpdir(), "ocra-opencode-"));
@@ -161,7 +172,7 @@ export class OpenCodeRuntime {
             const server = await startOpencodeServer({
                 binary: this.options.binary ?? resolveOpencodeBinary(this.options.env),
                 cwd: workspace,
-                env: serverEnv(this.options.env, dirs, providersOf(this.options.models), custom),
+                env: serverEnv(this.options.env, dirs, providersOf(this.options), custom),
                 config: openCodeConfig(tools, this.helperTools, custom, this.options.sampling),
             });
             started = server;
@@ -179,7 +190,7 @@ export class OpenCodeRuntime {
                 rmSync(root, { recursive: true, force: true });
             };
             process.on("exit", onExit);
-            const secrets = credentialValues(this.options.env, providersOf(this.options.models), custom);
+            const secrets = credentialValues(this.options.env, providersOf(this.options), custom);
             return { root, tools, server, client, dispatcher, onExit, secrets };
         }
         catch (error) {
@@ -270,8 +281,10 @@ function providerConfig(custom, temperature) {
         },
     ]));
 }
-function providersOf(models) {
-    return Object.values(models).flatMap((chain) => (chain ?? []).map((m) => parseModel(m).providerID));
+// The providers of every chain a call may run on: the tiers' and the
+// agents' own (ADR-0025), so each gets its credentials like a tier's.
+export function providersOf(options) {
+    return [...Object.values(options.models), ...Object.values(options.agentModels ?? {})].flatMap((chain) => (chain ?? []).map((m) => parseModel(m).providerID));
 }
 function noModel(tier) {
     return `No model configured for the "${tier}" tier; set models.${tier} in .ocra/config.json or OCRA_MODEL_${tier.toUpperCase()}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-cr-agent/runtime-opencode",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "OpenCode-based agent runtime for Open-CR-Agent",
   "keywords": [
     "code-review",
@@ -34,7 +34,7 @@
   ],
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.30.1",
-    "@open-cr-agent/core": "0.4.0",
+    "@open-cr-agent/core": "0.5.0",
     "@opencode-ai/sdk": "1.18.32",
     "opencode-ai": "1.18.32",
     "undici": "^8.11.2",