Skip to content

feat(openclaw): expand model catalog and refactor provider auth flow #2

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
tenequm merged 1 commit into from
Apr 3, 2026
Merged

feat(openclaw): expand model catalog and refactor provider auth flow #2

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
1 change: 0 additions & 1 deletion packages/x402-proxy/openclaw.plugin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"name": "mpp/x402 Payments Proxy",
"description": "x402 and MPP payments, wallet tools, and paid inference proxying",
"providers": ["surf"],
"autoEnableWhenConfiguredProviders": ["surf"],
"providerAuthChoices": [
{
"provider": "surf",
Expand Down
134 changes: 120 additions & 14 deletions packages/x402-proxy/src/openclaw/defaults.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,62 +25,168 @@ export const DEFAULT_SURF_UPSTREAM_URL = "https://surf.cascade.fyi/api/v1/infere
export const DEFAULT_PROVIDER_PROTOCOL: PaymentProtocol = "mpp";
export const DEFAULT_MPP_SESSION_BUDGET = "0.5";

export const DEFAULT_SURF_MODELS: Array<Omit<ModelEntry, "provider">> = [
{
id: "anthropic/claude-opus-4.6",
/** Known model metadata for cost/capability enrichment. */
const MODEL_METADATA: Record<string, Omit<ModelEntry, "provider" | "id">> = {
"anthropic/claude-opus-4.6": {
name: "Claude Opus 4.6",
maxTokens: 200000,
reasoning: true,
input: ["text", "image"],
cost: { input: 0.015, output: 0.075, cacheRead: 0.0015, cacheWrite: 0.01875 },
contextWindow: 200000,
},
{
id: "anthropic/claude-sonnet-4.6",
"anthropic/claude-opus-4.5": {
name: "Claude Opus 4.5",
maxTokens: 200000,
reasoning: true,
input: ["text", "image"],
cost: { input: 0.015, output: 0.075, cacheRead: 0.0015, cacheWrite: 0.01875 },
contextWindow: 200000,
},
"anthropic/claude-sonnet-4.6": {
name: "Claude Sonnet 4.6",
maxTokens: 200000,
reasoning: true,
input: ["text", "image"],
cost: { input: 0.003, output: 0.015, cacheRead: 0.0003, cacheWrite: 0.00375 },
contextWindow: 200000,
},
{
id: "x-ai/grok-4.20-beta",
"anthropic/claude-sonnet-4.5": {
name: "Claude Sonnet 4.5",
maxTokens: 200000,
reasoning: true,
input: ["text", "image"],
cost: { input: 0.003, output: 0.015, cacheRead: 0.0003, cacheWrite: 0.00375 },
contextWindow: 200000,
},
"x-ai/grok-4.20-beta": {
name: "Grok 4.20 Beta",
maxTokens: 131072,
reasoning: true,
input: ["text"],
cost: { input: 0.003, output: 0.015, cacheRead: 0, cacheWrite: 0 },
contextWindow: 131072,
},
{
id: "minimax/minimax-m2.5",
"x-ai/grok-4.1-fast": {
name: "Grok 4.1 Fast",
maxTokens: 131072,
reasoning: false,
input: ["text"],
cost: { input: 0.001, output: 0.005, cacheRead: 0, cacheWrite: 0 },
contextWindow: 131072,
},
"minimax/minimax-m2.7": {
name: "MiniMax M2.7",
maxTokens: 1000000,
reasoning: false,
input: ["text"],
cost: { input: 0.001, output: 0.005, cacheRead: 0, cacheWrite: 0 },
contextWindow: 1000000,
},
"minimax/minimax-m2.5": {
name: "MiniMax M2.5",
maxTokens: 1000000,
reasoning: false,
input: ["text"],
cost: { input: 0.001, output: 0.005, cacheRead: 0, cacheWrite: 0 },
contextWindow: 1000000,
},
{
id: "moonshotai/kimi-k2.5",
"moonshotai/kimi-k2.5": {
name: "Kimi K2.5",
maxTokens: 131072,
reasoning: true,
input: ["text"],
cost: { input: 0.002, output: 0.008, cacheRead: 0, cacheWrite: 0 },
contextWindow: 131072,
},
{
id: "z-ai/glm-5",
"z-ai/glm-5": {
name: "GLM-5",
maxTokens: 128000,
reasoning: false,
input: ["text"],
cost: { input: 0.001, output: 0.005, cacheRead: 0, cacheWrite: 0 },
contextWindow: 128000,
},
];
"z-ai/glm-5-turbo": {
name: "GLM-5 Turbo",
maxTokens: 128000,
reasoning: false,
input: ["text"],
cost: { input: 0.001, output: 0.005, cacheRead: 0, cacheWrite: 0 },
contextWindow: 128000,
},
"qwen/qwen-2.5-7b-instruct": {
name: "Qwen 2.5 7B Instruct",
maxTokens: 32768,
reasoning: false,
input: ["text"],
cost: { input: 0.0005, output: 0.002, cacheRead: 0, cacheWrite: 0 },
contextWindow: 131072,
},
"stepfun/step-3.5-flash": {
name: "Step 3.5 Flash",
maxTokens: 131072,
reasoning: false,
input: ["text"],
cost: { input: 0.001, output: 0.005, cacheRead: 0, cacheWrite: 0 },
contextWindow: 131072,
},
"xiaomi/mimo-v2-pro": {
name: "MiMo V2 Pro",
maxTokens: 131072,
reasoning: true,
input: ["text"],
cost: { input: 0.001, output: 0.005, cacheRead: 0, cacheWrite: 0 },
contextWindow: 131072,
},
};

const DEFAULT_CONTEXT_WINDOW = 131072;
const ZERO_COST = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };

export function modelFromId(id: string): Omit<ModelEntry, "provider"> {
const known = MODEL_METADATA[id];
if (known) return { id, ...known };
const raw = id.split("/").pop() ?? id;
const name = raw.replace(/[-_]/g, " ").replace(/\b\w/g, (c) => c.toUpperCase());
return {
id,
name,
maxTokens: DEFAULT_CONTEXT_WINDOW,
reasoning: false,
input: ["text"],
cost: ZERO_COST,
contextWindow: DEFAULT_CONTEXT_WINDOW,
};
}

/** Static fallback models used when upstream fetch fails. */
export const DEFAULT_SURF_MODELS: Array<Omit<ModelEntry, "provider">> =
Object.keys(MODEL_METADATA).map(modelFromId);

const MODELS_CACHE_TTL_MS = 5 * 60 * 1000;
let modelsCache: { models: Array<Omit<ModelEntry, "provider">>; fetchedAt: number } | null = null;

export async function fetchUpstreamModels(
upstreamUrl: string,
): Promise<Array<Omit<ModelEntry, "provider">>> {
if (modelsCache && Date.now() - modelsCache.fetchedAt < MODELS_CACHE_TTL_MS) {
return modelsCache.models;
}
try {
const res = await globalThis.fetch(`${upstreamUrl}/v1/models`, {
signal: AbortSignal.timeout(5000),
});
if (!res.ok) return modelsCache?.models ?? DEFAULT_SURF_MODELS;
const data = (await res.json()) as { data?: Array<{ id: string }> };
if (!data.data?.length) return modelsCache?.models ?? DEFAULT_SURF_MODELS;
const models = data.data.map((m) => modelFromId(m.id));
modelsCache = { models, fetchedAt: Date.now() };
return models;
} catch {
return modelsCache?.models ?? DEFAULT_SURF_MODELS;
}
}

export function resolveProviders(config: Record<string, unknown>): {
providers: ResolvedProviderConfig[];
Expand Down
69 changes: 52 additions & 17 deletions packages/x402-proxy/src/openclaw/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,49 @@ export function register(api: OpenClawPluginApi): void {
const { providers, models: allModels } = resolveProviders(config);
const defaultProvider = providers[0];

function buildSurfAuthResult(gatewayPort: number) {
return {
profiles: [
{
profileId: "surf:default",
credential: {
type: "api_key" as const,
provider: "surf",
key: "x402-proxy-managed",
},
},
],
configPatch: {
models: {
providers: {
surf: {
baseUrl: `http://localhost:${gatewayPort}${defaultProvider.baseUrl}`,
api: "openai-completions" as const,
authHeader: false,
models: defaultProvider.models as Array<{
id: string;
name: string;
reasoning: boolean;
input: Array<"text" | "image">;
cost: { input: number; output: number; cacheRead: number; cacheWrite: number };
contextWindow: number;
maxTokens: number;
}>,
},
},
},
},
defaultModel: defaultProvider.models[0]?.id,
};
}

const walletAuthMethod: ProviderAuthMethod = {
id: "wallet-setup",
label: "x402-proxy wallet setup",
hint: "Generate or import a crypto wallet for paid inference",
kind: "custom",
run: async (ctx) => {
const gatewayPort = ctx.config.gateway?.port ?? 18789;
const existing = resolveWallet();
if (existing.source !== "none") {
const addresses = [
Expand All @@ -51,7 +88,7 @@ export function register(api: OpenClawPluginApi): void {
`Wallet already configured (source: ${existing.source}).\n\n${addresses}`,
"x402-proxy wallet",
);
return { profiles: [] };
return buildSurfAuthResult(gatewayPort);
}

const action = await ctx.prompter.select({
Expand Down Expand Up @@ -99,14 +136,7 @@ export function register(api: OpenClawPluginApi): void {
.join("\n");
await ctx.prompter.note(msg, "Wallet created");

return {
profiles: [
{
profileId: "surf:x402-proxy",
credential: { type: "api_key", provider: "surf", key: "x402-proxy-managed" },
},
],
};
return buildSurfAuthResult(gatewayPort);
},
};

Expand All @@ -119,14 +149,19 @@ export function register(api: OpenClawPluginApi): void {
resolveConfigApiKey: () => "x402-proxy-managed",
catalog: {
order: "simple",
run: async () => ({
provider: {
baseUrl: provider.baseUrl,
api: "openai-completions",
authHeader: false,
models: provider.models,
},
}),
run: async (ctx) => {
const { apiKey } = ctx.resolveProviderApiKey(provider.id);
if (!apiKey) return null;
return {
provider: {
baseUrl: provider.baseUrl,
api: "openai-completions",
authHeader: false,
apiKey,
models: provider.models,
},
};
},
},
});
}
Expand Down
Loading