cozyclay 3.1.2 → 3.1.3

package/bin/agent/providers.mjs

@@ -5,6 +5,9 @@ import { createCredentialStore } from "./credential-store.mjs";
 import { readCredentials } from "./provider-keys.mjs";
 import { cliproxyBase, cliproxyProvider, extendCliproxyProvider, registryLiveCliproxy } from "./cliproxy-provider.mjs";
 export { cliproxyLiveModel } from "./cliproxy-provider.mjs";
+import { OPENAI_COMPATIBLE_ID, openaiCompatibleProvider, refreshOpenAICompatible } from "./openai-compatible-provider.mjs";
+import { rolesByMain } from "./model-roles.mjs";
+export { MODEL_ROLES, fallbackChain, resolveRoleModels } from "./model-roles.mjs";
 
 // #379 (F2 pass 5 finding 4): pi never forwards a per-request `fetch` to the
 // codex API module — `pi-agent-core`'s `createRequestOptions` (the options
@@ -58,30 +61,38 @@ function ensureCodexFetchPatched() {
 export const PROVIDERS = [
 	{ id: "openai-codex", label: "ChatGPT (OpenAI Codex)", auth: "chatgpt-oauth", env: [] },
 	{ id: "anthropic", label: "Anthropic", auth: "api_key", env: ["ANTHROPIC_API_KEY"] },
+	// #claude-subscription: Claude Pro/Max OAuth sign-in; requests run through the official
+	// Claude Code binary (anthropic-subscription.mjs), never against the API with a raw token.
+	{ id: "anthropic-subscription", label: "Claude (Anthropic)", auth: "oauth", env: [] },
 	{ id: "openai", label: "OpenAI", auth: "api_key", env: ["OPENAI_API_KEY"] },
 	{ id: "google", label: "Google Gemini", auth: "api_key", env: ["GEMINI_API_KEY", "GOOGLE_API_KEY"] },
+	{ id: "minimax", label: "MiniMax", auth: "api_key", env: ["MINIMAX_API_KEY"] }, { id: "minimax-cn", label: "MiniMax (China)", auth: "api_key", env: ["MINIMAX_CN_API_KEY"] },
 	{ id: "openrouter", label: "OpenRouter", auth: "api_key", env: ["OPENROUTER_API_KEY"] },
 	{ id: "cliproxy", label: "CLIProxyAPI", auth: "api_key", env: ["CLIPROXY_API_KEY"] },
+	// #885: LM Studio, Ollama or any OpenAI-compatible server; its address rides the stored credential
+	{ id: OPENAI_COMPATIBLE_ID, label: "OpenAI-compatible server", auth: "api_key", env: [] },
 ];
 
 const factories = {
-	"openai-codex": "openaiCodexProvider",
-	anthropic: "anthropicProvider",
-	openai: "openaiProvider",
-	google: "googleProvider",
+	"openai-codex": "openaiCodexProvider", openai: "openaiProvider", google: "googleProvider", minimax: "minimaxProvider", "minimax-cn": "minimaxCnProvider",
 	openrouter: "openrouterProvider",
 };
 
 const providerConfig = (id) => PROVIDERS.find((provider) => provider.id === id);
 
-export async function loadProvider(id, options = {}) {
-	const { baseUrl, env = process.env } = options;
-	const config = providerConfig(id);
-	if (!config) throw Object.assign(new Error(`Unknown provider: ${id}`), { code: "UNKNOWN_PROVIDER" });
+export async function loadProvider(id, { baseUrl, env = process.env } = {}) {
+	if (!providerConfig(id)) throw Object.assign(new Error(`Unknown provider: ${id}`), { code: "UNKNOWN_PROVIDER" });
 	if (id === "openai-codex") ensureCodexFetchPatched();
+	// Both Anthropic lanes come from CozyClay's own module: the subscription lane, and pi-ai's
+	// API-key lane minus the OAuth login it also advertises (see anthropicLaneProvider).
 	const provider = id === "cliproxy"
 		? await cliproxyProvider({ baseUrl, env })
-		: await import(`@earendil-works/pi-ai/providers/${id}`).then((module) => module[factories[id]]());
+		: id === OPENAI_COMPATIBLE_ID ? await openaiCompatibleProvider() : id === "anthropic" || id === "anthropic-subscription"
+			? await import("./anthropic-subscription.mjs").then((module) => module.anthropicLaneProvider(id))
+			: await import(`@earendil-works/pi-ai/providers/${id}`).then((module) => module[factories[id]]());
+	// pi 0.99 gave the API-key OpenAI lane a ChatGPT sign-in too; CozyClay's ChatGPT sign-in is the
+	// openai-codex lane, so the panel keeps showing one ChatGPT button.
+	if (id === "openai") provider.auth = { ...provider.auth, oauth: undefined };
 	if (baseUrl && id !== "cliproxy") {
 		provider.baseUrl = baseUrl;
 		const getModels = provider.getModels.bind(provider);
@@ -95,19 +106,18 @@ const piEffort = (level) => level === "none" ? "off" : level === "ultra" ? "max"
 const wireEffort = (level) => (level === "off" ? "none" : level);
 
 const registryCatalogueState = new WeakMap();
-
 function catalogueState(models) {
 	let state = registryCatalogueState.get(models);
 	if (!state) {
-		state = { fetch: null, models: [], extendedProviders: new WeakSet(), cliproxyFetch: null };
+		state = { fetch: null, models: [], extendedProviders: new WeakSet(), cliproxyFetch: null, cliproxyFetchError: null };
 		registryCatalogueState.set(models, state);
 	}
 	return state;
 }
-
 function livePiModel(model, template) {
 	const supported = new Set(model.efforts.map(piEffort));
-	const thinkingLevelMap = Object.fromEntries(PI_EFFORT_LEVELS.map((level) => [level, supported.has(level) ? level : null]));
+	// map values are what goes on the wire: pi sends a model's off mapping, and Codex calls it "none"
+	const thinkingLevelMap = Object.fromEntries(PI_EFFORT_LEVELS.map((level) => [level, supported.has(level) ? wireEffort(level) : null]));
 	return { ...template, id: model.id, name: model.label, thinkingLevelMap };
 }
 
@@ -171,6 +181,8 @@ export async function resolveModel(requested, options = {}) {
 	if (!modelId) throw unknownModel(requested);
 	const models = options.models ?? await createModels(options);
 	if (!providerConfig(provider) && !models.getProvider?.(provider)) throw unknownModel(requested);
+	// a custom server's models are its live /v1/models list, read again when a turn names one not listed yet (#885)
+	if (provider === OPENAI_COMPATIBLE_ID && !models.getModel(provider, modelId)) await refreshOpenAICompatible(models);
 	const model = models.getModel(provider, modelId);
 	if (!model) throw unknownModel(requested);
 	return { provider, modelId, model };
@@ -207,7 +219,8 @@ function resolveAuthSource(provider, { auth, saved, env }) {
 }
 
 export function providerStatus({ auth = defaultAuth, keys = defaultKeys, env = process.env } = {}) {
-	const saved = keys.readKeys();
+	// a stored API key (keys file) and an OAuth sign-in such as a subscription (auth.json) both count
+	const saved = { ...keys.readKeys(), ...readCredentials() };
 	return PROVIDERS.map((provider) => {
 		const authSource = resolveAuthSource(provider, { auth, saved, env });
 		return { id: provider.id, label: provider.label, authSource, signedIn: !!authSource };
@@ -254,119 +267,6 @@ function liveModelsCodex(result) {
 	}).filter((model) => model.id);
 }
 
-// --- model roles (#717) ------------------------------------------------------
-//
-// One picked model (main) implies the rest of the lineup a turn may lean on: a
-// cheap helper, a mid-tier advisor, a model that can see images, and the
-// ordered alternatives to try when main fails. Subscription accounts usually
-// have exactly one signed-in provider, so every derived role stays on main's
-// provider; only the fallback chain may cross to another signed-in provider
-// that serves the very same model id. Both functions are pure over a
-// listAgentModels-shaped `{ providers }` catalog and never throw.
-
-export const MODEL_ROLES = ["main", "helper", "vision", "advisor"];
-
-const CLAUDE_TIERS = ["opus", "sonnet", "haiku"];
-const GPT_MINI_CLASS = /mini|nano/;
-const newestFirst = (a, b) => b.id.localeCompare(a.id, undefined, { numeric: true });
-
-function splitModelKey(key) {
-	const slash = typeof key === "string" ? key.indexOf("/") : -1;
-	return slash > 0 ? { providerId: key.slice(0, slash), modelId: key.slice(slash + 1) } : null;
-}
-
-const modelFamily = (id) => /^claude-/.test(id) ? "claude" : /^gpt-/.test(id) ? "gpt" : null;
-const claudeTier = (id) => CLAUDE_TIERS.find((tier) => id.startsWith(`claude-${tier}`)) ?? null;
-const takesImages = (model) => Array.isArray(model?.input) && model.input.includes("image");
-const modelKeyOf = (providerId, model) => model.key ?? `${providerId}/${model.id}`;
-
-/** main's provider entry, main's own model entry and the same-family models on that provider. */
-function locateMain(mainKey, catalog) {
-	const parts = splitModelKey(mainKey);
-	const providers = Array.isArray(catalog?.providers) ? catalog.providers : [];
-	const provider = parts && providers.find((entry) => entry?.id === parts.providerId);
-	const models = Array.isArray(provider?.models) ? provider.models.filter((model) => typeof model?.id === "string") : [];
-	const main = parts && models.find((model) => model.id === parts.modelId);
-	if (!main) return null;
-	const family = modelFamily(main.id);
-	return { providers, provider, models, main, family, sameFamily: family ? models.filter((model) => modelFamily(model.id) === family) : [] };
-}
-
-/** The first preference that matches a model: an exact id, or the newest id a pattern matches. */
-function pickModel(models, preferences) {
-	for (const preference of preferences) {
-		const match = typeof preference === "string"
-			? models.find((model) => model.id === preference)
-			: [...models].filter((model) => preference.test(model.id)).sort(newestFirst)[0];
-		if (match) return match;
-	}
-	return null;
-}
-
-/** One tier of a Claude lineup, preferring main's own version (opus-5-5 -> sonnet-5-5). */
-function claudeTierModel(models, mainId, tier) {
-	const current = claudeTier(mainId);
-	return pickModel(models, [current ? mainId.replace(`claude-${current}`, `claude-${tier}`) : null, new RegExp(`^claude-${tier}`)].filter(Boolean));
-}
-
-export function resolveRoleModels(mainKey, catalog) {
-	const main = typeof mainKey === "string" ? mainKey : "";
-	const found = locateMain(main, catalog);
-	if (!found) return { main, helper: main, vision: main, advisor: main };
-	const { provider, models, main: model, family, sameFamily } = found;
-	const key = (entry) => (entry ? modelKeyOf(provider.id, entry) : main);
-	const helper = family === "claude" ? pickModel(sameFamily, ["claude-haiku-5-5", /^claude-haiku/, /^claude-sonnet/])
-		: family === "gpt" ? pickModel(sameFamily, [GPT_MINI_CLASS, /luna/])
-			: null;
-	const advisor = family === "claude" ? pickModel(sameFamily, ["claude-sonnet-5-5", /^claude-sonnet/])
-		: family === "gpt" ? pickModel(sameFamily, ["gpt-6-astra"])
-			: null;
-	const vision = takesImages(model) ? model : models.find(takesImages);
-	return { main, helper: key(helper), vision: key(vision), advisor: key(advisor) };
-}
-
-export function fallbackChain(mainKey, catalog) {
-	const found = locateMain(mainKey, catalog);
-	if (!found) return [];
-	const { providers, provider, main, family, sameFamily } = found;
-	const chain = [];
-	// The same model served by another signed-in provider is the closest substitute there is.
-	for (const other of providers) {
-		if (other === provider || !other?.signedIn || !Array.isArray(other.models)) continue;
-		const same = other.models.find((model) => model?.id === main.id);
-		if (same) chain.push(modelKeyOf(other.id, same));
-	}
-	// Then a step down main's own family on main's provider.
-	if (family === "claude") {
-		const tier = CLAUDE_TIERS.indexOf(claudeTier(main.id));
-		if (tier !== -1) {
-			for (const lower of CLAUDE_TIERS.slice(tier + 1)) {
-				const model = claudeTierModel(sameFamily, main.id, lower);
-				if (model) chain.push(modelKeyOf(provider.id, model));
-			}
-		}
-	} else if (family === "gpt" && !GPT_MINI_CLASS.test(main.id)) {
-		for (const model of [pickModel(sameFamily, ["gpt-6-astra"]), pickModel(sameFamily, [GPT_MINI_CLASS])]) {
-			if (model) chain.push(modelKeyOf(provider.id, model));
-		}
-	}
-	const mainKeyFound = modelKeyOf(provider.id, main);
-	return [...new Set(chain)].filter((key) => key !== mainKeyFound).slice(0, 3);
-}
-
-/** `roles.byMain` for listAgentModels: every model of every signed-in provider. */
-function rolesByMain(catalog) {
-	const byMain = {};
-	for (const provider of catalog.providers) {
-		if (!provider.signedIn) continue;
-		for (const model of provider.models) {
-			const { helper, vision, advisor } = resolveRoleModels(model.key, catalog);
-			byMain[model.key] = { helper, vision, advisor, fallback: fallbackChain(model.key, catalog) };
-		}
-	}
-	return { byMain };
-}
-
 const astraFirst = (a, b) => Number(b.id === "gpt-6-astra") - Number(a.id === "gpt-6-astra");
 const cliproxyFirst = (a, b) => astraFirst(a, b) || Number(b.id === "claude-fable-5-1") - Number(a.id === "claude-fable-5-1");
 
@@ -379,7 +279,8 @@ const cliproxyFirst = (a, b) => astraFirst(a, b) || Number(b.id === "claude-fabl
 export async function listAgentModels({ models, codex, auth = defaultAuth, keys = defaultKeys, env = process.env } = {}) {
 	const { getSupportedThinkingLevels } = await import("@earendil-works/pi-ai");
 	const resolvedModels = models ?? await createModels({ auth, keys, env });
-	const saved = keys.readKeys();
+	// a stored API key (keys file) and an OAuth sign-in such as a subscription (auth.json) both count
+	const saved = { ...keys.readKeys(), ...readCredentials() };
 	const providers = [];
 	for (const provider of PROVIDERS) {
 		const authResult = await resolvedModels.getAuth(provider.id).catch(() => undefined);
@@ -408,14 +309,18 @@ export async function listAgentModels({ models, codex, auth = defaultAuth, keys
 				}
 			}
 			list = [...list].sort(cliproxyFirst);
+			const error = catalogueState(resolvedModels).cliproxyFetchError; providers.push({ id: provider.id, label: provider.label, signedIn, authSource, models: list, ...(error ? { error } : {}) }); continue;
+		} else if (provider.id === OPENAI_COMPATIBLE_ID && signedIn) {
+			// the server's own /v1/models is the lineup, read on every listing so a model loaded since then shows up
+			const error = await refreshOpenAICompatible(resolvedModels);
+			providers.push({ id: provider.id, label: provider.label, signedIn, authSource, models: catalogModels(resolvedModels, provider.id, getSupportedThinkingLevels), ...(error ? { error } : {}) }); continue;
 		}
 		providers.push({ id: provider.id, label: provider.label, signedIn, authSource, models: list });
 	}
 	// a provider outside the curated list joins the picker once a pi login stored its credential here (#pi-login); ambient
 	// credentials (an AWS profile, cloud ADC files) alone do not list it, so the picker shows what the author connected
-	const stored = new Set([...Object.keys(readCredentials()), ...Object.keys(saved)]);
 	for (const provider of resolvedModels.getProviders?.() ?? []) {
-		const check = providerConfig(provider.id) || !stored.has(provider.id) ? undefined : await resolvedModels.checkAuth?.(provider.id).catch(() => undefined);
+		const check = providerConfig(provider.id) || !(provider.id in saved) ? undefined : await resolvedModels.checkAuth?.(provider.id).catch(() => undefined);
 		if (check) providers.push({ id: provider.id, label: provider.name ?? provider.id, signedIn: true, authSource: check.type === "oauth" || /stored/i.test(check.source ?? "") ? "file" : "env", models: catalogModels(resolvedModels, provider.id, getSupportedThinkingLevels) });
 	}
 	// The flat union is what the panel's dropdown reads today (`models[].id`);

package/dist/app/index.html

@@ -34,15 +34,15 @@
     <title>CozyClay Studio — 3D staging and previs in your browser</title>
 
     <script defer src="https://static.cloudflareinsights.com/beacon.min.js" data-cf-beacon='{"token": "6a4384d1375d4ffc8a30a6346a8ad1a0"}'></script>
-    <script type="module" crossorigin src="/assets/app-C4QTcDcb.js"></script>
+    <script type="module" crossorigin src="/assets/app-DwETmoQZ.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/rolldown-runtime-hePW80VL.js">
     <link rel="modulepreload" crossorigin href="/assets/modulepreload-polyfill-P2Xu9kJm.js">
-    <link rel="modulepreload" crossorigin href="/assets/task-board-BqReHzOi.js">
+    <link rel="modulepreload" crossorigin href="/assets/task-board-DFfNa0xg.js">
     <link rel="modulepreload" crossorigin href="/assets/fflate.module-KbGj5-H6.js">
-    <link rel="modulepreload" crossorigin href="/assets/scene-asset-sync-qoxcdrhj.js">
-    <link rel="modulepreload" crossorigin href="/assets/motion3-compile-dgGhrvPK.js">
+    <link rel="modulepreload" crossorigin href="/assets/scene-asset-sync-Bz59Ghdz.js">
+    <link rel="modulepreload" crossorigin href="/assets/motion3-compile-DDG3wklD.js">
     <link rel="stylesheet" crossorigin href="/assets/scene-asset-sync-BEjjhNEo.css">
-    <link rel="stylesheet" crossorigin href="/assets/app-Bhe0TpGz.css">
+    <link rel="stylesheet" crossorigin href="/assets/app-BdRlMf4J.css">
   </head>
   <body>
     <div id="root">

package/dist/assets/TaskBoard-U1Yl-4F1.js

@@ -0,0 +1 @@
+import{r as e}from"./rolldown-runtime-hePW80VL.js";import{Ti as t,c as n,d as r,f as i,fa as a,l as o,m as s,o as c,v as l}from"./task-board-DFfNa0xg.js";import{o as u,r as d,t as f}from"./motion3-compile-DDG3wklD.js";var p=e(a(),1),m=2e3,h=(e,t)=>new Promise(n=>{let r=setTimeout(n,e);t.addEventListener(`abort`,()=>{clearTimeout(r),n()},{once:!0})});function g(e,n){(0,p.useEffect)(()=>{let r=new Map;for(let[t,i]of Object.entries(e))for(let e of i)r.set(e,n[t]??t);let i=()=>{for(let e of document.querySelectorAll(`[data-node-id]`)){let n=r.get(e.getAttribute(`data-node-id`));n?(e.setAttribute(`data-task-scope`,n),e.setAttribute(`title`,t(`In task: ${n}`,`작업 중: ${n}`,`任务中：${n}`))):e.hasAttribute(`data-task-scope`)&&(e.removeAttribute(`data-task-scope`),e.removeAttribute(`title`))}};i();let a=new MutationObserver(i);return a.observe(document.body,{childList:!0,subtree:!0}),()=>{a.disconnect(),r.clear(),i()}},[e,n])}function _({sessionId:e,pulse:t,labelOf:a,onMainNote:_}){let v=(0,p.useMemo)(()=>c(),[]),y=u(),[b,x]=(0,p.useReducer)((e,t)=>t.seed?s(e,t.seed):t.reset?n():r(e,t.event),void 0,n),[S,C]=(0,p.useState)({}),[w,T]=(0,p.useState)(f),E=(0,p.useRef)(0),D=(0,p.useRef)(_);(0,p.useEffect)(()=>{E.current=b.after,D.current=_},[b.after,_]),(0,p.useEffect)(()=>{x({reset:!0}),E.current=0},[e]),(0,p.useEffect)(()=>d(T),[]),(0,p.useEffect)(()=>y.subscribe(e=>{typeof e?.type!=`string`||!e.type.startsWith(`task.`)||(C(t=>i(t,e)),(e.type===`task.userEdit`||e.type===`task.undone`)&&x({event:e}))}),[y]),(0,p.useEffect)(()=>{if(!e)return;let t=new AbortController;return(async()=>{for(;!t.signal.aborted;){try{let{tasks:n}=await v.board(e);x({seed:n}),await v.events(e,E.current,e=>{if(e.type===`main.turn`&&e.turnId){let n=``;v.frames(e.turnId,e=>{e.type===`text.delta`&&(n+=e.text??``),e.type===`tool.start`&&(n=``)},t.signal).then(()=>D.current?.(n),()=>{})}x({event:e})},t.signal)}catch{}await h(m,t.signal)}})(),()=>t.abort()},[v,e,t]);let O=b.order.filter(e=>b.tasks[e]?.status===`running`&&b.tasks[e]?.turnId),k=O.map(e=>`${e}:${b.tasks[e].turnId}`).join();return(0,p.useEffect)(()=>{let e=O.map(e=>{let t=new AbortController,{turnId:n}=b.tasks[e];return v.frames(n,t=>{let n=o(t,a);n&&x({event:{type:`task.progress`,taskId:e,status:`running`,progress:n}})},t.signal).catch(()=>{}),t});return()=>e.forEach(e=>e.abort())},[v,k,a]),g(S,(0,p.useMemo)(()=>Object.fromEntries(b.order.map(e=>[e,b.tasks[e].title])),[b])),(0,p.useEffect)(()=>{l.set({client:v,labelOf:a,undo:async e=>{let t=await y.run(`task.undo`,{taskId:e});if(t?.ok===!1)throw Error(t.message??t.code);x({event:{type:`task.undone`,taskId:e}})}})},[y,v,a]),(0,p.useEffect)(()=>{l.set({board:b,activity:w})},[b,w]),(0,p.useEffect)(()=>()=>l.set({board:n(),open:null}),[e]),null}export{_ as default};