@jeffreyjyz/opencode-command-code 0.2.1 → 0.2.3

package/dist/index.js

@@ -548,6 +548,8 @@ async function loadModels(key) {
 import { Plugin } from "@opencode/plugin";
 var PLUGIN_ID = "command-code";
 var PROVIDER_BASE = "https://api.commandcode.ai/provider/v1";
+var INTEGRATION_ID = "command-code";
+var INTEGRATION_NAME = "Command Code";
 var LANES = [
   { id: "command-code-anthropic", name: "Command Code (Anthropic)", pkg: "@opencode/ai/providers/anthropic" },
   {
@@ -586,16 +588,52 @@ function staticSeedModels() {
   }
   return seed;
 }
+async function credentialKey(ctx) {
+  try {
+    const connection = await ctx.integration.connection.active(INTEGRATION_ID);
+    if (connection) {
+      const credential = await ctx.integration.connection.resolve(connection);
+      if (credential?.type === "key")
+        return credential.key;
+      if (credential?.type === "oauth")
+        return credential.access;
+    }
+  } catch {}
+  try {
+    return await resolveKey();
+  } catch {
+    return;
+  }
+}
 var commandCodeV2 = Plugin.define({
   id: PLUGIN_ID,
   async setup(ctx) {
-    let key;
+    let localKey;
+    try {
+      localKey = await resolveKey();
+    } catch {}
+    let hasConnection = false;
     try {
-      key = await resolveKey();
+      hasConnection = await ctx.integration.connection.active(INTEGRATION_ID) !== undefined;
     } catch {}
-    if (!key) {
-      console.warn("[command-code] no API key found \u2014 providers registered disabled. `cmd login` (~/.commandcode/auth.json), CMD_API_KEY, or providers.command-code-*.settings.apiKey in opencode.jsonc, then restart.");
+    if (!localKey && !hasConnection) {
+      console.warn(`[command-code] no API key found. Run /connect and choose "${INTEGRATION_NAME}", or \`cmd login\` (~/.commandcode/auth.json), or set CMD_API_KEY.`);
     }
+    await ctx.integration.transform((editor) => {
+      editor.update(INTEGRATION_ID, (integration) => {
+        if (integration.name === integration.id) {
+          integration.name = INTEGRATION_NAME;
+        }
+      });
+      editor.method.update({
+        integrationID: INTEGRATION_ID,
+        method: { type: "env", names: ["CMD_API_KEY"] }
+      });
+      editor.method.update({
+        integrationID: INTEGRATION_ID,
+        method: { type: "key", label: "Command Code API key" }
+      });
+    });
     const seed = staticSeedModels();
     await ctx.provider.transform((editor) => {
       for (const lane of LANES) {
@@ -604,10 +642,12 @@ var commandCodeV2 = Plugin.define({
             provider.name = lane.name;
           if (provider.package === "")
             provider.package = lane.pkg;
-          provider.activation = key ? "enabled" : "disabled";
+          provider.activation = hasConnection || localKey ? "enabled" : "auto";
           provider.settings = { ...provider.settings, baseURL: PROVIDER_BASE };
-          if (key && provider.settings.apiKey === undefined)
-            provider.settings.apiKey = key;
+          if (!hasConnection && localKey && provider.settings.apiKey === undefined) {
+            provider.settings.apiKey = localKey;
+          }
+          provider.integrationID ??= INTEGRATION_ID;
         });
         editor.models.set(lane.id, seed[lane.id]);
       }
@@ -628,17 +668,23 @@ var commandCodeV2 = Plugin.define({
         },
         async execute(input) {
           const arg = typeof input?.arg === "string" ? input.arg : "";
+          const key = await credentialKey(ctx);
           return {
             content: await runCmduse(arg, { env: key ? { CMD_API_KEY: key } : undefined })
           };
         }
       });
     });
-    if (!key)
-      return;
     const controller = new AbortController;
-    (async () => {
+    let refreshing = false;
+    const refresh = async () => {
+      if (refreshing || controller.signal.aborted)
+        return;
+      refreshing = true;
       try {
+        const key = await credentialKey(ctx);
+        if (!key)
+          return;
         const split = await loadModels(key);
         if (controller.signal.aborted)
           return;
@@ -647,10 +693,17 @@ var commandCodeV2 = Plugin.define({
           editor.models.set("command-code-openai", split.open.map((m) => toV2Model(m, LANES[1])));
         });
       } catch (e) {
-        console.warn("[command-code] live model list unavailable, keeping static seed:", e);
+        console.warn("[command-code] live model list unavailable, keeping previous list:", e);
+      } finally {
+        refreshing = false;
       }
-    })();
-    return () => controller.abort();
+    };
+    refresh();
+    const timer = setInterval(() => void refresh(), 30 * 60 * 1000);
+    return () => {
+      controller.abort();
+      clearInterval(timer);
+    };
   }
 });
 

package/dist/v2.d.ts

@@ -2,6 +2,9 @@ import { Plugin } from "@opencode/plugin";
 import { type CmdModel } from "./models";
 export declare const PLUGIN_ID = "command-code";
 export declare const PROVIDER_BASE = "https://api.commandcode.ai/provider/v1";
+/** Shared integration backing both lanes' credentials (/connect + env). */
+export declare const INTEGRATION_ID = "command-code";
+export declare const INTEGRATION_NAME = "Command Code";
 type Lane = {
     id: "command-code-anthropic" | "command-code-openai";
     name: string;
@@ -20,4 +23,18 @@ export declare function toV2Model(m: CmdModel, lane: Lane): unknown;
  * Replaced by the gated live list once the background fetch lands; also the
  * fallback shown when the live fetch fails. */
 export declare function staticSeedModels(): Record<Lane["id"], unknown[]>;
+/** The slice of the plugin context the credential resolver needs. */
+type CredentialContext = {
+    integration: {
+        connection: {
+            active(integrationID: string): Promise<unknown>;
+            resolve(connection: unknown): Promise<unknown>;
+        };
+    };
+};
+/** Credential for spawning cmduse, host-first: a key stored by /connect lives
+ * only in opencode's credential store, so ask the connection before falling
+ * back to CMD_API_KEY / ~/.commandcode/auth.json. Resolved per call — a
+ * /connect mid-session must be picked up. */
+export declare function credentialKey(ctx: CredentialContext): Promise<string | undefined>;
 export declare const commandCodeV2: Plugin.Plugin;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@jeffreyjyz/opencode-command-code",
-	"version": "0.2.1",
+	"version": "0.2.3",
 	"description": "Command Code provider + usage dashboard for opencode: two providers (Anthropic wire for Claude, OpenAI wire for everything else) against api.commandcode.ai, live model list, plan gating, /cmd-usage. Requires the cmduse CLI for usage rendering.",
 	"type": "module",
 	"main": "dist/index.js",