gitdone-agent 0.6.5 → 0.6.7

package/index.js

@@ -27,7 +27,7 @@ import { randomUUID } from 'node:crypto'
 // Reported to the server on every sync so the web UI can flag outdated agents.
 // Keep in lockstep with packages/agent/package.json "version" AND
 // src/lib/agentVersion.ts LATEST_AGENT_VERSION.
-const AGENT_VERSION = '0.6.5'
+const AGENT_VERSION = '0.6.6'
 
 const AGENT_DIR = join(homedir(), '.gitdone-agent')
 const CONFIG_PATH = join(AGENT_DIR, 'config.json')
@@ -403,6 +403,42 @@ function decodeDiffText(buf) {
   }
 }
 
+// Git C-quotes paths with spaces / special chars / non-ASCII bytes, wrapping them
+// in double quotes with backslash escapes (`"export coca_cola/x.cs"`, octal `\NNN`
+// for raw bytes). Both `git status --porcelain` and the `diff --git` header do it.
+// Left unhandled, files with spaces (or Cyrillic) got mis-keyed and their diff was
+// dropped (gd-321). This reverses it back to a plain path so the diff key matches
+// the file name shown in the list.
+function unquoteGitPath(s) {
+  if (typeof s !== 'string' || s.length < 2 || s[0] !== '"' || s[s.length - 1] !== '"') return s
+  const body = s.slice(1, -1)
+  const bytes = []
+  for (let i = 0; i < body.length; i++) {
+    if (body[i] === '\\' && i + 1 < body.length) {
+      const n = body[i + 1]
+      if (n === 'n') { bytes.push(10); i++ }
+      else if (n === 't') { bytes.push(9); i++ }
+      else if (n === 'r') { bytes.push(13); i++ }
+      else if (n === '"') { bytes.push(34); i++ }
+      else if (n === '\\') { bytes.push(92); i++ }
+      else if (n >= '0' && n <= '7') { bytes.push(parseInt(body.substr(i + 1, 3), 8) & 0xff); i += 3 }
+      else { bytes.push(body.charCodeAt(i)) }
+    } else {
+      bytes.push(body.charCodeAt(i) & 0xff)
+    }
+  }
+  return Buffer.from(bytes).toString('utf8')
+}
+
+// Read the b-side path from a `diff --git` header line, handling git's quoting
+// of paths with spaces / special chars (gd-321).
+function diffHeaderPath(hdr) {
+  const q = hdr.match(/ ("b\/.*")$/) // quoted:  "a/x" "b/x"
+  if (q) return unquoteGitPath(q[1]).replace(/^b\//, '')
+  const u = hdr.match(/ b\/(.*)$/) //  plain:   a/x b/x
+  return u ? u[1] : null
+}
+
 function parseDiffByFile(diffBuf) {
   const files = {}
   if (!diffBuf || diffBuf.length === 0) return files
@@ -413,10 +449,11 @@ function parseDiffByFile(diffBuf) {
   for (const section of sections) {
     if (!section.trim()) continue
     // Decode THIS file's bytes on their own (UTF-8 or CP1251), then read the
-    // filename from the decoded header.
+    // filename from the decoded header (quoted or not).
     const text = decodeDiffText(Buffer.from(section, 'latin1'))
-    const match = text.match(/^diff --git a\/.+ b\/(.+)$/m)
-    if (match) files[match[1]] = text
+    const hdr = text.match(/^diff --git (.+)$/m)
+    const name = hdr ? diffHeaderPath(hdr[1]) : null
+    if (name) files[name] = text
   }
   return files
 }
@@ -430,7 +467,7 @@ function getSnapshot(repoPath) {
   const statuses = {}
   for (const line of statusLines) {
     const xy = line.slice(0, 2)
-    const file = line.slice(3)
+    const file = unquoteGitPath(line.slice(3))
     statuses[file] = xy
     if (xy[0] !== ' ' && xy[0] !== '?') staged.push(file)
     if (xy[1] !== ' ') modified.push(file)
@@ -510,12 +547,15 @@ async function reportCommandResult(cfg, id, status, result) {
 }
 
 // Post a batch of console events (and optional lifecycle status) for an AiRun.
-async function postRunEvents(cfg, runId, events, status, result) {
+// `usage` is sent once on the final (done/error) post so the server can record
+// how many tokens the run cost.
+async function postRunEvents(cfg, runId, events, status, result, usage) {
   await api(cfg, '/api/v1/agent/ai-run/events', {
     runId,
     events,
     ...(status ? { status } : {}),
     ...(result !== undefined ? { result } : {}),
+    ...(usage ? { usage } : {}),
   }).catch((e) => log(`✗ ai-run events post failed: ${e.message}`))
 }
 
@@ -538,7 +578,15 @@ async function postSessionEvents(cfg, sessionId, events, status, claudeSessionId
 // With `--include-partial-messages`, Claude also emits `stream_event` lines
 // carrying incremental text deltas — onDelta gets those so chat sessions can
 // show the reply being written live (gd-302).
-function parseStreamLine(line, push, onInit, onDelta) {
+// "12.3k" / "1.2M" compaction for the console token summary line.
+function fmtTokens(n) {
+  n = Number(n) || 0
+  if (n >= 1_000_000) return `${(n / 1_000_000).toFixed(1)}M`
+  if (n >= 1_000) return `${(n / 1_000).toFixed(1)}k`
+  return String(n)
+}
+
+function parseStreamLine(line, push, onInit, onDelta, onMeta) {
   let ev
   try { ev = JSON.parse(line) } catch { return }
   if (ev.type === 'system') {
@@ -546,6 +594,8 @@ function parseStreamLine(line, push, onInit, onDelta) {
       push('SYSTEM', `Сесия стартирана${ev.model ? ` (${ev.model})` : ''}.`)
       // Surface Claude's own session id so chat sessions can --resume it.
       if (ev.session_id && typeof onInit === 'function') onInit(ev.session_id)
+      // Remember which model ran, for the token/cost record (gd-334).
+      if (ev.model && typeof onMeta === 'function') onMeta({ model: ev.model })
     }
     return
   }
@@ -570,8 +620,40 @@ function parseStreamLine(line, push, onInit, onDelta) {
     }
     return
   }
-  if (ev.type === 'result' && ev.subtype && ev.subtype !== 'success') {
-    push('SYSTEM', `Резултат: ${ev.subtype}`)
+  if (ev.type === 'result') {
+    if (ev.subtype && ev.subtype !== 'success') push('SYSTEM', `Резултат: ${ev.subtype}`)
+    // claude's final result carries cumulative token usage + its own cost.
+    // Prefer `modelUsage` (summed over every model/subagent turn) which is the
+    // true cumulative; top-level `usage` is often just the last turn. Fall back
+    // to `usage` when modelUsage is absent (older CLI).
+    if (typeof onMeta === 'function' && (ev.modelUsage || ev.usage || typeof ev.total_cost_usd === 'number')) {
+      let usage
+      let model
+      if (ev.modelUsage && typeof ev.modelUsage === 'object') {
+        const acc = { inputTokens: 0, outputTokens: 0, cacheReadTokens: 0, cacheCreateTokens: 0 }
+        for (const [name, mu] of Object.entries(ev.modelUsage)) {
+          if (!model) model = name
+          acc.inputTokens += mu.inputTokens ?? mu.input_tokens ?? 0
+          acc.outputTokens += mu.outputTokens ?? mu.output_tokens ?? 0
+          acc.cacheReadTokens += mu.cacheReadInputTokens ?? mu.cache_read_input_tokens ?? 0
+          acc.cacheCreateTokens += mu.cacheCreationInputTokens ?? mu.cache_creation_input_tokens ?? 0
+        }
+        usage = acc
+      } else if (ev.usage) {
+        const u = ev.usage
+        usage = {
+          inputTokens: u.input_tokens ?? 0,
+          outputTokens: u.output_tokens ?? 0,
+          cacheReadTokens: u.cache_read_input_tokens ?? 0,
+          cacheCreateTokens: u.cache_creation_input_tokens ?? 0,
+        }
+      }
+      onMeta({
+        ...(usage ? { usage } : {}),
+        ...(model ? { model } : {}),
+        costUsd: typeof ev.total_cost_usd === 'number' ? ev.total_cost_usd : undefined,
+      })
+    }
   }
 }
 
@@ -762,6 +844,15 @@ function runAiCommand(cfg, cmd, repoPath) {
   const push = (kind, text) => { if (text != null && String(text) !== '') pending.push({ kind, text: String(text) }) }
   const timer = setInterval(flush, 800)
 
+  // Accumulate model + token usage across the stream (model from init, usage
+  // from the final result event) to report once on exit (gd-334).
+  const meta = { model: undefined, usage: undefined, costUsd: undefined }
+  const onMeta = (m) => {
+    if (m.model) meta.model = m.model
+    if (m.usage) meta.usage = m.usage
+    if (typeof m.costUsd === 'number') meta.costUsd = m.costUsd
+  }
+
   log(`▶ ai_run ${runId} @ ${repoPath} via ${claudePath}`)
   postRunEvents(cfg, runId, [{ kind: 'SYSTEM', text: `Стартиране на Claude Code в ${repoPath}…` }], 'running')
 
@@ -790,21 +881,28 @@ function runAiCommand(cfg, cmd, repoPath) {
     while ((nl = buf.indexOf('\n')) >= 0) {
       const line = buf.slice(0, nl).trim()
       buf = buf.slice(nl + 1)
-      if (line) parseStreamLine(line, push)
+      if (line) parseStreamLine(line, push, undefined, undefined, onMeta)
     }
   })
   child.stderr.on('data', (d) => { const s = d.toString().trim(); if (s) push('SYSTEM', s) })
   child.on('error', (err) => push('SYSTEM', `Процесна грешка: ${err.message}`))
   child.on('close', async (code) => {
     clearInterval(timer)
-    if (buf.trim()) parseStreamLine(buf.trim(), push)
+    if (buf.trim()) parseStreamLine(buf.trim(), push, undefined, undefined, onMeta)
     await flush()
     const ok = code === 0
+    // Build the usage payload + a console summary line from what we saw.
+    const usage = meta.usage
+      ? { model: meta.model, ...meta.usage, ...(typeof meta.costUsd === 'number' ? { costUsd: meta.costUsd } : {}) }
+      : undefined
+    const events = [{ kind: 'SYSTEM', text: ok ? '✓ Готово.' : `✗ Процесът приключи с код ${code}.` }]
+    if (usage) events.push({ kind: 'SYSTEM', text: `📊 Токени: ${fmtTokens(usage.inputTokens)} вход · ${fmtTokens(usage.outputTokens)} изход${usage.cacheReadTokens ? ` · ${fmtTokens(usage.cacheReadTokens)} кеш` : ''}${typeof usage.costUsd === 'number' ? ` · $${usage.costUsd.toFixed(4)}` : ''}` })
     await postRunEvents(
       cfg, runId,
-      [{ kind: 'SYSTEM', text: ok ? '✓ Готово.' : `✗ Процесът приключи с код ${code}.` }],
+      events,
       ok ? 'done' : 'error',
       ok ? 'ok' : `exit ${code}`,
+      usage,
     )
     reportCommandResult(cfg, cmd.id, ok ? 'done' : 'error', `exit ${code}`)
     log(`■ ai_run ${runId} приключи (code ${code})`)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name":  "gitdone-agent",
-    "version":  "0.6.5",
+    "version":  "0.6.7",
     "description":  "Local git agent for gitdone — watches a local repo and sends snapshots to gitdone.eu",
     "type":  "module",
     "bin":  {