@jeffreyjyz/opencode-command-code 0.3.0 → 0.3.1

package/dist/index.js

@@ -3751,6 +3751,19 @@ function staticSeedModels() {
   }
   return seed;
 }
+function mergeModels(snapshot, live) {
+  const byId = new Map;
+  const add = (model) => {
+    const id = model?.id;
+    if (typeof id === "string")
+      byId.set(id, model);
+  };
+  for (const model of snapshot)
+    add(model);
+  for (const model of live)
+    add(model);
+  return [...byId.values()];
+}
 async function credentialKey(ctx) {
   try {
     const connection = await ctx.integration.connection.active(INTEGRATION_ID);
@@ -3771,17 +3784,14 @@ async function credentialKey(ctx) {
 var commandCodeV2 = {
   id: PLUGIN_ID,
   async setup(ctx) {
+    const t0 = Date.now();
     let localKey;
+    let keyMs = 0;
     try {
+      const keyStart = Date.now();
       localKey = await resolveKey();
+      keyMs = Date.now() - keyStart;
     } catch {}
-    let hasConnection = false;
-    try {
-      hasConnection = await ctx.integration.connection.active(INTEGRATION_ID) !== undefined;
-    } catch {}
-    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) {
@@ -3816,9 +3826,9 @@ var commandCodeV2 = {
             provider.name = lane.name;
           if (provider.package === "")
             provider.package = lane.pkg;
-          provider.activation = hasConnection || localKey ? "enabled" : "auto";
+          provider.activation = localKey ? "enabled" : "auto";
           provider.settings = { ...provider.settings, baseURL: PROVIDER_BASE };
-          if (!hasConnection && localKey && provider.settings.apiKey === undefined) {
+          if (localKey && provider.settings.apiKey === undefined) {
             provider.settings.apiKey = localKey;
           }
           provider.integrationID ??= INTEGRATION_ID;
@@ -3826,6 +3836,7 @@ var commandCodeV2 = {
         editor.models.set(lane.id, seed[lane.id]);
       }
     });
+    const registerMs = Date.now() - t0;
     await ctx.tool.transform((editor) => {
       editor.add({
         name: "cmd_usage",
@@ -3849,12 +3860,32 @@ var commandCodeV2 = {
         }
       });
     });
+    let hasConnection = false;
+    let connectionMs = 0;
+    try {
+      const connectionStart = Date.now();
+      hasConnection = await ctx.integration.connection.active(INTEGRATION_ID) !== undefined;
+      connectionMs = Date.now() - connectionStart;
+    } catch {}
+    if (hasConnection) {
+      await ctx.provider.transform((editor) => {
+        for (const lane of LANES) {
+          editor.update(lane.id, (provider) => {
+            provider.activation = "enabled";
+          });
+        }
+      });
+    }
+    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.`);
+    }
     const controller = new AbortController;
     let refreshing = false;
     const refresh = async () => {
       if (refreshing || controller.signal.aborted)
         return;
       refreshing = true;
+      const refreshStart = Date.now();
       try {
         const key = await credentialKey(ctx);
         if (!key)
@@ -3863,11 +3894,12 @@ var commandCodeV2 = {
         if (controller.signal.aborted)
           return;
         await ctx.provider.transform((editor) => {
-          editor.models.set("command-code-anthropic", split.claude.map((m) => toV2Model(m, LANES[0])));
-          editor.models.set("command-code-openai", split.open.map((m) => toV2Model(m, LANES[1])));
+          editor.models.set("command-code-anthropic", mergeModels(seed["command-code-anthropic"], split.claude.map((m) => toV2Model(m, LANES[0]))));
+          editor.models.set("command-code-openai", mergeModels(seed["command-code-openai"], split.open.map((m) => toV2Model(m, LANES[1]))));
         });
+        console.log(`[command-code] setup: key=${keyMs}ms register=${registerMs}ms connection=${connectionMs}ms refresh=${Date.now() - refreshStart}ms models=${split.claude.length + split.open.length}`);
       } catch (e) {
-        console.warn("[command-code] live model list unavailable, keeping previous list:", e);
+        console.warn("[command-code] live model list unavailable, keeping the snapshot:", e);
       } finally {
         refreshing = false;
       }
@@ -3883,7 +3915,7 @@ var commandCodeV2 = {
 // package.json
 var package_default = {
   name: "@jeffreyjyz/opencode-command-code",
-  version: "0.3.0",
+  version: "0.3.1",
   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",

package/dist/sidebar/windows.d.ts

@@ -8,3 +8,9 @@ export declare const WEEKLY_SECS: number;
  * the same unit cmduse-core's vectors pin.
  */
 export declare function elapsedPct(resetAtMs: number | undefined, durSecs: number, nowSecs: number): number | undefined;
+/**
+ * `elapsedPct` as text: a seven-day window forty minutes in is 0.4%, and "0%"
+ * reads as "not started". Non-zero fractions below a percent render "<1%".
+ * Exact zero stays "0%".
+ */
+export declare function elapsedLabel(resetAtMs: number | undefined, durSecs: number, nowSecs: number): string | undefined;

package/dist/tui.js

@@ -403,6 +403,14 @@ function elapsedPct(resetAtMs, durSecs, nowSecs) {
   const pct = (nowSecs - start) / durSecs * 100;
   return Math.round(Math.min(100, Math.max(0, pct)));
 }
+function elapsedLabel(resetAtMs, durSecs, nowSecs) {
+  const pct = elapsedPct(resetAtMs, durSecs, nowSecs);
+  if (pct === undefined)
+    return;
+  if (pct === 0 && nowSecs > Math.floor(resetAtMs / 1000) - durSecs)
+    return "<1%";
+  return `${pct}%`;
+}
 
 // src/sidebar/rows.ts
 var TIER_DISPLAY = {
@@ -445,9 +453,9 @@ function windowRow(label, w, now, durSecs) {
     return;
   const used = typeof w.used === "number" ? w.used : 0;
   const pct = Math.round(used / w.cap * 100);
-  const elapsed = elapsedPct(w.resetAt, durSecs, Math.floor(now / 1000));
+  const elapsed = elapsedLabel(w.resetAt, durSecs, Math.floor(now / 1000));
   const reset = until(w.resetAt, now);
-  const parts = [`${money(used)} / ${money(w.cap)} (${pct}%)`, ...elapsed === undefined ? [] : [`${elapsed}% elapsed`], ...reset ? [`resets ${reset}`] : []];
+  const parts = [`${money(used)} / ${money(w.cap)} (${pct}%)`, ...elapsed === undefined ? [] : [`${elapsed} elapsed`], ...reset ? [`resets ${reset}`] : []];
   return [label, parts.join(" \xB7 ")];
 }
 function usageRows(usage, now = Date.now()) {

package/dist/v2.d.ts

@@ -21,9 +21,15 @@ export declare const TOOL_DESCRIPTION = "Fetch live Command Code plan/usage: pla
  * only the open lane needs the reasoning round-trip field. */
 export declare function toV2Model(m: CmdModel, lane: Lane): unknown;
 /** Instant static seed from gating.json's known model ids, split by wire lane.
- * Replaced by the gated live list once the background fetch lands; also the
- * fallback shown when the live fetch fails. */
+ * Shows in /model immediately; the live fetch merges over it later. */
 export declare function staticSeedModels(): Record<Lane["id"], unknown[]>;
+/**
+ * Union by model id: the snapshot keeps every id it had, so a gated or partial
+ * live response can never make a model vanish from the picker, while live
+ * entries win field-by-field so context, rates, variants and modalities stay
+ * fresh. Snapshot order is preserved; live-only models append in live order.
+ */
+export declare function mergeModels(snapshot: readonly unknown[], live: readonly unknown[]): unknown[];
 /** The slice of the plugin context the credential resolver needs. */
 type CredentialContext = {
     integration: {

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@jeffreyjyz/opencode-command-code",
- "version": "0.3.0",
+ "version": "0.3.1",
  "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",