terminal-smart-cli 0.97.1 → 0.97.2

package/lib/agent.js

@@ -148,7 +148,7 @@ async function llm({ baseUrl, key, messages, model, signalMs = 180000, noTools =
       throw new ApiError(_em, { status: res.status, code: (j && j.code) || (_cap ? 'no_credits' : '') });
     }
     const ch = (j.choices && j.choices[0]) || {};
-    return { msg: ch.message || { content: '' }, usage: j.usage || {}, model: j.model || 'smart' };
+    return { msg: ch.message || { content: '' }, usage: j.usage || {}, model: j.model || 'smart', billing: j.ts_billing || null };
   }, { tries: 4, baseMs: 800, onRetry });
 }
 
@@ -202,13 +202,17 @@ async function _subAgent({ task, k, model, cwd, lang, onStep }) {
     : 'You are a READ-ONLY exploration SUB-AGENT. Investigate by reading/listing/searching files and return a SHORT objective summary with the facts and paths that matter. Do NOT edit/create/run anything. When you have the answer, write the summary as text (no more tool calls).')
     + `\nDIRETÓRIO DE TRABALHO: ${cwd}`;
   let msgs = [{ role: 'system', content: sys }, { role: 'user', content: String(task || '') }];
-  let out = '', tin = 0, tout = 0, tcach = 0;
-  const _acc = (u) => { tin += u.prompt_tokens || 0; tout += u.completion_tokens || 0; tcach += (u.prompt_tokens_details && u.prompt_tokens_details.cached_tokens) || u.cached_tokens || 0; };
+  let out = '', tin = 0, tout = 0, tcach = 0, billed = 0;
+  const _acc = (u, billing) => {
+    tin += u.prompt_tokens || 0; tout += u.completion_tokens || 0;
+    tcach += (u.prompt_tokens_details && u.prompt_tokens_details.cached_tokens) || u.cached_tokens || 0;
+    billed += (billing && billing.charged) || 0;
+  };
   for (let i = 0; i < 8; i++) {
     let r;
     try { r = await llm({ baseUrl: k.baseUrl, key: k.key, messages: msgs, model, toolsOverride: roTools }); }
     catch (e) { if (e instanceof ApiError && (e.code === 'no_credits' || e.status === 402)) throw e; break; } // teto de IA → propaga (CTA); transitório → para
-    _acc(r.usage || {});
+    _acc(r.usage || {}, r.billing);
     const tcs = r.msg.tool_calls || [];
     if (!tcs.length) { out = String(r.msg.content || '').replace(/<think>[\s\S]*?<\/think>/gi, '').trim(); break; }
     msgs.push({ role: 'assistant', content: r.msg.content || '', tool_calls: tcs });
@@ -226,11 +230,11 @@ async function _subAgent({ task, k, model, cwd, lang, onStep }) {
     const pedido = lang !== 'en' ? 'PARE de usar ferramentas. Escreva agora um RESUMO curto do que você descobriu até aqui (fatos e caminhos).' : 'STOP using tools. Write a SHORT summary of what you found so far (facts and paths).';
     try {
       const r = await llm({ baseUrl: k.baseUrl, key: k.key, messages: [...msgs, { role: 'user', content: pedido }], model, noTools: true, signalMs: 60000 });
-      _acc(r.usage || {});
+      _acc(r.usage || {}, r.billing);
       out = String(r.msg.content || '').replace(/<think>[\s\S]*?<\/think>/gi, '').trim();
     } catch (_) {}
   }
-  return { resumo: out || (lang !== 'en' ? '(o sub-agente não produziu um resumo)' : '(sub-agent produced no summary)'), _tin: tin, _tout: tout, _tcach: tcach };
+  return { resumo: out || (lang !== 'en' ? '(o sub-agente não produziu um resumo)' : '(sub-agent produced no summary)'), _tin: tin, _tout: tout, _tcach: tcach, _billed: billed };
 }
 
 // Aprovação remota via Telegram (modo --yes): envia o pedido e faz poll até
@@ -536,6 +540,7 @@ async function run(task, opts = {}) {
         const r = await llm({ baseUrl: k.baseUrl, key: k.key, model: selectedModel, noTools: true, signalMs: 60000, messages: [{ role: 'system', content: sys }, { role: 'user', content: lines }] });
         const u = r.usage || {};
         acc.inTok += u.prompt_tokens || 0; acc.outTok += u.completion_tokens || 0;
+        charged += (r.billing && r.billing.charged) || 0;
         resumo = String(r.msg.content || '').replace(/<think>[\s\S]*?<\/think>/gi, '').trim().slice(0, 6000);
       } catch (_) {}
       if (!resumo) resumo = lang !== 'en'
