@newrelic/preflight 1.49.0 → 1.50.0

package/dist/metrics/git-activity-recorder.js

@@ -0,0 +1,178 @@
+import { classifyGitCommand } from './git-event-classifier.js';
+import { stripHeredocBodies } from './local-session-aggregator.js';
+// GitHub CLI patterns for PR detection
+const GH_PR_CREATE_RE = /\bgh\s+pr\s+create\b/;
+const GH_PR_MERGE_RE = /\bgh\s+pr\s+merge\b/;
+const GH_PR_VIEW_RE = /\bgh\s+pr\s+view\b/;
+const GH_PR_EDIT_RE = /\bgh\s+pr\s+edit\b/;
+const GH_PR_READY_RE = /\bgh\s+pr\s+ready\b/;
+const GH_PR_CHECKS_RE = /\bgh\s+pr\s+checks\b/;
+const GH_COMMAND_RE = /\bgh\s+/;
+const GH_PR_NUMBER_RE = /\bgh\s+pr\s+\w+\s+(\d+)/;
+/** Detected PR action from gh CLI or MCP tools. */
+const MCP_PR_TOOL_ACTION = {
+    create_pull_request: 'create',
+    update_pull_request: 'edit',
+};
+/**
+ * Extract and return a PrEvent from a gh CLI command, or null if the command
+ * doesn't match a recognized PR action.
+ */
+export function processGhCommand(command, timestamp) {
+    const numberMatch = GH_PR_NUMBER_RE.exec(command);
+    const prNumber = numberMatch ? numberMatch[1] : null;
+    if (GH_PR_CREATE_RE.test(command)) {
+        return { timestamp, action: 'create', prNumber };
+    }
+    else if (GH_PR_MERGE_RE.test(command)) {
+        return { timestamp, action: 'merge', prNumber };
+    }
+    else if (GH_PR_CHECKS_RE.test(command)) {
+        return { timestamp, action: 'checks', prNumber };
+    }
+    else if (GH_PR_READY_RE.test(command)) {
+        return { timestamp, action: 'ready', prNumber };
+    }
+    else if (GH_PR_EDIT_RE.test(command)) {
+        return { timestamp, action: 'edit', prNumber };
+    }
+    else if (GH_PR_VIEW_RE.test(command)) {
+        return { timestamp, action: 'view', prNumber };
+    }
+    return null;
+}
+export class GitActivityRecorder {
+    store;
+    identityResolver;
+    constructor(store, identityResolver) {
+        this.store = store;
+        this.identityResolver = identityResolver;
+    }
+    /** Mirrors GitEfficiencyTracker.recordToolCall's existing dispatch logic —
+     *  ingest file edits, build/test commands, MCP/gh-CLI PR actions, and
+     *  classified git commands, turning each into zero or more GitActivityRecord(s)
+     *  and pushing them into the store.
+     */
+    recordToolCall(record) {
+        const cwd = record.cwd;
+        // Track file edits (non-git tool calls that modify files)
+        if (record.toolName === 'Edit' || record.toolName === 'Write') {
+            const filePath = record.filePath;
+            if (filePath) {
+                this.ingestActivity({
+                    sessionId: record.sessionId ?? 'unknown',
+                    kind: 'edit',
+                    filePath,
+                    timestamp: record.timestamp,
+                    recordId: this.makeRecordId(record, 'edit'),
+                    workspaceKey: this.resolveWorkspaceKey(cwd),
+                });
+            }
+        }
+        // Track build/test commands for "verify before push" metric
+        if (record.isTestCommand) {
+            this.ingestActivity({
+                sessionId: record.sessionId ?? 'unknown',
+                kind: 'verify',
+                verify: 'test',
+                timestamp: record.timestamp,
+                recordId: this.makeRecordId(record, 'verify-test'),
+                workspaceKey: this.resolveWorkspaceKey(cwd),
+            });
+        }
+        if (record.isBuildCommand) {
+            this.ingestActivity({
+                sessionId: record.sessionId ?? 'unknown',
+                kind: 'verify',
+                verify: 'build',
+                timestamp: record.timestamp,
+                recordId: this.makeRecordId(record, 'verify-build'),
+                workspaceKey: this.resolveWorkspaceKey(cwd),
+            });
+        }
+        // MCP tool calls (e.g. the GitHub MCP server's create_pull_request /
+        // update_pull_request)
+        const mcpPrAction = MCP_PR_TOOL_ACTION[record.toolName];
+        if (mcpPrAction) {
+            this.ingestActivity({
+                sessionId: record.sessionId ?? 'unknown',
+                kind: 'pr',
+                prEvent: { timestamp: record.timestamp, action: mcpPrAction, prNumber: null },
+                timestamp: record.timestamp,
+                recordId: this.makeRecordId(record, 'pr-mcp'),
+                workspaceKey: this.resolveWorkspaceKey(cwd),
+            });
+        }
+        const rawCommand = record.command;
+        if (!rawCommand)
+            return;
+        // Classify on the command *minus* any inline script bodies: a heredoc
+        // that merely mentions git/gh words is not a git or PR operation.
+        const command = stripHeredocBodies(rawCommand);
+        // Track GitHub CLI PR commands. Split on shell separators first so a
+        // `gh` invocation chained after a `git` command is still detected.
+        const segments = command.split(/&&|;|\|/);
+        for (let i = 0; i < segments.length; i++) {
+            const trimmedSegment = segments[i].trim();
+            if (GH_COMMAND_RE.test(trimmedSegment) && !trimmedSegment.startsWith('git ')) {
+                const prEvent = processGhCommand(trimmedSegment, record.timestamp);
+                if (prEvent) {
+                    this.ingestActivity({
+                        sessionId: record.sessionId ?? 'unknown',
+                        kind: 'pr',
+                        prEvent,
+                        timestamp: record.timestamp,
+                        // Indexed so a compound command chaining two `gh pr` calls (rare,
+                        // but possible) doesn't collide on the same recordId.
+                        recordId: this.makeRecordId(record, `pr-gh-${i}`),
+                        workspaceKey: this.resolveWorkspaceKey(cwd),
+                    });
+                }
+            }
+        }
+        // Test for git command
+        if (!/\bgit\s+/.test(command)) {
+            // Not a git command, return early
+            return;
+        }
+        // Classify and ingest git command
+        const gitEvent = classifyGitCommand(command, record, (dir) => this.identityResolver.resolve(dir)?.repoName ?? null);
+        this.ingestActivity({
+            sessionId: record.sessionId ?? 'unknown',
+            kind: 'git',
+            gitEvent,
+            timestamp: record.timestamp,
+            recordId: this.makeRecordId(record, 'git'),
+            workspaceKey: this.resolveWorkspaceKey(cwd),
+        });
+    }
+    ingestActivity(activity) {
+        this.store.ingest(activity);
+    }
+    resolveWorkspaceKey(cwd) {
+        const identity = this.identityResolver.resolve(cwd);
+        if (identity === null) {
+            return 'unattributed';
+        }
+        // Use repoKey for repo-level identity and worktreeKey for worktree-level
+        // tracking. For now, use worktreeKey so each worktree is tracked separately.
+        return identity.worktreeKey;
+    }
+    // `discriminator` is part of the id, not just a label: one ToolCallRecord
+    // can legitimately produce several distinct activities (e.g. `npm run
+    // build && git commit` is both a 'verify' and a 'git' activity from the
+    // SAME record, and a record can even be both isTestCommand AND
+    // isBuildCommand at once). Without a discriminator in the id, two such
+    // activities would share the same (workspaceKey, recordId) pair and the
+    // store's insert-or-ignore dedup would silently drop the second one as a
+    // "duplicate" of the first — so this takes a string specific enough to
+    // distinguish every activity kind AND sub-kind a single record can
+    // produce, not just `GitActivityRecord['kind']`.
+    makeRecordId(record, discriminator) {
+        const base = record.toolUseId && record.toolUseId.length > 0
+            ? record.toolUseId
+            : `${record.sessionId ?? 'unknown'}:${record.timestamp}:${record.toolName}`;
+        return `${base}:${discriminator}`;
+    }
+}
+//# sourceMappingURL=git-activity-recorder.js.map

