opencode-usage-coach 0.2.2 → 0.2.4

package/README.md

@@ -1,16 +1,17 @@
 # opencode-usage-coach
 
 A closed-loop usage coach and harness for [OpenCode](https://opencode.ai). Built for
-flat-rate coding plans (e.g. z.ai / GLM) where USD cost is meaningless, so it tracks
-**quota windows (5h / weekly / monthly)** and turns them into coaching + loop control.
+flat-rate coding plans (e.g. z.ai / GLM, or any quota-metered provider) where USD cost
+is meaningless, so it tracks **quota windows (5h / weekly / monthly)** and turns them
+into coaching + loop control. Provider-agnostic — configure via `harness.config.json`.
 
 Existing plugins only *display* usage. This one **senses quota → coaches → stops/advances
-the loop** — and ships a harness agent mode + a deterministic orchestrator.
+the loop** — and ships a harness agent mode.
 
 ## What it does
 
 **Always-on guardian (plugin):**
-- Senses z.ai quota windows via the `codexbar` CLI.
+- Senses provider quota windows via the `codexbar` CLI (config-driven — any provider codexbar knows).
 - On STOP threshold: blocks tool calls (`tool.execute.before` throws) → the agent self-stops.
 - Injects coaching (how to use right now) into the system prompt (double defense).
 - Surfaces a sidebar panel: per-provider quota meters + harness task states + coaching.
@@ -21,12 +22,11 @@ the loop** — and ships a harness agent mode + a deterministic orchestrator.
   unclear → clarify; substantive → generate→grade→revise→advance.
 - Multi-model via plugin tools `generate`/`grade`: run the configured generator/grader model
   (from `harness.config.json`) in a new session on the same server — no second terminal.
-  e.g. GLM generation + free mimo grading in one opencode session.
 - Reports progress via `task_update` → the sidebar panel shows live task states.
 
 ## Requirements
-- opencode (tested on 1.17.13) with a z.ai coding-plan provider configured.
-- `codexbar` CLI with the z.ai key wired (`codexbar config set-api-key --provider zai --stdin`).
+- opencode (tested on 1.17.13) with a quota-metered provider configured.
+- `codexbar` CLI with your provider key wired (e.g. `codexbar config set-api-key --provider zai --stdin`).
 
 ## Install (from npm)
 ```jsonc
@@ -69,29 +69,29 @@ This plugin has **four config surfaces**. Only the first two are required to run
 
 ### 2. codexbar (quota data source)
 ```bash
-printf '%s' "$Z_AI_API_KEY" | codexbar config set-api-key --provider zai --stdin
+printf '%s' "$YOUR_PROVIDER_API_KEY" | codexbar config set-api-key --provider <id> --stdin
 ```
 
 ### 3. Harness config — `harness.config.json` (role → model) ★ the main one
-Place in the **work directory** beside `tasks.txt`/`rubric.md`. Each role runs on its model,
-so per-model quota is tracked (works for local LLMs — they show 0%).
+Place in the **work directory**. Each role runs on its model, so per-model quota is tracked
+(works for local LLMs — they show 0%).
 ```jsonc
 {
-  "generator":     "zai-coding-plan/glm-5.1",   // model that produces the work
-  "grader":        "ollama/llama3",              // model that grades it
-  "taskTimeoutMs": 1800000,                       // per-task timeout (on exceed: auto-split)
-  "maxRevisions":  2                              // revise attempts before giving up
+  "generator":     "opencode/deepseek-v4-flash-free",  // model that produces the work
+  "grader":        "opencode/mimo-v2.5-free",           // model that grades it
+  "provider":      "",                                   // codexbar quota provider ("" = default)
+  "lighterModel":  ""                                    // suggested when throttling
 }
 ```
 | Field | Default | Notes |
 |---|---|---|
-| `generator` | `UC_MODEL` | any `provider/model` opencode knows |
-| `grader` | `UC_MODEL` | can differ from generator (multi-model) |
-| `taskTimeoutMs` | `1800000` (30m) | exceed → task split into subtasks |
-| `maxRevisions` | `2` | FAIL → revise → re-grade, up to N times |
+| `generator` | **required** | any `provider/model` opencode knows |
+| `grader` | falls back to `generator` | can differ (multi-model) |
+| `provider` | `""` (codexbar default) | which provider's quota the guardian watches |
+| `lighterModel` | `""` | shown in throttle advice; env `UC_LIGHTER_MODEL` overrides |
 
-Missing roles fall back to `UC_MODEL`. Provider for quota is derived from the model id
-(`zai-coding-plan/...` → `zai`, `ollama/...` → `ollama`).
+`generator` is **required** — the tools return a clear error if missing. Copy
+`harness.config.example.json` to get started (both example models are free → never gated).
 
 ### 4. Env vars (thresholds / tuning)
 | Var | Default | Meaning |
@@ -101,12 +101,9 @@ Missing roles fall back to `UC_MODEL`. Provider for quota is derived from the mo
 | `UC_STOP_WEEKLY` | 95 | weekly STOP % |
 | `UC_THROTTLE_WEEKLY` | 85 | weekly throttle % |
 | `UC_STOP_MONTHLY` | 98 | monthly STOP % |
-| `UC_LIGHTER_MODEL` | glm-4.5-air | suggested model when throttling |
-| `UC_PROVIDER` | zai | codexbar provider for the guardian |
+| `UC_LIGHTER_MODEL` | (config `lighterModel`) | suggested model when throttling |
+| `UC_PROVIDER` | (config `provider`) | codexbar provider for the guardian |
 | `UC_TTL_MS` | 60000 | quota cache TTL (ms) |
-| `UC_MODEL` | zai-coding-plan/glm-5.1 | harness fallback model |
-| `UC_TASK_TIMEOUT_MS` | 1800000 | harness per-task timeout (overridden by config) |
-| `UC_MAX_REVISIONS` | 2 | harness revise attempts (overridden by config) |
 | `UC_DEBUG` | 0 | set to `1` for a diagnostic log at `~/.cache/opencode-usage-coach/coach.log` |
 
 ## Architecture
@@ -114,13 +111,13 @@ Missing roles fall back to `UC_MODEL`. Provider for quota is derived from the mo
 - **TUI module** (`src/tui.tsx`) — SolidJS, reads a state file, renders into `sidebar_footer`/`home_footer`. Loaded via `tui.json`. Bundled with `tsup` + `esbuild-plugin-solid`, solid kept **external** (resolves to opencode's bundle — avoids the duplicate-instance crash). Exports `{ tui }` (a bare function is misread as a server plugin).
 - server↔TUI communicate via a state file (`~/.cache/opencode-usage-coach/*.json`) — they are separate processes.
 
-Key lessons (see `PLAN.md`): never install `solid-js` in the config dir (conflicts with
+**Key lessons (hard-won):** never install `solid-js` in the config dir (conflicts with
 opencode's bundled solid); TUI plugins must be compiled + loaded via `tui.json` file path;
 `codexbar` must be called via `spawn` (the `$` BunShell leaks output to the TUI).
 
 ## Status
-- ✅ M0–M2 quota guardian + TUI panel (per-provider coach view, colors, collapsible Alt+H)
-- ✅ M3 harness: agent mode (triage) with generate/grade model-specific tools (1 terminal, multi-model)
-- ✅ M4 npm packaging (`opencode plugin install opencode-usage-coach`)
+- ✅ Quota guardian + TUI panel (per-provider coach view, colors, collapsible Alt+H)
+- ✅ Harness: agent mode (triage) with generate/grade model-specific tools (1 terminal, multi-model)
+- ✅ npm packaging (`opencode plugin install opencode-usage-coach`)
 
 License: MIT.

package/dist/index.js

@@ -73,6 +73,7 @@ function readHarnessCfg(dir) {
   };
 }
 async function runModel(client, model, prompt, directory) {
+  const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
   try {
     const slash = model.indexOf("/");
     const providerID = slash >= 0 ? model.slice(0, slash) : model;
@@ -80,11 +81,20 @@ async function runModel(client, model, prompt, directory) {
     const s = await client.session.create({ body: { title: "uc-harness-sub" }, query: { directory } });
     const id = s?.data?.info?.id;
     if (!id) return null;
-    const r = await client.session.prompt({
+    await client.session.prompt({
       path: { id },
       body: { model: { providerID, modelID }, parts: [{ type: "text", text: prompt }] }
     });
-    const parts = r?.data?.parts ?? [];
+    for (let i = 0; i < 600; i++) {
+      await sleep(1e3);
+      const st = await client.session.status({ path: { id } });
+      const status = st?.data?.[id]?.status ?? st?.data?.status;
+      if (status === "idle" || status === "completed" || !status) break;
+    }
+    const msgs = await client.session.messages({ path: { id } });
+    const all = msgs?.data ?? [];
+    const lastAssistant = all.filter((m) => m?.info?.role === "assistant").pop();
+    const parts = lastAssistant?.parts ?? [];
     const text = parts.filter((p) => p?.type === "text").map((p) => p?.text ?? "").join("");
     try {
       await client.session.remove?.({ path: { id } });
@@ -96,7 +106,6 @@ async function runModel(client, model, prompt, directory) {
     return null;
   }
 }
-var PROVIDER = process.env.UC_PROVIDER ?? "zai";
 var num = (e, d) => {
   try {
     const v = Number(process.env[e]);
@@ -110,7 +119,6 @@ var THR_5H = num("UC_THROTTLE_5H", 70);
 var STOP_WK = num("UC_STOP_WEEKLY", 95);
 var THR_WK = num("UC_THROTTLE_WEEKLY", 85);
 var STOP_MO = num("UC_STOP_MONTHLY", 98);
-var LIGHTER = process.env.UC_LIGHTER_MODEL ?? "glm-4.5-air";
 function humanRemaining(iso) {
   try {
     if (!iso) return "";
@@ -181,12 +189,13 @@ async function fetchProvidersCoach() {
   }));
   return results.filter(Boolean);
 }
-function fetchQuota() {
+function fetchQuota(provider) {
   return new Promise((resolve2) => {
     let out = "";
     let p;
     try {
-      p = spawn("codexbar", ["usage", "--provider", PROVIDER, "--json"], {
+      const args = provider ? ["usage", "--provider", provider, "--json"] : ["usage", "--json"];
+      p = spawn("codexbar", args, {
         stdio: ["ignore", "pipe", "ignore"]
       });
     } catch {
@@ -209,12 +218,12 @@ function fetchQuota() {
     });
   });
 }
-function coach(q) {
+function coach(q, lighter) {
   if (!q) return { decision: "GO", advice: "quota unavailable \u2014 proceeding cautiously.", weekly: -1, monthly: -1, fiveHour: -1 };
   const wk = Math.round(q.weekly?.usedPercent ?? 0), mo = Math.round(q.monthly?.usedPercent ?? 0), h5 = Math.round(q.fiveHour?.usedPercent ?? 0);
   const wkR = humanRemaining(q.weekly?.resetsAt), h5R = humanRemaining(q.fiveHour?.resetsAt);
   const stop = (r) => ({ decision: "STOP", advice: `STOP recommend \u2014 ${r}. window nearly exhausted. stop now or it will be force-blocked.`, weekly: wk, monthly: mo, fiveHour: h5 });
-  const thr = (r) => ({ decision: "THROTTLE", advice: `Throttle recommend \u2014 ${r}. switch to lighter model (${LIGHTER}) or wait for window reset.`, weekly: wk, monthly: mo, fiveHour: h5 });
+  const thr = (r) => ({ decision: "THROTTLE", advice: `Throttle recommend \u2014 ${r}. switch to lighter model (${lighter}) or wait for window reset.`, weekly: wk, monthly: mo, fiveHour: h5 });
   if (h5 >= STOP_5H) return stop(`5h window ${h5}% (${h5R})`);
   if (wk >= STOP_WK) return stop(`weekly ${wk}% (${wkR})`);
   if (mo >= STOP_MO) return stop(`monthly ${mo}%`);
@@ -226,6 +235,9 @@ var LOADING = { decision: "GO", advice: "quota loading\u2026", weekly: -1, month
 async function UsageCoachPlugin(input) {
   try {
     setStateDir(input.directory);
+    const cfg0 = readHarnessCfg(input.directory);
+    const PROVIDER = process.env.UC_PROVIDER ?? cfg0.provider ?? "";
+    const LIGHTER = process.env.UC_LIGHTER_MODEL ?? cfg0.lighterModel ?? "a lighter model";
     let last = null;
     let lastFetchedAt = 0;
     let refreshing = false;
@@ -234,9 +246,9 @@ async function UsageCoachPlugin(input) {
         if (refreshing) return;
         if (last && Date.now() - lastFetchedAt < TTL_MS) return;
         refreshing = true;
-        fetchQuota().then(async (q) => {
+        fetchQuota(PROVIDER).then(async (q) => {
           try {
-            last = coach(q);
+            last = coach(q, LIGHTER);
             lastFetchedAt = Date.now();
             let providers = [];
             try {
@@ -346,9 +358,9 @@ async function UsageCoachPlugin(input) {
           args: { prompt: tool.schema.string() },
           async execute(args, ctx) {
             const cfg = readHarnessCfg(ctx.directory);
-            const model = cfg.generator ?? "zai-coding-plan/glm-5.1";
-            const out = await runModel(input.client, model, args.prompt, ctx.directory);
-            return out ?? `(generator ${model} produced no text)`;
+            if (!cfg.generator) return 'ERROR: no generator model configured. Set "generator" in harness.config.json (see harness.config.example.json).';
+            const out = await runModel(input.client, cfg.generator, args.prompt, ctx.directory);
+            return out ?? `(generator ${cfg.generator} produced no text)`;
           }
         }),
         generate_batch: tool({
@@ -356,9 +368,9 @@ async function UsageCoachPlugin(input) {
           args: { tasks: tool.schema.array(tool.schema.object({ id: tool.schema.number(), prompt: tool.schema.string() })) },
           async execute(args, ctx) {
             const cfg = readHarnessCfg(ctx.directory);
-            const model = cfg.generator ?? "zai-coding-plan/glm-5.1";
+            if (!cfg.generator) return 'ERROR: no generator model configured. Set "generator" in harness.config.json (see harness.config.example.json).';
             const results = await Promise.all(args.tasks.map(async (t) => {
-              const out = await runModel(input.client, model, t.prompt, ctx.directory);
+              const out = await runModel(input.client, cfg.generator, t.prompt, ctx.directory);
               return `[task ${t.id}] ${out ?? "(no output)"}`;
             }));
             return results.join("\n\n");
@@ -369,7 +381,8 @@ async function UsageCoachPlugin(input) {
           args: { prompt: tool.schema.string() },
           async execute(args, ctx) {
             const cfg = readHarnessCfg(ctx.directory);
-            const model = cfg.grader ?? cfg.generator ?? "opencode/mimo-v2.5-free";
+            const model = cfg.grader ?? cfg.generator;
+            if (!model) return 'ERROR: no grader/generator model configured. Set "grader" (and "generator") in harness.config.json (see harness.config.example.json).';
             const out = await runModel(input.client, model, args.prompt, ctx.directory);
             return out ?? `(grader ${model} produced no text)`;
           }

package/dist/tui.js

@@ -334,7 +334,7 @@ function initializeTui(api, disposeRoot) {
           _$effect((_$p) => _$setProp(_el$59, "style", st(sKey), _$p));
           return _el$59;
         })());
-        const pv = t.model ? t.model.startsWith("zai") ? "zai" : (t.model.split("/")[0] ?? "").split("-")[0] : "";
+        const pv = t.model ? (t.model.split("/")[0] ?? "").split("-")[0] : "";
         const q = pv && h.quotas?.[pv] ? h.quotas[pv] : null;
         const pct = q ? q.fiveHour : 0;
         nodes.push((() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-usage-coach",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "opencode closed-loop usage coach \u2014 quota SENSE -> coaching DECIDE -> loop ACT + TUI integration",
   "type": "module",
   "main": "./dist/index.js",
@@ -33,8 +33,8 @@
     "usage",
     "coach",
     "loop",
-    "zai",
-    "glm"
+    "llm",
+    "harness"
   ],
   "license": "MIT",
   "peerDependencies": {