@jeffreyjyz/opencode-command-code 0.2.0 → 0.2.2

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,32 +642,16 @@ 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]);
       }
     });
-    await ctx.command.transform((editor) => {
-      editor.add({
-        name: "cmd-usage",
-        description: "Show Command Code plan, credits, and usage windows",
-        execute: async ({ sessionID, prompt }) => {
-          const arg = typeof prompt?.text === "string" ? prompt.text : "";
-          let text;
-          try {
-            text = await runCmduse(arg, { env: key ? { CMD_API_KEY: key } : undefined });
-          } catch (e) {
-            text = `cmd-usage failed: ${e instanceof Error ? e.message : String(e)}`;
-          }
-          await ctx.session.synthetic({ sessionID, text: `**/cmd-usage**
-
-${text}` });
-        }
-      });
-    });
     await ctx.tool.transform((editor) => {
       editor.add({
         name: "cmd_usage",
@@ -646,16 +668,18 @@ ${text}` });
         },
         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 () => {
+      const key = await credentialKey(ctx);
+      if (!key)
+        return;
       try {
         const split = await loadModels(key);
         if (controller.signal.aborted)

package/dist/tui.d.ts

@@ -0,0 +1,3 @@
+import { Plugin } from "@opencode/plugin/tui";
+declare const _default: Plugin.Definition;
+export default _default;

package/dist/tui.js

@@ -0,0 +1,165 @@
+// @bun
+// src/tui.ts
+import { Plugin } from "@opencode/plugin/tui";
+
+// src/cli.ts
+import { spawn } from "child_process";
+var CANDIDATES = ["cmduse", "/opt/homebrew/bin/cmduse", "/usr/local/bin/cmduse"];
+var DEFAULT_ARGS = ["-1", "--plain"];
+var SUBCOMMANDS = new Set([
+  "plans",
+  "models",
+  "daily",
+  "hourly",
+  "model",
+  "session",
+  "statusline",
+  "config"
+]);
+function splitCliArgs(input) {
+  const out = [];
+  let cur = "";
+  let has = false;
+  let quote;
+  for (let i = 0;i < input.length; i++) {
+    const ch = input[i] ?? "";
+    if (quote) {
+      if (ch === quote) {
+        quote = undefined;
+      } else if (ch === "\\" && quote === '"' && i + 1 < input.length) {
+        cur += input[++i];
+      } else {
+        cur += ch;
+      }
+      continue;
+    }
+    if (ch === '"' || ch === "'") {
+      quote = ch;
+      has = true;
+    } else if (ch === "\\") {
+      if (i + 1 < input.length)
+        cur += input[++i];
+      has = true;
+    } else if (/\s/.test(ch)) {
+      if (has)
+        out.push(cur);
+      cur = "";
+      has = false;
+    } else {
+      cur += ch;
+      has = true;
+    }
+  }
+  if (has)
+    out.push(cur);
+  return out;
+}
+function buildCmduseArgs(arg) {
+  const tokens = splitCliArgs(arg);
+  if (!tokens.length)
+    return DEFAULT_ARGS;
+  if (tokens.some((t) => SUBCOMMANDS.has(t)))
+    return tokens;
+  return [...DEFAULT_ARGS, ...tokens];
+}
+function stderrTail(text) {
+  const lines = text.trimEnd().split(`
+`);
+  return lines.slice(-3).join(`
+`).slice(-400);
+}
+function runOnce(bin, args, opts) {
+  return new Promise((resolve, reject) => {
+    const child = spawn(bin, args, {
+      env: { ...process.env, ...opts.env ?? {} },
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    const out = [];
+    const err = [];
+    const onAbort = () => child.kill("SIGTERM");
+    opts.signal?.addEventListener("abort", onAbort, { once: true });
+    child.stdout.on("data", (d) => out.push(d));
+    child.stderr.on("data", (d) => err.push(d));
+    child.on("error", (e) => {
+      opts.signal?.removeEventListener("abort", onAbort);
+      reject(e);
+    });
+    child.on("close", (code, signal) => {
+      opts.signal?.removeEventListener("abort", onAbort);
+      const stdout = Buffer.concat(out).toString("utf8");
+      if (opts.signal?.aborted) {
+        reject(new Error("cmduse invocation aborted"));
+      } else if (code === 0) {
+        resolve(stdout);
+      } else {
+        const why = signal ? `killed by ${signal}` : `exit ${code}`;
+        const tail = stderrTail(Buffer.concat(err).toString("utf8"));
+        reject(new Error(`cmduse ${args.join(" ")}: ${why}${tail ? `
+${tail}` : ""}`));
+      }
+    });
+  });
+}
+async function runCmduse(arg, opts = {}) {
+  const args = buildCmduseArgs(arg);
+  const candidates = opts.candidates ?? CANDIDATES;
+  let last;
+  for (const bin of candidates) {
+    try {
+      return await runOnce(bin, args, opts);
+    } catch (e) {
+      last = e;
+      if (e?.code !== "ENOENT")
+        throw e;
+    }
+  }
+  throw new Error(`cmduse binary not found (install: brew install JeffreyJYZ/tap/cmduse)${last instanceof Error && last.message !== last.name ? ` \u2014 ${last.message}` : ""}`, { cause: last });
+}
+
+// src/tui.ts
+var tui_default = Plugin.define({
+  id: "command-code.tui",
+  setup(context) {
+    context.ui.slot({
+      append: "app",
+      render: () => {
+        context.keymap.layer(() => ({
+          mode: "global",
+          priority: 10,
+          commands: [
+            {
+              id: "command-code.cmd-usage",
+              title: "Command Code usage",
+              group: "Command Code",
+              slash: { name: "cmd-usage", arguments: true },
+              enabled: () => true,
+              suggested: true,
+              run: async (input) => {
+                let text;
+                try {
+                  text = await runCmduse(input ?? "");
+                } catch (e) {
+                  context.ui.toast.show({
+                    title: "cmd-usage failed",
+                    message: e instanceof Error ? e.message : String(e),
+                    variant: "error"
+                  });
+                  return;
+                }
+                await context.ui.dialog.alert({
+                  title: "Command Code usage",
+                  message: text.trimEnd()
+                });
+              }
+            }
+          ],
+          bindings: ["command-code.cmd-usage"]
+        }));
+        return null;
+      }
+    });
+  }
+});
+export {
+  tui_default as default
+};

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,12 +1,16 @@
 {
 	"name": "@jeffreyjyz/opencode-command-code",
-	"version": "0.2.0",
+	"version": "0.2.2",
 	"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",
 	"types": "dist/index.d.ts",
+	"exports": {
+		".": "./dist/index.js",
+		"./tui": "./dist/tui.js"
+	},
 	"scripts": {
-		"build": "rm -rf dist && bun build src/index.ts --outdir dist --target bun --external @opencode-ai/plugin --external @opencode/plugin && tsc -p tsconfig.build.json",
+		"build": "rm -rf dist && bun build src/index.ts --outdir dist --target bun --external @opencode-ai/plugin --external @opencode/plugin --external @opencode/plugin/tui && bun build src/tui.ts --outdir dist --target bun --external @opencode-ai/plugin --external @opencode/plugin --external @opencode/plugin/tui && tsc -p tsconfig.build.json",
 		"test": "bun test",
 		"typecheck": "tsc --noEmit"
 	},
@@ -16,9 +20,10 @@
 	},
 	"devDependencies": {
 		"@types/bun": "latest",
+		"solid-js": "^1.9.0",
 		"typescript": "^5"
 	},
-	"files": ["dist", "LICENSE"],
+	"files": ["dist", "tui.js", "LICENSE"],
 	"keywords": ["opencode", "command-code", "plugin", "provider", "ai-sdk"],
 	"license": "MIT",
 	"publishConfig": {

package/tui.js

@@ -0,0 +1,5 @@
+// Entry shim for local/directory plugin loading: opencode resolves the TUI
+// half as a literal `tui.js` beside the package root (package `exports`
+// are only consulted for npm-installed plugins). Keep this file in sync with
+// the built ./tui output.
+export { default } from "./dist/tui.js"