@worca/app 1.3.0 → 1.4.0

package/src/shared/team-metrics/aggregate.mjs

@@ -80,6 +80,7 @@ export function weekStartMs(ms) {
 
 const startOf = (r) => Date.parse(r.startedAt);
 const usdOf = (r) => (Number.isFinite(r?.cost?.usd) ? r.cost.usd : 0);
+const hoursOf = (r) => (Number.isFinite(r?.human?.hours) ? r.human.hours : 0);
 const isNum = (v) => typeof v === 'number' && Number.isFinite(v);
 const sum = (a) => a.reduce((s, x) => s + x, 0);
 const round2 = (v) => Math.round(v * 100) / 100;
@@ -127,18 +128,26 @@ export function applyFilter(records, filter = {}) {
   return records.filter((r) => active.every(([dim, key]) => DIMENSIONS[dim](r).some((k) => k.key === key)));
 }
 
-function computeKpis(rs, now) {
+function computeKpis(rs, now, humanRateUsd = 0) {
   const n = rs.length;
   const count = (res) => rs.filter((r) => r.result === res).length;
   const usd = sum(rs.map(usdOf));
+  const hours = round2(sum(rs.map(hoursOf)));
   const paired = rs.filter((r) => isNum(r.wallMs) && isNum(r.activeMs));
-  const wallSum = sum(paired.map((r) => r.wallMs));
+  // Autonomy = active ÷ (wall − paused): a run parked on a pause or a crash was not waiting on a
+  // human, so its parked time leaves the denominator. `pausedMs` is additive — records pushed
+  // before it existed park nothing.
+  const wallSum = sum(paired.map((r) => Math.max(0, r.wallMs - (isNum(r.pausedMs) ? r.pausedMs : 0))));
   const withPr = rs.filter((r) => r.pr && (r.pr.url || r.pr.number != null));
   const reviews = rs.map((r) => r.cycles?.review).filter(isNum);
   const d = new Date(now);
   const monthStart = Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), 1);
   return {
     spendUsd: round2(usd),
+    // Human hours (money-saved design §9.2): records without `human` count 0 h; `humanRuns` gates the tile.
+    humanHours: hours,
+    humanRuns: rs.filter((r) => Number.isFinite(r?.human?.hours)).length,
+    savedUsd: round2(hours * humanRateUsd - usd),
     spendThisMonthUsd: round2(sum(rs.filter((r) => startOf(r) >= monthStart).map(usdOf))),
     runs: n,
     done: count('done'), failed: count('failed'), stopped: count('stopped'),
@@ -155,14 +164,26 @@ function computeKpis(rs, now) {
     reviewCyclesMean: reviews.length ? round1(sum(reviews) / reviews.length) : null,
     convergeInOneRate: reviews.length ? reviews.filter((c) => c <= 1).length / reviews.length : null,
     filesChanged: sum(rs.map((r) => r.git?.filesChanged).filter(isNum)),
+    // Team policy (team-policy design §10): runs that went past a team cap (continued past, or
+    // exceeded under warn / unattended) or picked something off-policy. Additive; policy-less
+    // records count nothing.
+    offPolicyRuns: rs.filter((r) => policyOverrides(r) + policyDeviations(r) > 0).length,
+    capOverrides: sum(rs.map(policyOverrides)),
+    deviations: sum(rs.map(policyDeviations)),
+    policyRuns: rs.filter((r) => r.policy && r.policy.home).length,
   };
 }
 
+const policyOverrides = (r) => (r.policy && r.policy.home ? (Array.isArray(r.policy.overrides) ? r.policy.overrides.length : 0) + (Array.isArray(r.policy.exceeded) ? r.policy.exceeded.length : 0) : 0);
+const policyDeviations = (r) => (r.policy && r.policy.home && Array.isArray(r.policy.deviations) ? r.policy.deviations.length : 0);
+
 const pct = (cur, prev) => (isNum(cur) && isNum(prev) && prev > 0 ? (cur - prev) / prev : null);
 
 function deltas(k, p) {
   return {
     spendPct: pct(k.spendUsd, p.spendUsd),
+    humanHoursPct: pct(k.humanHours, p.humanHours),
+    savedPct: pct(k.savedUsd, p.savedUsd),
     runsPct: pct(k.runs, p.runs),
     costPerRunPct: pct(k.costPerRunUsd, p.costPerRunUsd),
     durationPct: pct(k.durationMedianMs, p.durationMedianMs),
@@ -175,9 +196,11 @@ function breakdown(rs, dim) {
   const rows = new Map();
   for (const r of rs) {
     for (const k of DIMENSIONS[dim](r)) {
-      const row = rows.get(k.key) || { key: k.key, label: k.label, sub: k.sub ?? null, runs: 0, usd: 0, done: 0, reviews: [], filesChanged: 0, filesUnknown: 0 };
+      const row = rows.get(k.key) || { key: k.key, label: k.label, sub: k.sub ?? null, runs: 0, usd: 0, done: 0, reviews: [], filesChanged: 0, filesUnknown: 0, overrides: 0, offPolicy: 0 };
       row.runs += 1;
       row.usd += usdOf(r);                       // "a run touching two projects counts in both"
+      row.overrides += policyOverrides(r);       // team caps continued past / exceeded (team policy §10)
+      row.offPolicy += policyDeviations(r);
       if (r.result === 'done') row.done += 1;
       if (isNum(r.cycles?.review)) row.reviews.push(r.cycles.review);
       // A key that carries its own count (a touched member) uses it; every other dimension is
@@ -207,6 +230,8 @@ function breakdown(rs, dim) {
       // null when no run in the row carries a count: the cell shows "–", never a wrong number.
       filesChanged: row.filesUnknown === row.runs ? null : row.filesChanged,
       filesUnknown: row.filesUnknown,
+      overrides: row.overrides,
+      offPolicy: row.offPolicy,
       isNone: row.key === NONE,
     }))
     // Projects order by what the table shows (runs touched, then files); every other dimension by spend.
@@ -271,11 +296,17 @@ export function safeHttpUrl(u) {
   try { const x = new URL(u); return x.protocol === 'https:' || x.protocol === 'http:' ? x.href : null; } catch { return null; }
 }
 
-function toRunRow(r) {
+function toRunRow(r, humanRateUsd = 0) {
+  const usd = usdOf(r);
+  // Money saved (design §9.2) per run: null when the record carries no `human` (pre-v33 pushes),
+  // so the row prints "—" rather than claiming "−$cost" was saved. Same gate as the KPI tile.
+  const humanHours = isNum(r.human?.hours) ? r.human.hours : null;
   return {
     id: r.id, title: r.title ?? '(untitled)', startedAt: r.startedAt,
     workflow: r.workflow?.name ?? r.workflow?.id ?? null, result: r.result,
-    usd: usdOf(r), wallMs: isNum(r.wallMs) ? r.wallMs : null, activeMs: isNum(r.activeMs) ? r.activeMs : null,
+    usd, wallMs: isNum(r.wallMs) ? r.wallMs : null, activeMs: isNum(r.activeMs) ? r.activeMs : null,
+    pausedMs: isNum(r.pausedMs) ? r.pausedMs : null,
+    humanHours, savedUsd: humanHours == null ? null : round2(humanHours * humanRateUsd - usd),
     reviewCycles: isNum(r.cycles?.review) ? r.cycles.review : null,
     pr: r.pr && (r.pr.url || r.pr.number != null) ? { number: Number.isInteger(r.pr.number) ? r.pr.number : null, url: safeHttpUrl(r.pr.url) } : null,
     actor: r.actor ?? null,
@@ -283,6 +314,15 @@ function toRunRow(r) {
     projects: r.target?.kind === 'workspace'
       ? (Array.isArray(r.target.touched) ? r.target.touched.filter((p) => typeof p === 'string') : [])
       : [r.target?.project].filter((p) => typeof p === 'string' && p),
+    // Team policy (§10): only on a run recorded under a policy, so policy-less rows keep their shape.
+    ...(r.policy && r.policy.home ? { policy: {
+      home: r.policy.home,
+      overrides: Array.isArray(r.policy.overrides) ? r.policy.overrides : [],
+      exceeded: Array.isArray(r.policy.exceeded) ? r.policy.exceeded : [],
+      deviations: Array.isArray(r.policy.deviations) ? r.policy.deviations : [],
+      unattended: r.policy.unattended === true,
+      reason: typeof r.policy.reason === 'string' ? r.policy.reason : null,
+    } } : {}),
   };
 }
 
@@ -290,15 +330,15 @@ function toRunRow(r) {
  * @param {object[]} records  v1 records (already parsed; unknown v / malformed already dropped)
  * @param {{range?:string, from?:string|null, to?:string|null, groupBy?:string, filter?:object, now?:number}} [opts]
  */
-export function aggregate(records, { range = 'this-month', from = null, to = null, groupBy = 'workflow', filter = {}, now = Date.now() } = {}) {
+export function aggregate(records, { range = 'this-month', from = null, to = null, groupBy = 'workflow', filter = {}, now = Date.now(), humanRateUsd = 0 } = {}) {
   if (!GROUP_BYS.includes(groupBy)) throw new RangeError(`unknown groupBy "${groupBy}" (expected ${GROUP_BYS.join(' | ')})`);
   const win = resolveRange(range, { now, from, to });
   const usable = (records || []).filter((r) => r && Number.isFinite(startOf(r)));
   const filtered = applyFilter(usable, filter);
   const inWin = (s, e) => (r) => (s == null || startOf(r) >= s) && (e == null || startOf(r) < e);
   const inRange = filtered.filter(inWin(win.startMs, win.endMs));
-  const kpis = computeKpis(inRange, now);
-  const prevKpis = win.prevStartMs == null ? null : computeKpis(filtered.filter(inWin(win.prevStartMs, win.prevEndMs)), now);
+  const kpis = computeKpis(inRange, now, humanRateUsd);
+  const prevKpis = win.prevStartMs == null ? null : computeKpis(filtered.filter(inWin(win.prevStartMs, win.prevEndMs)), now, humanRateUsd);
   const hasActor = inRange.some((r) => r.actor);
   const hasWorkspace = inRange.some((r) => r.target?.kind === 'workspace');
   return {
@@ -312,12 +352,12 @@ export function aggregate(records, { range = 'this-month', from = null, to = nul
       project: hasWorkspace ? breakdown(inRange, 'project') : null,
       models: breakdown(inRange, 'models'),
     },
-    runs: [...inRange].sort((a, b) => startOf(b) - startOf(a)).map(toRunRow),
+    runs: [...inRange].sort((a, b) => startOf(b) - startOf(a)).map((r) => toRunRow(r, humanRateUsd)),
     totalRecords: usable.length,
   };
 }
 
-export const CSV_COLUMNS = Object.freeze(['startedAt', 'title', 'workflow', 'result', 'costUsd', 'wallMs', 'activeMs', 'reviewCycles', 'prNumber', 'prUrl', 'actor', 'source', 'projects', 'id']);
+export const CSV_COLUMNS = Object.freeze(['startedAt', 'title', 'workflow', 'result', 'costUsd', 'humanHours', 'savedUsd', 'wallMs', 'activeMs', 'pausedMs', 'reviewCycles', 'prNumber', 'prUrl', 'actor', 'source', 'projects', 'id']);
 
 function csvCell(v) {
   if (v == null) return '';
@@ -331,7 +371,7 @@ export function toCsv(runRows) {
   const lines = [CSV_COLUMNS.join(',')];
   for (const r of runRows) {
     lines.push([
-      r.startedAt, r.title, r.workflow, r.result, r.usd, r.wallMs, r.activeMs, r.reviewCycles,
+      r.startedAt, r.title, r.workflow, r.result, r.usd, r.humanHours, r.savedUsd, r.wallMs, r.activeMs, r.pausedMs, r.reviewCycles,
       r.pr?.number, r.pr?.url, r.actor, r.source, (r.projects || []).join(' '), r.id,
     ].map(csvCell).join(','));
   }

package/{scripts → tools}/install.mjs

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
-// scripts/install.mjs
+// tools/install.mjs
 //
 // Copy the orchestrator agents and the /worca skill into a target project's
 // .claude directory so that opening Claude Code there lets the user run:
 //   /worca <prompt>
 //
 // Usage:
-//   node scripts/install.mjs <targetDir> [--force]
+//   node tools/install.mjs <targetDir> [--force]
 //
 // - agents/*.md            -> <targetDir>/.claude/agents/
 // - skills/worca/**        -> <targetDir>/.claude/skills/worca/
@@ -39,7 +39,7 @@ function parseArgs(argv) {
 const HELP = `install — copy orchestrator agents + /worca skill into a project
 
 Usage:
-  node scripts/install.mjs <targetDir> [--force]
+  node tools/install.mjs <targetDir> [--force]
 
 Copies:
   agents/*.md            -> <targetDir>/.claude/agents/