@bongos/core 1.19.317 → 1.19.319

package/tests/session_records.mjs

@@ -405,3 +405,75 @@ test('a failed/empty subagent spawn digests to 0 tokens despite 1 assistant turn
 console.log('');
 console.log(`Session-records (6D.1) tests: ${passed} passed, ${failed} failed`);
 if (failed > 0) process.exit(1);
+
+// ---------- task 1003217: one API call is many transcript lines ----------
+//
+// Claude Code writes a separate line per content block of one assistant message
+// (thinking / text / tool_use) and repeats the SAME message.usage on each. The
+// digest must price the call ONCE. Measured 2.22x inflation on real transcripts
+// before this fix.
+function splitCallFixture() {
+  const usage = {
+    input_tokens: 2,
+    output_tokens: 799,
+    cache_read_input_tokens: 63182,
+    cache_creation_input_tokens: 3227,
+  };
+  const mk = (content) => ({
+    type: 'assistant',
+    timestamp: '2026-08-21T19:23:47.000Z',
+    message: { id: 'msg_01SPLIT', model: 'claude-opus-5', usage, content },
+  });
+  return [
+    mk([{ type: 'thinking', thinking: 'weighing it up' }]),
+    mk([{ type: 'text', text: 'Here is the plan.' }]),
+    mk([{ type: 'tool_use', name: 'Bash', input: { command: 'ls' } }]),
+  ];
+}
+
+test('1003217 buildSessionDigest prices one split assistant message ONCE, not per line', () => {
+  const d = buildSessionDigest(splitCallFixture());
+  // 3 transcript lines, 1 API call.
+  assert.equal(d.metrics.assistant_turns, 3, 'assistant_turns stays the LINE count for existing consumers');
+  assert.equal(d.metrics.api_calls, 1, 'api_calls is the honest round-trip count');
+  assert.equal(d.metrics.tokens.output, 799, 'output counted once, not 3x');
+  assert.equal(d.metrics.tokens.cache_read, 63182, 'cache_read counted once, not 3x');
+  assert.equal(d.metrics.tokens.cache_creation, 3227);
+  assert.equal(d.metrics.tokens.input, 2);
+  assert.equal(d.totalTokens, 2 + 799 + 63182 + 3227);
+  assert.deepEqual(d.metrics.model_usage['claude-opus-5'], {
+    input: 2, output: 799, cache_read: 63182, cache_creation: 3227,
+  }, 'model_usage — the cost-plus reward basis (ADR 0054) — must not be inflated');
+  // The tool_use on the third line is still seen.
+  assert.equal(d.metrics.tool_use_count, 1);
+});
+
+test('1003217 the detail rows still sum to the true usage (repeats zeroed + flagged)', () => {
+  const d = buildSessionDigest(splitCallFixture());
+  const asst = d.detail.filter((r) => r.role === 'assistant');
+  assert.equal(asst.length, 3, 'every line keeps its detail row');
+  const sum = (k) => asst.reduce((a, r) => a + (r[k] || 0), 0);
+  assert.equal(sum('cache_read'), 63182, 'summing detail must not double-count');
+  assert.equal(sum('out'), 799);
+  assert.equal(asst.filter((r) => r.dup === 1).length, 2, 'the two repeat lines are flagged dup');
+  assert.equal(asst[0].dup, undefined, 'the first line of the call is not a dup');
+});
+
+test('1003217 distinct message ids are still counted separately', () => {
+  const usage = { input_tokens: 0, output_tokens: 10, cache_read_input_tokens: 100, cache_creation_input_tokens: 0 };
+  const mk = (id) => ({
+    type: 'assistant',
+    timestamp: '2026-08-21T19:23:47.000Z',
+    message: { id, model: 'claude-opus-5', usage, content: [{ type: 'text', text: 'x' }] },
+  });
+  const d = buildSessionDigest([mk('msg_A'), mk('msg_B'), mk('msg_C')]);
+  assert.equal(d.metrics.api_calls, 3);
+  assert.equal(d.metrics.tokens.cache_read, 300, 'three real calls = three times the usage');
+});
+
+test('1003217 a transcript with no message.id degrades to the old per-line behaviour', () => {
+  const d = buildSessionDigest(fixture()); // fixture() messages carry no id
+  assert.equal(d.metrics.tokens.input, 300, 'unchanged from the pre-fix expectation');
+  assert.equal(d.metrics.tokens.output, 130);
+  assert.equal(d.metrics.api_calls, 2, 'with no id to dedup on, every line is its own call');
+});

package/tests/update_channel.mjs

@@ -184,3 +184,36 @@ t('loadSubscriptions: an entry without a dir is dropped (cannot be upgraded)', (
 
 console.log(`\nupdate_channel: ${passed} passed, ${failed} failed`);
 process.exit(failed ? 1 : 0);
+
+// ---------------------------------------------------------------------------
+// Deploy topology survives normalization (task 1003219)
+//
+// The sweep can only hand a bump to go-live.js — and so inherit its backup, its
+// pull-deploy-timer guard and its independent box-side read-back — if the roster's
+// topology actually REACHES the entry. The first cut of this dropped the new fields
+// on the floor, so an instance that named them looked enrolled while the sweep
+// quietly kept using the weaker direct path. A normalizer that silently discards a
+// field is indistinguishable from a feature that does not work.
+// ---------------------------------------------------------------------------
+
+test('deploy topology is carried through loadSubscriptions', () => {
+  const entry = {
+    slug: 's', dir: '/i', service: 'x.service', healthUrl: 'http://h',
+    versionUrl: 'http://v', deployTimer: 'd.timer', deployService: 'd.service',
+    backupDb: 'db', backupDir: '~/b', registryPackage: '@scope/core',
+  };
+  const fsImpl = { readFileSync: () => JSON.stringify({ instances: [entry] }) };
+  const { instances } = loadSubscriptions({ instanceDir: '/x', fsImpl });
+  assert.equal(instances.length, 1);
+  for (const k of ['versionUrl', 'deployTimer', 'deployService', 'backupDb', 'backupDir', 'registryPackage']) {
+    assert.equal(instances[0][k], entry[k], `${k} must survive normalization`);
+  }
+});
+
+test('an entry that names no topology reports null, not undefined', () => {
+  const fsImpl = { readFileSync: () => JSON.stringify({ instances: [{ slug: 's', dir: '/i' }] }) };
+  const { instances } = loadSubscriptions({ instanceDir: '/x', fsImpl });
+  for (const k of ['versionUrl', 'deployTimer', 'deployService', 'backupDb', 'backupDir']) {
+    assert.equal(instances[0][k], null, `${k} should be an explicit null`);
+  }
+});