@newrelic/preflight 1.63.1 → 1.63.3

package/dist/metrics/git-event-classifier.d.ts

@@ -4,6 +4,10 @@ export interface GitEvent {
     readonly timestamp: number;
     readonly type: GitEventType;
     readonly command?: string;
+    /** For one segment of a chained command that failed, true only when the
+     *  shell's `&&` grouping shows the segment succeeded, and otherwise the
+     *  command's own `false`. Always false for a segment `&` ran in the
+     *  background (see `classifyGitSegments`). */
     readonly success: boolean;
     readonly durationMs: number | null;
     /** `owner/name` of the repo this event belongs to, when known. */
@@ -27,6 +31,18 @@ export interface GitEvent {
     readonly files?: readonly string[];
 }
 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';
+/** Whether a commit segment is `git commit --amend`. */
+export declare function isAmendCommit(command: string): boolean;
+/** A commit that added history: it succeeded and was not an amend, which
+ *  rewrites a commit instead of adding one. Hydrated commits always qualify.
+ *  The weekly/30-day report and the per-session `GitEfficiencyTracker` both
+ *  count commits with this, so the two views agree. */
+export declare function isCountedCommit(event: GitEvent): boolean;
+/** A plain or force push that succeeded. A failed push keeps its push type
+ *  when its error shows no rejection, as when it fails on auth or exits a
+ *  `;` list after another step's conflict. Both reducers count pushes with
+ *  this, as they do commits with `isCountedCommit`. */
+export declare function isCountedPush(event: GitEvent): boolean;
 /**
  * Classify a git command into its event type. The logic is the exact same as
  * the private classifyGitCommand method from GitEfficiencyTracker, extracted
@@ -105,10 +121,28 @@ export interface ClassifiedGitSegment {
  * chained `git commit -m x && git push` yields a commit AND a push instead
  * of whichever verb `classifyGitCommand` ranks first.
  *
- * Conflict and rejection text in `record.error` belongs to the segment that
- * ran last, since `&&` stops at the first failure, so only the last git
- * segment sees it. The target directory comes from the whole command, so a
- * `cd dir &&` in an earlier segment still attributes every git segment.
+ * The hook reports one success/error pair for the whole command, so for a
+ * failed command each segment's outcome is read off bash's grouping. The
+ * failure goes to the segment the error text names (see `errorSegmentIndex`),
+ * and the segments `&&` then kept from running are dropped. Rejection text
+ * also names the last push that ran and may have failed when other text
+ * names another segment, as the pull's conflict does in `git pull; git
+ * push`. When the text names none, the failure is taken to be the last
+ * command's, but any step of the final `&&` run may be the one that failed,
+ * so the steps after its first are dropped as possibly never run. A segment
+ * is marked succeeded only when the step the failure goes to running proves
+ * it did (see `chainRunBefore`), so a commit before a rejected push or a
+ * failing `gh pr create` still counts. That proof needs the quotes to
+ * balance: bash refuses a command whose quote never closes, so the `&&` may
+ * be quoted text and nothing may have run. Dropping needs no such check,
+ * since a dropped step counts nowhere, while a kept one that never ran would
+ * still count in the totals that ignore `success`, such as `pullCount` and
+ * `forcePushes`. Every other segment keeps the command's `success`, which
+ * for a failed command counts no commit or push (see `isCountedCommit` and
+ * `isCountedPush`), except that a segment `&` runs in the background is
+ * never marked succeeded. The target directory comes from the whole
+ * command, so a `cd dir &&` in an earlier segment still attributes every
+ * git segment.
  */
 export declare function classifyGitSegments(command: string, record: ToolCallRecord, resolveRepo: (dir: string | null) => string | null): ClassifiedGitSegment[];
 //# sourceMappingURL=git-event-classifier.d.ts.map

package/dist/metrics/git-event-classifier.d.ts.map

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

package/dist/metrics/git-event-classifier.js

@@ -40,6 +40,21 @@ const REJECT_INDICATORS = [
     /failed to push/i,
     /Updates were rejected/i,
 ];
+// What only a failed `git commit` prints: its own refusals, or a hook failure
+// (husky prints "husky - pre-commit script failed (code 1)").
+const OWN_COMMIT_FAILURE_INDICATORS = [
+    /nothing to commit/i,
+    /Committing is not possible/i,
+    /Aborting commit/i,
+    /\b(?:pre-commit|commit-msg)\b.*\b(?:failed|exited)\b/i,
+];
+// What a failed `git commit` prints. The last two also end the status block
+// a conflicting `git stash pop` or `git merge` prints.
+const COMMIT_FAILURE_INDICATORS = [
+    ...OWN_COMMIT_FAILURE_INDICATORS,
+    /nothing added to commit/i,
+    /no changes added to commit/i,
+];
 // Conflict file path extraction: "CONFLICT (content): Merge conflict in <path>"
 const CONFLICT_FILE_RE = /Merge conflict in (.+)/g;
 /**
@@ -58,6 +73,28 @@ function extractConflictFiles(errorOutput) {
     }
     return files;
 }
+const AMEND_RE = /\s--amend\b/;
+// A commit message is quoted, so `-m "fix --amend handling"` is no amend.
+const QUOTED_TEXT_RE = /"(?:[^"\\]|\\.)*"|'[^']*'/g;
+/** Whether a commit segment is `git commit --amend`. */
+export function isAmendCommit(command) {
+    return AMEND_RE.test(command.replace(QUOTED_TEXT_RE, ''));
+}
+/** A commit that added history: it succeeded and was not an amend, which
+ *  rewrites a commit instead of adding one. Hydrated commits always qualify.
+ *  The weekly/30-day report and the per-session `GitEfficiencyTracker` both
+ *  count commits with this, so the two views agree. */
+export function isCountedCommit(event) {
+    return event.type === 'commit' && event.success && !isAmendCommit(event.command ?? '');
+}
+/** A plain or force push that succeeded. A failed push keeps its push type
+ *  when its error shows no rejection, as when it fails on auth or exits a
+ *  `;` list after another step's conflict. Both reducers count pushes with
+ *  this, as they do commits with `isCountedCommit`. */
+export function isCountedPush(event) {
+    return (event.success &&
+        (event.type === 'push' || event.type === 'force_push' || event.type === 'force_push_lease'));
+}
 // ---------------------------------------------------------------------------
 // Classifier
 // ---------------------------------------------------------------------------
@@ -366,22 +403,296 @@ export function cdSegmentTarget(segment) {
 export function segmentAssignsGhRepo(segment) {
     return GH_REPO_ASSIGNMENT_RE.test(segment);
 }
+// Git verbs whose own output can report a merge/rebase conflict. A plain
+// `git stash` or `git checkout <branch>` cannot, nor can `git merge-base` or
+// `git mergetool`, which `(?![\w-])` keeps from matching as `git merge`. Nor
+// can a `--abort` or `--quit` right after the verb, where `MERGE_ABORT_RE`
+// reads one, since it applies nothing, or `git merge --continue`, which only
+// commits the resolved merge. A rebase, cherry-pick, revert or am's
+// `--continue` or `--skip` applies the next commit or patch, which can
+// conflict.
+const GIT_CONFLICT_CAPABLE_RE = /\bgit\s+(?:merge(?!\s+--continue\b)|rebase|pull|cherry-pick|revert|am|apply|stash\s+(?:pop|apply|branch)|(?:checkout|switch)\b.*\s(?:-m|--merge))(?![\w-])(?!\s+--(?:abort|quit)\b)/;
+// How bash reads a `ShellChain`. `;`, newline and `&` end an and-or list.
+// Within one, `&&` and `||` join pipelines left to right with equal
+// precedence, so `a || b && c` is `(a || b) && c`. `|` joins the commands of
+// one pipeline, whose exit status is its last command's.
+/** Whether `op` joins two commands of one pipeline. `splitShellChain`
+ *  reports `|&` as `|`. */
+function isPipe(op) {
+    return op === '|';
+}
+/** Whether segment `i` sits in an and-or list that `&` runs in the
+ *  background, whose exit status never reaches the command's. */
+function inBackground(operators, i) {
+    let end = i;
+    while (operators[end] === '&&' || operators[end] === '||' || isPipe(operators[end]))
+        end++;
+    return operators[end] === '&';
+}
+/** First segment of the `&&` run holding segment `i`: the pipelines `&&`
+ *  joins to it, back to a `||` or the start of its and-or list. */
+function andRunStart(operators, i) {
+    let start = i;
+    while (start > 0 && (operators[start - 1] === '&&' || isPipe(operators[start - 1])))
+        start--;
+    return start;
+}
+/** Last segment of the pipeline that starts at segment `start`. */
+function pipelineEnd(operators, start) {
+    let end = start;
+    while (isPipe(operators[end]))
+        end++;
+    return end;
+}
+/**
+ * The commands `&&` runs segment `target` after, as a chain of their own,
+ * or null when `target` follows another operator. `target` ran only if that
+ * chain succeeded, so "did `target` running prove segment `i` succeeded" is
+ * `segmentSuccessFollowsCommand` asked of it, with that function's handling
+ * of `||` fallbacks, groups, pipelines and unbalanced quotes. A `target`
+ * piped from another command is taken to prove nothing before it, the
+ * reading that counts less in the case it decides: a failure that names no
+ * step with a pipeline last, as in `git commit -m x && git log | head -1`,
+ * where the commit may be the step that failed.
+ */
+function chainRunBefore(chain, target) {
+    if (target < 1 || chain.operators[target - 1] !== '&&')
+        return null;
+    return {
+        segments: chain.segments.slice(0, target),
+        operators: chain.operators.slice(0, target - 1),
+        quotesBalanced: chain.quotesBalanced,
+    };
+}
+/** Last segment that `&&` kept from running after segment `failed` failed;
+ *  `failed` itself when the next segment runs anyway, as it does when
+ *  `failed` is piped into another command. */
+function lastSkippedSegment(operators, failed) {
+    if (isPipe(operators[failed]))
+        return failed;
+    let last = failed;
+    while (operators[last] === '&&' || isPipe(operators[last]))
+        last++;
+    return last;
+}
+/** Last segment that runs a command: the one the command's exit status
+ *  comes from, if it ran. */
+function lastCommandSegment(segments) {
+    let last = segments.length - 1;
+    while (last > 0 && segmentRunsNoCommand(segments[last]))
+        last--;
+    return last;
+}
+/** Index of the last git segment matching `re`, or -1. */
+function lastGitSegment(segments, isGit, re) {
+    for (let i = segments.length - 1; i >= 0; i--) {
+        if (isGit[i] && re.test(segments[i]))
+            return i;
+    }
+    return -1;
+}
+/** Index of the last `git push` that `skip` doesn't rule out when `error`
+ *  holds rejection text, or -1. */
+function rejectedPushIndex(segments, isGit, error, skip = () => false) {
+    if (!REJECT_INDICATORS.some((re) => re.test(error)))
+        return -1;
+    for (let i = segments.length - 1; i >= 0; i--) {
+        if (isGit[i] && !skip(i) && GIT_PUSH_RE.test(segments[i]))
+            return i;
+    }
+    return -1;
+}
+/** The lines of `error` that any of `indicators` match. */
+function linesMatching(error, indicators) {
+    return error
+        .split('\n')
+        .filter((line) => indicators.some((re) => re.test(line)))
+        .join('\n');
+}
+/** The lines of `error` that report a rejected push, so a push classified on
+ *  them is not typed by the conflict text beside them. */
+function rejectionText(error) {
+    return linesMatching(error, REJECT_INDICATORS);
+}
+// What a conflict-capable step prints when it conflicts, unlike the unmerged
+// paths a `git status` lists.
+const STEP_CONFLICT_INDICATORS = [
+    /CONFLICT\s*\(/i,
+    /Automatic merge failed/i,
+    REBASE_CONFLICT_RE,
+];
+const CONFLICT_TEXT_INDICATORS = [
+    ...MERGE_CONFLICT_INDICATORS,
+    REBASE_CONFLICT_RE,
+];
+/** A commit's refusal to run over unmerged files, which neither a stash
+ *  pop's status block nor a usual commit subject prints. */
+const UNMERGED_COMMIT_RE = /Committing is not possible/i;
+// Lines that carry a commit's subject rather than a failure: the summary a
+// commit that landed prints, and a rebase or revert conflict's echoes of the
+// one it stopped at (`error: could not apply …`, then `Could not apply …`).
+const COMMIT_SUBJECT_LINE_RE = /^\[[^\]\n]+ [0-9a-f]{7,}\]|^(?:error: )?could not (?:apply|revert) /i;
+/** `error` without the lines that echo a commit subject, so a subject such as
+ *  "Fix pre-commit hook failed on CI" doesn't read as a commit failure. */
+function commitOutputLines(error) {
+    return error
+        .split('\n')
+        .filter((line) => !COMMIT_SUBJECT_LINE_RE.test(line))
+        .join('\n');
+}
+/**
+ * The git segment whose output `error` is. The hook payload carries one error
+ * for the whole command, not one per segment, but conflict, rejection and
+ * commit-failure text names the kind of git command that printed it.
+ * Conflict and commit-failure text go to the earliest segment that can print
+ * them in the last `&&` run holding one: the failure stops the run, and any
+ * of those segments may be the one it stopped at, so the earliest counts no
+ * step as run that may not have. `git pull && git commit && git checkout
+ * other` hands a conflict to the pull, and `git commit -m a && git commit -m
+ * b` hands a failed hook to the first commit. When a conflict-capable step
+ * before the conflict's run can have printed the conflict text, a commit in
+ * that run, before the step that can conflict, that printed a failure of its
+ * own is what stopped the run, as in `git stash pop; git commit -m x && git
+ * pull` or `git merge x; git add -A && git commit -m m && git rebase main`,
+ * so it takes the failure. Otherwise rejection text goes to the last `git
+ * push`, or commit-failure text to its commit, whichever comes later.
+ */
+function errorSegmentIndex({ segments, operators }, isGit, error) {
+    const earliestInLastRun = (re) => {
+        const last = lastGitSegment(segments, isGit, re);
+        if (last === -1)
+            return -1;
+        for (let i = andRunStart(operators, last); i < last; i++) {
+            if (isGit[i] && re.test(segments[i]))
+                return i;
+        }
+        return last;
+    };
+    const conflictText = CONFLICT_TEXT_INDICATORS.some((re) => re.test(error));
+    if (conflictText) {
+        const conflict = earliestInLastRun(GIT_CONFLICT_CAPABLE_RE);
+        if (conflict !== -1) {
+            const run = andRunStart(operators, conflict);
+            const conflictBeforeRun = lastGitSegment(segments.slice(0, run), isGit, GIT_CONFLICT_CAPABLE_RE) !== -1;
+            // The refusal is the commit's whatever printed the conflict text, unless
+            // the conflict-capable step printed it and a commit that can still run
+            // after it fails may be the one that refused. Unmerged paths with no
+            // text a conflicting step prints may predate the command, so they don't
+            // show the step ran. The cost: `git checkout -m` and `git apply --3way`
+            // print no such text, so a commit landed before them can take a later
+            // commit's refusal and go uncounted. Every proxy tried for "the step
+            // ran" (a status after it, a landed commit's summary line) also fit a
+            // command where it never ran. Other commit-only text counts when an
+            // earlier step can own the conflict.
+            const output = commitOutputLines(error);
+            const laterCommit = STEP_CONFLICT_INDICATORS.some((re) => re.test(error)) &&
+                lastGitSegment(segments, isGit, GIT_COMMIT_RE) > lastSkippedSegment(operators, conflict);
+            const commitStopped = (UNMERGED_COMMIT_RE.test(output) && !laterCommit) ||
+                (conflictBeforeRun && OWN_COMMIT_FAILURE_INDICATORS.some((re) => re.test(output)));
+            if (commitStopped) {
+                for (let i = run; i < conflict; i++) {
+                    if (isGit[i] && GIT_COMMIT_RE.test(segments[i])) {
+                        return { owner: i, commitOverConflict: true };
+                    }
+                }
+            }
+            return { owner: conflict, commitOverConflict: false };
+        }
+    }
+    const push = rejectedPushIndex(segments, isGit, error);
+    const output = commitOutputLines(error);
+    const commit = COMMIT_FAILURE_INDICATORS.some((re) => re.test(output))
+        ? earliestInLastRun(GIT_COMMIT_RE)
+        : -1;
+    const owner = Math.max(push, commit);
+    // No step here can conflict, so a commit refusing over unmerged files saw
+    // conflict text another command left, as `git status` prints it.
+    const refusedOverUnmerged = owner !== -1 && owner === commit && conflictText && UNMERGED_COMMIT_RE.test(output);
+    return { owner, commitOverConflict: refusedOverUnmerged };
+}
 /**
  * Classifies every git segment of a heredoc-stripped shell command, so a
  * chained `git commit -m x && git push` yields a commit AND a push instead
  * of whichever verb `classifyGitCommand` ranks first.
  *
- * Conflict and rejection text in `record.error` belongs to the segment that
- * ran last, since `&&` stops at the first failure, so only the last git
- * segment sees it. The target directory comes from the whole command, so a
- * `cd dir &&` in an earlier segment still attributes every git segment.
+ * The hook reports one success/error pair for the whole command, so for a
+ * failed command each segment's outcome is read off bash's grouping. The
+ * failure goes to the segment the error text names (see `errorSegmentIndex`),
+ * and the segments `&&` then kept from running are dropped. Rejection text
+ * also names the last push that ran and may have failed when other text
+ * names another segment, as the pull's conflict does in `git pull; git
+ * push`. When the text names none, the failure is taken to be the last
+ * command's, but any step of the final `&&` run may be the one that failed,
+ * so the steps after its first are dropped as possibly never run. A segment
+ * is marked succeeded only when the step the failure goes to running proves
+ * it did (see `chainRunBefore`), so a commit before a rejected push or a
+ * failing `gh pr create` still counts. That proof needs the quotes to
+ * balance: bash refuses a command whose quote never closes, so the `&&` may
+ * be quoted text and nothing may have run. Dropping needs no such check,
+ * since a dropped step counts nowhere, while a kept one that never ran would
+ * still count in the totals that ignore `success`, such as `pullCount` and
+ * `forcePushes`. Every other segment keeps the command's `success`, which
+ * for a failed command counts no commit or push (see `isCountedCommit` and
+ * `isCountedPush`), except that a segment `&` runs in the background is
+ * never marked succeeded. The target directory comes from the whole
+ * command, so a `cd dir &&` in an earlier segment still attributes every
+ * git segment.
  */
 export function classifyGitSegments(command, record, resolveRepo) {
-    const segments = splitShellSegments(command).filter((s) => GIT_SEGMENT_RE.test(s));
+    const chain = splitShellChain(command);
+    const { segments, operators } = chain;
+    const isGit = segments.map((s) => GIT_SEGMENT_RE.test(s));
+    const error = record.error ?? '';
+    const errorOwner = errorSegmentIndex(chain, isGit, error);
+    let owner = errorOwner.owner;
+    // Segments (dropFrom, dropThrough] did not, or may not, have run.
+    let failedAt = -1;
+    let dropFrom = -1;
+    let dropThrough = -1;
+    if (!record.success && owner !== -1) {
+        failedAt = owner;
+        dropFrom = owner;
+        dropThrough = lastSkippedSegment(operators, owner);
+    }
+    else if (!record.success) {
+        failedAt = lastCommandSegment(segments);
+        dropFrom = pipelineEnd(operators, andRunStart(operators, failedAt));
+        dropThrough = failedAt;
+        if (dropFrom === failedAt && isGit[failedAt])
+            owner = failedAt;
+    }
+    const dropped = (i) => i > dropFrom && i <= dropThrough;
+    const before = chainRunBefore(chain, failedAt);
+    const provenSucceeded = (i) => before !== null && i < failedAt && segmentSuccessFollowsCommand(before, i);
+    // Rejection text names the last push that ran and may have failed: not one
+    // `&&` kept from running, nor one `&&` proves succeeded.
+    const rejected = rejectedPushIndex(segments, isGit, error, (i) => dropped(i) || provenSucceeded(i));
+    // A commit that took the failure over conflict text (see errorSegmentIndex)
+    // gets only its own lines, and the conflict goes to the conflict-capable
+    // step before it that printed it, such as the `git stash pop` in
+    // `git stash pop; git commit -m x && git pull`.
+    const { commitOverConflict } = errorOwner;
+    const conflictAt = commitOverConflict
+        ? lastGitSegment(segments.slice(0, owner), isGit, GIT_CONFLICT_CAPABLE_RE)
+        : -1;
     const targetDir = gitCommandTargetDir(command, record.cwd);
-    return segments.map((segment, i) => {
-        const forSegment = i === segments.length - 1 ? record : { ...record, error: undefined };
-        return { segment, event: classifyGitCommand(segment, forSegment, resolveRepo, targetDir) };
+    return segments.flatMap((segment, i) => {
+        if (!isGit[i] || dropped(i))
+            return [];
+        const forSegment = i === owner
+            ? commitOverConflict
+                ? { ...record, error: linesMatching(error, COMMIT_FAILURE_INDICATORS) }
+                : record
+            : i === conflictAt
+                ? { ...record, success: false, error: linesMatching(error, CONFLICT_TEXT_INDICATORS) }
+                : i === rejected
+                    ? { ...record, success: false, error: rejectionText(error) }
+                    : {
+                        ...record,
+                        success: (record.success || provenSucceeded(i)) && !inBackground(operators, i),
+                        error: undefined,
+                    };
+        return [{ segment, event: classifyGitCommand(segment, forSegment, resolveRepo, targetDir) }];
     });
 }
 //# sourceMappingURL=git-event-classifier.js.map

package/dist/metrics/git-event-classifier.js.map

@@ -1 +1 @@
-{"version":3,"file":"git-event-classifier.js","sourceRoot":"","sources":["../../src/metrics/git-event-classifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAGpE,8EAA8E;AAC9E,sCAAsC;AACtC,8EAA8E;AAE9E,MAAM,yBAAyB,GAAG;IAChC,gBAAgB;IAChB,yBAAyB;IACzB,gCAAgC;IAChC,oBAAoB;IACpB,iBAAiB;CAClB,CAAC;AAEF,MAAM,kBAAkB,GAAG,gEAAgE,CAAC;AAE5F,MAAM,cAAc,GAAG,2BAA2B,CAAC;AACnD,MAAM,eAAe,GAAG,4BAA4B,CAAC;AACrD,MAAM,oBAAoB,GAAG,iCAAiC,CAAC;AAE/D,MAAM,WAAW,GAAG,gBAAgB,CAAC;AACrC,MAAM,YAAY,GAAG,iBAAiB,CAAC;AACvC,MAAM,WAAW,GAAG,gBAAgB,CAAC;AACrC,8EAA8E;AAC9E,sEAAsE;AACtE,+DAA+D;AAC/D,MAAM,iBAAiB,GAAG,mDAAmD,CAAC;AAC9E,MAAM,uBAAuB,GAAG,sBAAsB,CAAC;AACvD,MAAM,YAAY,GAAG,iBAAiB,CAAC;AACvC,MAAM,aAAa,GAAG,kBAAkB,CAAC;AACzC,MAAM,YAAY,GAAG,iBAAiB,CAAC;AACvC,MAAM,iBAAiB,GAAG,0BAA0B,CAAC;AACrD,MAAM,oBAAoB,GAAG,yBAAyB,CAAC;AACvD,MAAM,cAAc,GAAG,mBAAmB,CAAC;AAC3C,MAAM,aAAa,GAAG,gDAAgD,CAAC;AACvE,MAAM,aAAa,GAAG,kBAAkB,CAAC;AACzC,MAAM,WAAW,GAAG,gBAAgB,CAAC;AACrC,MAAM,UAAU,GAAG,eAAe,CAAC;AACnC,MAAM,aAAa,GAAG,kBAAkB,CAAC;AACzC,MAAM,eAAe,GAAG,oBAAoB,CAAC;AAE7C,MAAM,iBAAiB,GAAG;IACxB,eAAe;IACf,mBAAmB;IACnB,iBAAiB;IACjB,wBAAwB;CACzB,CAAC;AAEF,gFAAgF;AAChF,MAAM,gBAAgB,GAAG,yBAAyB,CAAC;AAEnD;;;;;;GAMG;AACH,SAAS,oBAAoB,CAAC,WAAmB;IAC/C,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,KAA6B,CAAC;IAClC,gBAAgB,CAAC,SAAS,GAAG,CAAC,CAAC;IAC/B,OAAO,CAAC,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QAC7D,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAC9B,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AA0DD,8EAA8E;AAC9E,aAAa;AACb,8EAA8E;AAE9E;;;;;;;;;;GAUG;AACH,MAAM,UAAU,kBAAkB,CAChC,OAAe,EACf,MAAsB,EACtB,WAAkD,EAClD,YAA2B,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,GAAyB,CAAC;IAEzF,MAAM,IAAI,GAAG;QACX,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,mEAAmE;QACnE,kEAAkE;QAClE,OAAO,EAAE,eAAe,CAAC,OAAO,CAAC;QACjC,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,sEAAsE;QACtE,kEAAkE;QAClE,IAAI,EAAE,WAAW,CAAC,SAAS,CAAC;KAC7B,CAAC;IAEF,MAAM,MAAM,GAAI,MAAM,CAAC,KAAgB,IAAI,EAAE,CAAC;IAC9C,MAAM,WAAW,GAAG,yBAAyB,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5E,MAAM,iBAAiB,GAAG,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1D,MAAM,YAAY,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAErE,IAAI,WAAW,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACtC,OAAO,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,oBAAoB,CAAC,MAAM,CAAC,EAAE,CAAC;IAClF,CAAC;IACD,IAAI,iBAAiB;QACnB,OAAO,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,oBAAoB,CAAC,MAAM,CAAC,EAAE,CAAC;IACnF,IAAI,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;IAC1E,IAAI,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;IAC5E,IAAI,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,mBAAmB,EAAE,CAAC;IACtF,IAAI,uBAAuB,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC;IACxF,IAAI,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;IAC5E,IAAI,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;IAC5E,IAAI,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC;QACpE,OAAO,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC;IAC9C,IAAI,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;IACxE,IAAI,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAChE,IAAI,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAClE,IAAI,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,YAAY;QAAE,OAAO,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC;IACzF,IAAI,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAChE,IAAI,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IACpE,IAAI,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAClE,IAAI,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAClE,IAAI,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IACpE,IAAI,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IACpE,IAAI,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IACpE,IAAI,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAChE,IAAI,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IAE9D,OAAO,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;AACxC,CAAC;AAED,8EAA8E;AAC9E,gDAAgD;AAChD,8EAA8E;AAE9E,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAA,wDAAwD,CAAC;AAEtF,oEAAoE;AACpE,sEAAsE;AACtE,gDAAgD;AAChD,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAA,OAAO,UAAU,kBAAkB,CAAC,CAAC;AAEjF,uEAAuE;AACvE,0EAA0E;AAC1E,0BAA0B;AAC1B,uEAAuE;AACvE,2DAA2D;AAC3D,MAAM,gBAAgB,GAAG,IAAI,MAAM,CACjC,MAAM,CAAC,GAAG,CAAA,OAAO,UAAU,2CAA2C,CACvE,CAAC;AAEF,uEAAuE;AACvE,MAAM,iBAAiB,GAAsC;IAC3D,MAAM,EAAE,QAAQ;IAChB,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,QAAQ;IAChB,KAAK,EAAE,OAAO;IACd,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;CACb,CAAC;AAYF,4EAA4E;AAC5E,oEAAoE;AACpE,MAAM,kBAAkB,GAAG,4BAA4B,CAAC;AAExD,uEAAuE;AACvE,0BAA0B;AAC1B,MAAM,aAAa,GAAG,UAAU,CAAC;AAEjC;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,eAAe,CAAC,OAAe;IAC7C,MAAM,KAAK,GAAG,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC5C,OAAO,KAAK,CAAC,cAAc;QACzB,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,EAAE,GAAG,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC;AACnE,CAAC;AAED;0BAC0B;AAC1B,SAAS,cAAc,CAAC,OAAe,EAAE,UAAmB;IAC1D,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,IAAI,KAAK,GAAkB,IAAI,CAAC;IAChC,IAAI,SAAS,GAAG,IAAI,CAAC;IACrB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACxC,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QACtB,IAAI,KAAK,KAAK,GAAG,EAAE,CAAC;YAClB,OAAO,IAAI,EAAE,CAAC;YACd,IAAI,EAAE,KAAK,GAAG;gBAAE,KAAK,GAAG,IAAI,CAAC;YAC7B,SAAS;QACX,CAAC;QACD,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;YAChB,IAAI,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;gBAC5B,OAAO,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;gBACnC,SAAS,GAAG,KAAK,CAAC;YACpB,CAAC;YACD,CAAC,EAAE,CAAC;YACJ,SAAS;QACX,CAAC;QACD,IAAI,KAAK,KAAK,GAAG,EAAE,CAAC;YAClB,OAAO,IAAI,EAAE,CAAC;YACd,IAAI,EAAE,KAAK,GAAG;gBAAE,KAAK,GAAG,IAAI,CAAC;YAC7B,SAAS;QACX,CAAC;QACD,IAAI,UAAU,IAAI,CAAC,EAAE,KAAK,GAAG,IAAI,EAAE,KAAK,GAAG,CAAC,EAAE,CAAC;YAC7C,OAAO,IAAI,EAAE,CAAC;YACd,KAAK,GAAG,EAAE,CAAC;YACX,SAAS,GAAG,KAAK,CAAC;YAClB,SAAS;QACX,CAAC;QACD,IAAI,UAAU,IAAI,EAAE,KAAK,GAAG,IAAI,SAAS,EAAE,CAAC;YAC1C,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YACzC,CAAC,GAAG,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACpD,SAAS;QACX,CAAC;QACD,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACrC,IAAI,QAAgB,CAAC;QACrB,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YACpD,QAAQ,GAAG,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;YACtC,CAAC,EAAE,CAAC;QACN,CAAC;aAAM,IAAI,EAAE,KAAK,GAAG,IAAI,EAAE,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;YACnD,QAAQ,GAAG,EAAE,CAAC;QAChB,CAAC;aAAM,IACL,EAAE,KAAK,GAAG;YACV,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,GAAG;YACtB,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,GAAG;YACtB,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,GAAG,EACtB,CAAC;YACD,QAAQ,GAAG,EAAE,CAAC;QAChB,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,EAAE,CAAC;YACd,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACnC,SAAS;QACX,CAAC;QACD,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACvB,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACzB,OAAO,GAAG,EAAE,CAAC;QACb,SAAS,GAAG,IAAI,CAAC;QACjB,IAAI,QAAQ,KAAK,IAAI,IAAI,QAAQ,KAAK,IAAI,IAAI,QAAQ,KAAK,GAAG,EAAE,CAAC;YAC/D,kBAAkB,CAAC,SAAS,GAAG,CAAC,GAAG,CAAC,CAAC;YACrC,IAAI,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC;gBAAE,CAAC,GAAG,kBAAkB,CAAC,SAAS,GAAG,CAAC,CAAC;QAC7E,CAAC;IACH,CAAC;IACD,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvB,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,cAAc,EAAE,KAAK,KAAK,IAAI,EAAE,CAAC;AACjE,CAAC;AAED,gEAAgE;AAChE,MAAM,UAAU,kBAAkB,CAAC,OAAe;IAChD,OAAO,CAAC,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC;AAChD,CAAC;AAED,gFAAgF;AAChF,MAAM,UAAU,gBAAgB,CAAC,OAAe,EAAE,SAAiB;IACjE,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC7C,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,MAAM,MAAM,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3C,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IACzB,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;AAC3D,CAAC;AAED,0EAA0E;AAC1E,8EAA8E;AAC9E,kDAAkD;AAClD,MAAM,mBAAmB,GAAG,oDAAoD,CAAC;AAEjF,2EAA2E;AAC3E,uDAAuD;AACvD,MAAM,mBAAmB,GAAG,4CAA4C,CAAC;AAEzE;iDACiD;AACjD,MAAM,UAAU,sBAAsB,CAAC,OAAe;IACpD,OAAO,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC3C,CAAC;AAED,6EAA6E;AAC7E,MAAM,UAAU,oBAAoB,CAAC,OAAe;IAClD,OAAO,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC3C,CAAC;AAED,yEAAyE;AACzE,qBAAqB;AACrB,MAAM,aAAa,GAAG,uBAAuB,CAAC;AAC9C,MAAM,cAAc,GAAG,4BAA4B,CAAC;AAEpD;gBACgB;AAChB,SAAS,YAAY,CAAC,OAAe;IACnC,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;IACjD,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC,CAAC;AACjF,CAAC;AAED,sDAAsD;AACtD,MAAM,UAAU,oBAAoB,CAAC,OAAe;IAClD,OAAO,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AACrC,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,4BAA4B,CAAC,KAAiB,EAAE,KAAa;IAC3E,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IACtC,IAAI,CAAC,KAAK,CAAC,cAAc;QAAE,OAAO,KAAK,CAAC;IACxC,IAAI,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC;IAC/B,OACE,OAAO,GAAG,KAAK;QACf,oBAAoB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACvC,CAAC,SAAS,CAAC,OAAO,GAAG,CAAC,CAAC,KAAK,GAAG,IAAI,SAAS,CAAC,OAAO,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC,EACnE,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,KAAK,IAAI,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,+BAA+B;QAC/B,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QACjF,IAAI,oBAAoB,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAAE,OAAO,KAAK,CAAC;IAC1D,CAAC;IACD,+DAA+D;IAC/D,MAAM,MAAM,GAAG,CAAC,KAAK,CAAC,CAAC;IACvB,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,KAAK,IAAI,CAAC,GAAG,KAAK,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QACpC,MAAM,IAAI,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QACpC,IAAI,MAAM,GAAG,CAAC,EAAE,CAAC;YACf,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACf,MAAM,GAAG,CAAC,CAAC;QACb,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;QAC5B,IAAI,aAAa,GAAG,KAAK,CAAC;QAC1B,OAAO,aAAa,GAAG,CAAC,IAAI,SAAS,CAAC,aAAa,GAAG,CAAC,CAAC,KAAK,GAAG;YAAE,aAAa,EAAE,CAAC;QAClF,OAAO,aAAa,KAAK,CAAC,IAAI,SAAS,CAAC,aAAa,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC;IACtE,CAAC,CAAC,CAAC;AACL,CAAC;AAED,wEAAwE;AACxE,0EAA0E;AAC1E,MAAM,aAAa,GACjB,yGAAyG,CAAC;AAC5G,MAAM,qBAAqB,GAAG,kBAAkB,CAAC;AAEjD;gFACgF;AAChF,MAAM,UAAU,eAAe,CAAC,OAAe;IAC7C,MAAM,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC1C,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACjE,CAAC;AAED;0BAC0B;AAC1B,MAAM,UAAU,oBAAoB,CAAC,OAAe;IAClD,OAAO,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC7C,CAAC;AAOD;;;;;;;;;GASG;AACH,MAAM,UAAU,mBAAmB,CACjC,OAAe,EACf,MAAsB,EACtB,WAAkD;IAElD,MAAM,QAAQ,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACnF,MAAM,SAAS,GAAG,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,GAAyB,CAAC,CAAC;IACjF,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE;QACjC,MAAM,UAAU,GAAG,CAAC,KAAK,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;QACxF,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,kBAAkB,CAAC,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,CAAC;IAC7F,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"git-event-classifier.js","sourceRoot":"","sources":["../../src/metrics/git-event-classifier.ts"],"names":[],"mappings":"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"}

package/dist/metrics/git-workspace-report.d.ts

@@ -1,5 +1,4 @@
 import { type GitActivityRecord } from './git-activity-recorder.js';
-import type { GitEvent } from './git-event-classifier.js';
 import type { GitEfficiencyMetrics } from './git-efficiency-tracker.js';
 import { type WorktreeIdentity } from './git-workspace-identity.js';
 /**
@@ -101,9 +100,6 @@ export interface GitWorkspaceReport {
     } | null;
 }
 export declare const COMMIT_RECONCILE_WINDOW_MS = 60000;
-/** A commit that added history: it succeeded and was not an amend, which
- *  rewrites a commit instead of adding one. Hydrated commits always qualify. */
-export declare function isCountedCommit(event: GitEvent): boolean;
 /**
  * Reconciles hook-observed commits against commits hydrated from `git log`
  * for the same underlying repo, so a commit both sources saw is counted

package/dist/metrics/git-workspace-report.d.ts.map

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

package/dist/metrics/git-workspace-report.js

@@ -1,5 +1,6 @@
 import { createLogger } from '../shared/index.js';
 import { GIT_LOG_SESSION_ID } from './git-activity-recorder.js';
+import { isAmendCommit, isCountedCommit, isCountedPush, } from './git-event-classifier.js';
 import { UNATTRIBUTED_WORKSPACE_KEY, isPlaceholderIdentity, } from './git-workspace-identity.js';
 const logger = createLogger('git-workspace-report');
 // ---------------------------------------------------------------------------
@@ -550,12 +551,6 @@ function countStaleBranchPulls(events) {
 // commits have independent clocks. One-to-one nearest matching keeps two
 // distinct rapid commits from collapsing into one despite the wide window.
 export const COMMIT_RECONCILE_WINDOW_MS = 60_000;
-const AMEND_RE = /\s--amend\b/;
-/** A commit that added history: it succeeded and was not an amend, which
- *  rewrites a commit instead of adding one. Hydrated commits always qualify. */
-export function isCountedCommit(event) {
-    return event.type === 'commit' && event.success && !AMEND_RE.test(event.command ?? '');
-}
 function isHookCommit(r) {
     return isCountedCommit(r.gitEvent) && !r.gitEvent.hash;
 }
@@ -793,9 +788,12 @@ nowMs = Date.now()) {
                 break;
             }
             case 'commit': {
+                // A failed commit resolved nothing; see GitEfficiencyTracker.
+                if (!event.success)
+                    break;
                 // git commit --amend fixes a prior commit, not a merge conflict —
                 // drop the oldest pending conflict without recording a resolution.
-                if (command.includes('--amend')) {
+                if (isAmendCommit(command)) {
                     pendingConflicts.shift();
                 }
                 else {
@@ -837,6 +835,9 @@ nowMs = Date.now()) {
                 commitsSinceLastSync = 0;
                 break;
             case 'push':
+                // A failed push changed nothing on the remote; see GitEfficiencyTracker.
+                if (!event.success)
+                    break;
                 lastPushTimestamp = event.timestamp;
                 buildBeforePush = computeBuildBeforePush(lastBuildOrTestTimestamp, commitTimestamps);
                 break;
@@ -862,11 +863,16 @@ nowMs = Date.now()) {
                     event.timestamp - lastPushRejectedTimestamp < 300_000) {
                     forceAfterReject++;
                 }
+                // The checks above judge the command run; see GitEfficiencyTracker.
+                if (!event.success)
+                    break;
                 lastPushTimestamp = event.timestamp;
                 buildBeforePush = computeBuildBeforePush(lastBuildOrTestTimestamp, commitTimestamps);
                 break;
             case 'force_push_lease':
                 hasUsedForceWithLease = true;
+                if (!event.success)
+                    break;
                 lastPushTimestamp = event.timestamp;
                 buildBeforePush = computeBuildBeforePush(lastBuildOrTestTimestamp, commitTimestamps);
                 break;
@@ -888,7 +894,7 @@ nowMs = Date.now()) {
     const resetHards = events.filter((e) => e.type === 'reset_hard').length;
     const discardedChanges = events.filter((e) => e.type === 'discard_changes').length;
     const pullCount = events.filter((e) => e.type === 'pull').length;
-    const pushCount = events.filter((e) => e.type === 'push' || e.type === 'force_push' || e.type === 'force_push_lease').length;
+    const pushCount = events.filter(isCountedPush).length;
     const commitCount = events.filter(isCountedCommit).length;
     const branchOperations = events.filter((e) => e.type === 'branch').length;
     const mergeEventCount = events.filter((e) => e.type === 'merge').length;