package/dist/metrics/git-activity-recorder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-activity-recorder.js","sourceRoot":"","sources":["../../src/metrics/git-activity-recorder.ts"],"names":[],"mappings":"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"}

package/dist/metrics/git-activity-store.d.ts

@@ -0,0 +1,63 @@
+/** Minimum shape any record needs to be stored: a stable dedup id, a
+ *  timestamp, and which "workspace" (an opaque grouping key defined by the
+ *  caller — this store doesn't know or care what it means) it belongs to. */
+export interface KeyedRecord {
+    readonly recordId: string;
+    readonly timestamp: number;
+    readonly workspaceKey: string;
+}
+export interface ActivityQuery {
+    readonly since: number;
+    readonly until: number;
+    /** Omit or pass an empty array to match every known key. */
+    readonly keys?: readonly string[];
+}
+/**
+ * Generic in-memory activity store, keyed by an opaque workspaceKey.
+ *
+ * Concurrency note: two different workspaceKeys' records never interact —
+ * each key's records live in their own bucket, so nothing about inserting
+ * for key A can corrupt or reorder key B's bucket, regardless of call order.
+ * This matters because a caller may be feeding records from several
+ * concurrent sources (e.g. several git worktrees producing activity "at the
+ * same time") — per-key isolation is what makes that safe without a lock.
+ */
+export declare class ActivityStore<T extends KeyedRecord> {
+    private buckets;
+    private dedup;
+    /**
+     * Insert-or-ignore, keyed on `record.recordId` WITHIN that record's own
+     * workspaceKey bucket (the same recordId string appearing under two
+     * different workspaceKeys is not a duplicate — that would be a caller
+     * bug, but this store doesn't need to detect it, just not misbehave: treat
+     * each (workspaceKey, recordId) pair as the true dedup key). Ingesting a
+     * record whose (workspaceKey, recordId) pair has already been seen is a
+     * silent no-op — same call twice, e.g. from replaying the same session
+     * summary at startup twice, or a retried write, must not double-count.
+     */
+    ingest(record: T): void;
+    /**
+     * Every stored record whose timestamp falls in [since, until), across the
+     * given keys (or every known key if `keys` is omitted/empty), returned
+     * SORTED ASCENDING by timestamp regardless of insertion order (insertion
+     * order across different workspaceKeys is never meaningful — each key's
+     * own records happen to already be insertion-ordered since ingest is
+     * append-only per key, but don't rely on that; sort explicitly so this
+     * stays correct even if that internal detail ever changes).
+     */
+    query(opts: ActivityQuery): readonly T[];
+    /** Every workspaceKey with at least one record whose timestamp is >= since. */
+    knownKeys(since: number): readonly string[];
+    /**
+     * Housekeeping only — bounds memory for a long-lived process. Deletes
+     * every record with timestamp < cutoffMs, across every key. This is NOT a
+     * correctness dependency for any caller: nothing about `query()`'s
+     * correctness for an in-range window relies on this having been called at
+     * any particular time, unlike a "reset" that a caller might depend on for
+     * a number to be right. If a key's bucket becomes empty as a result,
+     * remove the empty bucket too (so `knownKeys()` doesn't report a key with
+     * zero records).
+     */
+    evictBefore(cutoffMs: number): void;
+}
+//# sourceMappingURL=git-activity-store.d.ts.map

