@automagik/genie 4.260407.6 → 4.260408.1

package/.claude-plugin/marketplace.json

@@ -10,7 +10,7 @@
   "plugins": [
     {
       "name": "genie",
-      "version": "4.260407.6",
+      "version": "4.260408.1",
       "source": "./plugins/genie",
       "description": "Human-AI partnership for Claude Code. Share a terminal, orchestrate workers, evolve together. Brainstorm ideas, wish them into plans, make with parallel agents, ship as one team. A coding genie that grows with your project."
     }

package/.genie/agents/metrics-updater/runs.jsonl

@@ -20,3 +20,4 @@
 {"timestamp":"2026-04-05T12:24:47Z","duration_ms":32000,"api_calls":0,"tools_generated":0,"errors":["gh CLI not available","GitHub MCP tools not present in session"],"status":"success","fallback":true,"metrics":{"releases_24h":2,"merged_prs_7d":35,"avg_merge_time_h":0.3,"ship_rate_pct":85}}
 {"timestamp":"2026-04-06T12:29:47.000Z","duration_ms":12500,"api_calls":0,"tools_generated":1,"errors":["gh_cli_unavailable: fallback to last_metrics from state.json"],"metrics":{"releases_24h":2,"merged_prs_7d":35,"avg_merge_time_h":0.3,"ship_rate_pct":85}}
 {"timestamp":"2026-04-07T12:04:30Z","duration_ms":27000,"api_calls":0,"tools_generated":0,"errors":["gh CLI not available","no GitHub token or MCP GitHub tools present in session"],"status":"failed","fallback":false,"metrics":null}
+{"timestamp":"2026-04-08T00:00:00.000Z","duration_ms":18000,"api_calls":0,"tools_generated":0,"errors":["gh CLI not available","GitHub MCP tools not present in session","fallback data older than current README — README update skipped"],"status":"failed","fallback":false,"metrics":null}

package/.genie/agents/metrics-updater/state.json

@@ -1,5 +1,5 @@
 {
-  "last_run": "2026-04-07T12:04:30Z",
+  "last_run": "2026-04-08T00:00:00.000Z",
   "last_run_status": "failed",
   "last_metrics": {
     "releases_24h": 2,

package/.genie/agents/metrics-updater/tools/parse-metrics.py

@@ -69,12 +69,20 @@ def calc_ship_rate(prs_json: list, days: int = 7) -> float:
     return round((shipped_first / total) * 100, 0)
 
 
-def calc_loc_changed(repo_root: str) -> int:
-    """Calculate total lines changed (additions + deletions) in last 24 hours."""
+def calc_loc_changed(repo_root: str, branches: list[str] | None = None, hours: int = 24) -> int:
+    """Calculate total lines changed (additions + deletions) in last N hours.
+
+    When branches is provided, counts changes across all listed branches
+    (e.g. ['main', 'dev']) to capture work that hasn't been promoted yet.
+    """
     try:
+        cmd = ['git', 'log', f'--since={hours} hours ago', '--stat', '--format=']
+        if branches:
+            cmd.extend(branches)
+        else:
+            cmd.append('--all')
         result = subprocess.run(
-            ['git', 'log', '--since=24 hours ago', '--stat', '--format='],
-            capture_output=True, text=True, cwd=repo_root
+            cmd, capture_output=True, text=True, cwd=repo_root
         )
         total = 0
         for line in result.stdout.splitlines():
@@ -91,12 +99,20 @@ def calc_loc_changed(repo_root: str) -> int:
         return 0
 
 
-def calc_commits_24h(repo_root: str) -> int:
-    """Count commits in the last 24 hours."""
+def calc_commits_24h(repo_root: str, branches: list[str] | None = None, hours: int = 24) -> int:
+    """Count commits in the last N hours.
+
+    When branches is provided, counts across all listed branches
+    (e.g. ['main', 'dev']) to capture work not yet promoted to main.
+    """
     try:
+        cmd = ['git', 'log', f'--since={hours} hours ago', '--oneline']
+        if branches:
+            cmd.extend(branches)
+        else:
+            cmd.append('--all')
         result = subprocess.run(
-            ['git', 'log', '--since=24 hours ago', '--oneline'],
-            capture_output=True, text=True, cwd=repo_root
+            cmd, capture_output=True, text=True, cwd=repo_root
         )
         lines = [l for l in result.stdout.strip().splitlines() if l.strip()]
         return len(lines)
@@ -104,32 +120,98 @@ def calc_commits_24h(repo_root: str) -> int:
         return 0
 
 
-def calc_prs_24h(owner: str, repo: str) -> int:
-    """Count PRs created in the last 24 hours using gh API."""
+def calc_files_changed(repo_root: str, hours: int = 24, branches: list[str] | None = None) -> int:
+    """Count files changed in the last N hours."""
+    try:
+        cmd = ['git', 'log', f'--since={hours} hours ago', '--stat', '--format=']
+        if branches:
+            cmd.extend(branches)
+        else:
+            cmd.append('--all')
+        result = subprocess.run(
+            cmd, capture_output=True, text=True, cwd=repo_root
+        )
+        total = 0
+        for line in result.stdout.splitlines():
+            if 'file' in line and 'changed' in line:
+                total += int(line.strip().split()[0])
+        return total
+    except Exception:
+        return 0
+
+
+def calc_npm_releases(package: str, hours: int = 24) -> int:
+    """Count npm releases in the last N hours."""
     try:
-        since = (datetime.now(timezone.utc) - timedelta(hours=24)).strftime('%Y-%m-%dT%H:%M:%SZ')
         result = subprocess.run(
-            ['gh', 'api', f'search/issues?q=repo:{owner}/{repo}+type:pr+created:>={since}',
-             '--jq', '.total_count'],
+            ['npm', 'view', package, 'time', '--json'],
             capture_output=True, text=True
         )
-        return int(result.stdout.strip()) if result.stdout.strip() else 0
+        if not result.stdout.strip():
+            return 0
+        data = json.loads(result.stdout)
+        cutoff = datetime.now(timezone.utc) - timedelta(hours=hours)
+        count = 0
+        for ver, ts in data.items():
+            if ver in ('created', 'modified'):
+                continue
+            dt = datetime.fromisoformat(ts.replace('Z', '+00:00'))
+            if dt >= cutoff:
+                count += 1
+        return count
     except Exception:
         return 0
 
 
-def format_metrics(releases_per_day: int, avg_merge_hours: float,
-                   ship_rate: float, parallel_agents: int,
-                   loc_changed_24h: int = 0, commits_24h: int = 0,
-                   prs_24h: int = 0) -> dict:
+def calc_merged_prs(prs_json: list, hours: int = 24) -> int:
+    """Count merged PRs within the last N hours."""
+    cutoff = datetime.now(timezone.utc) - timedelta(hours=hours)
+    count = 0
+    for pr in prs_json:
+        if not pr.get('merged_at'):
+            continue
+        merged = datetime.fromisoformat(pr['merged_at'].replace('Z', '+00:00'))
+        if merged >= cutoff:
+            count += 1
+    return count
+
+
+def calc_avg_merge_time_window(prs_json: list, hours: int = 24) -> float:
+    """Calculate average merge time in hours for PRs merged in the last N hours."""
+    cutoff = datetime.now(timezone.utc) - timedelta(hours=hours)
+    durations = []
+    for pr in prs_json:
+        if not pr.get('merged_at'):
+            continue
+        merged = datetime.fromisoformat(pr['merged_at'].replace('Z', '+00:00'))
+        if merged < cutoff:
+            continue
+        created = datetime.fromisoformat(pr['created_at'].replace('Z', '+00:00'))
+        durations.append((merged - created).total_seconds() / 3600)
+    if not durations:
+        return 0.0
+    return round(sum(durations) / len(durations), 1)
+
+
+def format_metrics(*, commits_7d: int = 0, loc_7d: int = 0, files_7d: int = 0,
+                   prs_7d: int = 0, releases_7d: int = 0, avg_merge_7d: float = 0,
+                   commits_24h: int = 0, loc_24h: int = 0, files_24h: int = 0,
+                   prs_24h: int = 0, releases_24h: int = 0, avg_merge_24h: float = 0,
+                   parallel_agents: int = 0) -> dict:
     """Format metrics into the standard output structure."""
     return {
-        'releases_per_day': releases_per_day,
-        'avg_bugfix_time_hours': avg_merge_hours,
-        'ship_rate_pct': ship_rate,
-        'loc_changed_24h': loc_changed_24h,
+        'commits_7d': commits_7d,
+        'loc_changed_7d': loc_7d,
+        'files_changed_7d': files_7d,
+        'prs_7d': prs_7d,
+        'releases_7d': releases_7d,
+        'avg_merge_time_7d': avg_merge_7d,
         'commits_24h': commits_24h,
+        'loc_changed_24h': loc_24h,
+        'files_changed_24h': files_24h,
         'prs_24h': prs_24h,
+        'releases_24h': releases_24h,
+        'avg_merge_time_24h': avg_merge_24h,
         'parallel_agents': parallel_agents,
         'updated': datetime.now(timezone.utc).strftime('%Y-%m-%dT%H:%M:%SZ'),
     }
@@ -142,6 +224,8 @@ def main():
     parser.add_argument('--parallel-agents', type=int, default=0,
                         help='Number of parallel agents active')
     parser.add_argument('--repo-root', default='.', help='Path to repo root for git log commands')
+    parser.add_argument('--branches', nargs='+', default=['main', 'dev'],
+                        help='Branches to include in git metrics (default: main dev)')
     parser.add_argument('--owner', default='automagik-dev', help='GitHub owner')
     parser.add_argument('--repo', default='genie', help='GitHub repo name')
     parser.add_argument('--from-state', help='Fallback: read last_metrics from state.json')
@@ -166,21 +250,24 @@ def main():
         with open(args.prs_json) as f:
             prs = json.load(f)
 
-        releases_count = parse_releases_count(releases)
-        avg_merge = calc_avg_merge_time_hours(prs)
-        ship_rate = calc_ship_rate(prs)
-        loc_changed = calc_loc_changed(args.repo_root)
-        commits = calc_commits_24h(args.repo_root)
-        prs_count = calc_prs_24h(args.owner, args.repo)
+        pkg = f'@{args.owner}/{args.repo}'
 
         metrics = format_metrics(
-            releases_per_day=releases_count,
-            avg_merge_hours=avg_merge,
-            ship_rate=ship_rate,
+            # 7-day metrics
+            commits_7d=calc_commits_24h(args.repo_root, args.branches, hours=168),
+            loc_7d=calc_loc_changed(args.repo_root, args.branches, hours=168),
+            files_7d=calc_files_changed(args.repo_root, hours=168, branches=args.branches),
+            prs_7d=calc_merged_prs(prs, hours=168),
+            releases_7d=calc_npm_releases(pkg, hours=168),
+            avg_merge_7d=calc_avg_merge_time_window(prs, hours=168),
+            # 24h metrics
+            commits_24h=calc_commits_24h(args.repo_root, args.branches),
+            loc_24h=calc_loc_changed(args.repo_root, args.branches),
+            files_24h=calc_files_changed(args.repo_root, branches=args.branches),
+            prs_24h=calc_merged_prs(prs),
+            releases_24h=calc_npm_releases(pkg),
+            avg_merge_24h=calc_avg_merge_time_window(prs),
             parallel_agents=args.parallel_agents,
-            loc_changed_24h=loc_changed,
-            commits_24h=commits,
-            prs_24h=prs_count,
         )
 
     output = json.dumps(metrics, indent=2)

package/.genie/agents/metrics-updater/tools/update-readme.py

@@ -23,27 +23,41 @@ END_MARKER = '<!-- METRICS:END \u2014 \U0001f9de automagik/genie -->'
 def build_metrics_table(metrics: dict) -> str:
     """Build the markdown metrics table with signature markers."""
     timestamp = metrics.get('updated', datetime.now(timezone.utc).strftime('%Y-%m-%dT%H:%M:%SZ'))
-    releases = metrics.get('releases_per_day', 0)
-    avg_time = metrics.get('avg_bugfix_time_hours', 0)
-    ship_rate = metrics.get('ship_rate_pct', 0)
-    loc_changed = metrics.get('loc_changed_24h', 0)
-    commits = metrics.get('commits_24h', 0)
-    prs = metrics.get('prs_24h', 0)
-    agents = metrics.get('parallel_agents', 0)
+    date_str = timestamp[:10] if 'T' in timestamp else timestamp
+
+    # 7-day metrics
+    commits_7d = metrics.get('commits_7d', 0)
+    loc_7d = metrics.get('loc_changed_7d', 0)
+    files_7d = metrics.get('files_changed_7d', 0)
+    prs_7d = metrics.get('prs_7d', 0)
+    releases_7d = metrics.get('releases_7d', 0)
+    avg_merge_7d = metrics.get('avg_merge_time_7d', 0)
+
+    # 24h metrics
+    commits_24h = metrics.get('commits_24h', 0)
+    loc_24h = metrics.get('loc_changed_24h', 0)
+    files_24h = metrics.get('files_changed_24h', 0)
+    prs_24h = metrics.get('prs_24h', 0)
+    releases_24h = metrics.get('releases_24h', metrics.get('releases_per_day', 0))
+    avg_merge_24h = metrics.get('avg_merge_time_24h', metrics.get('avg_bugfix_time_hours', 0))
 
     start_marker = f'<!-- METRICS:START \u2014 Updated by Genie Metrics Agent at {timestamp} -->'
 
     lines = [
         start_marker,
-        '| Metric | Value |',
-        '|--------|-------|',
-        f'| Releases/day | {releases} |',
-        f'| Avg bug-fix time | {avg_time}h |',
-        f'| SHIP rate | {ship_rate}% |',
-        f'| Lines changed (24h) | {loc_changed:,} |',
-        f'| Commits (24h) | {commits} |',
-        f'| Pull requests (24h) | {prs} |',
-        f'| Parallel agents | {agents} |',
+        '<p align="center">',
+        '',
+        '| Metric | 7 days | 24h |',
+        '|--------|--------|-----|',
+        f'| Commits | {commits_7d:,} | {commits_24h} |',
+        f'| Lines changed | {loc_7d:,} | {loc_24h:,} |',
+        f'| Files touched | {files_7d:,} | {files_24h} |',
+        f'| Merged PRs | {prs_7d} | {prs_24h} |',
+        f'| npm releases | {releases_7d} | {releases_24h} |',
+        f'| Avg merge time | {avg_merge_7d}h | {avg_merge_24h}h |',
+        '',
+        f'*Last updated: {date_str}*',
+        '</p>',
         END_MARKER,
     ]
     return '\n'.join(lines)

package/README.md

@@ -27,14 +27,16 @@
 <!-- METRICS:START -->
 <p align="center">
 
-| Metric | Value |
-|--------|-------|
-| Releases (24h) | 2 |
-| Merged PRs (7d) | 35 |
-| Avg merge time | 0.3h |
-| SHIP rate | 85% |
-
-*Last updated: 2026-04-06*
+| Metric | 7 days | 24h |
+|--------|--------|-----|
+| Commits | 445 | 38 |
+| Lines changed | 57,462 | 3,917 |
+| Files touched | 1,062 | 80 |
+| Merged PRs | 87 | 10 |
+| npm releases | 68 | 7 |
+| Avg merge time | 3.3h | 5.4h |
+
+*Last updated: 2026-04-07*
 </p>
 <!-- METRICS:END -->
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automagik/genie",
-  "version": "4.260407.6",
+  "version": "4.260408.1",
   "description": "Collaborative terminal toolkit for human + AI workflows",
   "type": "module",
   "bin": {

package/plugins/genie/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "genie",
-  "version": "4.260407.6",
+  "version": "4.260408.1",
   "description": "Human-AI partnership for Claude Code. Share a terminal, orchestrate workers, evolve together. Brainstorm ideas, turn them into wishes, execute with /work, validate with /review, and ship as one team.",
   "author": {
     "name": "Namastex Labs"

package/plugins/genie/package.json

@@ -1,6 +1,6 @@
 {
   "name": "genie-plugin",
-  "version": "4.260407.6",
+  "version": "4.260408.1",
   "private": true,
   "description": "Runtime dependencies for genie bundled CLIs",
   "type": "module",