@@ -551,6 +556,7 @@ async function run(task, opts = {}) {
   // cobrança Smart Credits (best-effort — o teto da sk-hub já protege no gateway)
   const _bill = async () => {
     if (acc.inTok + acc.outTok <= 0) return;
+    if (k.billingAuthoritative) return;
     try {
       const c = await api('/api/credit/charge', { method: 'POST', token, body: { model: usedModel, inTok: acc.inTok, outTok: acc.outTok, cachedTok: acc.cachedTok } });
       charged = (c && c.charged) || 0;
@@ -581,6 +587,7 @@ async function run(task, opts = {}) {
     }
     const u = r.usage || {};
     acc.inTok += u.prompt_tokens || 0; acc.outTok += u.completion_tokens || 0;
+    charged += (r.billing && r.billing.charged) || 0;
     acc.cachedTok += (u.prompt_tokens_details && u.prompt_tokens_details.cached_tokens) || u.cached_tokens || 0;
     lastCtx = { used: u.prompt_tokens || estMsgsTok(messages), window: ctxWindow };
     if (r.model) usedModel = r.model;
@@ -866,6 +873,7 @@ async function run(task, opts = {}) {
         onStep({ name: 'explorar', detail: argsShort(name, input) });
         const sub = await _subAgent({ task: input.tarefa || input.pergunta || '', k, model: selectedModel, cwd, lang, onStep });
         acc.inTok += sub._tin; acc.outTok += sub._tout; acc.cachedTok += sub._tcach || 0;
+        charged += sub._billed || 0;
         result = { resumo: sub.resumo };
         steps++; _ran = true;
       }
@@ -951,6 +959,7 @@ async function run(task, opts = {}) {
       const r = await llm({ baseUrl: k.baseUrl, key: k.key, messages: [...messages, { role: 'user', content: pedido }], model: selectedModel, noTools: true, signalMs: 60000 });
       const u = r.usage || {};
       acc.inTok += u.prompt_tokens || 0; acc.outTok += u.completion_tokens || 0;
+      charged += (r.billing && r.billing.charged) || 0;
       acc.cachedTok += (u.prompt_tokens_details && u.prompt_tokens_details.cached_tokens) || u.cached_tokens || 0;
       if (r.model) usedModel = r.model;
       finalText = String(r.msg.content || '').replace(/<think>[\s\S]*?<\/think>/gi, '').replace(/<think>[\s\S]*$/i, '').trim();

package/lib/meta.js

@@ -611,8 +611,8 @@ async function _llmVision({ token, model, text, imageB64, images, maxTokens = 70
   const j = await res.json().catch(() => null);
   if (!res.ok) _capGuard(res, j);
   const u = j?.usage || {};
-  let credits = 0;
-  if (u.prompt_tokens) { try { const c = await api('/api/credit/charge', { method: 'POST', token, body: { model, inTok: u.prompt_tokens || 0, outTok: u.completion_tokens || 0 } }); credits = (c && c.charged) || 0; } catch (_) {} }
+  let credits = (j?.ts_billing && j.ts_billing.charged) || 0;
+  if (u.prompt_tokens && !_key.billingAuthoritative) { try { const c = await api('/api/credit/charge', { method: 'POST', token, body: { model, inTok: u.prompt_tokens || 0, outTok: u.completion_tokens || 0 } }); credits = (c && c.charged) || 0; } catch (_) {} }
   return { text: String(j?.choices?.[0]?.message?.content || '').trim(), credits };
 }
 const _os = require('os');
@@ -811,9 +811,9 @@ async function _llmJson({ token, system, user, maxTokens = 900 }) {
   const j = await res.json().catch(() => null);
   if (!res.ok) _capGuard(res, j);
   const u = j?.usage || {};
-  let credits = 0;
+  let credits = (j?.ts_billing && j.ts_billing.charged) || 0;
   if (u.prompt_tokens) {
-    try { const c = await api('/api/credit/charge', { method: 'POST', token, body: { model: 'gemini-2.5-flash-lite', inTok: u.prompt_tokens || 0, outTok: u.completion_tokens || 0 } }); credits = (c && c.charged) || 0; } catch (_) {}
+    if (!_key.billingAuthoritative) { try { const c = await api('/api/credit/charge', { method: 'POST', token, body: { model: 'gemini-2.5-flash-lite', inTok: u.prompt_tokens || 0, outTok: u.completion_tokens || 0 } }); credits = (c && c.charged) || 0; } catch (_) {} }
   }
   return { json: _tolerantJson(String(j?.choices?.[0]?.message?.content || '')), credits };
 }
@@ -834,8 +834,8 @@ async function _llmText({ token, model, system, user, maxTokens = 1200 }) {
   const j = await res.json().catch(() => null);
   if (!res.ok) _capGuard(res, j);
   const u = j?.usage || {};
-  let credits = 0;
-  if (u.prompt_tokens) { try { const c = await api('/api/credit/charge', { method: 'POST', token, body: { model, inTok: u.prompt_tokens || 0, outTok: u.completion_tokens || 0 } }); credits = (c && c.charged) || 0; } catch (_) {} }
+  let credits = (j?.ts_billing && j.ts_billing.charged) || 0;
+  if (u.prompt_tokens && !_key.billingAuthoritative) { try { const c = await api('/api/credit/charge', { method: 'POST', token, body: { model, inTok: u.prompt_tokens || 0, outTok: u.completion_tokens || 0 } }); credits = (c && c.charged) || 0; } catch (_) {} }
   return { text: String(j?.choices?.[0]?.message?.content || '').trim(), credits };
 }
 

package/lib/router.js

@@ -79,7 +79,7 @@ async function classify(msg, token) {
     const word = String(j?.choices?.[0]?.message?.content || '').toLowerCase();
     // cobra a classificação (mesmo padrão do web-intent) — best-effort
     const u = j?.usage || {};
-    if (u.prompt_tokens) api('/api/credit/charge', { method: 'POST', token, body: { model: 'gemini-2.5-flash-lite', inTok: u.prompt_tokens || 0, outTok: u.completion_tokens || 0 } }).catch(() => {});
+    if (u.prompt_tokens && !k.billingAuthoritative) api('/api/credit/charge', { method: 'POST', token, body: { model: 'gemini-2.5-flash-lite', inTok: u.prompt_tokens || 0, outTok: u.completion_tokens || 0 } }).catch(() => {});
     if (word.includes('agente')) return 'agente';
     if (word.includes('orquestrar')) return 'run';
     return 'chat';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminal-smart-cli",
-  "version": "0.97.1",
+  "version": "0.97.2",
   "description": "Terminal Smart no seu terminal — pergunte, analise logs por pipe e orquestre agentes de IA. Comando: ts",
   "bin": {
     "ts": "bin/ts.js"