From 8051efcee00a56193ce12fc3d88d39b8bc075793 Mon Sep 17 00:00:00 2001
From: garrytan <garrytan@gmail.com>
Date: Sat, 3 Oct 2026 21:12:14 +0000
Subject: [PATCH] G6: analytics averages quoted duration_s values (#1728)

gstack-skill-end writes duration_s as a quoted string, and the per-skill
average stripped everything from the leading quote, so every average
read 0s. The awk now drops a leading quote before extracting digits.

Co-authored-by: Ryan Alberts <ryan.a.alberts@gmail.com>
---
 bin/gstack-analytics                       |  4 +-
 test/gstack-analytics-avg-duration.test.ts | 90 ++++++++++++++++++++++
 2 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 test/gstack-analytics-avg-duration.test.ts

diff --git a/bin/gstack-analytics b/bin/gstack-analytics
index 8e814bcc9..7e0ec022c 100755
--- a/bin/gstack-analytics
+++ b/bin/gstack-analytics
@@ -170,7 +170,9 @@ echo "$SKILL_COUNTS" | while read -r COUNT SKILL; do
       # Extract duration_s value using split on "duration_s":
       n = split($0, parts, "\"duration_s\":")
       if (n >= 2) {
-        # parts[2] starts with the value, e.g. "142,"
+        # parts[2] starts with the value: unquoted (142,...) or quoted ("142",...),
+        # which gstack-skill-end writes. Strip a leading quote before the digits.
+        sub(/^"/, "", parts[2])
         gsub(/[^0-9.].*/, "", parts[2])
         if (parts[2]+0 > 0) { total += parts[2]; count++ }
       }
diff --git a/test/gstack-analytics-avg-duration.test.ts b/test/gstack-analytics-avg-duration.test.ts
new file mode 100644
index 000000000..3b6b4d462
--- /dev/null
+++ b/test/gstack-analytics-avg-duration.test.ts
@@ -0,0 +1,90 @@
+import { describe, test, expect, beforeEach, afterEach } from 'bun:test';
+import { spawnSync } from 'child_process';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+
+const ROOT = path.resolve(import.meta.dir, '..');
+const BIN = path.join(ROOT, 'bin', 'gstack-analytics');
+
+// Verifies the per-skill avg-duration calculation in the bash dashboard
+// (bin/gstack-analytics) parses both unquoted and quoted "duration_s"
+// values from skill-usage.jsonl. The completion-status preamble (and
+// gstack-codex-probe) emit quoted strings; gstack-telemetry-log emits
+// unquoted numbers. The previous awk regex stripped from the leading
+// quote, silently yielding avg=0 for quoted-only skills.
+// G6 rider #1728 (from PR #1728 by Ryan Alberts).
+describe('gstack-analytics avg duration parsing', () => {
+  let stateDir: string;
+
+  beforeEach(() => {
+    stateDir = fs.mkdtempSync(path.join(os.tmpdir(), 'gstack-analytics-test-'));
+    fs.mkdirSync(path.join(stateDir, 'analytics'), { recursive: true });
+  });
+
+  afterEach(() => {
+    fs.rmSync(stateDir, { recursive: true, force: true });
+  });
+
+  function run(jsonl: string[]): string {
+    fs.writeFileSync(
+      path.join(stateDir, 'analytics', 'skill-usage.jsonl'),
+      jsonl.join('\n') + '\n',
+    );
+    const { GSTACK_STATE_ROOT: _r, GSTACK_HOME: _h, ...ambient } = process.env;
+    const r = spawnSync('bash', [BIN, 'all'], {
+      env: { ...ambient, GSTACK_HOME: stateDir },
+      encoding: 'utf-8',
+      timeout: 30_000,
+    });
+    if (r.status !== 0) {
+      throw new Error(`gstack-analytics failed (status ${r.status}): ${r.stderr}`);
+    }
+    return r.stdout;
+  }
+
+  // Pull "(avg <value>)" out of a /skill row.
+  function avgFor(report: string, skill: string): string {
+    const re = new RegExp(`/${skill}\\b[^\\n]*\\(avg ([^)]+)\\)`);
+    const m = report.match(re);
+    if (!m) throw new Error(`no avg row for /${skill} in:\n${report}`);
+    return m[1];
+  }
+
+  test('quoted "duration_s" values are averaged (regression: previously read as 0)', () => {
+    const output = run([
+      '{"skill":"review","duration_s":"120","outcome":"success","ts":"2026-05-25T10:00:00Z"}',
+      '{"skill":"review","duration_s":"180","outcome":"success","ts":"2026-05-25T11:00:00Z"}',
+      '{"skill":"review","duration_s":"60","outcome":"success","ts":"2026-05-25T12:00:00Z"}',
+    ]);
+    // (120+180+60)/3 = 120s = 2m
+    expect(avgFor(output, 'review')).toBe('2m');
+  });
+
+  test('unquoted numeric "duration_s" values are averaged', () => {
+    const output = run([
+      '{"skill":"qa","duration_s":300,"outcome":"success","ts":"2026-05-25T13:00:00Z"}',
+      '{"skill":"qa","duration_s":420,"outcome":"success","ts":"2026-05-25T14:00:00Z"}',
+    ]);
+    // (300+420)/2 = 360s = 6m
+    expect(avgFor(output, 'qa')).toBe('6m');
+  });
+
+  test('mixed quoted and unquoted values average together', () => {
+    const output = run([
+      '{"skill":"ship","duration_s":"30","outcome":"success","ts":"2026-05-25T10:00:00Z"}',
+      '{"skill":"ship","duration_s":50,"outcome":"success","ts":"2026-05-25T11:00:00Z"}',
+    ]);
+    // (30+50)/2 = 40s — under 60 so shown in seconds, exercising both paths.
+    expect(avgFor(output, 'ship')).toBe('40s');
+  });
+
+  test('total time sums quoted and unquoted across all skills', () => {
+    const output = run([
+      '{"skill":"review","duration_s":"120","outcome":"success","ts":"2026-05-25T10:00:00Z"}',
+      '{"skill":"qa","duration_s":300,"outcome":"success","ts":"2026-05-25T13:00:00Z"}',
+    ]);
+    // 120+300 = 420s = 7m
+    expect(output).toContain('Total time: 7m');
+  });
+});