opencode-usage-coach 0.6.2 → 0.7.1

package/README.md

@@ -155,7 +155,6 @@ Place in the **work directory**. Each role runs on its model, so per-model quota
 | `UC_HARNESS_AGENT` | `Usage-Coach-Harness` | comma-separated agent modes allowed to use harness tools + receive quota coaching (case-insensitive; must match the agent id, e.g. `usage-coach-harness` from `agents/usage-coach-harness.md`) |
 | `UC_WORM_MAX_AGE_DAYS` | 180 | domain DB worm (GC): drop nodes not accessed in N days (~6 months) |
 | `UC_WORM_MAX_NODES` | 100000 | domain DB worm (GC): cap node count, evict oldest-accessed beyond this |
-| `UC_DOMAIN_TIMEOUT_MS` | 5000 | domain DB query timeout (ms) — a slow/hung query resolves to a safe fallback instead of blocking the plugin |
 
 ## Agent-mode scoping
 

package/dist/index.js

@@ -1,5 +1,5 @@
 // src/index.ts
-import { mkdirSync, writeFileSync, appendFileSync, readFileSync as readFileSync2, existsSync as existsSync2 } from "fs";
+import { mkdirSync as mkdirSync2, writeFileSync as writeFileSync2, appendFileSync as appendFileSync2, readFileSync as readFileSync2, existsSync as existsSync2 } from "fs";
 import { spawn } from "child_process";
 import { createHash } from "crypto";
 import { homedir } from "os";
@@ -7,193 +7,125 @@ import { join as join2, resolve, dirname } from "path";
 import { tool } from "@opencode-ai/plugin";
 
 // src/domain.ts
-import { Database, Connection } from "@ladybugdb/core";
+import { mkdirSync, appendFileSync, readFileSync, existsSync, writeFileSync } from "fs";
 import { join } from "path";
-import { existsSync, readFileSync } from "fs";
-var QUERY_TIMEOUT_MS = (() => {
-  try {
-    const v = Number(process.env.UC_DOMAIN_TIMEOUT_MS);
-    return Number.isFinite(v) && v > 0 ? v : 5e3;
-  } catch {
-    return 5e3;
-  }
-})();
 var BASE_DIR = "";
-var DB_PATH = "";
-var db = null;
-var conn = null;
-var schemaReady = false;
-var migrated = false;
 function initDomain(stateDir) {
   BASE_DIR = stateDir;
-  DB_PATH = join(BASE_DIR, "domain.ladybug");
-  db = null;
-  conn = null;
-  schemaReady = false;
-  migrated = false;
 }
