Skip to content

fix(desktop): PR #313 small-model regression (OAuth + provider fallback) #318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MocA-Love merged 1 commit into from
Apr 18, 2026
Merged

fix(desktop): PR #313 small-model regression (OAuth + provider fallback) #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
278 changes: 99 additions & 179 deletions apps/desktop/src/lib/ai/call-small-model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
// FORK NOTE: upstream #3517 removed provider-diagnostics and the
// SmallModelProviders array based on per-attempt reporting — mastracode's
// AuthStorage is now the only credential source and getSmallModel() returns
// a single LanguageModel (Anthropic-then-OpenAI, API key only).
// FORK NOTE: upstream #3517 removed fork's SmallModelProviders array
// and the provider-diagnostics store. Fork code (enhance-text.ts,
// git-operations.ts) still calls callSmallModel({ invoke }) expecting
// { result, attempts } with per-provider fallback. This shim restores
// that behavior on top of getSmallModelCandidates() (a fork-maintained
// replacement that returns the full priority list with OAuth / API key
// / proxy AUTH_TOKEN correctly wired via getAnthropicProviderOptions).
//
// Fork code (enhance-text.ts, git-operations.ts) still consumes the old
// callSmallModel({ invoke }) -> { result, attempts } shape. Rather than
// rewriting every callsite, expose a thin shim backed by the new
// getSmallModel() so the existing logging / error mapping keeps working.
//
// Trade-offs vs. upstream #3517:
// - OAuth-only users get no small-model service (upstream accepts this).
// - The attempts[] list collapses to a single entry (we don't try per-
// provider anymore — getSmallModel() picks one and returns it).
import { getSmallModel } from "@superset/chat/server/shared";
// Trade-offs vs. the pre-#3517 fork:
// - ProviderIssue reporting collapsed to generic `failed` — upstream
// removed the diagnostic classifiers when it dropped
// provider-diagnostics, and fork no longer surfaces them anywhere
// except describeEnhanceFailure's reason string.
// - Credential resolution happens synchronously (mastracode token
// refresh is not awaited in the candidate list). If an OAuth access
// token is actually expired, the next candidate in the priority
// chain is tried.
import { getSmallModelCandidates } from "@superset/chat/server/shared";
import type { ProviderId, ProviderIssue } from "shared/ai/provider-status";

export type SmallModelCredentialKind = "api_key" | "oauth" | "env";
Expand Down Expand Up @@ -44,125 +47,15 @@ export interface SmallModelInvocationContext {
credentials: SmallModelCredential;
}

function providerNameFor(providerId: ProviderId): string {
return providerId === "anthropic" ? "Anthropic" : "OpenAI";
}

// Mirror getSmallModel()'s resolution precedence so the synthesized
// attempt shows the provider that actually got used: Anthropic if env or
// mastracode auth.json carries an API key, else OpenAI, else fallback to
// Anthropic. We duplicate the path resolution rather than import
// getSmallModel internals because the store file path is stable
// (mastracode's CLI installs to the same OS-conventional dir).
function hasAnthropicAuthKey(): boolean {
if (process.env.ANTHROPIC_API_KEY?.trim()) return true;
if (hasStoredApiKeyIn("anthropic")) return true;
// FORK NOTE: match get-small-model.ts's read of
// ~/.superset/chat-anthropic-env.json managed env config.
return hasAnthropicEnvConfigKey();
}

function hasOpenAIAuthKey(): boolean {
if (process.env.OPENAI_API_KEY?.trim()) return true;
// FORK NOTE: fork stores OpenAI under the `openai-codex` slot; also
// check the stock `openai` slot.
if (hasStoredApiKeyIn("openai")) return true;
return hasStoredApiKeyIn("openai-codex");
}

function hasAnthropicEnvConfigKey(): boolean {
// Mirrors the same shape parseAnthropicEnvText in
// packages/chat/src/server/desktop/chat-service/anthropic-env-config.ts
// accepts: optional `export ` prefix, optional single/double quotes.
// Whatever it can't parse, it falls back to false — the actual key
// resolution lives in get-small-model.ts (which imports the real
// parseAnthropicEnvText), so a miss here only degrades attempt-logging
// labels, not small-model functionality.
try {
const fs = require("node:fs") as typeof import("node:fs");
const os = require("node:os") as typeof import("node:os");
const path = require("node:path") as typeof import("node:path");
const supersetHome =
process.env.SUPERSET_HOME_DIR?.trim() ||
path.join(os.homedir(), ".superset");
const configPath = path.join(supersetHome, "chat-anthropic-env.json");
if (!fs.existsSync(configPath)) return false;
const parsed = JSON.parse(fs.readFileSync(configPath, "utf-8")) as {
envText?: string;
};
if (typeof parsed.envText !== "string") return false;
for (const line of parsed.envText.split("\n")) {
const trimmed = line.trim().replace(/^export\s+/, "");
if (!trimmed || trimmed.startsWith("#")) continue;
const eq = trimmed.indexOf("=");
if (eq === -1) continue;
const key = trimmed.slice(0, eq).trim();
let value = trimmed.slice(eq + 1).trim();
if (
(value.startsWith('"') && value.endsWith('"')) ||
(value.startsWith("'") && value.endsWith("'"))
) {
value = value.slice(1, -1);
}
if (
(key === "ANTHROPIC_API_KEY" || key === "ANTHROPIC_AUTH_TOKEN") &&
value.length > 0
) {
return true;
}
}
} catch {
return false;
}
return false;
}