package/dist/metrics/git-activity-store.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-activity-store.d.ts","sourceRoot":"","sources":["../../src/metrics/git-activity-store.ts"],"names":[],"mappings":"AAAA;;6EAE6E;AAC7E,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,4DAA4D;IAC5D,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACnC;AAED;;;;;;;;;GASG;AACH,qBAAa,aAAa,CAAC,CAAC,SAAS,WAAW;IAC9C,OAAO,CAAC,OAAO,CAA+B;IAC9C,OAAO,CAAC,KAAK,CAAuC;IAEpD;;;;;;;;;OASG;IACH,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI;IAyBvB;;;;;;;;OAQG;IACH,KAAK,CAAC,IAAI,EAAE,aAAa,GAAG,SAAS,CAAC,EAAE;IAuBxC,+EAA+E;IAC/E,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE;IAe3C;;;;;;;;;OASG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;CAyBpC"}

package/dist/metrics/git-activity-store.js

@@ -0,0 +1,115 @@
+/**
+ * Generic in-memory activity store, keyed by an opaque workspaceKey.
+ *
+ * Concurrency note: two different workspaceKeys' records never interact —
+ * each key's records live in their own bucket, so nothing about inserting
+ * for key A can corrupt or reorder key B's bucket, regardless of call order.
+ * This matters because a caller may be feeding records from several
+ * concurrent sources (e.g. several git worktrees producing activity "at the
+ * same time") — per-key isolation is what makes that safe without a lock.
+ */
+export class ActivityStore {
+    buckets = new Map();
+    dedup = new Map();
+    /**
+     * Insert-or-ignore, keyed on `record.recordId` WITHIN that record's own
+     * workspaceKey bucket (the same recordId string appearing under two
+     * different workspaceKeys is not a duplicate — that would be a caller
+     * bug, but this store doesn't need to detect it, just not misbehave: treat
+     * each (workspaceKey, recordId) pair as the true dedup key). Ingesting a
+     * record whose (workspaceKey, recordId) pair has already been seen is a
+     * silent no-op — same call twice, e.g. from replaying the same session
+     * summary at startup twice, or a retried write, must not double-count.
+     */
+    ingest(record) {
+        const key = record.workspaceKey;
+        const recordId = record.recordId;
+        let dedupSet = this.dedup.get(key);
+        if (!dedupSet) {
+            dedupSet = new Set();
+            this.dedup.set(key, dedupSet);
+        }
+        if (dedupSet.has(recordId)) {
+            return;
+        }
+        dedupSet.add(recordId);
+        let bucket = this.buckets.get(key);
+        if (!bucket) {
+            bucket = [];
+            this.buckets.set(key, bucket);
+        }
+        bucket.push(record);
+    }
+    /**
+     * Every stored record whose timestamp falls in [since, until), across the
+     * given keys (or every known key if `keys` is omitted/empty), returned
+     * SORTED ASCENDING by timestamp regardless of insertion order (insertion
+     * order across different workspaceKeys is never meaningful — each key's
+     * own records happen to already be insertion-ordered since ingest is
+     * append-only per key, but don't rely on that; sort explicitly so this
+     * stays correct even if that internal detail ever changes).
+     */
+    query(opts) {
+        const { since, until, keys } = opts;
+        const keysToQuery = !keys || keys.length === 0 ? Array.from(this.buckets.keys()) : keys;
+        const results = [];
+        for (const key of keysToQuery) {
+            const bucket = this.buckets.get(key);
+            if (!bucket) {
+                continue;
+            }
+            for (const record of bucket) {
+                if (record.timestamp >= since && record.timestamp < until) {
+                    results.push(record);
+                }
+            }
+        }
+        results.sort((a, b) => a.timestamp - b.timestamp);
+        return results;
+    }
+    /** Every workspaceKey with at least one record whose timestamp is >= since. */
+    knownKeys(since) {
+        const result = [];
+        for (const [key, bucket] of this.buckets) {
+            for (const record of bucket) {
+                if (record.timestamp >= since) {
+                    result.push(key);
+                    break;
+                }
+            }
+        }
+        return result;
+    }
+    /**
+     * Housekeeping only — bounds memory for a long-lived process. Deletes
+     * every record with timestamp < cutoffMs, across every key. This is NOT a
+     * correctness dependency for any caller: nothing about `query()`'s
+     * correctness for an in-range window relies on this having been called at
+     * any particular time, unlike a "reset" that a caller might depend on for
+     * a number to be right. If a key's bucket becomes empty as a result,
+     * remove the empty bucket too (so `knownKeys()` doesn't report a key with
+     * zero records).
+     */
+    evictBefore(cutoffMs) {
+        const keysToRemove = [];
+        for (const [key, bucket] of this.buckets) {
+            const filteredBucket = bucket.filter((record) => record.timestamp >= cutoffMs);
+            if (filteredBucket.length === 0) {
+                keysToRemove.push(key);
+                continue;
+            }
+            this.buckets.set(key, filteredBucket);
+            // A partial eviction still needs to drop the evicted records' ids from
+            // the dedup set — otherwise they leak forever, and evictBefore stops
+            // bounding memory for exactly the callers that use it as intended
+            // (continuous rolling eviction rather than one final cleanup).
+            const survivingIds = new Set(filteredBucket.map((record) => record.recordId));
+            this.dedup.set(key, survivingIds);
+        }
+        for (const key of keysToRemove) {
+            this.buckets.delete(key);
+            this.dedup.delete(key);
+        }
+    }
+}
+//# sourceMappingURL=git-activity-store.js.map