-function uid(prefix) {
-  return `${prefix}_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`;
+var nodesFile = () => join(BASE_DIR, "nodes.ndjson");
+var edgesFile = () => join(BASE_DIR, "edges.ndjson");
+function readNdjson(path) {
+  try {
+    if (!existsSync(path)) return [];
+    return readFileSync(path, "utf8").split("\n").filter(Boolean).map((l) => JSON.parse(l));
+  } catch {
+    return [];
+  }
 }
-function esc(s) {
-  return String(s ?? "").replace(/\\/g, "\\\\").replace(/'/g, "\\'");
+function readNodes() {
+  return readNdjson(nodesFile());
 }
-function timed(op, fallback) {
-  let timer;
-  const timeout = new Promise((resolve2) => {
-    timer = setTimeout(() => resolve2(fallback), QUERY_TIMEOUT_MS);
-  });
-  return Promise.race([op().catch(() => fallback), timeout]).finally(() => {
-    if (timer) clearTimeout(timer);
-  });
+function readEdges() {
+  return readNdjson(edgesFile());
+}
+function uid(prefix) {
+  return `${prefix}_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`;
 }
-function parseNode(r) {
-  let props = {};
+function addDomainNode(node) {
+  const full = { ...node, id: uid("node"), ts: (/* @__PURE__ */ new Date()).toISOString() };
   try {
-    if (r.props) props = JSON.parse(r.props);
+    mkdirSync(BASE_DIR, { recursive: true });
+    appendFileSync(nodesFile(), JSON.stringify(full) + "\n");
   } catch {
   }
-  return {
-    id: r.id,
-    type: r.type,
-    name: r.name,
-    props,
-    source: r.source ?? "",
-    confidence: r.confidence ?? 0,
-    ts: r.ts,
-    lastAccessed: r.lastAccessed || void 0,
-    accessCount: r.accessCount ?? void 0
-  };
+  return full.id;
 }
-var NODE_COLS = "n.id AS id, n.type AS type, n.name AS name, n.props AS props, n.source AS source, n.confidence AS confidence, n.ts AS ts, n.lastAccessed AS lastAccessed, n.accessCount AS accessCount";
-async function ready() {
-  if (!conn) {
-    db = new Database(DB_PATH);
-    conn = new Connection(db);
-  }
-  if (!schemaReady) {
-    try {
-      await conn.query("CREATE NODE TABLE DomainNode(id STRING, type STRING, name STRING, props STRING, source STRING, confidence DOUBLE, lastAccessed STRING, accessCount INT64 DEFAULT 0, ts STRING, PRIMARY KEY(id))");
-    } catch {
-    }
-    try {
-      await conn.query("CREATE REL TABLE Related(FROM DomainNode TO DomainNode, rel STRING, note STRING, ts STRING)");
-    } catch {
-    }
-    schemaReady = true;
-  }
-  if (!migrated) {
-    migrated = true;
-    await migrateFromNdjson();
-  }
-  return conn;
-}
-async function migrateFromNdjson() {
-  if (!conn) return;
-  const nf = join(BASE_DIR, "nodes.ndjson");
-  const ef = join(BASE_DIR, "edges.ndjson");
-  if (!existsSync(nf)) return;
+function writeNodes(nodes) {
   try {
-    const existing = await conn.query("MATCH (n:DomainNode) RETURN count(n) AS c");
-    const cnt = (await existing.getAll())[0]?.c ?? 0;
-    if (cnt > 0) return;
-    const readNdjson = (p) => {
-      try {
-        return readFileSync(p, "utf8").split("\n").filter(Boolean).map((l) => JSON.parse(l));
-      } catch {
-        return [];
-      }
-    };
-    for (const n of readNdjson(nf)) {
-      await conn.query(`CREATE (n:DomainNode {id:'${esc(n.id)}',type:'${esc(n.type)}',name:'${esc(n.name)}',props:'${esc(JSON.stringify(n.props ?? {}))}',source:'${esc(n.source ?? "")}',confidence:${Number(n.confidence ?? 0)},ts:'${esc(n.ts ?? "")}',lastAccessed:'${esc(n.lastAccessed ?? "")}',accessCount:${Number(n.accessCount ?? 0)}})`);
-    }
-    if (existsSync(ef)) {
-      for (const e of readNdjson(ef)) {
-        await conn.query(`MATCH (a:DomainNode {id:'${esc(e.from)}'}), (b:DomainNode {id:'${esc(e.to)}'}) CREATE (a)-[:Related {rel:'${esc(e.rel)}',note:'${esc(e.note ?? "")}',ts:'${esc(e.ts ?? "")}'}]->(b)`);
-      }
-    }
+    mkdirSync(BASE_DIR, { recursive: true });
+    const lines = nodes.map((n) => JSON.stringify(n));
+    writeFileSync(nodesFile(), lines.length ? lines.join("\n") + "\n" : "");
   } catch {
   }
 }
-async function _readNodes() {
-  const c = await ready();
-  const r = await c.query(`MATCH (n:DomainNode) RETURN ${NODE_COLS}`);
-  return (await r.getAll()).map(parseNode);
-}
-async function _addDomainNode(node) {
-  const c = await ready();
-  const id = uid("node");
-  const now = (/* @__PURE__ */ new Date()).toISOString();
-  await c.query(`CREATE (n:DomainNode {id:'${esc(id)}',type:'${esc(node.type)}',name:'${esc(node.name)}',props:'${esc(JSON.stringify(node.props ?? {}))}',source:'${esc(node.source ?? "")}',confidence:${Number(node.confidence ?? 0)},ts:'${esc(now)}',lastAccessed:'',accessCount:0})`);
-  return id;
-}
 function queryDomain(keywords) {
-  return timed(() => _queryDomain(keywords), { nodes: [], edges: [] });
-}
-async function _queryDomain(keywords) {
-  const lc = keywords.map((k) => k.toLowerCase()).filter(Boolean);
-  if (lc.length === 0) return { nodes: [], edges: [] };
-  const c = await ready();
-  const conds = lc.map((kw) => `(lower(n.name) CONTAINS '${esc(kw)}' OR lower(n.props) CONTAINS '${esc(kw)}')`).join(" OR ");
-  const r = await c.query(`MATCH (n:DomainNode) WHERE ${conds} RETURN ${NODE_COLS}`);
-  const matched = (await r.getAll()).map(parseNode);
-  if (matched.length) await _touchNodes(new Set(matched.map((n) => n.id)));
-  let edges = [];
-  if (matched.length) {
-    const ids = matched.map((n) => `'${esc(n.id)}'`).join(",");
-    const er = await c.query(`MATCH (a:DomainNode)-[r:Related]->(b:DomainNode) WHERE a.id IN [${ids}] OR b.id IN [${ids}] RETURN a.id AS from, b.id AS to, r.rel AS rel, r.note AS note, r.ts AS ts`);
-    edges = await er.getAll();
-  }
+  const lc = keywords.map((k) => k.toLowerCase());
+  const nodes = readNodes();
+  const matched = nodes.filter((n) => {
+    const hay = (n.name + " " + JSON.stringify(n.props)).toLowerCase();
+    return lc.some((k) => k && hay.includes(k));
+  });
+  if (matched.length) touchNodes(new Set(matched.map((n) => n.id)));
+  const ids = new Set(matched.map((n) => n.id));
+  const edges = readEdges().filter((e) => ids.has(e.from) || ids.has(e.to));
   return { nodes: matched, edges };
 }
-async function _touchNodes(ids) {
+function touchNodes(ids) {
   if (ids.size === 0) return;
-  const c = await ready();
-  const now = (/* @__PURE__ */ new Date()).toISOString();
-  const idList = [...ids].map((id) => `'${esc(id)}'`).join(",");
-  await c.query(`MATCH (n:DomainNode) WHERE n.id IN [${idList}] SET n.lastAccessed = '${esc(now)}', n.accessCount = COALESCE(n.accessCount, 0) + 1`);
-}
-function evictStale(maxAgeDays = 30, maxNodes = 1e5) {
-  return timed(() => _evictStale(maxAgeDays, maxNodes), { removed: 0, kept: 0 });
-}
-async function _evictStale(maxAgeDays, maxNodes) {
-  const c = await ready();
-  const all = await _readNodes();
-  if (all.length === 0) return { removed: 0, kept: 0 };
-  const now = Date.now();
-  const ageMs = maxAgeDays * 864e5;
-  const lastTs = (n) => {
-    const la = n.lastAccessed ? new Date(n.lastAccessed).getTime() : 0;
-    return la || new Date(n.ts).getTime();
-  };
-  let kept = all.filter((n) => now - lastTs(n) < ageMs);
-  if (kept.length > maxNodes) {
-    kept.sort((a, b) => lastTs(b) - lastTs(a));
-    kept = kept.slice(0, maxNodes);
+  try {
+    const nodes = readNodes();
+    let changed = false;
+    const now = (/* @__PURE__ */ new Date()).toISOString();
+    for (const n of nodes) {
+      if (ids.has(n.id)) {
+        n.lastAccessed = now;
+        n.accessCount = (n.accessCount ?? 0) + 1;
+        changed = true;
+      }
+    }
+    if (changed) writeNodes(nodes);
+  } catch {
   }
-  const keepIds = new Set(kept.map((n) => n.id));
-  const toRemove = all.filter((n) => !keepIds.has(n.id));
-  for (const n of toRemove) {
-    await c.query(`MATCH (n:DomainNode {id:'${esc(n.id)}'}) DETACH DELETE n`);
+}
+function evictStale(maxAgeDays = 30, maxNodes = 1e3) {
+  try {
+    const nodes = readNodes();
+    if (nodes.length === 0) return { removed: 0, kept: 0 };
+    const now = Date.now();
+    const ageMs = maxAgeDays * 864e5;
+    const lastTs = (n) => new Date(n.lastAccessed ?? n.ts).getTime();
+    let kept = nodes.filter((n) => now - lastTs(n) < ageMs);
+    if (kept.length > maxNodes) {
+      kept.sort((a, b) => lastTs(b) - lastTs(a));
+      kept = kept.slice(0, maxNodes);
+    }
+    const removed = nodes.length - kept.length;
+    if (removed > 0) writeNodes(kept);
+    return { removed, kept: kept.length };
+  } catch {
+    return { removed: 0, kept: 0 };
   }
-  return { removed: toRemove.length, kept: kept.length };
 }
 function saveInvestigationResult(keywords, result, source) {
-  return timed(() => _saveInvestigationResult(keywords, result, source), "");
-}
-async function _saveInvestigationResult(keywords, result, source) {
-  return _addDomainNode({
-    type: "fact",
-    name: keywords.join(" "),
-    props: { result },
-    source: source || "investigation",
-    confidence: 0.7
-  });
+  try {
+    return addDomainNode({
+      type: "fact",
+      name: keywords.join(" "),
+      props: { result },
+      source: source || "investigation",
+      confidence: 0.7
+    });
+  } catch {
+    return "";
+  }
 }
 
 // src/index.ts
 var PLUGIN_NAME = "opencode-usage-coach";
 var TTL_MS = Number(process.env.UC_TTL_MS ?? 6e4);
+var DEFAULT_MAX_STEPS = Number(process.env.UC_MAX_STEPS ?? 30) || 30;
+var WATCHDOG_POLL_MS = Math.max(1e3, Number(process.env.UC_WATCHDOG_POLL_MS ?? 3e3) || 3e3);
+var PIPE_LOG = join2(homedir(), ".cache", "opencode-usage-coach", "pipeline.log");
+function pipeLog(msg) {
+  try {
+    mkdirSync2(dirname(PIPE_LOG), { recursive: true });
+    appendFileSync2(PIPE_LOG, `[SERVER] ${(/* @__PURE__ */ new Date()).toISOString()} ${msg}
+`);
+  } catch {
+  }
+}
+pipeLog(`MODULE LOADED | node=${process.version} | pid=${process.pid}`);
 var STATE_DIR = join2(homedir(), ".cache", "opencode-usage-coach");
 var STATE_FILE = join2(STATE_DIR, "state.json");
 var LOG_FILE = join2(STATE_DIR, "coach.log");
@@ -210,15 +142,15 @@ function setStateDir(dir) {
 var NOOP_HOOKS = {};
 function log(msg) {
   try {
-    appendFileSync(LOG_FILE, `${(/* @__PURE__ */ new Date()).toISOString()} ${msg}
+    appendFileSync2(LOG_FILE, `${(/* @__PURE__ */ new Date()).toISOString()} ${msg}
 `);
   } catch {
   }
 }
 function writeState(c) {
   try {
-    mkdirSync(STATE_DIR, { recursive: true });
-    writeFileSync(STATE_FILE, JSON.stringify({ ...c, updatedAt: (/* @__PURE__ */ new Date()).toISOString() }));
+    mkdirSync2(STATE_DIR, { recursive: true });
+    writeFileSync2(STATE_FILE, JSON.stringify({ ...c, updatedAt: (/* @__PURE__ */ new Date()).toISOString() }));
   } catch {
   }
 }
@@ -269,12 +201,46 @@ function readHarness(sessionID) {
 function writeHarness(sessionID, h) {
   try {
     const f = harnessFile(sessionID);
-    mkdirSync(dirname(f), { recursive: true });
+    mkdirSync2(dirname(f), { recursive: true });
     h.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
-    writeFileSync(f, JSON.stringify(h, null, 2));
+    writeFileSync2(f, JSON.stringify(h, null, 2));
+  } catch {
+  }
+}
+function updateSubSession(sessionID, taskId, fields) {
+  try {
+    const h = readHarness(sessionID);
+    if (!h) return;
+    const t = h.tasks.find((x) => x.id === taskId);
+    if (!t) return;
+    Object.assign(t, fields);
+    writeHarness(sessionID, h);
   } catch {
   }
 }
+function clearSubSession(sessionID, taskId) {
+  try {
+    const h = readHarness(sessionID);
+    if (!h) return;
+    const t = h.tasks.find((x) => x.id === taskId);
+    if (!t) return;
+    t.subSessionId = void 0;
+    t.subStep = void 0;
+    t.lastActivity = void 0;
+    t.subElapsed = void 0;
+    writeHarness(sessionID, h);
+  } catch {
+  }
+}
+function findActiveTaskId(sessionID, status) {
+  try {
+    const h = readHarness(sessionID);
+    if (!h) return void 0;
+    return h.tasks.find((x) => x.status === status)?.id;
+  } catch {
+    return void 0;
+  }
+}
 function readHarnessCfg(dir) {
   const tryRead = (p) => {
     try {
@@ -288,8 +254,16 @@ function readHarnessCfg(dir) {
     ...tryRead(join2(dir, "harness.config.json"))
   };
 }
-async function runModel(client, model, prompt, directory) {
+async function runModel(client, model, prompt, directory, track, maxSteps = DEFAULT_MAX_STEPS) {
   const t0 = Date.now();
+  const subStart = Date.now();
+  let poller = null;
+  let subId = null;
+  let timedOut = false;
+  let signalTimeout;
+  const timeoutSignal = new Promise((resolve2) => {
+    signalTimeout = resolve2;
+  });
   try {
     const slash = model.indexOf("/");
     const providerID = slash >= 0 ? model.slice(0, slash) : model;
@@ -297,12 +271,75 @@ 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 ?? s?.data?.id ?? s?.id;
     if (!id) return `ERROR: session.create returned no id (response: ${JSON.stringify(s?.data ?? s).slice(0, 200)})`;
-    log(`runModel(${model}): session ${id} created, sending prompt (${prompt.length} chars)`);
-    const resp = await client.session.prompt({
+    subId = id;
+    log(`runModel(${model}): session ${id} created, sending prompt (${prompt.length} chars), max_steps=${maxSteps}`);
+    poller = setInterval(async () => {
+      if (timedOut) return;
+      try {
+        let step = 0;
+        let lastTs = (/* @__PURE__ */ new Date()).toISOString();
+        try {
+          const msgs = await client.session.messages?.({ path: { id } });
+          const msgList = Array.isArray(msgs?.data) ? msgs.data : Array.isArray(msgs) ? msgs : [];
+          if (msgList.length) {
+            step = msgList.filter((m) => {
+              const role = m?.role ?? m?.info?.role;
+              return role === "assistant";
+            }).length;
+            const last = msgList[msgList.length - 1];
+            const ts = last?.ts ?? last?.info?.updatedAt ?? last?.info?.completedAt ?? last?.updatedAt;
+            if (ts) lastTs = String(ts);
+          }
+        } catch {
+        }
+        if (step > maxSteps) {
+          log(`runModel(${model}): STEP LIMIT exceeded (${step} > ${maxSteps}), aborting session ${id}`);
+          timedOut = true;
+          try {
+            await client.session.abort?.({ path: { id } });
+          } catch {
+          }
+          signalTimeout();
+          return;
+        }
+        if (track) {
+          const elapsed2 = Math.round((Date.now() - subStart) / 1e3);
+          updateSubSession(track.sessionID, track.taskId, {
+            subSessionId: id,
+            subStep: step,
+            lastActivity: lastTs,
+            subElapsed: elapsed2
+          });
+        }
+      } catch (e) {
+        log(`runModel poller err: ${String(e)}`);
+      }
+    }, WATCHDOG_POLL_MS);
+    const promptP = client.session.prompt({
       path: { id },
       body: { model: { providerID, modelID }, parts: [{ type: "text", text: prompt }] }
-    });
+    }).then(
+      (r) => r,
+      () => null
+      // abort causes rejection -> return null (handled via timedOut flag)
+    );
+    const resp = await Promise.race([promptP, timeoutSignal.then(() => null)]);
     const elapsed = Math.round((Date.now() - t0) / 1e3);
+    if (timedOut) {
+      try {
+        const summary = await client.session.summarize?.({ path: { id } });
+        log(`runModel(${model}): TIMED OUT summary: ${JSON.stringify(summary?.data ?? summary).slice(0, 300)}`);
+      } catch {
+      }
+      try {
+        await client.session.delete?.({ path: { id } });
+      } catch {
+      }
+      subId = null;
+      log(`runModel(${model}): TIMED OUT after ${elapsed}s (${maxSteps} steps exceeded)`);
+      return `Task appears too large (exceeded ${maxSteps} steps). Consider splitting into smaller subtasks.
+[usage-coach NEXT] split the original task into smaller subtasks (each should complete within ${maxSteps} steps), then re-run generate for each subtask.`;
+    }
     const parts = resp?.data?.parts ?? resp?.parts ?? [];
     const text = parts.filter((p) => p?.type === "text").map((p) => p?.text ?? "").join("");
     try {
@@ -314,12 +351,27 @@ async function runModel(client, model, prompt, directory) {
       await client.session.delete?.({ path: { id } });
     } catch {
     }
+    subId = null;
     log(`runModel(${model}): done ${elapsed}s, ${text.length} chars`);
     return text.trim() || `ERROR: no assistant text in prompt response after ${elapsed}s (parts: ${parts.length}, types: ${parts.map((p) => p?.type).join(",")})`;
   } catch (e) {
     const elapsed = Math.round((Date.now() - t0) / 1e3);
     log(`runModel err (${model}, ${elapsed}s): ${String(e)}`);
     return `ERROR: runModel exception after ${elapsed}s: ${String(e)}`;
+  } finally {
+    if (poller) clearInterval(poller);
+    if (track) {
+      try {
+        clearSubSession(track.sessionID, track.taskId);
+      } catch {
+      }
+    }
+    if (subId) {
+      try {
+        await client.session.delete?.({ path: { id: subId } });
+      } catch {
+      }
+    }
   }
 }
 var HARNESS_AGENTS = (process.env.UC_HARNESS_AGENT ?? "Usage-Coach-Harness").split(",").map((s) => s.trim().toLowerCase()).filter(Boolean);
@@ -451,14 +503,44 @@ function coach(q, lighter) {
   return { decision: "GO", advice: `Comfortable \u2014 weekly ${wk}% \xB7 5h ${h5}% \xB7 monthly ${mo}%. proceed. 5h window ${h5R}.`, weekly: wk, monthly: mo, fiveHour: h5 };
 }
 var agentCache = /* @__PURE__ */ new Map();
+var currentModel = "";
+var currentProvider = "";
+var currentAgent = "";
+var modelChanged = false;
+function isFreeModel(model, provider) {
+  if (!model && !provider) return false;
+  if (provider === "opencode") return true;
+  if (model.toLowerCase().includes("free")) return true;
+  return false;
+}
+function providerToCodexbar(provider) {
+  if (!provider) return "";
+  return provider.split("-")[0];
+}
 async function resolveAgent(client, sessionID) {
   if (!sessionID) return "";
   const hit = agentCache.get(sessionID);
-  if (hit && Date.now() - hit.ts < 6e4) return hit.agent;
+  if (hit && Date.now() - hit.ts < 6e4) {
+    currentModel = hit.model;
+    currentProvider = hit.provider;
+    return hit.agent;
+  }
   try {
     const s = await client.session.get({ path: { id: sessionID } });
-    const agent = String(s?.data?.info?.agent ?? s?.data?.agent ?? s?.info?.agent ?? "");
-    agentCache.set(sessionID, { agent, ts: Date.now() });
+    log(`resolveAgent raw session: ${JSON.stringify(s?.data?.info ?? s?.data ?? s?.info ?? s).slice(0, 500)}`);
+    const info = s?.data?.info ?? s?.data ?? s?.info ?? s;
+    const agent = String(info?.agent ?? "");
+    const rawModel = info?.model;
+    const model = typeof rawModel === "string" ? rawModel : rawModel?.id ?? rawModel?.modelID ?? rawModel?.name ?? "";
+    const rawProvider = info?.providerID ?? info?.provider ?? (typeof rawModel === "object" ? rawModel?.providerID ?? rawModel?.provider : "");
+    const provider = typeof rawProvider === "string" ? rawProvider : rawProvider?.id ?? "";
+    if (currentModel && model && currentModel !== model) {
+      log(`MODEL CHANGED: ${currentModel} \u2192 ${model} (provider: ${currentProvider} \u2192 ${provider})`);
+      modelChanged = true;
+    }
+    agentCache.set(sessionID, { agent, model, provider, ts: Date.now() });
+    currentModel = model;
+    currentProvider = provider;
     return agent;
   } catch (e) {
     log(`resolveAgent err: ${String(e)}`);
@@ -483,9 +565,19 @@ async function UsageCoachPlugin(input) {
     const refreshBackground = () => {
       try {
         if (refreshing) return;
-        if (last && Date.now() - lastFetchedAt < TTL_MS) return;
+        if (last && !modelChanged && Date.now() - lastFetchedAt < TTL_MS) return;
         refreshing = true;
-        fetchQuota(PROVIDER).then(async (q) => {
+        modelChanged = false;
+        if (isFreeModel(currentModel, currentProvider)) {
+          last = { decision: "GO", advice: `${currentModel || currentProvider || "free model"} \u2014 no quota limit.`, weekly: -1, monthly: -1, fiveHour: -1, model: currentModel, provider: currentProvider, isFree: true };
+          lastFetchedAt = Date.now();
+          writeState({ ...last, providers: [], model: currentModel, provider: currentProvider, isFree: true, agent: currentAgent, updatedAt: (/* @__PURE__ */ new Date()).toISOString() });
+          log(`FREE | model=${currentModel} provider=${currentProvider}`);
+          refreshing = false;
+          return;
+        }
+        const activeProvider = providerToCodexbar(currentProvider) || PROVIDER;
+        fetchQuota(activeProvider).then(async (q) => {
           try {
             last = coach(q, LIGHTER);
             lastFetchedAt = Date.now();
@@ -498,7 +590,7 @@ async function UsageCoachPlugin(input) {
               const p0 = providers[0];
               last = { ...last, weekly: p0.weekly, fiveHour: p0.fiveHour, monthly: p0.weekly >= 0 ? 0 : -1, advice: p0.advice, decision: p0.weekly >= STOP_WK ? "STOP" : p0.weekly >= THR_WK ? "THROTTLE" : "GO" };
             }
-            writeState({ ...last, providers, updatedAt: (/* @__PURE__ */ new Date()).toISOString() });
+            writeState({ ...last, providers, model: currentModel, provider: currentProvider, isFree: false, agent: currentAgent, updatedAt: (/* @__PURE__ */ new Date()).toISOString() });
             log(`${last.decision} | weekly=${last.weekly}% 5h=${last.fiveHour}% | providers=${providers.length}`);
           } catch (e) {
             log(`refresh-in-then err: ${String(e)}`);
@@ -526,7 +618,7 @@ async function UsageCoachPlugin(input) {
           if (event.type === "session.created" || event.type === "session.idle") refreshBackground();
           if (event.type === "session.idle") {
             try {
-              const r = await evictStale(WORM_MAX_AGE_DAYS, WORM_MAX_NODES);
+              const r = evictStale(WORM_MAX_AGE_DAYS, WORM_MAX_NODES);
               if (r.removed) log(`evictStale: removed ${r.removed}, kept ${r.kept} (maxAge=${WORM_MAX_AGE_DAYS}d, maxNodes=${WORM_MAX_NODES})`);
             } catch (e) {
               log(`evictStale err: ${String(e)}`);
@@ -536,13 +628,14 @@ async function UsageCoachPlugin(input) {
           log(`event err: ${String(e)}`);
         }
       },
-      // ACT(1) hard gate — harness tools are restricted to the configured harness
-      // agent mode AND gated by quota STOP. General tools (read/edit/bash/grep/task)
-      // are NEVER gated, in ANY mode — they don't consume model quota.
+      // ACT(1) — model/agent detection on EVERY tool call (cached 60s, negligible overhead).
+      // Then hard-gate harness tools by agent mode + quota STOP.
       "tool.execute.before": async (_input) => {
+        const agent = await resolveAgent(input.client, _input.sessionID);
+        currentAgent = agent;
+        refreshBackground();
         const harnessTools = ["generate", "generate_batch", "grade", "investigate", "verify_diagnosis", "generalize", "harness_start", "task_update", "harness_done", "record_failure"];
         if (!harnessTools.includes(_input.tool)) return;
-        const agent = await resolveAgent(input.client, _input.sessionID);
         if (!isHarnessAgent(agent)) {
           throw new Error(`[${PLUGIN_NAME}] '${_input.tool}' is restricted to agent mode ${JSON.stringify(HARNESS_AGENTS)} (current: ${JSON.stringify(agent || "unknown")}). Switch to that agent mode to use it.`);
         }
@@ -562,6 +655,7 @@ async function UsageCoachPlugin(input) {
         try {
           if (_input.sessionID) {
             const agent = await resolveAgent(input.client, _input.sessionID);
+            refreshBackground();
             if (!isHarnessAgent(agent)) return;
           }
           const c = current();
@@ -577,12 +671,14 @@ async function UsageCoachPlugin(input) {
       // Custom tools for the harness agent mode — report status to the panel.
       tool: {
         harness_start: tool({
-          description: "Start the harness: register the total task count on the panel. Call once when the harness loop begins.",
+          description: "Start the harness: register the total task count on the panel. Call once when the harness loop begins. IMPORTANT: each generate/generate_batch sub-session is step-limited (default 30). If any task seems too large, split it into smaller subtasks BEFORE starting \u2014 oversized tasks will timeout.",
           args: { name: tool.schema.string(), total: tool.schema.number() },
           async execute(args, ctx) {
             writeHarness(ctx.sessionID, { name: args.name, total: args.total, current: 0, tasks: [], usage: {}, active: true, startedAt: (/* @__PURE__ */ new Date()).toISOString() });
             return `Harness '${args.name}' started (${args.total} tasks).
 
+STEP LIMIT (default ${DEFAULT_MAX_STEPS}): each generate call creates a sub-session that is automatically aborted if it exceeds ${DEFAULT_MAX_STEPS} assistant steps. Before starting the loop, review each task: can it be completed in a focused, single-pass effort? If a task seems too broad (multiple files, multiple features, open-ended research), SPLIT it now into 2-3 smaller subtasks. A timeout wastes quota \u2014 split upfront.
+
 DETERMINISTIC LOOP \u2014 first classify the tasks:
   INDEPENDENT = task B does NOT need task A's output  ->  use PATH A (parallel, faster)
   DEPENDENT   = task B needs task A's output          ->  use PATH B (sequential)
@@ -651,8 +747,8 @@ Then: harness_done(). Follow the [usage-coach NEXT] directive each tool returns.
           async execute(args, _ctx) {
             const rec = { ts: (/* @__PURE__ */ new Date()).toISOString(), task: args.task, prompt: args.prompt, gradeResult: args.gradeResult, model: args.model, revisions: args.revisions };
             try {
-              mkdirSync(STATE_DIR, { recursive: true });
-              appendFileSync(failuresFile(), JSON.stringify(rec) + "\n");
+              mkdirSync2(STATE_DIR, { recursive: true });
+              appendFileSync2(failuresFile(), JSON.stringify(rec) + "\n");
             } catch (e) {
               log(`record_failure err: ${String(e)}`);
             }
@@ -676,7 +772,7 @@ Then: harness_done(). Follow the [usage-coach NEXT] directive each tool returns.
             try {
               keywords = extractKeywords(`${args.task} ${args.gradeResult}`);
               if (keywords.length) {
-                const { nodes, edges } = await queryDomain(keywords);
+                const { nodes, edges } = queryDomain(keywords);
                 if (nodes && nodes.length || edges && edges.length) {
                   domainEmpty = false;
                   domainPrefix = `Known facts from domain DB: ${JSON.stringify({ nodes, edges })}. Use these if relevant.
@@ -697,10 +793,17 @@ Output a structured root cause:
 category: (one of: constraint-violation, missing-context, tool-misuse, model-limitation, other)
 explanation: <why it failed>
 evidence: <file/line or specific quote>`;
-            const out = await runModel(input.client, cfg.generator, domainPrefix + rcaPrompt, ctx.directory);
+            const invTaskId = findActiveTaskId(ctx.sessionID, "revising");
+            const out = await runModel(
+              input.client,
+              cfg.generator,
+              domainPrefix + rcaPrompt,
+              ctx.directory,
+              invTaskId ? { sessionID: ctx.sessionID, taskId: invTaskId } : void 0
+            );
             if (domainEmpty && keywords.length) {
               try {
-                await saveInvestigationResult(keywords, out, "investigate");
+                saveInvestigationResult(keywords, out, "investigate");
               } catch (e) {
                 log(`investigate save err: ${String(e)}`);
               }
@@ -725,7 +828,14 @@ Grade feedback: ${args.gradeResult}
 Diagnosis: ${args.diagnosis}
 Is the diagnosis CORRECT and ACTIONABLE (leads to a useful rule)?
 Output PASS (the diagnosis is right) or FAIL (re-investigate needed), then reason.`;
-            const out = await runModel(input.client, model, verifyPrompt, ctx.directory);
+            const verTaskId = findActiveTaskId(ctx.sessionID, "revising");
+            const out = await runModel(
+              input.client,
+              model,
+              verifyPrompt,
+              ctx.directory,
+              verTaskId ? { sessionID: ctx.sessionID, taskId: verTaskId } : void 0
+            );
             let verdict = "FAIL";
             if (!out.startsWith("ERROR:")) {
               const f = (out.split("\n").find((l) => l.trim()) ?? "").trim();
@@ -752,12 +862,19 @@ Diagnosis: ${args.diagnosis}
 Failed task: ${args.task}
 Output a single rule in the form: 'For <task-type> tasks, always <check/do X> because <reason>.'
 Keep it concrete and actionable.`;
-            const out = await runModel(input.client, cfg.generator, genPrompt, ctx.directory);
+            const genRuleTaskId = findActiveTaskId(ctx.sessionID, "revising");
+            const out = await runModel(
+              input.client,
+              cfg.generator,
+              genPrompt,
+              ctx.directory,
+              genRuleTaskId ? { sessionID: ctx.sessionID, taskId: genRuleTaskId } : void 0
+            );
             const rule = out;
             try {
               const date = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
-              mkdirSync(STATE_DIR, { recursive: true });
-              appendFileSync(rulesFile(), `## Rule (${date})
+              mkdirSync2(STATE_DIR, { recursive: true });
+              appendFileSync2(rulesFile(), `## Rule (${date})
 ${rule}
 Origin: ${args.task}
 
@@ -772,8 +889,8 @@ Origin: ${args.task}
         // Per-role model execution (config-driven, quota-aware, same server, no deadlock).
         // P1: quota decision drives model selection + concurrency.
         generate: tool({
-          description: "Run the GENERATOR model on a prompt. Quota-aware: on THROTTLE, auto-switches to lighterModel if configured. Returns the model's text response.",
-          args: { prompt: tool.schema.string() },
+          description: "Run the GENERATOR model on a prompt. Quota-aware: on THROTTLE, auto-switches to lighterModel if configured. Returns the model's text response. Step-limited: aborts after max_steps (default 30) to prevent runaway tasks.",
+          args: { prompt: tool.schema.string(), max_steps: tool.schema.number().optional().describe("Maximum sub-session steps before timeout (default 30). Increase for complex tasks, decrease to fail fast on scope creep.") },
           async execute(args, ctx) {
             const cfg = readHarnessCfg(ctx.directory);
             if (!cfg.generator) return 'ERROR: no generator model configured. Set "generator" in harness.config.json (see harness.config.example.json).';
@@ -796,7 +913,7 @@ ${rules}
             try {
               keywords = extractKeywords(args.prompt);
               if (keywords.length) {
-                const { nodes, edges } = await queryDomain(keywords);
+                const { nodes, edges } = queryDomain(keywords);
                 if (nodes && nodes.length || edges && edges.length) {
                   domainEmpty = false;
                   prefix = `Known facts from domain DB: ${JSON.stringify({ nodes, edges })}. Use these if relevant.
@@ -809,22 +926,33 @@ ${rules}
             } catch (e) {
               log(`generate domain query err: ${String(e)}`);
             }
-            const out = await runModel(input.client, model, prefix + args.prompt, ctx.directory);
-            if (domainEmpty && keywords.length) {
+            const genTaskId = findActiveTaskId(ctx.sessionID, "generating");
+            const maxSteps = args.max_steps ?? DEFAULT_MAX_STEPS;
+            const out = await runModel(
+              input.client,
+              model,
+              prefix + args.prompt,
+              ctx.directory,
+              genTaskId ? { sessionID: ctx.sessionID, taskId: genTaskId } : void 0,
+              maxSteps
+            );
+            const isTimeoutOrError = out.startsWith("Task appears too large") || out.startsWith("ERROR:");
+            if (domainEmpty && keywords.length && !isTimeoutOrError) {
               try {
-                await saveInvestigationResult(keywords, out, "generate");
+                saveInvestigationResult(keywords, out, "generate");
               } catch (e) {
                 log(`generate save err: ${String(e)}`);
               }
             }
+            if (out.startsWith("Task appears too large")) return out;
             return out + (throttle ? `
 [usage-coach] quota THROTTLE \u2014 used lighter model ${cfg.lighterModel}` : "") + `
 [usage-coach NEXT] call task_update(i, title, "grading"), then grade to evaluate this work.`;
           }
         }),
         generate_batch: tool({
-          description: "Run the GENERATOR model on MULTIPLE tasks. Quota-aware: GO = full parallel; THROTTLE = lighter model + concurrency capped at 2; STOP = refused. Use for INDEPENDENT tasks.",
-          args: { tasks: tool.schema.array(tool.schema.object({ id: tool.schema.number(), prompt: tool.schema.string() })) },
+          description: "Run the GENERATOR model on MULTIPLE tasks. Quota-aware: GO = full parallel; THROTTLE = lighter model + concurrency capped at 2; STOP = refused. Use for INDEPENDENT tasks. Step-limited: each sub-session aborts after max_steps (default 30).",
+          args: { tasks: tool.schema.array(tool.schema.object({ id: tool.schema.number(), prompt: tool.schema.string() })), max_steps: tool.schema.number().optional().describe("Maximum sub-session steps per task before timeout (default 30).") },
           async execute(args, ctx) {
             const cfg = readHarnessCfg(ctx.directory);
             if (!cfg.generator) return 'ERROR: no generator model configured. Set "generator" in harness.config.json (see harness.config.example.json).';
@@ -841,7 +969,14 @@ ${rules}
             for (let i = 0; i < args.tasks.length; i += limit) {
               const batch = args.tasks.slice(i, i + limit);
               const out = await Promise.all(batch.map(async (t) => {
-                const r = await runModel(input.client, model, t.prompt, ctx.directory);
+                const r = await runModel(
+                  input.client,
+                  model,
+                  t.prompt,
+                  ctx.directory,
+                  { sessionID: ctx.sessionID, taskId: t.id },
+                  args.max_steps ?? DEFAULT_MAX_STEPS
+                );
                 return `[task ${t.id}] ${r}`;
               }));
               results.push(...out);
@@ -858,7 +993,14 @@ ${rules}
             const cfg = readHarnessCfg(ctx.directory);
             const model = cfg.grader ?? cfg.generator;
             if (!model) return "FAIL\n(ERROR: no grader/generator model configured.)\n[usage-coach NEXT] configure grader in harness.config.json, then retry grade.";
-            const out = await runModel(input.client, model, args.prompt, ctx.directory);
+            const gradeTaskId = findActiveTaskId(ctx.sessionID, "grading");
+            const out = await runModel(
+              input.client,
+              model,
+              args.prompt,
+              ctx.directory,
+              gradeTaskId ? { sessionID: ctx.sessionID, taskId: gradeTaskId } : void 0
+            );
             let verdict = "FAIL";
             if (!out.startsWith("ERROR:")) {
               const f = (out.split("\n").find((l) => l.trim()) ?? "").trim();

package/dist/tui.js

@@ -202,173 +202,217 @@ function initializeTui(api, disposeRoot) {
       h = null;
     }
     const nodes = [];
+    const HARNESS_AGENTS = ["usage-coach-harness"];
+    if (s && s.agent && !HARNESS_AGENTS.includes(s.agent)) {
+      return _$createElement("box");
+    }
     if (s) {
       const dKey = s.decision === "GO" ? "success" : s.decision === "THROTTLE" ? "warning" : "error";
-      nodes.push((() => {
-        var _el$4 = _$createElement("text"), _el$5 = _$createTextNode(`usage-coach [`), _el$6 = _$createTextNode(`]`);
-        _$insertNode(_el$4, _el$5);
-        _$insertNode(_el$4, _el$6);
-        _$insert(_el$4, () => TAG[s.decision], _el$6);
-        _$effect((_$p) => _$setProp(_el$4, "style", st(dKey), _$p));
-        return _el$4;
-      })());
-      if (s.providers && s.providers.length > 0) {
-        for (const p of s.providers) {
-          nodes.push((() => {
-            var _el$7 = _$createElement("text"), _el$8 = _$createTextNode(` `);
-            _$insertNode(_el$7, _el$8);
-            _$insert(_el$7, () => p.name, null);
-            _$effect((_$p) => _$setProp(_el$7, "style", st("textMuted"), _$p));
-            return _el$7;
-          })());
+      const modelShort = s.model ? s.model.split("/").pop() ?? s.model : "";
+      if (s.isFree) {
+        nodes.push((() => {
+          var _el$5 = _$createElement("box"), _el$6 = _$createElement("text"), _el$8 = _$createElement("text"), _el$9 = _$createTextNode(` `);
+          _$insertNode(_el$5, _el$6);
+          _$insertNode(_el$5, _el$8);
+          _$setProp(_el$5, "flexDirection", "row");
+          _$insertNode(_el$6, _$createTextNode(`usage-coach [free]`));
+          _$insertNode(_el$8, _el$9);
+          _$insert(_el$8, modelShort, null);
+          _$effect((_p$) => {
+            var _v$ = st(dKey), _v$2 = st("textMuted");
+            _v$ !== _p$.e && (_p$.e = _$setProp(_el$6, "style", _v$, _p$.e));
+            _v$2 !== _p$.t && (_p$.t = _$setProp(_el$8, "style", _v$2, _p$.t));
+            return _p$;
+          }, {
+            e: void 0,
+            t: void 0
+          });
+          return _el$5;
+        })());
+      } else {
+        if (modelShort) {
           nodes.push((() => {
-            var _el$9 = _$createElement("box"), _el$0 = _$createElement("text"), _el$10 = _$createElement("text"), _el$11 = _$createElement("text"), _el$12 = _$createElement("text"), _el$13 = _$createTextNode(` `), _el$14 = _$createTextNode(`% `);
-            _$insertNode(_el$9, _el$0);
-            _$insertNode(_el$9, _el$10);
-            _$insertNode(_el$9, _el$11);
-            _$insertNode(_el$9, _el$12);
-            _$setProp(_el$9, "flexDirection", "row");
-            _$insertNode(_el$0, _$createTextNode(` 5h `));
-            _$insert(_el$10, () => barFill(p.fiveHour));
-            _$insert(_el$11, () => barEmpty(p.fiveHour));
+            var _el$0 = _$createElement("box"), _el$1 = _$createElement("text"), _el$10 = _$createTextNode(`usage-coach [`), _el$11 = _$createTextNode(`]`), _el$12 = _$createElement("text"), _el$13 = _$createTextNode(` `);
+            _$insertNode(_el$0, _el$1);
+            _$insertNode(_el$0, _el$12);
+            _$setProp(_el$0, "flexDirection", "row");
+            _$insertNode(_el$1, _el$10);
+            _$insertNode(_el$1, _el$11);
+            _$insert(_el$1, () => TAG[s.decision], _el$11);
             _$insertNode(_el$12, _el$13);
-            _$insertNode(_el$12, _el$14);
-            _$insert(_el$12, () => p.fiveHour, _el$14);
-            _$insert(_el$12, () => p.fiveHourReset, null);
+            _$insert(_el$12, modelShort, null);
             _$effect((_p$) => {
-              var _v$ = st("text"), _v$2 = st("text");
-              _v$ !== _p$.e && (_p$.e = _$setProp(_el$10, "style", _v$, _p$.e));
-              _v$2 !== _p$.t && (_p$.t = _$setProp(_el$11, "style", _v$2, _p$.t));
+              var _v$3 = st(dKey), _v$4 = st("textMuted");
+              _v$3 !== _p$.e && (_p$.e = _$setProp(_el$1, "style", _v$3, _p$.e));
+              _v$4 !== _p$.t && (_p$.t = _$setProp(_el$12, "style", _v$4, _p$.t));
               return _p$;
             }, {
               e: void 0,
               t: void 0
             });
-            return _el$9;
+            return _el$0;
+          })());
+        } else {
+          nodes.push((() => {
+            var _el$14 = _$createElement("text"), _el$15 = _$createTextNode(`usage-coach [`), _el$16 = _$createTextNode(`]`);
+            _$insertNode(_el$14, _el$15);
+            _$insertNode(_el$14, _el$16);
+            _$insert(_el$14, () => TAG[s.decision], _el$16);
+            _$effect((_$p) => _$setProp(_el$14, "style", st(dKey), _$p));
+            return _el$14;
           })());
+        }
+        if (s.providers && s.providers.length > 0) {
+          for (const p of s.providers) {
+            nodes.push((() => {
+              var _el$17 = _$createElement("box"), _el$18 = _$createElement("text"), _el$20 = _$createElement("text"), _el$21 = _$createElement("text"), _el$22 = _$createElement("text"), _el$23 = _$createTextNode(` `), _el$24 = _$createTextNode(`% `);
+              _$insertNode(_el$17, _el$18);
+              _$insertNode(_el$17, _el$20);
+              _$insertNode(_el$17, _el$21);
+              _$insertNode(_el$17, _el$22);
+              _$setProp(_el$17, "flexDirection", "row");
+              _$insertNode(_el$18, _$createTextNode(` 5h `));
+              _$insert(_el$20, () => barFill(p.fiveHour));
+              _$insert(_el$21, () => barEmpty(p.fiveHour));
+              _$insertNode(_el$22, _el$23);
+              _$insertNode(_el$22, _el$24);
+              _$insert(_el$22, () => p.fiveHour, _el$24);
+              _$insert(_el$22, () => p.fiveHourReset, null);
+              _$effect((_p$) => {
+                var _v$5 = st("text"), _v$6 = st("text");
+                _v$5 !== _p$.e && (_p$.e = _$setProp(_el$20, "style", _v$5, _p$.e));
+                _v$6 !== _p$.t && (_p$.t = _$setProp(_el$21, "style", _v$6, _p$.t));
+                return _p$;
+              }, {
+                e: void 0,
+                t: void 0
+              });
+              return _el$17;
+            })());
+            nodes.push((() => {
+              var _el$25 = _$createElement("box"), _el$26 = _$createElement("text"), _el$28 = _$createElement("text"), _el$29 = _$createElement("text"), _el$30 = _$createElement("text"), _el$31 = _$createTextNode(` `), _el$32 = _$createTextNode(`% `);
+              _$insertNode(_el$25, _el$26);
+              _$insertNode(_el$25, _el$28);
+              _$insertNode(_el$25, _el$29);
+              _$insertNode(_el$25, _el$30);
+              _$setProp(_el$25, "flexDirection", "row");
+              _$insertNode(_el$26, _$createTextNode(` 1w `));
+              _$insert(_el$28, () => barFill(p.weekly));
+              _$insert(_el$29, () => barEmpty(p.weekly));
+              _$insertNode(_el$30, _el$31);
+              _$insertNode(_el$30, _el$32);
+              _$insert(_el$30, () => p.weekly, _el$32);
+              _$insert(_el$30, () => p.weeklyReset, null);
+              _$effect((_p$) => {
+                var _v$7 = st("text"), _v$8 = st("text");
+                _v$7 !== _p$.e && (_p$.e = _$setProp(_el$28, "style", _v$7, _p$.e));
+                _v$8 !== _p$.t && (_p$.t = _$setProp(_el$29, "style", _v$8, _p$.t));
+                return _p$;
+              }, {
+                e: void 0,
+                t: void 0
+              });
+              return _el$25;
+            })());
+          }
+        } else {
           nodes.push((() => {
-            var _el$15 = _$createElement("box"), _el$16 = _$createElement("text"), _el$18 = _$createElement("text"), _el$19 = _$createElement("text"), _el$20 = _$createElement("text"), _el$21 = _$createTextNode(` `), _el$22 = _$createTextNode(`% `);
-            _$insertNode(_el$15, _el$16);
-            _$insertNode(_el$15, _el$18);
-            _$insertNode(_el$15, _el$19);
-            _$insertNode(_el$15, _el$20);
-            _$setProp(_el$15, "flexDirection", "row");
-            _$insertNode(_el$16, _$createTextNode(` 1w `));
-            _$insert(_el$18, () => barFill(p.weekly));
-            _$insert(_el$19, () => barEmpty(p.weekly));
-            _$insertNode(_el$20, _el$21);
-            _$insertNode(_el$20, _el$22);
-            _$insert(_el$20, () => p.weekly, _el$22);
-            _$insert(_el$20, () => p.weeklyReset, null);
+            var _el$33 = _$createElement("box"), _el$34 = _$createElement("text"), _el$36 = _$createElement("text"), _el$37 = _$createElement("text"), _el$38 = _$createElement("text");
+            _$insertNode(_el$33, _el$34);
+            _$insertNode(_el$33, _el$36);
+            _$insertNode(_el$33, _el$37);
+            _$insertNode(_el$33, _el$38);
+            _$setProp(_el$33, "flexDirection", "row");
+            _$insertNode(_el$34, _$createTextNode(` 5h `));
+            _$insert(_el$36, () => barFill(s.fiveHour));
+            _$insert(_el$37, () => barEmpty(s.fiveHour));
+            _$insertNode(_el$38, _$createTextNode(` 0%`));
             _$effect((_p$) => {
-              var _v$3 = st("text"), _v$4 = st("text");
-              _v$3 !== _p$.e && (_p$.e = _$setProp(_el$18, "style", _v$3, _p$.e));
-              _v$4 !== _p$.t && (_p$.t = _$setProp(_el$19, "style", _v$4, _p$.t));
+              var _v$9 = st("text"), _v$0 = st("text");
+              _v$9 !== _p$.e && (_p$.e = _$setProp(_el$36, "style", _v$9, _p$.e));
+              _v$0 !== _p$.t && (_p$.t = _$setProp(_el$37, "style", _v$0, _p$.t));
               return _p$;
             }, {
               e: void 0,
               t: void 0
             });
-            return _el$15;
+            return _el$33;
           })());
           nodes.push((() => {
-            var _el$23 = _$createElement("text"), _el$24 = _$createTextNode(` -> `);
-            _$insertNode(_el$23, _el$24);
-            _$insert(_el$23, () => p.advice, null);
-            _$effect((_$p) => _$setProp(_el$23, "style", st(dKey), _$p));
-            return _el$23;
+            var _el$40 = _$createElement("box"), _el$41 = _$createElement("text"), _el$43 = _$createElement("text"), _el$44 = _$createElement("text"), _el$45 = _$createElement("text");
+            _$insertNode(_el$40, _el$41);
+            _$insertNode(_el$40, _el$43);
+            _$insertNode(_el$40, _el$44);
+            _$insertNode(_el$40, _el$45);
+            _$setProp(_el$40, "flexDirection", "row");
+            _$insertNode(_el$41, _$createTextNode(` 1w `));
+            _$insert(_el$43, () => barFill(s.weekly));
+            _$insert(_el$44, () => barEmpty(s.weekly));
+            _$insertNode(_el$45, _$createTextNode(` 0%`));
+            _$effect((_p$) => {
+              var _v$1 = st("text"), _v$10 = st("text");
+              _v$1 !== _p$.e && (_p$.e = _$setProp(_el$43, "style", _v$1, _p$.e));
+              _v$10 !== _p$.t && (_p$.t = _$setProp(_el$44, "style", _v$10, _p$.t));
+              return _p$;
+            }, {
+              e: void 0,
+              t: void 0
+            });
+            return _el$40;
           })());
         }
-      } else {
-        nodes.push((() => {
-          var _el$27 = _$createElement("box"), _el$28 = _$createElement("text"), _el$30 = _$createElement("text"), _el$31 = _$createElement("text"), _el$32 = _$createElement("text");
-          _$insertNode(_el$27, _el$28);
-          _$insertNode(_el$27, _el$30);
-          _$insertNode(_el$27, _el$31);
-          _$insertNode(_el$27, _el$32);
-          _$setProp(_el$27, "flexDirection", "row");
-          _$insertNode(_el$28, _$createTextNode(` 5h `));
-          _$insert(_el$30, () => barFill(s.fiveHour));
-          _$insert(_el$31, () => barEmpty(s.fiveHour));
-          _$insertNode(_el$32, _$createTextNode(` 0%`));
-          _$effect((_p$) => {
-            var _v$5 = st("text"), _v$6 = st("text");
-            _v$5 !== _p$.e && (_p$.e = _$setProp(_el$30, "style", _v$5, _p$.e));
-            _v$6 !== _p$.t && (_p$.t = _$setProp(_el$31, "style", _v$6, _p$.t));
-            return _p$;
-          }, {
-            e: void 0,
-            t: void 0
-          });
-          return _el$27;
-        })());
-        nodes.push((() => {
-          var _el$34 = _$createElement("box"), _el$35 = _$createElement("text"), _el$37 = _$createElement("text"), _el$38 = _$createElement("text"), _el$39 = _$createElement("text");
-          _$insertNode(_el$34, _el$35);
-          _$insertNode(_el$34, _el$37);
-          _$insertNode(_el$34, _el$38);
-          _$insertNode(_el$34, _el$39);
-          _$setProp(_el$34, "flexDirection", "row");
-          _$insertNode(_el$35, _$createTextNode(` 1w `));
-          _$insert(_el$37, () => barFill(s.weekly));
-          _$insert(_el$38, () => barEmpty(s.weekly));
-          _$insertNode(_el$39, _$createTextNode(` 0%`));
-          _$effect((_p$) => {
-            var _v$7 = st("text"), _v$8 = st("text");
-            _v$7 !== _p$.e && (_p$.e = _$setProp(_el$37, "style", _v$7, _p$.e));
-            _v$8 !== _p$.t && (_p$.t = _$setProp(_el$38, "style", _v$8, _p$.t));
-            return _p$;
-          }, {
-            e: void 0,
-            t: void 0
-          });
-          return _el$34;
-        })());
       }
     } else {
       nodes.push((() => {
-        var _el$41 = _$createElement("text");
-        _$insertNode(_el$41, _$createTextNode(`usage-coach: ...`));
-        return _el$41;
+        var _el$47 = _$createElement("text");
+        _$insertNode(_el$47, _$createTextNode(`usage-coach: ...`));
+        return _el$47;
       })());
     }
     if (h && h.active !== false && h.tasks.length > 0) {
       nodes.push((() => {
-        var _el$43 = _$createElement("text");
-        _$insertNode(_el$43, _$createTextNode(` `));
-        return _el$43;
+        var _el$49 = _$createElement("text");
+        _$insertNode(_el$49, _$createTextNode(` `));
+        return _el$49;
       })());
       nodes.push((() => {
-        var _el$45 = _$createElement("text"), _el$46 = _$createTextNode(`harness: `), _el$47 = _$createTextNode(` `), _el$48 = _$createTextNode(`/`);
-        _$insertNode(_el$45, _el$46);
-        _$insertNode(_el$45, _el$47);
-        _$insertNode(_el$45, _el$48);
-        _$insert(_el$45, () => h.name, _el$47);
-        _$insert(_el$45, () => h.current, _el$48);
-        _$insert(_el$45, () => h.total, null);
-        _$effect((_$p) => _$setProp(_el$45, "style", st("textMuted"), _$p));
-        return _el$45;
+        var _el$51 = _$createElement("text"), _el$52 = _$createTextNode(`harness: `), _el$53 = _$createTextNode(` `), _el$54 = _$createTextNode(`/`);
+        _$insertNode(_el$51, _el$52);
+        _$insertNode(_el$51, _el$53);
+        _$insertNode(_el$51, _el$54);
+        _$insert(_el$51, () => h.name, _el$53);
+        _$insert(_el$51, () => h.current, _el$54);
+        _$insert(_el$51, () => h.total, null);
+        _$effect((_$p) => _$setProp(_el$51, "style", st("textMuted"), _$p));
+        return _el$51;
       })());
       for (const t of h.tasks) {
         const sKey = statusKey[t.status] ?? "text";
         const lbl = TLABEL[t.status] ?? t.status;
         const rev = t.revisions > 0 && t.status === "revising" ? `(${t.revisions})` : "";
         const mdl = t.model ? ` ${t.model.split("/").pop() ?? t.model}` : "";
+        const hasSub = !!t.subSessionId;
+        const subStepStr = hasSub && t.subStep !== void 0 && t.subStep > 0 ? ` step:${t.subStep}` : "";
+        const subEl = hasSub && t.subElapsed !== void 0 ? ` ${t.subElapsed}s` : "";
+        const subWarn = hasSub && (t.subElapsed ?? 0) > 300;
         const elapsed = t.startedAt ? Math.max(0, Math.round((Date.now() - new Date(t.startedAt).getTime()) / 1e3)) : 0;
-        const elapsedStr = t.status === "completed" || t.status === "failed" ? "" : elapsed > 0 ? ` ${elapsed}s` : "";
+        const taskEl = t.status === "completed" || t.status === "failed" ? "" : elapsed > 0 ? ` ${elapsed}s` : "";
+        const displayEl = hasSub ? subEl : taskEl;
+        const lineKey = subWarn ? "warning" : sKey;
         nodes.push((() => {
-          var _el$49 = _$createElement("text"), _el$50 = _$createTextNode(` \u25CF `), _el$51 = _$createTextNode(` `), _el$52 = _$createTextNode(` `);
-          _$insertNode(_el$49, _el$50);
-          _$insertNode(_el$49, _el$51);
-          _$insertNode(_el$49, _el$52);
-          _$insert(_el$49, () => t.id, _el$51);
-          _$insert(_el$49, mdl, _el$51);
-          _$insert(_el$49, lbl, _el$52);
-          _$insert(_el$49, rev, _el$52);
-          _$insert(_el$49, elapsedStr, _el$52);
-          _$insert(_el$49, () => t.title, null);
-          _$effect((_$p) => _$setProp(_el$49, "style", st(sKey), _$p));
-          return _el$49;
+          var _el$55 = _$createElement("text"), _el$56 = _$createTextNode(` \u25CF `), _el$57 = _$createTextNode(` `), _el$58 = _$createTextNode(` `);
+          _$insertNode(_el$55, _el$56);
+          _$insertNode(_el$55, _el$57);
+          _$insertNode(_el$55, _el$58);
+          _$insert(_el$55, () => t.id, _el$57);
+          _$insert(_el$55, mdl, _el$57);
+          _$insert(_el$55, lbl, _el$58);
+          _$insert(_el$55, rev, _el$58);
+          _$insert(_el$55, subStepStr, _el$58);
+          _$insert(_el$55, displayEl, _el$58);
+          _$insert(_el$55, () => t.title, null);
+          _$effect((_$p) => _$setProp(_el$55, "style", st(lineKey), _$p));
+          return _el$55;
         })());
         const pv = t.model ? (t.model.split("/")[0] ?? "").split("-")[0] : "";
         const provCoach = pv ? s?.providers?.find((p) => p.id === pv || pv && p.id.startsWith(pv) || pv && pv.startsWith(p.id)) : s?.providers?.[0];
@@ -376,35 +420,35 @@ function initializeTui(api, disposeRoot) {
         const pct = rawPct < 0 ? 0 : rawPct;
         const pctLabel = rawPct < 0 ? "n/a" : `${rawPct}%`;
         nodes.push((() => {
-          var _el$53 = _$createElement("box"), _el$54 = _$createElement("text"), _el$56 = _$createElement("text"), _el$57 = _$createElement("text"), _el$58 = _$createElement("text"), _el$59 = _$createTextNode(` `);
-          _$insertNode(_el$53, _el$54);
-          _$insertNode(_el$53, _el$56);
-          _$insertNode(_el$53, _el$57);
-          _$insertNode(_el$53, _el$58);
-          _$setProp(_el$53, "flexDirection", "row");
-          _$insertNode(_el$54, _$createTextNode(` 5h `));
-          _$insert(_el$56, () => barFill(pct));
-          _$insert(_el$57, () => barEmpty(pct));
-          _$insertNode(_el$58, _el$59);
-          _$insert(_el$58, pctLabel, null);
+          var _el$59 = _$createElement("box"), _el$60 = _$createElement("text"), _el$62 = _$createElement("text"), _el$63 = _$createElement("text"), _el$64 = _$createElement("text"), _el$65 = _$createTextNode(` `);
+          _$insertNode(_el$59, _el$60);
+          _$insertNode(_el$59, _el$62);
+          _$insertNode(_el$59, _el$63);
+          _$insertNode(_el$59, _el$64);
+          _$setProp(_el$59, "flexDirection", "row");
+          _$insertNode(_el$60, _$createTextNode(` 5h `));
+          _$insert(_el$62, () => barFill(pct));
+          _$insert(_el$63, () => barEmpty(pct));
+          _$insertNode(_el$64, _el$65);
+          _$insert(_el$64, pctLabel, null);
           _$effect((_p$) => {
-            var _v$9 = st("text"), _v$0 = st("text");
-            _v$9 !== _p$.e && (_p$.e = _$setProp(_el$56, "style", _v$9, _p$.e));
-            _v$0 !== _p$.t && (_p$.t = _$setProp(_el$57, "style", _v$0, _p$.t));
+            var _v$11 = st("text"), _v$12 = st("text");
+            _v$11 !== _p$.e && (_p$.e = _$setProp(_el$62, "style", _v$11, _p$.e));
+            _v$12 !== _p$.t && (_p$.t = _$setProp(_el$63, "style", _v$12, _p$.t));
             return _p$;
           }, {
             e: void 0,
             t: void 0
           });
-          return _el$53;
+          return _el$59;
         })());
       }
     }
     return (() => {
-      var _el$60 = _$createElement("box");
-      _$setProp(_el$60, "flexDirection", "column");
-      _$insert(_el$60, nodes);
-      return _el$60;
+      var _el$66 = _$createElement("box");
+      _$setProp(_el$66, "flexDirection", "column");
+      _$insert(_el$66, nodes);
+      return _el$66;
     })();
   };
   tlog("registering slots");
@@ -419,9 +463,9 @@ function initializeTui(api, disposeRoot) {
         } catch (e) {
           tlog(`sidebar_footer err: ${String(e)}`);
           result = (() => {
-            var _el$61 = _$createElement("text");
-            _$insertNode(_el$61, _$createTextNode(`usage-coach`));
-            return _el$61;
+            var _el$67 = _$createElement("text");
+            _$insertNode(_el$67, _$createTextNode(`usage-coach`));
+            return _el$67;
           })();
         }
         return result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-usage-coach",
-  "version": "0.6.2",
+  "version": "0.7.1",
   "description": "opencode closed-loop usage coach — quota SENSE -> coaching DECIDE -> loop ACT + TUI integration",
   "type": "module",
   "main": "./dist/index.js",
@@ -58,11 +58,5 @@
     "tsup": "^8.5",
     "typescript": "^5",
     "typescript-eslint": "^8.63.0"
-  },
-  "dependencies": {
-    "@ladybugdb/core": "^0.18.0"
-  },
-  "trustedDependencies": [
-    "@ladybugdb/core"
-  ]
+  }
 }