From 4eeace6ce3d3c3c20176afb4d4f22e6d1e62c2d2 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 6 Nov 2026 13:26:34 -0500 Subject: [PATCH] feat: store API key in SecretStorage, add set/sign-out commands --- package.json | 32 ++++--- src/extension.ts | 220 ++++++++++++++++++++++++++++++++--------------- 2 files changed, 170 insertions(+), 82 deletions(-) diff --git a/package.json b/package.json index ef31a0d..24981c5 100644 --- a/package.json +++ b/package.json @@ -28,8 +28,26 @@ { "command": "inference-coop-copilot.helloWorld", "title": "Hello World" + }, + { + "command": "inferenceCoop.setKey", + "title": "Inference Coop: Set API Key" + }, + { + "command": "inferenceCoop.clearKey", + "title": "Inference Coop: Sign Out" } - ] + ], + "configuration": { + "title": "Inference Coop", + "properties": { + "inferenceCoop.baseUrl": { + "type": "string", + "default": "https://gateway.inference.coop/v1", + "description": "Gateway base URL. Leave default unless testing." + } + } + } }, "scripts": { "vscode:prepublish": "npm run package", @@ -60,15 +78,5 @@ "overrides": { "diff": "^8.0.4", "serialize-javascript": "^7.0.6" - }, - "configuration": { - "title": "Inference Coop", - "properties": { - "inferenceCoop.apiKey": { - "type": "string", - "default": "", - "description": "API key from the Inference Cooperative dashboard." - } - } } -} +} \ No newline at end of file diff --git a/src/extension.ts b/src/extension.ts index a7eca98..e5ad164 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,16 +1,21 @@ -import * as vscode from 'vscode'; +import * as vscode from "vscode"; -const BASE_URL = 'https://gateway.inference.coop/v1'; -const PREFIX = 'inference-coop/'; +const BASE_URL = "https://gateway.inference.coop/v1"; +const PREFIX = "inference-coop/"; +const SECRET_KEY = "inferenceCoop.apiKey"; type CoopModel = { - id: string; name: string; family: string; version: string; - maxInputTokens: number; maxOutputTokens: number; + id: string; + name: string; + family: string; + version: string; + maxInputTokens: number; + maxOutputTokens: number; capabilities: { toolCalling: boolean; imageInput: boolean }; }; export function activate(context: vscode.ExtensionContext) { - const out = vscode.window.createOutputChannel('Inference Coop'); + const out = vscode.window.createOutputChannel("Inference Coop"); context.subscriptions.push(out); const changed = new vscode.EventEmitter(); @@ -20,26 +25,34 @@ export function activate(context: vscode.ExtensionContext) { let lastFetch = 0; async function refresh(force = false): Promise { - if (!force && Date.now() - lastFetch < 30_000 && cached.length) {return cached;} - const key = vscode.workspace.getConfiguration('inferenceCoop').get('apiKey'); - if (!key) {return cached;} + if (!force && Date.now() - lastFetch < 30_000 && cached.length) { + return cached; + } + const key = await context.secrets.get(SECRET_KEY); + if (!key) { + return cached; + } try { const res = await fetch(`${BASE_URL}/models`, { - headers: { Authorization: `Bearer ${key}` } + headers: { Authorization: `Bearer ${key}` }, }); out.appendLine(`refresh: /models ${res.status}`); - if (!res.ok) {return cached;} - const body = (await res.json()) as { data: Array<{ id: string; mode?: string }> }; + if (!res.ok) { + return cached; + } + const body = (await res.json()) as { + data: Array<{ id: string; mode?: string }>; + }; const next: CoopModel[] = body.data - .filter(m => !m.mode || m.mode === 'chat') - .map(m => ({ + .filter((m) => !m.mode || m.mode === "chat") + .map((m) => ({ id: `${PREFIX}${m.id}`, name: m.id, - family: 'inference-coop', - version: '1.0.0', + family: "inference-coop", + version: "1.0.0", maxInputTokens: 131072, maxOutputTokens: 8192, - capabilities: { toolCalling: true, imageInput: false } + capabilities: { toolCalling: true, imageInput: false }, })); lastFetch = Date.now(); if (JSON.stringify(next) !== JSON.stringify(cached)) { @@ -58,75 +71,86 @@ export function activate(context: vscode.ExtensionContext) { onDidChangeLanguageModelChatInformation: changed.event, async provideLanguageModelChatInformation() { - out.appendLine('provideLanguageModelChatInformation: called'); + out.appendLine("provideLanguageModelChatInformation: called"); if (cached.length) { - void refresh(); // refresh in background, answer now + void refresh(); // refresh in background, answer now return cached; } return await refresh(true); // first call: must wait }, - async provideLanguageModelChatResponse(model, messages, options, progress, token) { + async provideLanguageModelChatResponse( + model, + messages, + options, + progress, + token, + ) { out.appendLine(`provideLanguageModelChatResponse: ${model.id}`); out.appendLine(` tools offered: ${options.tools?.length ?? 0}`); - const key = vscode.workspace - .getConfiguration('inferenceCoop') - .get('apiKey'); + const key = await context.secrets.get(SECRET_KEY); const body: Record = { - model: model.id.replace(PREFIX, ''), + model: model.id.replace(PREFIX, ""), stream: true, - messages: toOpenAIMessages(messages, out) + messages: toOpenAIMessages(messages, out), }; if (options.tools?.length) { - body.tools = options.tools.map(t => ({ - type: 'function', + body.tools = options.tools.map((t) => ({ + type: "function", function: { name: t.name, description: t.description, - parameters: t.inputSchema ?? { type: 'object', properties: {} } - } + parameters: t.inputSchema ?? { type: "object", properties: {} }, + }, })); - body.tool_choice = 'auto'; + body.tool_choice = "auto"; } const res = await fetch(`${BASE_URL}/chat/completions`, { - method: 'POST', + method: "POST", headers: { Authorization: `Bearer ${key}`, - 'Content-Type': 'application/json' + "Content-Type": "application/json", }, body: JSON.stringify(body), - signal: token.isCancellationRequested ? AbortSignal.abort() : undefined + signal: token.isCancellationRequested ? AbortSignal.abort() : undefined, }); out.appendLine(` /chat/completions status: ${res.status}`); if (!res.ok || !res.body) { - throw new Error(`Inference Coop: HTTP ${res.status} — ${await res.text()}`); + throw new Error( + `Inference Coop: HTTP ${res.status} — ${await res.text()}`, + ); } const reader = res.body.getReader(); const decoder = new TextDecoder(); - let buf = ''; + let buf = ""; let textChunks = 0; - const pending = new Map(); + const pending = new Map< + number, + { id?: string; name: string; args: string } + >(); const flushTools = () => { for (const call of pending.values()) { let input: object = {}; try { - input = JSON.parse(call.args || '{}'); + input = JSON.parse(call.args || "{}"); } catch { - out.appendLine(` WARN bad tool args for ${call.name}: ${call.args}`); + out.appendLine( + ` WARN bad tool args for ${call.name}: ${call.args}`, + ); } out.appendLine(` tool call: ${call.name} ${JSON.stringify(input)}`); progress.report( new vscode.LanguageModelToolCallPart( call.id ?? `call_${Math.random().toString(36).slice(2)}`, call.name, - input - ) + input, + ), ); } pending.clear(); @@ -134,17 +158,23 @@ export function activate(context: vscode.ExtensionContext) { while (true) { const { done, value } = await reader.read(); - if (done) {break;} + if (done) { + break; + } buf += decoder.decode(value, { stream: true }); - const frames = buf.split('\n\n'); - buf = frames.pop() ?? ''; + const frames = buf.split("\n\n"); + buf = frames.pop() ?? ""; for (const frame of frames) { - for (const line of frame.split('\n')) { - if (!line.startsWith('data:')) {continue;} + for (const line of frame.split("\n")) { + if (!line.startsWith("data:")) { + continue; + } const data = line.slice(5).trim(); - if (data === '[DONE]') { - if (pending.size) {flushTools();} + if (data === "[DONE]") { + if (pending.size) { + flushTools(); + } out.appendLine(` done, ${textChunks} text chunks`); return; } @@ -156,52 +186,95 @@ export function activate(context: vscode.ExtensionContext) { } const choice = json.choices?.[0]; const delta = choice?.delta; - if (!delta) {continue;} + if (!delta) { + continue; + } - if (typeof delta.content === 'string' && delta.content) { + if (typeof delta.content === "string" && delta.content) { textChunks++; progress.report(new vscode.LanguageModelTextPart(delta.content)); } for (const tc of delta.tool_calls ?? []) { const i = tc.index ?? 0; - const acc = pending.get(i) ?? { id: undefined, name: '', args: '' }; + const acc = pending.get(i) ?? { + id: undefined, + name: "", + args: "", + }; acc.id = tc.id ?? acc.id; acc.name = tc.function?.name ?? acc.name; - acc.args += tc.function?.arguments ?? ''; + acc.args += tc.function?.arguments ?? ""; pending.set(i, acc); } if (choice?.finish_reason) { out.appendLine(` finish_reason: ${choice.finish_reason}`); - if (pending.size) {flushTools();} + if (pending.size) { + flushTools(); + } } } } } - if (pending.size) {flushTools();} + if (pending.size) { + flushTools(); + } out.appendLine(` stream ended, ${textChunks} text chunks`); }, async provideTokenCount() { return 0; - } + }, }; context.subscriptions.push( - vscode.lm.registerLanguageModelChatProvider('inference-coop', provider) + vscode.lm.registerLanguageModelChatProvider("inference-coop", provider), ); context.subscriptions.push( - vscode.commands.registerCommand('inference-coop-copilot.helloWorld', () => { - vscode.window.showInformationMessage('Inference Coop extension loaded.'); - }) + vscode.commands.registerCommand("inference-coop-copilot.helloWorld", () => { + vscode.window.showInformationMessage("Inference Coop extension loaded."); + }), + ); + + context.subscriptions.push( + vscode.commands.registerCommand("inferenceCoop.setKey", async () => { + const key = await vscode.window.showInputBox({ + title: "Inference Coop API key", + prompt: "Paste your key from the co-op dashboard.", + password: true, + ignoreFocusOut: true, + validateInput: (v) => + v.trim().length < 16 + ? "That looks too short to be an API key." + : undefined, + }); + if (!key) {return;} + await context.secrets.store(SECRET_KEY, key.trim()); + cached = []; + lastFetch = 0; + await refresh(true); + vscode.window.showInformationMessage( + `Inference Coop: signed in, ${cached.length} models available.`, + ); + }), + ); + + context.subscriptions.push( + vscode.commands.registerCommand("inferenceCoop.clearKey", async () => { + await context.secrets.delete(SECRET_KEY); + cached = []; + lastFetch = 0; + changed.fire(); + vscode.window.showInformationMessage("Inference Coop: signed out."); + }), ); } function toOpenAIMessages( messages: readonly vscode.LanguageModelChatRequestMessage[], - out: vscode.OutputChannel + out: vscode.OutputChannel, ): object[] { const result: object[] = []; @@ -216,35 +289,42 @@ function toOpenAIMessages( } else if (part instanceof vscode.LanguageModelToolCallPart) { toolCalls.push({ id: part.callId, - type: 'function', - function: { name: part.name, arguments: JSON.stringify(part.input ?? {}) } + type: "function", + function: { + name: part.name, + arguments: JSON.stringify(part.input ?? {}), + }, }); } else if (part instanceof vscode.LanguageModelToolResultPart) { toolResults.push({ - role: 'tool', + role: "tool", tool_call_id: part.callId, content: part.content .map((c: unknown) => - c instanceof vscode.LanguageModelTextPart ? c.value : JSON.stringify(c) + c instanceof vscode.LanguageModelTextPart + ? c.value + : JSON.stringify(c), ) - .join('\n') + .join("\n"), }); } } const role = msg.role === vscode.LanguageModelChatMessageRole.Assistant - ? 'assistant' + ? "assistant" : msg.role === vscode.LanguageModelChatMessageRole.User - ? 'user' - : 'system'; + ? "user" + : "system"; if (text.length || toolCalls.length) { const m: Record = { role, - content: text.length ? text.join('\n') : null + content: text.length ? text.join("\n") : null, }; - if (toolCalls.length) {m.tool_calls = toolCalls;} + if (toolCalls.length) { + m.tool_calls = toolCalls; + } result.push(m); } result.push(...toolResults); @@ -254,4 +334,4 @@ function toOpenAIMessages( return result; } -export function deactivate() {} \ No newline at end of file +export function deactivate() {}