swarmdo 1.19.0 → 1.27.0

package/v3/@swarmdo/cli/dist/src/testreport/testreport.js

@@ -21,6 +21,37 @@ function decodeXml(s) {
         .replace(/&#(\d+);/g, (_, d) => String.fromCharCode(parseInt(d, 10)))
         .replace(/&amp;/g, '&'); // last, so &amp;lt; → &lt; not <
 }
+/**
+ * Decode an element's text content, honoring CDATA sections. Text OUTSIDE
+ * `<![CDATA[ … ]]>` is entity-decoded; text INSIDE is taken literally (per the
+ * XML spec, CDATA content is never entity-expanded). Maven Surefire/Failsafe
+ * wrap `<failure>`/`<error>` stack traces in CDATA, so without this the raw
+ * `<![CDATA[`/`]]>` markers leak into the failure message. Pure.
+ */
+function decodeXmlContent(s) {
+    const OPEN = '<![CDATA[';
+    const CLOSE = ']]>';
+    if (!s.includes(OPEN))
+        return decodeXml(s);
+    let out = '';
+    let i = 0;
+    while (i < s.length) {
+        const start = s.indexOf(OPEN, i);
+        if (start < 0) {
+            out += decodeXml(s.slice(i));
+            break;
+        }
+        out += decodeXml(s.slice(i, start));
+        const end = s.indexOf(CLOSE, start + OPEN.length);
+        if (end < 0) {
+            out += s.slice(start + OPEN.length);
+            break;
+        } // unterminated → rest is literal
+        out += s.slice(start + OPEN.length, end);
+        i = end + CLOSE.length;
+    }
+    return out;
+}
 /** Extract key="value" / key='value' attributes from a tag's attribute text. Pure. */
 function parseAttrs(attrText) {
     const out = {};
@@ -62,7 +93,7 @@ export function parseJUnit(xml) {
         if (fail) {
             failed++;
             const fAttrs = parseAttrs(fail[2]);
-            const inner = decodeXml((fail[3] ?? '').trim());
+            const inner = decodeXmlContent(fail[3] ?? '').trim();
             const message = fAttrs.message || inner.split('\n')[0] || undefined;
             // Prefer explicit file/line attrs (pytest, some emitters), else sniff the trace.
             const loc = attrs.file
@@ -82,10 +113,20 @@ export function parseJUnit(xml) {
 /** Parse TAP (Test Anything Protocol) output. Pure. */
 export function parseTAP(text) {
     const failures = [];
-    let passed = 0, failed = 0, skipped = 0;
+    let passed = 0, failed = 0, skipped = 0, todo = 0;
+    let bailedOut = false;
+    let bailReason;
     const lines = text.split('\n');
     for (let i = 0; i < lines.length; i++) {
         const line = lines[i];
+        // `Bail out!` (column 1, per the TAP spec) aborts the run — stop parsing;
+        // anything after it is not a valid result.
+        const bail = line.match(/^Bail out!(?:\s+(.*))?$/);
+        if (bail) {
+            bailedOut = true;
+            bailReason = bail[1]?.trim() || undefined;
+            break;
+        }
         const m = line.match(/^(ok|not ok)\b\s*(\d+)?\s*-?\s*(.*)$/);
         if (!m)
             continue;
@@ -98,6 +139,12 @@ export function parseTAP(text) {
             skipped++;
             continue;
         }
+        // TODO tests are "not expected to succeed" — a `not ok … # TODO` is a known
+        // stub, not a real failure (TAP spec). Count it as todo, never a failure.
+        if (directive && /todo/i.test(directive[1])) {
+            todo++;
+            continue;
+        }
         if (ok) {
             passed++;
         }
@@ -131,7 +178,7 @@ export function parseTAP(text) {
             failures.push({ suite: '', name: desc || '(unnamed)', message, file, line: lineNo });
         }
     }
-    return { passed, failed, skipped, total: passed + failed + skipped, durationMs: 0, failures };
+    return { passed, failed, skipped, total: passed + failed + skipped + todo, durationMs: 0, failures, ...(todo && { todo }), ...(bailedOut && { bailedOut, bailReason }) };
 }
 /** Sniff the format from a path extension, then content. Pure. */
 export function detectFormat(content, path) {
@@ -153,7 +200,7 @@ export function parseTestReport(content, format) {
 }
 /** Merge several summaries (multi-file globs). Pure. */
 export function mergeSummaries(list) {
-    return list.reduce((acc, s) => ({
+    const merged = list.reduce((acc, s) => ({
         passed: acc.passed + s.passed,
         failed: acc.failed + s.failed,
         skipped: acc.skipped + s.skipped,
@@ -161,14 +208,31 @@ export function mergeSummaries(list) {
         durationMs: acc.durationMs + s.durationMs,
         failures: acc.failures.concat(s.failures),
     }), { passed: 0, failed: 0, skipped: 0, total: 0, durationMs: 0, failures: [] });
+    const todoSum = list.reduce((n, s) => n + (s.todo ?? 0), 0);
+    if (todoSum > 0)
+        merged.todo = todoSum;
+    // Any bailed file taints the whole run; keep the first reason seen.
+    const bailed = list.find((s) => s.bailedOut);
+    if (bailed) {
+        merged.bailedOut = true;
+        merged.bailReason = bailed.bailReason;
+    }
+    return merged;
 }
 /** Human-readable digest. Pure. */
 export function formatSummary(s, opts = {}) {
-    const head = `${s.passed} passed · ${s.failed} failed · ${s.skipped} skipped (${s.total} total, ${s.durationMs}ms)`;
-    if (s.failures.length === 0)
+    const todoSeg = s.todo ? ` · ${s.todo} todo` : '';
+    const head = `${s.passed} passed · ${s.failed} failed · ${s.skipped} skipped${todoSeg} (${s.total} total, ${s.durationMs}ms)`;
+    const bailLine = s.bailedOut
+        ? `⚠ suite ABORTED (Bail out!${s.bailReason ? `: ${s.bailReason}` : ''}) — results incomplete`
+        : '';
+    if (s.failures.length === 0) {
+        if (s.bailedOut)
+            return `${bailLine}\n${head}`;
         return head + (s.failed === 0 ? ' ✓' : '');
+    }
     const shown = opts.top && opts.top > 0 ? s.failures.slice(0, opts.top) : s.failures;
-    const lines = [head, ''];
+    const lines = s.bailedOut ? [bailLine, head, ''] : [head, ''];
     for (const f of shown) {
         const where = f.file ? `${f.file}${f.line ? `:${f.line}` : ''}` : '';
         lines.push(`✗ ${f.suite ? f.suite + ' › ' : ''}${f.name}${where ? `  (${where})` : ''}`);

package/v3/@swarmdo/cli/dist/src/usage/claude-pricing.d.ts

@@ -16,7 +16,10 @@
 export interface TranscriptModelPrice {
     in: number;
     out: number;
+    /** 5-minute-TTL cache write (1.25× base input) */
     cacheWrite: number;
+    /** 1-hour-TTL cache write (2× base input) */
+    cacheWrite1h: number;
     cacheRead: number;
 }
 /**
@@ -32,7 +35,10 @@ export declare function resolveTranscriptPrice(rawModelId: string): TranscriptMo
 export interface TokenBundle {
     inputTokens: number;
     outputTokens: number;
+    /** TOTAL cache-write tokens (5-min + 1-hour). */
     cacheWriteTokens: number;
+    /** The 1-hour-TTL SUBSET of cacheWriteTokens (≤ cacheWriteTokens). Default 0 → all writes priced at the 5-min rate. */
+    cacheWrite1hTokens?: number;
     cacheReadTokens: number;
 }
 /** USD for one response at the given rates. */

package/v3/@swarmdo/cli/dist/src/usage/claude-pricing.js

@@ -20,14 +20,14 @@
  * publishes rates — absent means "unpriced", never "guessed".
  */
 const PRICE_FAMILIES = {
-    'claude-opus-4': { in: 15, out: 75, cacheWrite: 18.75, cacheRead: 1.5 },
-    'claude-sonnet-4': { in: 3, out: 15, cacheWrite: 3.75, cacheRead: 0.3 },
-    'claude-haiku-4': { in: 1, out: 5, cacheWrite: 1.25, cacheRead: 0.1 },
-    'claude-3-7-sonnet': { in: 3, out: 15, cacheWrite: 3.75, cacheRead: 0.3 },
-    'claude-3-5-sonnet': { in: 3, out: 15, cacheWrite: 3.75, cacheRead: 0.3 },
-    'claude-3-5-haiku': { in: 0.8, out: 4, cacheWrite: 1, cacheRead: 0.08 },
-    'claude-3-opus': { in: 15, out: 75, cacheWrite: 18.75, cacheRead: 1.5 },
-    'claude-3-haiku': { in: 0.25, out: 1.25, cacheWrite: 0.3, cacheRead: 0.03 },
+    'claude-opus-4': { in: 15, out: 75, cacheWrite: 18.75, cacheWrite1h: 30, cacheRead: 1.5 },
+    'claude-sonnet-4': { in: 3, out: 15, cacheWrite: 3.75, cacheWrite1h: 6, cacheRead: 0.3 },
+    'claude-haiku-4': { in: 1, out: 5, cacheWrite: 1.25, cacheWrite1h: 2, cacheRead: 0.1 },
+    'claude-3-7-sonnet': { in: 3, out: 15, cacheWrite: 3.75, cacheWrite1h: 6, cacheRead: 0.3 },
+    'claude-3-5-sonnet': { in: 3, out: 15, cacheWrite: 3.75, cacheWrite1h: 6, cacheRead: 0.3 },
+    'claude-3-5-haiku': { in: 0.8, out: 4, cacheWrite: 1, cacheWrite1h: 1.6, cacheRead: 0.08 },
+    'claude-3-opus': { in: 15, out: 75, cacheWrite: 18.75, cacheWrite1h: 30, cacheRead: 1.5 },
+    'claude-3-haiku': { in: 0.25, out: 1.25, cacheWrite: 0.3, cacheWrite1h: 0.5, cacheRead: 0.03 },
 };
 /**
  * Reduce a transcript/gateway model id to the bare Anthropic id:
@@ -62,9 +62,12 @@ export function resolveTranscriptPrice(rawModelId) {
 }
 /** USD for one response at the given rates. */
 export function transcriptCostUsd(price, t) {
+    const cacheWrite1h = t.cacheWrite1hTokens ?? 0;
+    const cacheWrite5m = Math.max(0, t.cacheWriteTokens - cacheWrite1h);
     return ((t.inputTokens * price.in +
         t.outputTokens * price.out +
-        t.cacheWriteTokens * price.cacheWrite +
+        cacheWrite5m * price.cacheWrite +
+        cacheWrite1h * price.cacheWrite1h +
         t.cacheReadTokens * price.cacheRead) / 1_000_000);
 }
 //# sourceMappingURL=claude-pricing.js.map

package/v3/@swarmdo/cli/dist/src/usage/transcript-usage.js

@@ -177,6 +177,9 @@ function toUsageEvent(line, project, seen, unpriced) {
         cacheWriteTokens: usage.cache_creation_input_tokens ?? 0,
         cacheReadTokens: usage.cache_read_input_tokens ?? 0,
     };
+    // 1-hour-TTL cache writes cost 2× base input, not the 1.25× 5-min rate. Recent
+    // transcripts split them in `cache_creation`; older ones don't (→ all 5-min).
+    const cacheWrite1hTokens = usage.cache_creation?.ephemeral_1h_input_tokens ?? 0;
     let costUsd;
     let costSource;
     const price = resolveTranscriptPrice(model);
@@ -185,7 +188,7 @@ function toUsageEvent(line, project, seen, unpriced) {
         costSource = 'transcript';
     }
     else if (price) {
-        costUsd = transcriptCostUsd(price, tokens);
+        costUsd = transcriptCostUsd(price, { ...tokens, cacheWrite1hTokens });
         costSource = 'computed';
     }
     else {

package/v3/@swarmdo/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swarmdo/cli",
-  "version": "1.19.0",
+  "version": "1.27.0",
   "type": "module",
   "description": "Swarmdo CLI - Enterprise AI agent orchestration with 60+ specialized agents, swarm coordination, MCP server, self-learning hooks, and vector memory for Claude Code",
   "main": "dist/src/index.js",