add deprecated model fallback chain resolution
models can now be marked `deprecated: true` with a `fallback` slug pointing to a replacement. `resolveCliModel` follows the chain recursively (with cycle detection) until it finds a non-deprecated model. this keeps deprecated models in the registry for backward compatibility instead of removing them. marks opencode/mimo-v2-pro-free as deprecated with fallback to opencode/nemotron-3-super-free. Made-with: Cursor
This commit is contained in:
committed by
pullfrog[bot]
parent
a45c164b18
commit
b8c4d5b716
+1
-5
@@ -13,7 +13,7 @@
|
||||
* security is enforced at the tool layer, not the process layer.
|
||||
*/
|
||||
import { execFileSync } from "node:child_process";
|
||||
import { mkdirSync, rmSync } from "node:fs";
|
||||
import { mkdirSync } from "node:fs";
|
||||
import { join } from "node:path";
|
||||
import { performance } from "node:perf_hooks";
|
||||
import { ghPullfrogMcpName } from "../external.ts";
|
||||
@@ -627,10 +627,6 @@ export const opentoad = agent({
|
||||
agent: "opencode",
|
||||
});
|
||||
|
||||
// remove untrusted project plugins/tools before agent starts (no env var to disable loading)
|
||||
rmSync(join(process.cwd(), ".opencode", "plugins"), { recursive: true, force: true });
|
||||
rmSync(join(process.cwd(), ".opencode", "tools"), { recursive: true, force: true });
|
||||
|
||||
const args = ["run", ctx.instructions.full, "--format", "json", "--print-logs"];
|
||||
|
||||
// OPENCODE_PERMISSION has absolute highest precedence (merged after managed/MDM configs).
|
||||
|
||||
@@ -107842,7 +107842,9 @@ var providers = {
|
||||
displayName: "MiMo V2 Pro",
|
||||
resolve: "opencode/mimo-v2-pro-free",
|
||||
envVars: [],
|
||||
isFree: true
|
||||
isFree: true,
|
||||
deprecated: true,
|
||||
fallback: "opencode/nemotron-3-super-free"
|
||||
},
|
||||
"minimax-m2.5-free": {
|
||||
displayName: "MiniMax M2.5",
|
||||
@@ -107951,14 +107953,25 @@ var modelAliases = Object.entries(providers).flatMap(
|
||||
resolve: def.resolve,
|
||||
openRouterResolve: def.openRouterResolve,
|
||||
preferred: def.preferred ?? false,
|
||||
isFree: def.isFree ?? false
|
||||
isFree: def.isFree ?? false,
|
||||
deprecated: def.deprecated ?? false,
|
||||
fallback: def.fallback
|
||||
}))
|
||||
);
|
||||
function resolveModelSlug(slug) {
|
||||
return modelAliases.find((a) => a.slug === slug)?.resolve;
|
||||
}
|
||||
var MAX_FALLBACK_DEPTH = 10;
|
||||
function resolveCliModel(slug) {
|
||||
return resolveModelSlug(slug);
|
||||
let current = slug;
|
||||
const visited = /* @__PURE__ */ new Set();
|
||||
for (let i = 0; i < MAX_FALLBACK_DEPTH; i++) {
|
||||
if (visited.has(current)) return void 0;
|
||||
visited.add(current);
|
||||
const alias = modelAliases.find((a) => a.slug === current);
|
||||
if (!alias) return void 0;
|
||||
if (!alias.deprecated) return alias.resolve;
|
||||
if (!alias.fallback) return void 0;
|
||||
current = alias.fallback;
|
||||
}
|
||||
return void 0;
|
||||
}
|
||||
|
||||
// utils/buildPullfrogFooter.ts
|
||||
@@ -144696,7 +144709,7 @@ var import_semver = __toESM(require_semver2(), 1);
|
||||
// package.json
|
||||
var package_default = {
|
||||
name: "@pullfrog/pullfrog",
|
||||
version: "0.0.188",
|
||||
version: "0.0.189",
|
||||
type: "module",
|
||||
files: [
|
||||
"index.js",
|
||||
@@ -149541,7 +149554,7 @@ var claude = agent({
|
||||
|
||||
// agents/opentoad.ts
|
||||
import { execFileSync as execFileSync3 } from "node:child_process";
|
||||
import { mkdirSync as mkdirSync4, rmSync } from "node:fs";
|
||||
import { mkdirSync as mkdirSync4 } from "node:fs";
|
||||
import { join as join11 } from "node:path";
|
||||
import { performance as performance7 } from "node:perf_hooks";
|
||||
async function installOpencodeCli() {
|
||||
@@ -149925,8 +149938,6 @@ var opentoad = agent({
|
||||
env: homeEnv,
|
||||
agent: "opencode"
|
||||
});
|
||||
rmSync(join11(process.cwd(), ".opencode", "plugins"), { recursive: true, force: true });
|
||||
rmSync(join11(process.cwd(), ".opencode", "tools"), { recursive: true, force: true });
|
||||
const args2 = ["run", ctx.instructions.full, "--format", "json", "--print-logs"];
|
||||
const permissionOverride = JSON.stringify({
|
||||
external_directory: { "*": "deny", "/tmp/*": "allow" }
|
||||
|
||||
@@ -22,6 +22,10 @@ export interface ModelAlias {
|
||||
preferred: boolean;
|
||||
/** whether this alias is free and requires no API key */
|
||||
isFree: boolean;
|
||||
/** model is deprecated on models.dev — resolve via fallback chain instead */
|
||||
deprecated: boolean;
|
||||
/** slug of another model to resolve to when this one is deprecated */
|
||||
fallback: string | undefined;
|
||||
}
|
||||
|
||||
interface ModelDef {
|
||||
@@ -33,6 +37,10 @@ interface ModelDef {
|
||||
preferred?: boolean;
|
||||
envVars?: readonly string[];
|
||||
isFree?: boolean;
|
||||
/** model is deprecated on models.dev — kept for backward compatibility, resolved via fallback */
|
||||
deprecated?: boolean;
|
||||
/** slug of another model to fall back to (e.g. "opencode/nemotron-3-super-free") */
|
||||
fallback?: string;
|
||||
}
|
||||
|
||||
export interface ProviderConfig {
|
||||
@@ -221,6 +229,8 @@ export const providers = {
|
||||
resolve: "opencode/mimo-v2-pro-free",
|
||||
envVars: [],
|
||||
isFree: true,
|
||||
deprecated: true,
|
||||
fallback: "opencode/nemotron-3-super-free",
|
||||
},
|
||||
"minimax-m2.5-free": {
|
||||
displayName: "MiniMax M2.5",
|
||||
@@ -348,6 +358,8 @@ export const modelAliases: ModelAlias[] = Object.entries(providers).flatMap(
|
||||
openRouterResolve: def.openRouterResolve,
|
||||
preferred: def.preferred ?? false,
|
||||
isFree: def.isFree ?? false,
|
||||
deprecated: def.deprecated ?? false,
|
||||
fallback: def.fallback,
|
||||
}))
|
||||
);
|
||||
|
||||
@@ -358,7 +370,24 @@ export function resolveModelSlug(slug: string): string | undefined {
|
||||
return modelAliases.find((a) => a.slug === slug)?.resolve;
|
||||
}
|
||||
|
||||
/** resolve a model slug to the CLI-ready model string (full models.dev specifier) */
|
||||
const MAX_FALLBACK_DEPTH = 10;
|
||||
|
||||
/**
|
||||
* resolve a model slug to the CLI-ready model string, following the fallback
|
||||
* chain when a model is deprecated. returns the first non-deprecated resolve
|
||||
* target, or undefined if the chain is exhausted or broken.
|
||||
*/
|
||||
export function resolveCliModel(slug: string): string | undefined {
|
||||
return resolveModelSlug(slug);
|
||||
let current = slug;
|
||||
const visited = new Set<string>();
|
||||
for (let i = 0; i < MAX_FALLBACK_DEPTH; i++) {
|
||||
if (visited.has(current)) return undefined;
|
||||
visited.add(current);
|
||||
const alias = modelAliases.find((a) => a.slug === current);
|
||||
if (!alias) return undefined;
|
||||
if (!alias.deprecated) return alias.resolve;
|
||||
if (!alias.fallback) return undefined;
|
||||
current = alias.fallback;
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@pullfrog/pullfrog",
|
||||
"version": "0.0.188",
|
||||
"version": "0.0.189",
|
||||
"type": "module",
|
||||
"files": [
|
||||
"index.js",
|
||||
|
||||
@@ -37686,7 +37686,9 @@ var providers = {
|
||||
displayName: "MiMo V2 Pro",
|
||||
resolve: "opencode/mimo-v2-pro-free",
|
||||
envVars: [],
|
||||
isFree: true
|
||||
isFree: true,
|
||||
deprecated: true,
|
||||
fallback: "opencode/nemotron-3-super-free"
|
||||
},
|
||||
"minimax-m2.5-free": {
|
||||
displayName: "MiniMax M2.5",
|
||||
@@ -37773,7 +37775,9 @@ var modelAliases = Object.entries(providers).flatMap(
|
||||
resolve: def.resolve,
|
||||
openRouterResolve: def.openRouterResolve,
|
||||
preferred: def.preferred ?? false,
|
||||
isFree: def.isFree ?? false
|
||||
isFree: def.isFree ?? false,
|
||||
deprecated: def.deprecated ?? false,
|
||||
fallback: def.fallback
|
||||
}))
|
||||
);
|
||||
|
||||
@@ -41557,7 +41561,7 @@ var core3 = __toESM(require_core(), 1);
|
||||
// package.json
|
||||
var package_default = {
|
||||
name: "@pullfrog/pullfrog",
|
||||
version: "0.0.188",
|
||||
version: "0.0.189",
|
||||
type: "module",
|
||||
files: [
|
||||
"index.js",
|
||||
|
||||
+26
-5
@@ -1,5 +1,5 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { type ModelProvider, modelAliases, providers } from "../models.ts";
|
||||
import { type ModelProvider, modelAliases, providers, resolveCliModel } from "../models.ts";
|
||||
|
||||
type ModelsDevModel = {
|
||||
name: string;
|
||||
@@ -38,10 +38,31 @@ describe("models.dev validity", async () => {
|
||||
).toBeDefined();
|
||||
});
|
||||
|
||||
it(`${alias.resolve} is not deprecated`, () => {
|
||||
const model = data[parsed.provider]?.models[parsed.modelId];
|
||||
if (!model) return; // covered by existence test above
|
||||
expect(model.status, `${alias.resolve} is deprecated on models.dev`).not.toBe("deprecated");
|
||||
if (!alias.deprecated) {
|
||||
it(`${alias.resolve} is not deprecated`, () => {
|
||||
const model = data[parsed.provider]?.models[parsed.modelId];
|
||||
if (!model) return; // covered by existence test above
|
||||
expect(model.status, `${alias.resolve} is deprecated on models.dev`).not.toBe("deprecated");
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// deprecated models must have a fallback that resolves to a non-deprecated model
|
||||
const deprecatedAliases = modelAliases.filter((a) => a.deprecated);
|
||||
for (const alias of deprecatedAliases) {
|
||||
it(`${alias.slug} (deprecated) has a fallback`, () => {
|
||||
expect(
|
||||
alias.fallback,
|
||||
`deprecated model "${alias.slug}" is missing a fallback`
|
||||
).toBeDefined();
|
||||
});
|
||||
|
||||
it(`${alias.slug} (deprecated) fallback chain resolves`, () => {
|
||||
const resolved = resolveCliModel(alias.slug);
|
||||
expect(
|
||||
resolved,
|
||||
`fallback chain for "${alias.slug}" does not resolve to a non-deprecated model`
|
||||
).toBeDefined();
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user