package/dist/metrics/git-activity-store.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-activity-store.js","sourceRoot":"","sources":["../../src/metrics/git-activity-store.ts"],"names":[],"mappings":"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"}

package/dist/metrics/git-efficiency-tracker.d.ts

@@ -1,5 +1,6 @@
 import type { MetricAggregator } from '../shared/index.js';
 import type { ReplayTimelineEntry, ToolCallRecord } from '../storage/types.js';
+import { type GitEvent } from './git-event-classifier.js';
 /**
  * Parse `git symbolic-ref --short refs/remotes/<remoteName>/HEAD`'s stdout
  * (e.g. "origin/main") into just the branch name. Falls back to 'main' if
@@ -8,20 +9,7 @@ import type { ReplayTimelineEntry, ToolCallRecord } from '../storage/types.js';
  * expected remote prefix).
  */
 export declare function parseDefaultBranchFromSymbolicRef(output: string, remoteName: string): string;
-export interface GitEvent {
-    readonly timestamp: number;
-    readonly type: GitEventType;
-    readonly command?: string;
-    readonly success: boolean;
-    readonly durationMs: number | null;
-    /** `owner/name` of the repo this event belongs to, when known. */
-    readonly repo?: string | null;
-    /** Commit subject line, for events hydrated from `git log`. */
-    readonly subject?: string | null;
-    /** Browsable URL for the commit, when the remote could be mapped. */
-    readonly url?: string | null;
-}
-export type GitEventType = 'merge_conflict' | 'rebase_conflict' | 'merge_abort' | 'rebase_abort' | 'cherry_pick_abort' | 'force_push' | 'force_push_lease' | 'reset_hard' | 'discard_changes' | 'pull' | 'fetch' | 'push' | 'push_rejected' | 'merge' | 'rebase' | 'stash' | 'branch' | 'commit' | 'status' | 'diff' | 'log' | 'worktree' | 'other_git';
+export type { GitEvent, GitEventType } from './git-event-classifier.js';
 export interface MergeConflictRecord {
     readonly timestamp: number;
     readonly resolution: 'resolved' | 'aborted' | 'pending';
@@ -193,7 +181,6 @@ export declare class GitEfficiencyTracker {
     getMetrics(): GitEfficiencyMetrics;
     emitMetrics(aggregator: MetricAggregator): void;
     reset(_sessionId: string): void;
-    private classifyGitCommand;
     private processEvent;
     private countStaleBranchPulls;
     private computeRiskIndicators;

package/dist/metrics/git-efficiency-tracker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"git-efficiency-tracker.d.ts","sourceRoot":"","sources":["../../src/metrics/git-efficiency-tracker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"git-efficiency-tracker.d.ts","sourceRoot":"","sources":["../../src/metrics/git-efficiency-tracker.ts"],"names":[],"mappings":"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"}

package/dist/metrics/git-efficiency-tracker.js

@@ -1,5 +1,6 @@
-import { redactSensitive } from '../config.js';
-import { gitCommandTargetDir, RepoNameResolver, stripHeredocBodies, } from './local-session-aggregator.js';
+import { stripHeredocBodies } from './local-session-aggregator.js';
+import { classifyGitCommand } from './git-event-classifier.js';
+import { RepoNameResolver } from './local-session-aggregator.js';
 /**
  * Parse `git symbolic-ref --short refs/remotes/<remoteName>/HEAD`'s stdout
  * (e.g. "origin/main") into just the branch name. Falls back to 'main' if
@@ -15,49 +16,16 @@ export function parseDefaultBranchFromSymbolicRef(output, remoteName) {
     }
     return 'main';
 }
-// ---------------------------------------------------------------------------
-// Git command classification patterns
-// ---------------------------------------------------------------------------
-const GIT_COMMAND_RE = /\bgit\s+/;
-const MERGE_CONFLICT_INDICATORS = [
-    /CONFLICT\s*\(/i,
-    /Automatic merge failed/i,
-    /fix conflicts and then commit/i,
-    /Merge conflict in/i,
-    /both modified:/i,
-];
-const REBASE_CONFLICT_RE = /\brebase\b.*(?:conflict|could not apply|patch does not apply)/i;
-const MERGE_ABORT_RE = /\bgit\s+merge\s+--abort\b/;
-const REBASE_ABORT_RE = /\bgit\s+rebase\s+--abort\b/;
-const CHERRY_PICK_ABORT_RE = /\bgit\s+cherry-pick\s+--abort\b/;
-const GIT_PULL_RE = /\bgit\s+pull\b/;
-const GIT_FETCH_RE = /\bgit\s+fetch\b/;
-const GIT_PUSH_RE = /\bgit\s+push\b/;
-// `(?!-)` excludes `--force-with-lease` — without it, a lease-protected force
-// push would also match this plain "unsafe force push" pattern, since
-// "--force-with-lease" starts with the literal text "--force".
-const GIT_PUSH_FORCE_RE = /\bgit\s+push\s+.*--force(?!-)|\bgit\s+push\s+-f\b/;
-const GIT_PUSH_FORCE_LEASE_RE = /--force-with-lease\b/;
-const GIT_MERGE_RE = /\bgit\s+merge\b/;
-const GIT_REBASE_RE = /\bgit\s+rebase\b/;
-const GIT_STASH_RE = /\bgit\s+stash\b/;
-const GIT_RESET_HARD_RE = /\bgit\s+reset\s+--hard\b/;
-const GIT_CHECKOUT_DASH_RE = /\bgit\s+checkout\s+--\s/;
-const GIT_RESTORE_RE = /\bgit\s+restore\b/;
-const GIT_BRANCH_RE = /\bgit\s+(?:branch|checkout\s+-b|switch\s+-c)\b/;
-const GIT_STATUS_RE = /\bgit\s+status\b/;
-const GIT_DIFF_RE = /\bgit\s+diff\b/;
-const GIT_LOG_RE = /\bgit\s+log\b/;
-const GIT_COMMIT_RE = /\bgit\s+commit\b/;
-const GIT_WORKTREE_RE = /\bgit\s+worktree\b/;
-// Only `add`/`remove` create or tear down real isolation — `list`/`prune`/
-// `lock`/etc. are read-only inspection and shouldn't inflate the "worktree
-// ops" count with commands that don't reflect any parallel-isolation work.
-const GIT_WORKTREE_ADD_REMOVE_RE = /\bgit\s+worktree\s+(?:add|remove)\b/;
+// Regex patterns needed by processEvent (others moved to git-event-classifier.ts)
 const GIT_CHECKOUT_OURS_RE = /\bgit\s+checkout\s+--ours\b/;
 const GIT_CHECKOUT_THEIRS_RE = /\bgit\s+checkout\s+--theirs\b/;
 const GIT_CHERRY_PICK_RE = /\bgit\s+cherry-pick\b/;
-// GitHub CLI patterns
+const CHERRY_PICK_ABORT_RE = /\bgit\s+cherry-pick\s+--abort\b/;
+const GIT_WORKTREE_ADD_REMOVE_RE = /\bgit\s+worktree\s+(?:add|remove)\b/;
+const GIT_PULL_RE = /\bgit\s+pull\b/;
+// Conflict file path extraction: "CONFLICT (content): Merge conflict in <path>"
+const CONFLICT_FILE_RE = /Merge conflict in (.+)/g;
+// GitHub CLI patterns (used by processGhCommand)
 const GH_PR_CREATE_RE = /\bgh\s+pr\s+create\b/;
 const GH_PR_MERGE_RE = /\bgh\s+pr\s+merge\b/;
 const GH_PR_VIEW_RE = /\bgh\s+pr\s+view\b/;
@@ -101,14 +69,6 @@ const COMMIT_DEDUP_WINDOW_MS = 5_000;
 // (see below), letting isDuplicate() tell a hydrated event apart from a
 // hook-observed one and recover its hash.
 const HYDRATED_COMMIT_HASH_RE = /^git commit \((.+)\)$/;
-const REJECT_INDICATORS = [
-    /\[rejected\]/i,
-    /non-fast-forward/i,
-    /failed to push/i,
-    /Updates were rejected/i,
-];
-// Conflict file path extraction: "CONFLICT (content): Merge conflict in <path>"
-const CONFLICT_FILE_RE = /Merge conflict in (.+)/g;
 // Render order for suggestions/best-practices — most severe first — rather
 // than fixed source-code push order, which could put a critical item below
 // a milder one.
@@ -239,9 +199,9 @@ export class GitEfficiencyTracker {
                 this.processGhCommand(trimmedSegment, record.timestamp);
             }
         }
-        if (!GIT_COMMAND_RE.test(command))
+        if (!/\bgit\s+/.test(command))
             return;
-        const event = this.classifyGitCommand(command, record);
+        const event = classifyGitCommand(command, record, (dir) => this.repoResolver.resolve(dir));
         // A hook-observed commit whose timestamp `hydrateGitLog()` already saw
         // (via `git log`) is the same commit, not a new one — hydrateGitLog()
         // can't dedupe this itself since a live event's `command` is the raw
@@ -571,72 +531,6 @@ export class GitEfficiencyTracker {
     // -------------------------------------------------------------------------
     // Internals
     // -------------------------------------------------------------------------
-    // Order matters: several patterns overlap (e.g. a force-push-with-lease
-    // command also matches the plain push/force-push patterns), so more
-    // specific checks must run before the more general ones they'd otherwise
-    // be shadowed by.
-    classifyGitCommand(command, record) {
-        const base = {
-            timestamp: record.timestamp,
-            // The command is now surfaced in the dashboard's Detail column, so
-            // redact it: a git remote URL can carry an embedded access token.
-            command: redactSensitive(command),
-            success: record.success,
-            durationMs: record.durationMs,
-            // Live git events previously carried no repo at all, so the dashboard
-            // showed "—" for everything except commits hydrated from git log.
-            repo: this.repoResolver.resolve(gitCommandTargetDir(command, record.cwd)),
-        };
-        const output = record.error ?? '';
-        const hasConflict = MERGE_CONFLICT_INDICATORS.some((re) => re.test(output));
-        const hasRebaseConflict = REBASE_CONFLICT_RE.test(output);
-        const hasRejection = REJECT_INDICATORS.some((re) => re.test(output));
-        if (hasConflict && !hasRebaseConflict)
-            return { ...base, type: 'merge_conflict' };
-        if (hasRebaseConflict)
-            return { ...base, type: 'rebase_conflict' };
-        if (MERGE_ABORT_RE.test(command))
-            return { ...base, type: 'merge_abort' };
-        if (REBASE_ABORT_RE.test(command))
-            return { ...base, type: 'rebase_abort' };
-        if (CHERRY_PICK_ABORT_RE.test(command))
-            return { ...base, type: 'cherry_pick_abort' };
-        if (GIT_PUSH_FORCE_LEASE_RE.test(command))
-            return { ...base, type: 'force_push_lease' };
-        if (GIT_PUSH_FORCE_RE.test(command))
-            return { ...base, type: 'force_push' };
-        if (GIT_RESET_HARD_RE.test(command))
-            return { ...base, type: 'reset_hard' };
-        if (GIT_CHECKOUT_DASH_RE.test(command) || GIT_RESTORE_RE.test(command))
-            return { ...base, type: 'discard_changes' };
-        if (GIT_WORKTREE_RE.test(command))
-            return { ...base, type: 'worktree' };
-        if (GIT_PULL_RE.test(command))
-            return { ...base, type: 'pull' };
-        if (GIT_FETCH_RE.test(command))
-            return { ...base, type: 'fetch' };
-        if (GIT_PUSH_RE.test(command) && hasRejection)
-            return { ...base, type: 'push_rejected' };
-        if (GIT_PUSH_RE.test(command))
-            return { ...base, type: 'push' };
-        if (GIT_REBASE_RE.test(command))
-            return { ...base, type: 'rebase' };
-        if (GIT_MERGE_RE.test(command))
-            return { ...base, type: 'merge' };
-        if (GIT_STASH_RE.test(command))
-            return { ...base, type: 'stash' };
-        if (GIT_BRANCH_RE.test(command))
-            return { ...base, type: 'branch' };
-        if (GIT_COMMIT_RE.test(command))
-            return { ...base, type: 'commit' };
-        if (GIT_STATUS_RE.test(command))
-            return { ...base, type: 'status' };
-        if (GIT_DIFF_RE.test(command))
-            return { ...base, type: 'diff' };
-        if (GIT_LOG_RE.test(command))
-            return { ...base, type: 'log' };
-        return { ...base, type: 'other_git' };
-    }
     processEvent(event, command, record) {
         // Attribute ours/theirs/cherry-pick resolution strategy to the oldest
         // still-open conflict, not to every matching command — a multi-file