agent-orchestrator-kit 0.12.0 → 0.14.0

package/bin/agent-orchestrator.js

@@ -5,7 +5,8 @@ import { readFileSync, existsSync, mkdirSync, copyFileSync, readdirSync, statSyn
 import { join, dirname, basename, resolve } from 'path';
 import { fileURLToPath } from 'url';
 import { execSync } from 'child_process';
-import { collectSpend, enrichMetricsCursorEstimates } from './spend-collect.js';
+import { collectSpend } from './spend-collect.js';
+import { describeClaudeCostEstimate } from './claude-cost-estimate.js';
 import { resolveRestoreClient, ampThreadIdFromEnv } from './session-client.js';
 import {
   earlierTimestamp,
@@ -968,8 +969,14 @@ function firstLineCommand(value) {
 function firstSpawnName(value) {
   const tick = String(value || '').match(/`([a-z0-9-]+)`/i);
   if (tick) return tick[1];
-  const word = String(value || '').match(/\b([a-z][a-z0-9-]{2,})\b/i);
-  return word ? word[1] : '';
+  const role = canonicalRole(value);
+  return {
+    Explorer: 'explorer',
+    Architect: 'spec-architect',
+    'Spec Reviewer': 'spec-reviewer',
+    Implementer: '',
+    Archiver: '',
+  }[role] || '';
 }
 
 function sectionOr(sections, title, fallback = '') {
@@ -1611,7 +1618,7 @@ function readHandoffFields(projectDir, changeName) {
   return { filePath, fields: fieldsFromSections(changeName, sections) };
 }
 
-const METRICS_VERSION = 1;
+const METRICS_VERSION = 2;
 const METRICS_SPEND_KEYS = ['inputTokens', 'outputTokens', 'totalTokens', 'costUsd', 'costUsdEstimated'];
 const LEFTOVER_GRACE_MS = 120000;
 
@@ -1675,6 +1682,92 @@ function defaultMetrics(changeName, nowIso) {
   };
 }
 
+const VALID_COST_SOURCES = new Set(['api-estimate', 'api-estimate-fallback', 'amp-usage']);
+
+function compactModelRows(sources) {
+  const byModel = new Map();
+  for (const source of sources || []) {
+    if (!source) continue;
+    const platform = VALID_PLATFORMS.has(source.platform) ? source.platform : null;
+    const model = source.model == null || source.model === '' ? null : String(source.model);
+    const key = `${platform || ''}::${model || ''}`;
+    const row = byModel.get(key) || {
+      model,
+      platform,
+      inputTokens: null,
+      outputTokens: null,
+      totalTokens: null,
+      costUsd: null,
+      costUsdEstimated: null,
+    };
+    for (const field of ['inputTokens', 'outputTokens', 'totalTokens', 'costUsd']) {
+      row[field] = addNullable(row[field], numOrNull(source[field]));
+    }
+    row.costUsdEstimated = roundUsd4(addNullable(row.costUsdEstimated, numOrNull(source.costUsdEstimated)));
+    if (VALID_COST_SOURCES.has(source.costSource)) {
+      if (!row.costSource || row.costSource === source.costSource) row.costSource = source.costSource;
+      else delete row.costSource;
+    }
+    byModel.set(key, row);
+  }
+  return [...byModel.values()];
+}
+
+function compactSourceTotals(sources) {
+  const sourceIds = [];
+  const sourceTotals = {};
+  for (const source of sources || []) {
+    if (!source || source.id == null || source.id === '') continue;
+    const id = String(source.id);
+    if (!sourceIds.includes(id)) sourceIds.push(id);
+    const total = numOrNull(source.totalTokens);
+    if (total != null) sourceTotals[id] = Math.max(numOrNull(sourceTotals[id]) ?? 0, total);
+  }
+  return { sourceIds, sourceTotals };
+}
+
+function normalizeSessionV2(session) {
+  const normalized = session && typeof session === 'object' && !Array.isArray(session) ? { ...session } : {};
+  const legacySources = Array.isArray(normalized.sources) ? normalized.sources : null;
+  if (legacySources) {
+    const bestById = new Map();
+    for (const source of legacySources) {
+      if (!source || source.id == null || source.id === '') continue;
+      const id = String(source.id);
+      const previous = bestById.get(id);
+      if (!previous || (numOrNull(source.totalTokens) ?? 0) >= (numOrNull(previous.totalTokens) ?? 0)) bestById.set(id, source);
+    }
+    const compactSources = [...bestById.values()].map((source) => ({
+      ...source,
+      model: source.model || normalized.model || null,
+      platform: source.platform || normalized.platform || null,
+    }));
+    const compact = compactSourceTotals(compactSources);
+    normalized.sourceIds = compact.sourceIds;
+    normalized.sourceTotals = compact.sourceTotals;
+    normalized.byModel = compactModelRows(compactSources);
+    if (!normalized.platform && compactSources[0] && compactSources[0].platform) normalized.platform = compactSources[0].platform;
+    if (!normalized.model && compactSources[0] && compactSources[0].model) normalized.model = compactSources[0].model;
+    delete normalized.sources;
+  } else {
+    normalized.sourceIds = Array.isArray(normalized.sourceIds)
+      ? [...new Set(normalized.sourceIds.filter((id) => id != null && id !== '').map(String))]
+      : [];
+    normalized.sourceTotals = normalized.sourceTotals && typeof normalized.sourceTotals === 'object' && !Array.isArray(normalized.sourceTotals)
+      ? { ...normalized.sourceTotals }
+      : {};
+    normalized.byModel = Array.isArray(normalized.byModel) ? normalized.byModel.map((row) => ({ ...row })) : [];
+  }
+  return normalized;
+}
+
+function normalizeMetricsV2(metrics) {
+  if (!metrics || typeof metrics !== 'object' || Array.isArray(metrics)) return metrics;
+  metrics.version = METRICS_VERSION;
+  metrics.sessions = Array.isArray(metrics.sessions) ? metrics.sessions.map(normalizeSessionV2) : [];
+  return metrics;
+}
+
 function loadMetricsFile(filePath, changeName, nowIso) {
   if (!existsSync(filePath)) return defaultMetrics(changeName, nowIso);
   let parsed;
@@ -1687,7 +1780,7 @@ function loadMetricsFile(filePath, changeName, nowIso) {
     return defaultMetrics(changeName, nowIso);
   }
   const base = defaultMetrics(changeName, parsed.createdAt || nowIso);
-  return {
+  return normalizeMetricsV2({
     ...base,
     ...parsed,
     version: METRICS_VERSION,
@@ -1698,12 +1791,12 @@ function loadMetricsFile(filePath, changeName, nowIso) {
     totals: { ...base.totals, ...(parsed.totals && typeof parsed.totals === 'object' ? parsed.totals : {}) },
     phases: parsed.phases && typeof parsed.phases === 'object' && !Array.isArray(parsed.phases) ? parsed.phases : {},
     sessions: Array.isArray(parsed.sessions) ? parsed.sessions : [],
-  };
+  });
 }
 
 function saveMetricsFile(filePath, metrics) {
   mkdirSync(dirname(filePath), { recursive: true });
-  const out = { ...metrics };
+  const out = normalizeMetricsV2({ ...metrics });
   delete out.timezone;
   writeFileSync(filePath, `${JSON.stringify(out, null, 2)}\n`);
 }
@@ -1750,7 +1843,7 @@ function phaseForRole(role) {
 function sessionFieldOrSources(session, key) {
   if (session[key] != null && session[key] !== '') return numOrNull(session[key]);
   let sum = null;
-  for (const src of session.sources || []) {
+  for (const src of session.byModel || []) {
     sum = addNullable(sum, numOrNull(src[key]));
   }
   return sum;
@@ -1764,8 +1857,14 @@ function lastSessionEndedAt(metrics) {
   return last;
 }
 
-function collectWindowStart(metrics, extra) {
-  return (extra && extra.startedAt) || (metrics.pending && metrics.pending.startedAt) || null;
+function collectWindowStart(metrics, extra = {}) {
+  const explicit = isoOrNull(extra.explicitStartedAt);
+  const pending = isoOrNull(metrics.pending && metrics.pending.startedAt);
+  const selected = explicit || pending || isoOrNull(extra.lastEndedAt) || isoOrNull(metrics.createdAt);
+  if (!selected) return nowUtcIso();
+  if (!explicit && !pending) return selected;
+  const selectedMs = parseFlexibleIso(selected);
+  return Number.isFinite(selectedMs) ? new Date(selectedMs - LEFTOVER_GRACE_MS).toISOString() : selected;
 }
 
 function leftoverGraceEnd(endedAt) {
@@ -1774,6 +1873,15 @@ function leftoverGraceEnd(endedAt) {
   return new Date(ms + LEFTOVER_GRACE_MS).toISOString();
 }
 
+function sessionLeftoverEnd(session, pendingStartedAt) {
+  const pending = isoOrNull(pendingStartedAt);
+  const grace = leftoverGraceEnd(session && session.endedAt);
+  if (session && session.threadId) return pending || grace;
+  if (!pending) return grace;
+  if (!grace) return pending;
+  return earlierTimestamp(pending, grace);
+}
+
 function leftoverTimestampInWindow(at, windowStart, leftoverEnd, exclusiveEnd) {
   const t = parseFlexibleIso(at);
   if (!Number.isFinite(t)) return false;
@@ -1788,19 +1896,71 @@ function leftoverTimestampInWindow(at, windowStart, leftoverEnd, exclusiveEnd) {
   return true;
 }
 
+function uniqueAmpSourceThreadPrefix(sourceIds) {
+  const prefixes = [];
+  for (const sourceId of sourceIds || []) {
+    const id = sourceId == null ? '' : String(sourceId);
+    if (!id.startsWith('T-')) continue;
+    const prefix = id.split(':')[0];
+    if (!prefix) continue;
+    if (!prefixes.includes(prefix)) prefixes.push(prefix);
+  }
+  return prefixes.length === 1 ? prefixes[0] : null;
+}
+
+function leftoverAmpThreadId(session) {
+  if (!session) return null;
+  if (session.threadId) return String(session.threadId);
+  return uniqueAmpSourceThreadPrefix(session.sourceIds);
+}
+
+function sessionAmpThreadKeys(session) {
+  const keys = new Set();
+  if (session && session.threadId) keys.add(String(session.threadId));
+  for (const sourceId of (session && session.sourceIds) || []) {
+    const id = sourceId == null ? '' : String(sourceId);
+    if (!id.startsWith('T-')) continue;
+    const prefix = id.split(':')[0];
+    if (prefix) keys.add(prefix);
+  }
+  return keys;
+}
+
+function usageModelTokenCount(row) {
+  const total = numOrNull(row && row.totalTokens);
+  if (total != null) return total;
+  return (numOrNull(row && row.inputTokens) ?? 0) + (numOrNull(row && row.outputTokens) ?? 0);
+}
+
+function usageModelsForSession(session, ampThreads) {
+  const allowed = sessionAmpThreadKeys(session);
+  const byModel = new Map();
+  for (const thread of ampThreads || []) {
+    const id = thread && thread.id != null ? String(thread.id) : '';
+    if (!allowed.has(id)) continue;
+    for (const row of (thread && thread.models) || []) {
+      if (!row || !row.model) continue;
+      const key = String(row.model);
+      const prev = byModel.get(key);
+      if (!prev || usageModelTokenCount(row) >= usageModelTokenCount(prev)) {
+        byModel.set(key, row);
+      }
+    }
+  }
+  return [...byModel.values()];
+}
+
 function sessionSpendIsFrozen(session) {
   if (!session) return false;
   if (session.spendSource === 'flag') return true;
-  if (!reportedHasSpendNumbers(session)) return false;
-  if (!session.spendSource || session.spendSource === 'adapter' || session.spendSource === 'unreported') return false;
-  return true;
+  return session.spendSource === 'self-report' && reportedHasSpendNumbers(session);
 }
 
-function existingSourceRecords(metrics) {
-  const out = [];
+function existingSourceTotals(metrics) {
+  const out = {};
   for (const session of metrics.sessions || []) {
-    for (const src of session.sources || []) {
-      if (src) out.push(src);
+    for (const [id, total] of Object.entries(session.sourceTotals || {})) {
+      out[id] = Math.max(numOrNull(out[id]) ?? 0, numOrNull(total) ?? 0);
     }
   }
   return out;
@@ -1809,13 +1969,15 @@ function existingSourceRecords(metrics) {
 function existingSourceIdSet(metrics) {
   const ids = new Set();
   for (const session of metrics.sessions || []) {
-    for (const src of session.sources || []) {
-      if (src && src.id != null && src.id !== '') ids.add(String(src.id));
-    }
+    for (const id of session.sourceIds || []) ids.add(String(id));
   }
   return ids;
 }
 
+function existingSessionThreadIds(metrics) {
+  return [...new Set((metrics.sessions || []).map((session) => session && session.threadId).filter(Boolean).map(String))];
+}
+
 function lastNonArchiverSession(sessions) {
   const list = Array.isArray(sessions) ? sessions : [];
   for (let i = list.length - 1; i >= 0; i -= 1) {
@@ -1851,6 +2013,63 @@ function uniqueSourceModels(sources) {
   return seen;
 }
 
+function sessionTotalsFromModels(byModel) {
+  const totals = { inputTokens: null, outputTokens: null, totalTokens: null, costUsd: null, costUsdEstimated: null };
+  for (const row of byModel || []) {
+    for (const key of Object.keys(totals)) totals[key] = addNullable(totals[key], numOrNull(row[key]));
+  }
+  totals.costUsdEstimated = roundUsd4(totals.costUsdEstimated);
+  return totals;
+}
+
+function mergeModelRows(current, incoming) {
+  const merged = new Map();
+  for (const raw of [...(current || []), ...(incoming || [])]) {
+    if (!raw) continue;
+    const model = raw.model == null || raw.model === '' ? null : String(raw.model);
+    const key = `${raw.platform || ''}::${model || ''}`;
+    const row = merged.get(key) || {
+      model,
+      platform: raw.platform || null,
+      inputTokens: null,
+      outputTokens: null,
+      totalTokens: null,
+      costUsd: null,
+      costUsdEstimated: null,
+    };
+    for (const field of ['inputTokens', 'outputTokens', 'totalTokens', 'costUsd']) {
+      row[field] = addNullable(row[field], numOrNull(raw[field]));
+    }
+    row.costUsdEstimated = roundUsd4(addNullable(row.costUsdEstimated, numOrNull(raw.costUsdEstimated)));
+    if (raw.costSource) row.costSource = raw.costSource;
+    merged.set(key, row);
+  }
+  return [...merged.values()];
+}
+
+function compactCollectedDelta(session, sources) {
+  const adjusted = [];
+  for (const source of sources || []) {
+    if (!source || source.id == null) continue;
+    const previous = numOrNull(session.sourceTotals && session.sourceTotals[source.id]);
+    const next = numOrNull(source.totalTokens);
+    if (previous == null || next == null) {
+      adjusted.push(source);
+      continue;
+    }
+    const delta = Math.max(0, next - previous);
+    if (delta === 0) continue;
+    const ratio = next > 0 ? delta / next : 0;
+    const copy = { ...source };
+    for (const field of ['inputTokens', 'outputTokens', 'totalTokens', 'costUsd', 'costUsdEstimated']) {
+      const value = numOrNull(copy[field]);
+      if (value != null) copy[field] = field.includes('Usd') ? roundUsd4(value * ratio) : Math.round(value * ratio);
+    }
+    adjusted.push(copy);
+  }
+  return adjusted;
+}
+
 function rankSources(sources) {
   return [...sources].sort((a, b) => {
     const ta = a.totalTokens ?? 0;
@@ -1922,7 +2141,15 @@ function ampThreadTotals(threads) {
       if (row && row.model && !models.includes(row.model)) models.push(row.model);
     }
   }
-  return { costUsd, agentMode, models };
+  let inputTokens = null;
+  let outputTokens = null;
+  let totalTokens = null;
+  for (const thread of list) {
+    inputTokens = addNullable(inputTokens, numOrNull(thread && thread.inputTokens));
+    outputTokens = addNullable(outputTokens, numOrNull(thread && thread.outputTokens));
+    totalTokens = addNullable(totalTokens, numOrNull(thread && thread.totalTokens));
+  }
+  return { costUsd, agentMode, models, inputTokens, outputTokens, totalTokens };
 }
 
 function resolveSessionSpend(opts, reported, sources, extra = {}) {
@@ -1936,9 +2163,9 @@ function resolveSessionSpend(opts, reported, sources, extra = {}) {
   const flagTotal = numOrNull(flags.totalTokens);
   const flagCost = numOrNull(flags.costUsd);
   const flagCredits = numOrNull(flags.ampCredits);
-  const inputTokens = firstNonNull(flagInput, self.inputTokens, fromSources.inputTokens);
-  const outputTokens = firstNonNull(flagOutput, self.outputTokens, fromSources.outputTokens);
-  let totalTokens = firstNonNull(flagTotal, self.totalTokens, fromSources.totalTokens);
+  const inputTokens = firstNonNull(flagInput, self.inputTokens, fromAmp.inputTokens, fromSources.inputTokens);
+  const outputTokens = firstNonNull(flagOutput, self.outputTokens, fromAmp.outputTokens, fromSources.outputTokens);
+  let totalTokens = firstNonNull(flagTotal, self.totalTokens, fromAmp.totalTokens, fromSources.totalTokens);
   if (totalTokens == null && (inputTokens != null || outputTokens != null)) {
     totalTokens = (inputTokens ?? 0) + (outputTokens ?? 0);
   }
@@ -1994,65 +2221,132 @@ function sessionTotalsFromSources(sources) {
 function runCollectSpend(metrics, windowStart, windowEnd, extra = {}) {
   try {
     return collectSpend({
-      cwd: process.cwd(),
+      cwd: extra.cwd || process.cwd(),
       windowStart,
       windowEnd,
       existingSourceIds: existingSourceIdSet(metrics),
-      existingSources: existingSourceRecords(metrics),
-      env: process.env,
-      homedir: process.env.HOME,
+      existingSourceTotals: existingSourceTotals(metrics),
+      env: extra.env || process.env,
+      homedir: extra.homedir || process.env.HOME,
       platforms: extra.platforms,
       ampThreadId: extra.ampThreadId,
       ampCli: extra.ampCli === true,
       cursorConversationId: extra.cursorConversationId,
       exportAmpThread: extra.exportAmpThread,
       usageAmpThread: extra.usageAmpThread,
+      listRecentAmpThreads: extra.listRecentAmpThreads,
+      listAmpThreads: extra.listAmpThreads,
+      collectAll: extra.collectAll === true,
+      existingThreadIds: existingSessionThreadIds(metrics),
+      rebillThreadId: extra.rebillThreadId,
     });
   } catch {
-    return { sources: [], byPlatform: defaultSpendByPlatform(), byModel: [], notes: [] };
+    return { sources: [], ids: [], totals: {}, byPlatform: defaultSpendByPlatform(), byModel: [], notes: [] };
+  }
+}
+
+function leftoverCollectPlatforms(session, collectAll, ampThreadId) {
+  if (collectAll) return undefined;
+  if (session.platform === 'amp' || session.platform === 'cursor' || session.platform === 'claude') {
+    if (session.platform === 'amp' && !ampThreadId) return [];
+    return [session.platform];
+  }
+  if (session.platform == null && ampThreadId) return ['amp'];
+  return [];
+}
+
+function resyncLeftoverSessionSpend(session, priorCost, priorSource) {
+  const fromSources = sessionTotalsFromModels(session.byModel || []);
+  session.inputTokens = fromSources.inputTokens;
+  session.outputTokens = fromSources.outputTokens;
+  let totalTokens = fromSources.totalTokens;
+  if (totalTokens == null && (fromSources.inputTokens != null || fromSources.outputTokens != null)) {
+    totalTokens = (fromSources.inputTokens ?? 0) + (fromSources.outputTokens ?? 0);
+  }
+  session.totalTokens = totalTokens;
+  if (fromSources.costUsd == null && priorCost != null) {
+    session.costUsd = priorCost;
+  }
+  if (priorSource === 'amp-usage' && numOrNull(session.costUsd) != null) {
+    session.spendSource = 'amp-usage';
   }
 }
 
 function attachLeftoverSources(metrics, session, leftoverEnd, extra = {}) {
   if (!session || !session.endedAt || !leftoverEnd) return 0;
   const exclusiveEnd = extra.exclusiveEnd === true;
+  const collectAll = extra.collect === true;
+  const ampThreadId = leftoverAmpThreadId(session);
+  const platforms = leftoverCollectPlatforms(session, collectAll, ampThreadId);
+  if (!collectAll && (!Array.isArray(platforms) || platforms.length === 0)) return 0;
+  const collectAmp = collectAll || (Array.isArray(platforms) && platforms.includes('amp'));
+  const collectCursor = collectAll || (Array.isArray(platforms) && platforms.includes('cursor'));
   const collected = runCollectSpend(metrics, session.endedAt, leftoverEnd, {
-    platforms: extra.platforms,
-    ampThreadId: session.threadId || extra.ampThreadId || ampThreadIdFromEnv(process.env) || null,
-    ampCli: extra.ampCli === true || session.platform === 'amp',
+    platforms,
+    ...(ampThreadId ? { ampThreadId } : {}),
+    listRecentAmpThreads: false,
+    ampCli: extra.ampCli === true || collectAmp,
     cursorConversationId: extra.cursorConversationId
-      || (session.platform === 'cursor' ? session.threadId : undefined),
+      || (collectCursor && session.platform === 'cursor' ? session.threadId : undefined),
+    exportAmpThread: extra.exportAmpThread,
+    usageAmpThread: extra.usageAmpThread,
+    listAmpThreads: extra.listAmpThreads,
+    env: extra.env,
+    cwd: extra.cwd,
+    homedir: extra.homedir,
+    rebillThreadId: ampThreadId,
   });
-  const incoming = (collected.sources || []).filter((src) => leftoverTimestampInWindow(
+  let incoming = (collected.sources || []).filter((src) => leftoverTimestampInWindow(
     src.at,
     session.endedAt,
     leftoverEnd,
     exclusiveEnd,
   ));
+  if (ampThreadId) {
+    const prefix = `${ampThreadId}:`;
+    incoming = incoming.filter((src) => {
+      if (src && src.platform === 'amp') return String(src.id || '').startsWith(prefix);
+      return true;
+    });
+  }
   if (!incoming.length) return 0;
-  const merged = [...(session.sources || []), ...incoming];
+  const beforeIds = new Set(session.sourceIds || []);
   if (sessionSpendIsFrozen(session)) {
-    session.sources = merged;
-    const uniqueModels = uniqueSourceModels(merged);
+    const delta = compactCollectedDelta(session, incoming);
+    session.sourceIds = [...new Set([...(session.sourceIds || []), ...incoming.map((source) => String(source.id))])];
+    session.sourceTotals = { ...(session.sourceTotals || {}) };
+    for (const source of incoming) session.sourceTotals[source.id] = Math.max(numOrNull(session.sourceTotals[source.id]) ?? 0, numOrNull(source.totalTokens) ?? 0);
+    session.byModel = mergeModelRows(session.byModel, compactModelRows(delta));
+    const uniqueModels = uniqueSourceModels(session.byModel);
     if (uniqueModels.length > 1) session.models = uniqueModels;
   } else {
-    applyCollectedSessionFields(session, merged, session.model, {}, {
+    const priorCost = numOrNull(session.costUsd);
+    const priorSource = session.spendSource;
+    applyCollectedSessionFields(session, incoming, session.model, {}, {
       model: session.model,
       platform: session.platform,
-    }, { ampThreads: collected.ampThreads });
+    }, { ampThreads: Array.isArray(extra.ampThreads) ? extra.ampThreads : collected.ampThreads });
+    resyncLeftoverSessionSpend(session, priorCost, priorSource);
   }
-  return incoming.length;
+  return incoming.filter((source) => !beforeIds.has(String(source.id))).length;
 }
 
 function applyCollectedSessionFields(session, sources, resolvedModel, opts, reported, extra = {}) {
-  session.sources = sources || [];
-  const uniqueModels = uniqueSourceModels(session.sources);
+  const incoming = sources || [];
+  const delta = compactCollectedDelta(session, incoming);
+  session.sourceIds = [...new Set([...(session.sourceIds || []), ...incoming.map((source) => String(source.id))])];
+  session.sourceTotals = { ...(session.sourceTotals || {}) };
+  for (const source of incoming) {
+    session.sourceTotals[source.id] = Math.max(numOrNull(session.sourceTotals[source.id]) ?? 0, numOrNull(source.totalTokens) ?? 0);
+  }
+  session.byModel = mergeModelRows(session.byModel, compactModelRows(delta));
+  const uniqueModels = uniqueSourceModels(session.byModel);
   const fromAmp = ampThreadTotals(extra.ampThreads);
   for (const model of fromAmp.models) {
     if (model && !uniqueModels.includes(model)) uniqueModels.push(model);
   }
   if (uniqueModels.length > 1) session.models = uniqueModels;
-  const sourceModel = primaryModelFromSources(session.sources);
+  const sourceModel = primaryModelFromSources(incoming);
   if (sourceModel) {
     session.model = sourceModel;
   } else {
@@ -2060,8 +2354,8 @@ function applyCollectedSessionFields(session, sources, resolvedModel, opts, repo
       || fromAmp.models[0]
       || null;
   }
-  if (!session.platform) session.platform = primaryPlatformFromSources(session.sources) || null;
-  const spend = resolveSessionSpend(opts, reported, session.sources, extra);
+  if (!session.platform) session.platform = primaryPlatformFromSources(incoming) || null;
+  const spend = resolveSessionSpend(opts, reported, incoming, extra);
   session.inputTokens = spend.inputTokens;
   session.outputTokens = spend.outputTokens;
   session.totalTokens = spend.totalTokens;
@@ -2070,17 +2364,43 @@ function applyCollectedSessionFields(session, sources, resolvedModel, opts, repo
   session.costUsdEstimated = spend.costUsdEstimated;
   session.spendSource = spend.spendSource;
   if (spend.agentMode) session.agentMode = spend.agentMode;
-  const usageModels = [];
-  for (const thread of extra.ampThreads || []) {
-    for (const row of thread.models || []) {
-      if (row && row.model) usageModels.push(row);
+  const usageModels = usageModelsForSession(session, extra.ampThreads);
+  if (usageModels.length || Array.isArray(session.usageModels)) {
+    session.usageModels = usageModels;
+  }
+  if (session.platform === 'amp' && usageModels.length) {
+    session.byModel = usageModels.map((row) => ({
+      model: row.model,
+      platform: 'amp',
+      inputTokens: numOrNull(row.inputTokens),
+      outputTokens: numOrNull(row.outputTokens),
+      totalTokens: numOrNull(row.totalTokens) ?? ((numOrNull(row.inputTokens) ?? 0) + (numOrNull(row.outputTokens) ?? 0)),
+      costUsd: numOrNull(row.costUsd),
+      costUsdEstimated: null,
+      ...(numOrNull(row.costUsd) != null ? { costSource: 'amp-usage' } : {}),
+    }));
+  }
+  if (session.costUsd == null) {
+    for (const row of session.byModel) {
+      if (row.costUsd != null) continue;
+      const described = describeClaudeCostEstimate({
+        model: String(row.model || '').replace(/^Claude\s+/i, 'claude-').replaceAll(' ', '-').toLowerCase(),
+        inputTokens: row.inputTokens,
+        outputTokens: row.outputTokens,
+      });
+      if (described) {
+        row.costUsdEstimated = described.usd;
+        row.costSource = described.costSource;
+      }
     }
+    session.costUsdEstimated = sessionTotalsFromModels(session.byModel).costUsdEstimated;
+  } else {
+    session.costUsdEstimated = null;
   }
-  if (usageModels.length) session.usageModels = usageModels;
 }
 
 function sessionTotalsLookOverridden(session) {
-  const fromSources = sessionTotalsFromSources(session.sources || []);
+  const fromSources = sessionTotalsFromModels(session.byModel || []);
   return ['inputTokens', 'outputTokens', 'totalTokens', 'costUsd'].some((key) => {
     const sessionVal = numOrNull(session[key]);
     const sourceVal = numOrNull(fromSources[key]);
@@ -2111,16 +2431,16 @@ function metricsBackfillFile(filePath, changeName) {
   });
   const incoming = collected.sources || [];
   if (!incoming.length) return { filePath, added: 0 };
-  const merged = [...(last.sources || []), ...incoming];
   if (sessionSpendIsFrozen(last)) {
-    last.sources = merged;
-    const uniqueModels = uniqueSourceModels(merged);
-    if (uniqueModels.length > 1) last.models = uniqueModels;
+    applyCollectedSessionFields(last, incoming, last.model, {}, last, { ampThreads: collected.ampThreads });
   } else {
-    applyCollectedSessionFields(last, merged, last.model, {}, {
+    const priorCost = numOrNull(last.costUsd);
+    const priorSource = last.spendSource;
+    applyCollectedSessionFields(last, incoming, last.model, {}, {
       model: last.model,
       platform: last.platform,
     }, { ampThreads: collected.ampThreads });
+    resyncLeftoverSessionSpend(last, priorCost, priorSource);
   }
   metrics.updatedAt = nowIso;
   recomputeMetricsAggregates(metrics);
@@ -2185,27 +2505,19 @@ function recomputeSpendMaps(metrics) {
     byModel.set(key, row);
   }
 
-  function addSourceRow(src) {
-    const nums = spendTuple(src);
-    if (src.platform && byPlatform[src.platform]) {
-      addSpendNums(byPlatform[src.platform], nums);
-      const label = adapterSourceName(src.platform, src.via);
-      if (label) byPlatform[src.platform].source = label;
-    }
-    addModelRow(src.model, src.platform, nums);
-  }
-
   for (const session of metrics.sessions || []) {
-    const sources = session.sources || [];
-    if (sources.length > 0) {
-      for (const src of sources) addSourceRow(src);
-      continue;
-    }
     const sessionNums = spendTuple(session);
     if (session.platform && byPlatform[session.platform]) {
       addSpendNums(byPlatform[session.platform], sessionNums);
+      if ((session.sourceIds || []).length) {
+        byPlatform[session.platform].source = adapterSourceName(session.platform, session.platform === 'amp' ? 'amp-cli' : null);
+      }
+    }
+    if ((session.byModel || []).length) {
+      for (const row of session.byModel) addModelRow(row.model, row.platform || session.platform, spendTuple(row));
+    } else {
+      addModelRow(session.model, session.platform, sessionNums);
     }
-    addModelRow(session.model, session.platform, sessionNums);
   }
   for (const key of Object.keys(byPlatform)) {
     byPlatform[key].costUsdEstimated = roundUsd4(byPlatform[key].costUsdEstimated);
@@ -2218,7 +2530,7 @@ function recomputeSpendMaps(metrics) {
 }
 
 function recomputeMetricsAggregates(metrics) {
-  enrichMetricsCursorEstimates(metrics, process.cwd());
+  normalizeMetricsV2(metrics);
   const phases = {};
   const totals = { sessions: 0, durationMs: null, leadTimeMs: null, cloudSessions: 0 };
   const spend = emptySpendTotals();
@@ -2259,14 +2571,7 @@ function recomputeMetricsAggregates(metrics) {
         : laterTimestamp(phase.endedAt, session.endedAt);
     }
     for (const spendKey of METRICS_SPEND_KEYS) {
-      let value = null;
-      if ((session.sources || []).length > 0) {
-        for (const src of session.sources) {
-          value = addNullable(value, numOrNull(src[spendKey]));
-        }
-      } else {
-        value = sessionFieldOrSources(session, spendKey);
-      }
+      const value = sessionFieldOrSources(session, spendKey);
       phase[spendKey] = addNullable(phase[spendKey], value);
       spend[spendKey] = addNullable(spend[spendKey], value);
     }
@@ -2303,7 +2608,7 @@ function metricsRecordSessionStart(projectDir, changeName, role, client = {}) {
   const metrics = loadMetricsFile(filePath, changeName, nowIso);
   metrics.pending = {
     startedAt: nowIso,
-    role: role || '',
+    role: canonicalRole(role) || role || '',
     platform: client.platform || null,
     threadId: client.threadId || null,
     clientSource: client.source || null,
@@ -2319,18 +2624,29 @@ function metricsRecordSessionEnd(projectDir, fields, opts = {}) {
   const nowIso = nowUtcIso();
   const metrics = loadMetricsFile(filePath, fields.changeName, nowIso);
   const lastClosed = (metrics.sessions || [])[(metrics.sessions || []).length - 1];
-  const leftoverEnd = (metrics.pending && metrics.pending.startedAt)
-    ? metrics.pending.startedAt
-    : leftoverGraceEnd(lastClosed && lastClosed.endedAt);
+  const leftoverEnd = sessionLeftoverEnd(lastClosed, metrics.pending && metrics.pending.startedAt);
   attachLeftoverSources(metrics, lastClosed, leftoverEnd, {
     exclusiveEnd: Boolean(metrics.pending && metrics.pending.startedAt),
+    collect: opts.collect === true,
   });
-  let startedAt = isoOrNull(opts.startedAt) || isoOrNull(metrics.pending && metrics.pending.startedAt) || null;
+  const explicitStartedAt = isoOrNull(opts.startedAt);
+  const pendingStartedAt = isoOrNull(metrics.pending && metrics.pending.startedAt);
+  const startedAt = explicitStartedAt || pendingStartedAt || isoOrNull(lastClosed && lastClosed.endedAt) || isoOrNull(metrics.createdAt) || nowIso;
+  if (!explicitStartedAt && !pendingStartedAt) console.error('Warning: persist without restore; collecting from the last closed session boundary.');
   const reported = opts.reported || fields.metrics || emptyMetricsFields();
   const resolvedModel = opts.model === undefined ? resolveModel(opts, process.env, reported) : opts.model;
-  const windowStart = collectWindowStart(metrics, { startedAt });
+  const windowStart = collectWindowStart(metrics, {
+    explicitStartedAt,
+    lastEndedAt: lastClosed && lastClosed.endedAt,
+  });
   const pending = metrics.pending || {};
   const platform = opts.platform || pending.platform || null;
+  const cursorThreadId = platform === 'cursor'
+    ? (pending.threadId || String(process.env.CURSOR_CONVERSATION_ID || '').trim() || null)
+    : null;
+  const ampThreadId = platform === 'amp'
+    ? (opts.ampThreadId || pending.threadId || ampThreadIdFromEnv(process.env) || null)
+    : null;
   const collectAll = opts.collect === true;
   const platforms = collectAll ? undefined : (platform ? [platform] : []);
   const shouldCollect = collectAll || (Array.isArray(platforms) && platforms.length > 0);
@@ -2338,9 +2654,11 @@ function metricsRecordSessionEnd(projectDir, fields, opts = {}) {
   const collected = shouldCollect
     ? runCollectSpend(metrics, windowStart, endedAt, {
       platforms,
-      ampThreadId: opts.ampThreadId || pending.threadId || ampThreadIdFromEnv(process.env) || null,
+      ampThreadId,
       ampCli: collectAll || platform === 'amp',
-      cursorConversationId: platform === 'cursor' ? pending.threadId : undefined,
+      cursorConversationId: cursorThreadId || undefined,
+      listRecentAmpThreads: false,
+      collectAll,
     })
     : { sources: [] };
   const startedMs = parseFlexibleIso(startedAt);
@@ -2359,9 +2677,11 @@ function metricsRecordSessionEnd(projectDir, fields, opts = {}) {
     agentId: fields.agentId || 'none',
     model: resolvedModel || null,
     platform: opts.platform || pending.platform || null,
-    threadId: opts.ampThreadId || pending.threadId || null,
+    threadId: cursorThreadId || ampThreadId || pending.threadId || null,
     tasks: fields.tasks || null,
-    sources: [],
+    sourceIds: [],
+    sourceTotals: {},
+    byModel: [],
     inputTokens: null,
     outputTokens: null,
     totalTokens: null,
@@ -2371,22 +2691,6 @@ function metricsRecordSessionEnd(projectDir, fields, opts = {}) {
     spendSource: 'unreported',
   };
   applyCollectedSessionFields(session, collected.sources || [], resolvedModel, opts, reported, collected);
-  if (!session.startedAt) {
-    let earliest = null;
-    for (const src of session.sources || []) {
-      const at = isoOrNull(src.at);
-      if (!at) continue;
-      earliest = earliest == null ? at : earlierTimestamp(earliest, at);
-    }
-    if (earliest) {
-      session.startedAt = earliest;
-      const fromMs = parseFlexibleIso(session.startedAt);
-      const toMs = parseFlexibleIso(session.endedAt);
-      session.durationMs = Number.isFinite(fromMs) && Number.isFinite(toMs)
-        ? Math.max(0, toMs - fromMs)
-        : null;
-    }
-  }
   metrics.sessions.push(session);
   metrics.pending = null;
   metrics.updatedAt = nowIso;
@@ -2417,12 +2721,15 @@ function metricsFinalizeArchive(targetDir, changeName, opts = {}) {
   const platforms = collectAll ? undefined : (platform ? [platform] : []);
   const shouldCollect = collectAll || (Array.isArray(platforms) && platforms.length > 0);
   const ampThreadId = opts.ampThreadId || pending.threadId || ampThreadIdFromEnv(process.env) || null;
+  const archiveWindowStart = collectWindowStart(metrics, {});
   const collected = shouldCollect
-    ? runCollectSpend(metrics, startedAt, endedAt, {
+    ? runCollectSpend(metrics, archiveWindowStart, endedAt, {
       platforms,
       ampThreadId,
       ampCli: collectAll || platform === 'amp',
       cursorConversationId: platform === 'cursor' ? (pending.threadId || ampThreadId) : undefined,
+      listRecentAmpThreads: false,
+      collectAll,
     })
     : { sources: [] };
   const reported = dropStaleArchiveSelfReport(opts.reported, metrics.sessions);
@@ -2439,7 +2746,9 @@ function metricsFinalizeArchive(targetDir, changeName, opts = {}) {
     platform,
     threadId: ampThreadId || null,
     tasks: opts.tasks || null,
-    sources: [],
+    sourceIds: [],
+    sourceTotals: {},
+    byModel: [],
     inputTokens: null,
     outputTokens: null,
     totalTokens: null,
@@ -2464,7 +2773,7 @@ function metricsFinalizeArchive(targetDir, changeName, opts = {}) {
   return filePath;
 }
 
-function metricsPrepareArchiveStart(changeRoot, changeName, client = {}) {
+function metricsPrepareArchiveStart(changeRoot, changeName, client = {}, extra = {}) {
   const filePath = join(changeRoot, 'metrics.json');
   if (!existsSync(filePath)) return;
   const nowIso = nowUtcIso();
@@ -2478,9 +2787,11 @@ function metricsPrepareArchiveStart(changeRoot, changeName, client = {}) {
       clientSource: client.source || null,
     };
   }
-  const leftoverEnd = metrics.pending && metrics.pending.startedAt;
-  attachLeftoverSources(metrics, lastNonArchiverSession(metrics.sessions), leftoverEnd, {
+  const previous = lastNonArchiverSession(metrics.sessions);
+  const leftoverEnd = sessionLeftoverEnd(previous, metrics.pending && metrics.pending.startedAt);
+  attachLeftoverSources(metrics, previous, leftoverEnd, {
     exclusiveEnd: true,
+    collect: extra.collect === true,
   });
   metrics.updatedAt = nowIso;
   recomputeMetricsAggregates(metrics);
@@ -3876,7 +4187,7 @@ program
       homedir: process.env.HOME,
       platform: opts.platform,
     });
-    metricsPrepareArchiveStart(changeRoot, name, archiveClient);
+    metricsPrepareArchiveStart(changeRoot, name, archiveClient, { collect: opts.collect === true });
     mkdirSync(dirname(targetDir), { recursive: true });
     renameSync(changeRoot, targetDir);
 
@@ -4367,6 +4678,8 @@ program
   .command('metrics [change-name]')
   .description('Show recorded session metrics for a change: time per phase, tokens, cost, roles, and models')
   .option('--json', 'Print raw metrics.json', false)
+  .option('--summary-json', 'Print compact aggregate JSON for dashboards', false)
+  .option('--migrate', 'Rewrite metrics.json using the current schema without recomputing numbers', false)
   .option('--collect', 'Backfill the last session from local spend adapters without adding a new session', false)
   .action((changeName, opts) => {
     const projectDir = process.cwd();
@@ -4423,6 +4736,29 @@ program
     }
 
     const metrics = loadMetricsFile(filePath, name, nowUtcIso());
+    if (opts.migrate) {
+      saveMetricsFile(filePath, metrics);
+      if (!opts.json && !opts.summaryJson) {
+        log.ok(`migrated: ${filePath.replace(`${projectDir}/`, '')}`);
+        return;
+      }
+    }
+    if (opts.summaryJson) {
+      recomputeMetricsAggregates(metrics);
+      const summary = {
+        version: metrics.version,
+        change: metrics.change,
+        createdAt: metrics.createdAt,
+        archivedAt: metrics.archivedAt,
+        totals: metrics.totals,
+        phases: metrics.phases,
+        spend: metrics.spend,
+        spendByPlatform: metrics.spendByPlatform,
+        spendByModel: metrics.spendByModel,
+      };
+      process.stdout.write(`${JSON.stringify(summary, null, 2)}\n`);
+      return;
+    }
     if (opts.json) {
       process.stdout.write(`${JSON.stringify(metrics, null, 2)}\n`);
       return;
@@ -4447,4 +4783,15 @@ if (isDirectCliRun()) {
   program.parse();
 }
 
-export { formatMetricsCostLine, resolveSessionSpend, canonicalRole, phaseForRole };
+export {
+  formatMetricsCostLine,
+  resolveSessionSpend,
+  canonicalRole,
+  phaseForRole,
+  recomputeMetricsAggregates,
+  sessionSpendIsFrozen,
+  attachLeftoverSources,
+  runCollectSpend,
+  normalizeMetricsV2,
+  firstSpawnName,
+};