function hasStoredApiKeyIn(providerId: string): boolean {
try {
// Lazy require so this never blocks in non-Node environments.
const fs = require("node:fs") as typeof import("node:fs");
const os = require("node:os") as typeof import("node:os");
const path = require("node:path") as typeof import("node:path");
const p = os.platform();
let base: string;
if (p === "darwin") {
base = path.join(os.homedir(), "Library", "Application Support");
} else if (p === "win32") {
base =
process.env.APPDATA ?? path.join(os.homedir(), "AppData", "Roaming");
} else {
base =
process.env.XDG_DATA_HOME ?? path.join(os.homedir(), ".local", "share");
}
const authPath = path.join(base, "mastracode", "auth.json");
if (!fs.existsSync(authPath)) return false;
const data = JSON.parse(fs.readFileSync(authPath, "utf-8")) as Record<
string,
unknown
>;
const entry = data[`apikey:${providerId}`];
return (
typeof entry === "object" &&
entry !== null &&
"type" in entry &&
(entry as { type?: unknown }).type === "api_key" &&
"key" in entry &&
typeof (entry as { key?: unknown }).key === "string" &&
(entry as { key: string }).key.trim().length > 0
);
} catch {
return false;
}
}

function detectProviderId(): ProviderId {
if (hasAnthropicAuthKey()) return "anthropic";
if (hasOpenAIAuthKey()) return "openai";
return "anthropic";
function toShimCredentialKind(
kind: "apiKey" | "oauth",
): SmallModelCredentialKind {
return kind === "oauth" ? "oauth" : "api_key";
}

export async function callSmallModel<TResult>({
invoke,
providerOrder,
}: {
invoke: (
context: SmallModelInvocationContext,
Expand All @@ -172,72 +65,99 @@ export async function callSmallModel<TResult>({
result: TResult | null;
attempts: SmallModelAttempt[];
}> {
const model = getSmallModel();
if (!model) {
const allCandidates = getSmallModelCandidates();

const ordered = providerOrder
? [...allCandidates].sort((a, b) => {
const ai = providerOrder.indexOf(a.providerId);
const bi = providerOrder.indexOf(b.providerId);
return (
(ai === -1 ? Number.MAX_SAFE_INTEGER : ai) -
(bi === -1 ? Number.MAX_SAFE_INTEGER : bi)
);
})
: allCandidates;

const attempts: SmallModelAttempt[] = [];

if (ordered.length === 0) {
// No credentials at all for either provider. Fabricate two
// missing-credentials attempts so describeEnhanceFailure's
// "every attempt is missing-credentials" branch triggers the
// correct "アカウントが接続されていません" message.
return {
result: null,
attempts: [
{
providerId: "anthropic",
providerName: providerNameFor("anthropic"),
providerName: "Anthropic",
outcome: "missing-credentials",
},
{
providerId: "openai",
providerName: providerNameFor("openai"),
providerName: "OpenAI",
outcome: "missing-credentials",
},
],
};
}

const providerId = detectProviderId();
const providerName = providerNameFor(providerId);
const credentials: SmallModelCredential = { kind: "api_key" };
for (const candidate of ordered) {
const credentials: SmallModelCredential = {
kind: toShimCredentialKind(candidate.credentialKind),
source: candidate.credentialSource,
};
let model: unknown;
try {
model = candidate.createModel();
} catch (error) {
attempts.push({
providerId: candidate.providerId,
providerName: candidate.providerName,
credentialKind: credentials.kind,
credentialSource: candidate.credentialSource,
outcome: "failed",
reason: error instanceof Error ? error.message : String(error),
});
continue;
}

try {
const result = await invoke({
providerId,
providerName,
model,
credentials,
});
if (result === null || result === undefined) {
return {
result: null,
attempts: [
{
providerId,
providerName,
credentialKind: "api_key",
outcome: "empty-result",
},
],
};
try {
const result = await invoke({
providerId: candidate.providerId,
providerName: candidate.providerName,
model,
credentials,
});
if (result === null || result === undefined) {
attempts.push({
providerId: candidate.providerId,
providerName: candidate.providerName,
credentialKind: credentials.kind,
credentialSource: candidate.credentialSource,
outcome: "empty-result",
});
continue;
}
attempts.push({
providerId: candidate.providerId,
providerName: candidate.providerName,
credentialKind: credentials.kind,
credentialSource: candidate.credentialSource,
outcome: "succeeded",
});
return { result, attempts };
} catch (error) {
attempts.push({
providerId: candidate.providerId,
providerName: candidate.providerName,
credentialKind: credentials.kind,
credentialSource: candidate.credentialSource,
outcome: "failed",
reason: error instanceof Error ? error.message : String(error),
});
}
return {
result,
attempts: [
{
providerId,
providerName,
credentialKind: "api_key",
outcome: "succeeded",
},
],
};
} catch (error) {
return {
result: null,
attempts: [
{
providerId,
providerName,
credentialKind: "api_key",
outcome: "failed",
reason: error instanceof Error ? error.message : String(error),
},
],
};
}

return { result: null, attempts };
}
7 changes: 6 additions & 1 deletion packages/chat/src/server/shared/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
export { getSmallModel } from "./small-model";
export {
getSmallModel,
getSmallModelCandidates,
type SmallModelCandidate,
type SmallModelProviderId,
} from "./small-model";
Loading
Loading