Skip to content
Draft
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
6 changes: 3 additions & 3 deletions desktop/renderer/renderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -24590,12 +24590,12 @@ function localTurnGate() {
? 'no local model is selected — open Models (/local) to pick and download one'
: (bswDownloadProgress(modelId) || 'not downloaded — open Models (/local) and press Enter on it to download');
const subject = modelId === null ? status : 'local model ' + modelId + ' is ' + status;
// resolveFallbackChain: the configured chain (or just the active id), with local-llama appended unless appendLocal is false.
// resolveFallbackChain: the configured chain (or just the active id), with local-llama appended only when appendLocal is true (agent default off, ATO-1643).
const ids = new Set(providers.map((p) => p.id));
const fb = llm.fallback || {};
const requested = (fb.chain && fb.chain.length) ? fb.chain : [llm.activeTextProvider];
const chain = [llm.activeTextProvider].concat(requested.filter((id) => ids.has(id) && id !== llm.activeTextProvider));
if (fb.appendLocal !== false) { const local = providers.find((p) => p.kind === 'llama-server'); if (local && !chain.includes(local.id)) chain.push(local.id); }
if (fb.appendLocal === true) { const local = providers.find((p) => p.kind === 'llama-server'); if (local && !chain.includes(local.id)) chain.push(local.id); }
const length = chain.filter((id, i) => ids.has(id) && chain.indexOf(id) === i).length;
if (length > 1) return {kind:'notice', text: subject + ' — running this turn through the fallback chain'};
return {kind:'block', text: subject};
Expand Down Expand Up @@ -27777,7 +27777,7 @@ function llmFallbackView() {
const llm = llmBlock();
const providers = llmProviders();
const fb = llm.fallback || {};
const appendLocal = fb.appendLocal === undefined ? true : !!fb.appendLocal;
const appendLocal = fb.appendLocal === true; // unset = off, like the agent's DEFAULT_APPEND_LOCAL (ATO-1643)
const explicitChain = Array.isArray(fb.chain) ? fb.chain.filter((x) => typeof x === 'string') : [];
const configured = new Set(providers.map((p) => p.id));
const activeId = llmActiveTextId();
Expand Down
67 changes: 67 additions & 0 deletions desktop/test/fallback-append-local-default.test.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
// ATO-1643: since v0.7.0 the agent does not append the local model to the
// fallback chain unless llm.fallback.appendLocal is true (DEFAULT_APPEND_LOCAL
// = false in src/llm/fallback/fallback-config.ts). The desktop used to read an
// unset value as on: Settings › Fallback showed "On" with the local model in
// the chain, and the turn gate promised a fallback the agent never runs.
//
// renderer.js is read as text; llmFallbackView runs in a vm context with its
// neighbours stubbed. No deps, no build.
import { test } from "node:test";
import assert from "node:assert/strict";
import { readFileSync } from "node:fs";
import vm from "node:vm";

const source = readFileSync(new URL("../renderer/renderer.js", import.meta.url), "utf8");

function fn(name) {
const at = source.indexOf("\nfunction " + name + "(");
assert.ok(at >= 0, name + " is a top-level function in renderer.js");
return source.slice(at + 1, source.indexOf("\n}\n", at) + 2);
}

const providers = [
{ id: "openrouter", kind: "openrouter", model: "m1" },
{ id: "local-llama", kind: "llama-server", model: "q" },
];

function viewFor(fallback) {
const llm = { activeTextProvider: "openrouter", providers };
if (fallback !== undefined) llm.fallback = fallback;
const c = vm.createContext({
llmBlock: () => llm,
llmProviders: () => providers,
llmActiveTextId: () => "openrouter",
});
vm.runInContext(fn("llmFallbackView") + "globalThis.llmFallbackView = llmFallbackView;", c);
return c.llmFallbackView();
}

test("no llm.fallback block: local is Off and not in the chain", () => {
const v = viewFor(undefined);
assert.equal(v.appendLocal, false);
assert.deepEqual(Array.from(v.links, (l) => l.providerId), ["openrouter"]);
assert.ok(v.addableProviderIds.includes("local-llama"));
});

test("fallback block without appendLocal: still Off", () => {
const v = viewFor({ chain: ["openrouter"] });
assert.equal(v.appendLocal, false);
assert.ok(!v.links.some((l) => l.isAppendedLocal));
});

test("appendLocal true: On, local appended last", () => {
const v = viewFor({ appendLocal: true });
assert.equal(v.appendLocal, true);
assert.deepEqual(Array.from(v.links, (l) => l.providerId), ["openrouter", "local-llama"]);
assert.equal(v.links[1].isAppendedLocal, true);
});

test("appendLocal false: Off", () => {
assert.equal(viewFor({ appendLocal: false }).appendLocal, false);
});

test("turn gate appends local only when appendLocal is true", () => {
const gate = fn("localTurnGate");
assert.ok(gate.includes("fb.appendLocal === true"), "localTurnGate treats unset as off");
assert.ok(!gate.includes("fb.appendLocal !== false"), "the old unset-means-on check is gone");
});
Loading