vouchington-tooling 0.20.0 → 0.22.0

package/dist/gha-workspace-policy/docker-options.mjs

@@ -0,0 +1,93 @@
+import { shellTokens } from './shell-tokens.mjs';
+const DOCKER_GLOBAL_FLAG_OPTIONS = new Set(['--debug', '-D', '--help', '--tls', '--tlsverify']);
+const DOCKER_GLOBAL_VALUE_OPTIONS = new Set([
+    '--config',
+    '--context',
+    '-c',
+    '--host',
+    '-H',
+    '--log-level',
+    '-l',
+    '--tlscacert',
+    '--tlscert',
+    '--tlskey',
+]);
+const FLAG_OPTIONS = new Set([
+    '--detach',
+    '-d',
+    '--init',
+    '--interactive',
+    '-i',
+    '--privileged',
+    '--publish-all',
+    '-P',
+    '--read-only',
+    '--rm',
+    '--tty',
+    '-t',
+]);
+export function dockerOptions(block) {
+    const tokens = shellTokens(block);
+    const dockerIndex = findDockerCommand(tokens);
+    if (dockerIndex < 0)
+        return undefined;
+    let start = dockerIndex + 1;
+    while (start < tokens.length && tokens[start].startsWith('-')) {
+        const option = tokens[start];
+        const name = option.includes('=') ? option.slice(0, option.indexOf('=')) : option;
+        if (DOCKER_GLOBAL_FLAG_OPTIONS.has(name) || option.includes('='))
+            start += 1;
+        else if (DOCKER_GLOBAL_VALUE_OPTIONS.has(name))
+            start += 2;
+        else
+            return undefined;
+    }
+    if (tokens[start] === 'container')
+        start += 1;
+    if (tokens[start] !== 'run')
+        return undefined;
+    start += 1;
+    const volumes = [];
+    let user;
+    for (let index = start; index < tokens.length; index += 1) {
+        const option = tokens[index];
+        if (!option.startsWith('-'))
+            break;
+        const equals = option.indexOf('=');
+        const compact = option.startsWith('-v') || option.startsWith('-u');
+        const name = equals > 0
+            ? option.slice(0, equals)
+            : compact && option.length > 2
+                ? option.slice(0, 2)
+                : option;
+        const inlineValue = equals > 0
+            ? option.slice(equals + 1)
+            : compact && option.length > 2
+                ? option.slice(2)
+                : undefined;
+        const bundledFlags = /^-[diPt]{2,}$/u.test(option);
+        const value = inlineValue ?? (FLAG_OPTIONS.has(name) || bundledFlags ? undefined : tokens[++index]);
+        if ((name === '-v' || name === '--volume' || name === '--mount') && value !== undefined)
+            volumes.push(value);
+        if ((name === '-u' || name === '--user') && value !== undefined)
+            user = value;
+    }
+    return { user, volumes };
+}
+function findDockerCommand(tokens) {
+    let commandStart = true;
+    for (const [index, token] of tokens.entries()) {
+        if (token === ';' || token === '|' || token === '&') {
+            commandStart = true;
+            continue;
+        }
+        if (!commandStart)
+            continue;
+        if (/^[A-Za-z_][A-Za-z0-9_]*=.*/u.test(token))
+            continue;
+        if (token === 'docker')
+            return index;
+        commandStart = false;
+    }
+    return -1;
+}

package/dist/gha-workspace-policy/docker-workspace-user.mjs

@@ -1,32 +1,6 @@
+import { dockerOptions } from './docker-options.mjs';
 import { visitRunSteps } from './shared.mjs';
 const WORKSPACE_RE = /(?:\$\{?GITHUB_WORKSPACE\}?|\$\{\{\s*github\.workspace\s*\}\})/iu;
-const DOCKER_GLOBAL_FLAG_OPTIONS = new Set(['--debug', '-D', '--help', '--tls', '--tlsverify']);
-const DOCKER_GLOBAL_VALUE_OPTIONS = new Set([
-    '--config',
-    '--context',
-    '-c',
-    '--host',
-    '-H',
-    '--log-level',
-    '-l',
-    '--tlscacert',
-    '--tlscert',
-    '--tlskey',
-]);
-const FLAG_OPTIONS = new Set([
-    '--detach',
-    '-d',
-    '--init',
-    '--interactive',
-    '-i',
-    '--privileged',
-    '--publish-all',
-    '-P',
-    '--read-only',
-    '--rm',
-    '--tty',
-    '-t',
-]);
 export function checkDockerWorkspaceUserDocument(file, document, kind, errors) {
     visitRunSteps(document, kind === 'action', (scope, index, step) => {
         if (typeof step.run !== 'string')
@@ -44,82 +18,6 @@ export function checkDockerWorkspaceUserDocument(file, document, kind, errors) {
         }
     });
 }
-function shellTokens(input) {
-    const tokens = [];
-    let token = '';
-    let quote = '';
-    let substitutionDepth = 0;
-    let githubExpression = false;
-    for (let index = 0; index < input.length; index += 1) {
-        const character = input[index];
-        if (githubExpression) {
-            token += character;
-            if (character === '}' && input[index + 1] === '}') {
-                token += '}';
-                index += 1;
-                githubExpression = false;
-            }
-            continue;
-        }
-        if (substitutionDepth > 0) {
-            token += character;
-            if (character === '(')
-                substitutionDepth += 1;
-            if (character === ')')
-                substitutionDepth -= 1;
-            continue;
-        }
-        if (character === '$' && input[index + 1] === '{' && input[index + 2] === '{') {
-            token += '${{';
-            index += 2;
-            githubExpression = true;
-            continue;
-        }
-        if (character === '$' && input[index + 1] === '(') {
-            token += '$(';
-            substitutionDepth = 1;
-            index += 1;
-            continue;
-        }
-        if (quote) {
-            if (character === '\\' && input[index + 1] !== undefined)
-                token += input[++index];
-            else if (character === quote)
-                quote = '';
-            else
-                token += character;
-            continue;
-        }
-        if (character === '"' || character === "'") {
-            quote = character;
-            continue;
-        }
-        if (/\s/u.test(character)) {
-            if (token)
-                tokens.push(token);
-            token = '';
-            continue;
-        }
-        if (character === '#' && !token)
-            break;
-        if (character === ';' || character === '|' || character === '&') {
-            if (token)
-                tokens.push(token);
-            token = '';
-            if ((character === '&' || character === '|') && input[index + 1] === character)
-                index += 1;
-            tokens.push(character);
-            continue;
-        }
-        if (character === '\\' && input[index + 1] !== undefined)
-            token += input[++index];
-        else
-            token += character;
-    }
-    if (token)
-        tokens.push(token);
-    return tokens;
-}
 function dockerRunBlocks(run) {
     const blocks = [];
     const lines = run.split('\n');
@@ -135,71 +33,6 @@ function dockerRunBlocks(run) {
     }
     return blocks;
 }
-function findDockerCommand(tokens) {
-    let commandStart = true;
-    for (const [index, token] of tokens.entries()) {
-        if (token === ';' || token === '|' || token === '&') {
-            commandStart = true;
-            continue;
-        }
-        if (!commandStart)
-            continue;
-        if (/^[A-Za-z_][A-Za-z0-9_]*=.*/u.test(token))
-            continue;
-        if (token === 'docker')
-            return index;
-        commandStart = false;
-    }
-    return -1;
-}
-function dockerOptions(block) {
-    const tokens = shellTokens(block);
-    const dockerIndex = findDockerCommand(tokens);
-    if (dockerIndex < 0)
-        return undefined;
-    let start = dockerIndex + 1;
-    while (start < tokens.length && tokens[start].startsWith('-')) {
-        const option = tokens[start];
-        const name = option.includes('=') ? option.slice(0, option.indexOf('=')) : option;
-        if (DOCKER_GLOBAL_FLAG_OPTIONS.has(name) || option.includes('='))
-            start += 1;
-        else if (DOCKER_GLOBAL_VALUE_OPTIONS.has(name))
-            start += 2;
-        else
-            return undefined;
-    }
-    if (tokens[start] === 'container')
-        start += 1;
-    if (tokens[start] !== 'run')
-        return undefined;
-    start += 1;
-    const volumes = [];
-    let user;
-    for (let index = start; index < tokens.length; index += 1) {
-        const option = tokens[index];
-        if (!option.startsWith('-'))
-            break;
-        const equals = option.indexOf('=');
-        const compact = option.startsWith('-v') || option.startsWith('-u');
-        const name = equals > 0
-            ? option.slice(0, equals)
-            : compact && option.length > 2
-                ? option.slice(0, 2)
-                : option;
-        const inlineValue = equals > 0
-            ? option.slice(equals + 1)
-            : compact && option.length > 2
-                ? option.slice(2)
-                : undefined;
-        const bundledFlags = /^-[diPt]{2,}$/u.test(option);
-        const value = inlineValue ?? (FLAG_OPTIONS.has(name) || bundledFlags ? undefined : tokens[++index]);
-        if ((name === '-v' || name === '--volume' || name === '--mount') && value !== undefined)
-            volumes.push(value);
-        if ((name === '-u' || name === '--user') && value !== undefined)
-            user = value;
-    }
-    return { user, volumes };
-}
 function hasHostUserMapping(value) {
     return value !== undefined && /^\$\(\s*id\s+-u\s*\):\$\(\s*id\s+-g\s*\)$/u.test(value);
 }

package/dist/gha-workspace-policy/shell-token-modes.d.mts

@@ -0,0 +1,10 @@
+export type ShellTokenScan = {
+    githubExpression: boolean;
+    quote: string;
+    substitutionDepth: number;
+    token: string;
+    tokens: string[];
+};
+export declare function consumeGithubExpression(input: string, index: number, scan: ShellTokenScan): number;
+export declare function consumeCommandSubstitution(input: string, index: number, scan: ShellTokenScan): number;
+export declare function consumeQuotedCharacter(input: string, index: number, scan: ShellTokenScan): number;

package/dist/gha-workspace-policy/shell-token-modes.mjs

@@ -0,0 +1,31 @@
+export function consumeGithubExpression(input, index, scan) {
+    const character = input[index];
+    scan.token += character;
+    if (character === '}' && input[index + 1] === '}') {
+        scan.token += '}';
+        scan.githubExpression = false;
+        return index + 1;
+    }
+    return index;
+}
+export function consumeCommandSubstitution(input, index, scan) {
+    const character = input[index];
+    scan.token += character;
+    if (character === '(')
+        scan.substitutionDepth += 1;
+    if (character === ')')
+        scan.substitutionDepth -= 1;
+    return index;
+}
+export function consumeQuotedCharacter(input, index, scan) {
+    const character = input[index];
+    if (character === '\\' && input[index + 1] !== undefined) {
+        scan.token += input[index + 1];
+        return index + 1;
+    }
+    if (character === scan.quote)
+        scan.quote = '';
+    else
+        scan.token += character;
+    return index;
+}

package/dist/gha-workspace-policy/shell-tokens.d.mts

@@ -0,0 +1 @@
+export declare function shellTokens(input: string): string[];

package/dist/gha-workspace-policy/shell-tokens.mjs

@@ -0,0 +1,65 @@
+import { consumeCommandSubstitution, consumeGithubExpression, consumeQuotedCharacter, } from './shell-token-modes.mjs';
+export function shellTokens(input) {
+    const scan = {
+        githubExpression: false,
+        quote: '',
+        substitutionDepth: 0,
+        token: '',
+        tokens: [],
+    };
+    for (let index = 0; index < input.length; index += 1) {
+        const character = input[index];
+        if (scan.githubExpression) {
+            index = consumeGithubExpression(input, index, scan);
+            continue;
+        }
+        if (scan.substitutionDepth > 0) {
+            index = consumeCommandSubstitution(input, index, scan);
+            continue;
+        }
+        if (character === '$' && input[index + 1] === '{' && input[index + 2] === '{') {
+            scan.token += '${{';
+            index += 2;
+            scan.githubExpression = true;
+            continue;
+        }
+        if (character === '$' && input[index + 1] === '(') {
+            scan.token += '$(';
+            scan.substitutionDepth = 1;
+            index += 1;
+            continue;
+        }
+        if (scan.quote) {
+            index = consumeQuotedCharacter(input, index, scan);
+            continue;
+        }
+        if (character === '"' || character === "'") {
+            scan.quote = character;
+            continue;
+        }
+        if (/\s/u.test(character)) {
+            if (scan.token)
+                scan.tokens.push(scan.token);
+            scan.token = '';
+            continue;
+        }
+        if (character === '#' && !scan.token)
+            break;
+        if (character === ';' || character === '|' || character === '&') {
+            if (scan.token)
+                scan.tokens.push(scan.token);
+            scan.token = '';
+            if ((character === '&' || character === '|') && input[index + 1] === character)
+                index += 1;
+            scan.tokens.push(character);
+            continue;
+        }
+        if (character === '\\' && input[index + 1] !== undefined)
+            scan.token += input[++index];
+        else
+            scan.token += character;
+    }
+    if (scan.token)
+        scan.tokens.push(scan.token);
+    return scan.tokens;
+}

package/dist/index.d.mts

@@ -97,7 +97,8 @@ export { DEFAULT_MAX_DIAGNOSTIC_REPORTS, DEFAULT_MAX_FORMATTED_DIAGNOSTIC_REPORT
 export type { DiagnosticReportLimitOptions, DiagnosticReportSummary, } from './vitest-diagnostics/index.mts';
 export { createCommandRunner, runGh, runGit } from './gh-cli/index.mts';
 export type { ExecFileText, RunTextCommand } from './gh-cli/index.mts';
-export { getDiffAgainstBase } from './gh-cli/index.mts';
+export { DiffCommandError, processDiffCommand } from './gh-cli/index.mts';
+export type { DiffBlockCallback, DiffCommand } from './gh-cli/index.mts';
 export { GITHUB_BODY_MAX_CHARACTERS, validateGitHubBodyLength } from './gh-cli/index.mts';
 export type { GitHubBodyLengthValidation } from './gh-cli/index.mts';
 export { assertHeadPushed, buildGhPrCreateArgs, createPullRequest, DetachedHeadError, HeadNotPushedError, HeadOutOfDateError, resolveHeadBranch, } from './gh-cli/index.mts';

package/dist/index.mjs

@@ -53,6 +53,6 @@ export { isSwiftCodeOffset, parseUniqueSwiftBinaryTargetChecksum, } from './swif
 export { validateResolvedPinDelta } from './swift-resolved-pin-delta/index.mjs';
 export { DEFAULT_MAX_DIAGNOSTIC_REPORTS, DEFAULT_MAX_FORMATTED_DIAGNOSTIC_REPORTS, formatDiagnosticReportSummaries, HARD_MAX_DIAGNOSTIC_REPORTS, readDiagnosticReportSummaries, summarizeDiagnosticReport, } from './vitest-diagnostics/index.mjs';
 export { createCommandRunner, runGh, runGit } from './gh-cli/index.mjs';
-export { getDiffAgainstBase } from './gh-cli/index.mjs';
+export { DiffCommandError, processDiffCommand } from './gh-cli/index.mjs';
 export { GITHUB_BODY_MAX_CHARACTERS, validateGitHubBodyLength } from './gh-cli/index.mjs';
 export { assertHeadPushed, buildGhPrCreateArgs, createPullRequest, DetachedHeadError, HeadNotPushedError, HeadOutOfDateError, resolveHeadBranch, } from './gh-cli/index.mjs';

package/dist/openapi-document/contract-schema-types.d.mts

@@ -12,7 +12,7 @@ export type ContractSchemaNode = {
     type: 'number';
 } | {
     type: 'string';
-    format?: 'uuid';
+    format?: 'uuid' | 'binary';
 } | {
     type: 'literal';
     value: boolean | number | string;

package/dist/openapi-document/openapi-types.d.mts

@@ -1,7 +1,7 @@
 export type OpenApiSchema = {
     $ref?: string;
     type?: 'null' | 'boolean' | 'integer' | 'number' | 'string' | 'array' | 'object';
-    format?: 'uri' | 'uuid';
+    format?: 'uri' | 'uuid' | 'binary';
     const?: boolean | number | string;
     enum?: (boolean | number | string)[];
     items?: OpenApiSchema | false;

package/dist/pnpm-install/native-family.d.mts

@@ -0,0 +1,3 @@
+export type NativeFamily = 'elf' | 'macho' | 'pe';
+export declare function nativeFamilyFromMagic(buffer: Buffer): NativeFamily | undefined;
+export declare function expectedNativeFamily(platform?: NodeJS.Platform): NativeFamily | undefined;

package/dist/pnpm-install/native-family.mjs

@@ -0,0 +1,31 @@
+const ELF = Buffer.from([0x7f, 0x45, 0x4c, 0x46]);
+const PE = Buffer.from([0x4d, 0x5a]);
+const MACHO = [
+    Buffer.from([0xcf, 0xfa, 0xed, 0xfe]),
+    Buffer.from([0xfe, 0xed, 0xfa, 0xcf]),
+    Buffer.from([0xce, 0xfa, 0xed, 0xfe]),
+    Buffer.from([0xfe, 0xed, 0xfa, 0xce]),
+    Buffer.from([0xca, 0xfe, 0xba, 0xbe]),
+    Buffer.from([0xbe, 0xba, 0xfe, 0xca]),
+];
+function startsWith(buffer, magic) {
+    return buffer.length >= magic.length && buffer.subarray(0, magic.length).equals(magic);
+}
+export function nativeFamilyFromMagic(buffer) {
+    if (startsWith(buffer, ELF))
+        return 'elf';
+    if (MACHO.some((magic) => startsWith(buffer, magic)))
+        return 'macho';
+    if (startsWith(buffer, PE))
+        return 'pe';
+    return undefined;
+}
+export function expectedNativeFamily(platform = process.platform) {
+    if (platform === 'linux')
+        return 'elf';
+    if (platform === 'darwin')
+        return 'macho';
+    if (platform === 'win32')
+        return 'pe';
+    return undefined;
+}

package/dist/pnpm-install/native-health.d.mts

@@ -1,8 +1,5 @@
-export type NativeFamily = 'elf' | 'macho' | 'pe';
-export declare function nativeFamilyFromMagic(buffer: Buffer): NativeFamily | undefined;
-export declare function expectedNativeFamily(platform?: NodeJS.Platform): NativeFamily | undefined;
+export { expectedNativeFamily, nativeFamilyFromMagic } from './native-family.mts';
 declare function packageExcludesPlatform(owner: string, platform: string): Promise<boolean>;
 export declare function mismatchedNativeBinaries(root?: string, platform?: NodeJS.Platform, readPackageExclusion?: typeof packageExcludesPlatform): Promise<string[]>;
 export declare function nativeBinariesMatchRuntime(root?: string, platform?: NodeJS.Platform): Promise<boolean>;
 export declare function repairedNativeBinariesMatchRuntime(paths: string[], platform?: NodeJS.Platform): Promise<boolean>;
-export {};

package/dist/pnpm-install/native-health.mjs

@@ -1,36 +1,7 @@
 import { glob, open, readFile, stat } from 'node:fs/promises';
 import path from 'node:path';
-const ELF = Buffer.from([0x7f, 0x45, 0x4c, 0x46]);
-const PE = Buffer.from([0x4d, 0x5a]);
-const MACHO = [
-    Buffer.from([0xcf, 0xfa, 0xed, 0xfe]),
-    Buffer.from([0xfe, 0xed, 0xfa, 0xcf]),
-    Buffer.from([0xce, 0xfa, 0xed, 0xfe]),
-    Buffer.from([0xfe, 0xed, 0xfa, 0xce]),
-    Buffer.from([0xca, 0xfe, 0xba, 0xbe]),
-    Buffer.from([0xbe, 0xba, 0xfe, 0xca]),
-];
-function startsWith(buffer, magic) {
-    return buffer.length >= magic.length && buffer.subarray(0, magic.length).equals(magic);
-}
-export function nativeFamilyFromMagic(buffer) {
-    if (startsWith(buffer, ELF))
-        return 'elf';
-    if (MACHO.some((magic) => startsWith(buffer, magic)))
-        return 'macho';
-    if (startsWith(buffer, PE))
-        return 'pe';
-    return undefined;
-}
-export function expectedNativeFamily(platform = process.platform) {
-    if (platform === 'linux')
-        return 'elf';
-    if (platform === 'darwin')
-        return 'macho';
-    if (platform === 'win32')
-        return 'pe';
-    return undefined;
-}
+import { expectedNativeFamily, nativeFamilyFromMagic } from './native-family.mjs';
+export { expectedNativeFamily, nativeFamilyFromMagic } from './native-family.mjs';
 async function readMagic(pathname) {
     let handle;
     try {

package/dist/retrospective-facts/local-merge.d.mts

@@ -0,0 +1,2 @@
+import type { CommandResult, RetrospectiveFactsOptions } from './shared.mts';
+export declare function mergeFact(data: Record<string, unknown> | undefined, state: string, merge: string | undefined, range: string | undefined, originMain: boolean, options: RetrospectiveFactsOptions, run: (command: string, args: string[]) => Promise<CommandResult>): Promise<string>;

package/dist/retrospective-facts/local-merge.mjs

@@ -0,0 +1,21 @@
+export async function mergeFact(data, state, merge, range, originMain, options, run) {
+    if (merge && originMain) {
+        const inOrigin = await run('git', ['merge-base', '--is-ancestor', merge, 'origin/main']);
+        if (!inOrigin.ok)
+            return inOrigin.exitCode === 1 ? `no (origin/main lacks ${merge})` : 'unavailable';
+        const inLocalMain = await run('git', ['merge-base', '--is-ancestor', merge, 'main']);
+        if (!inLocalMain.ok && inLocalMain.exitCode === 1)
+            options.onWarning?.(`Warning: local main lacks PR merge commit ${merge}, but origin/main contains it.`);
+        return `yes (origin/main contains ${merge})`;
+    }
+    if (data && (state === 'OPEN' || state === 'CLOSED'))
+        return 'unmerged at time of retro';
+    if (!data && range && originMain) {
+        const rangeInOrigin = await run('git', ['merge-base', '--is-ancestor', range, 'origin/main']);
+        if (rangeInOrigin.ok)
+            return `yes (origin/main contains ${range})`;
+        if (rangeInOrigin.exitCode === 1)
+            return `no (origin/main lacks ${range})`;
+    }
+    return 'unavailable';
+}

package/dist/retrospective-facts/local.mjs

@@ -1,5 +1,6 @@
 import { rawBlock } from './exec.mjs';
 import { apiFiles, count, dirs, format, objectField, readJson, stringField, topDirs, } from './format.mjs';
+import { mergeFact } from './local-merge.mjs';
 import { PR_JSON_FIELDS, } from './shared.mjs';
 export async function localFacts(options, execute) {
     const calls = [];
@@ -121,24 +122,3 @@ async function resolveNamedRef(name, run, fetched = false) {
 function unresolvedRange() {
     return { range: undefined, refreshed: false };
 }
-async function mergeFact(data, state, merge, range, originMain, options, run) {
-    if (merge && originMain) {
-        const inOrigin = await run('git', ['merge-base', '--is-ancestor', merge, 'origin/main']);
-        if (!inOrigin.ok)
-            return inOrigin.exitCode === 1 ? `no (origin/main lacks ${merge})` : 'unavailable';
-        const inLocalMain = await run('git', ['merge-base', '--is-ancestor', merge, 'main']);
-        if (!inLocalMain.ok && inLocalMain.exitCode === 1)
-            options.onWarning?.(`Warning: local main lacks PR merge commit ${merge}, but origin/main contains it.`);
-        return `yes (origin/main contains ${merge})`;
-    }
-    if (data && (state === 'OPEN' || state === 'CLOSED'))
-        return 'unmerged at time of retro';
-    if (!data && range && originMain) {
-        const rangeInOrigin = await run('git', ['merge-base', '--is-ancestor', range, 'origin/main']);
-        if (rangeInOrigin.ok)
-            return `yes (origin/main contains ${range})`;
-        if (rangeInOrigin.exitCode === 1)
-            return `no (origin/main lacks ${range})`;
-    }
-    return 'unavailable';
-}

package/dist/retrospective-transcript/claude-blocks.d.mts

@@ -0,0 +1,3 @@
+import { type ParsedLine, type TranscriptFacts } from './shared.mts';
+export declare function applyAssistantUsage(record: ParsedLine, message: ParsedLine | undefined, subagent: boolean, facts: TranscriptFacts): void;
+export declare function applyToolBlocks(message: ParsedLine | undefined, subagent: boolean, facts: TranscriptFacts, advisorIds: Set<string>): void;

package/dist/retrospective-transcript/claude-blocks.mjs

@@ -0,0 +1,38 @@
+import { applyCommand, asNumber, asRecord, } from './shared.mjs';
+export function applyAssistantUsage(record, message, subagent, facts) {
+    if (record.type === 'assistant') {
+        if (!subagent)
+            facts.assistantResponses++;
+        const usage = asRecord(message?.usage);
+        const totals = subagent ? facts.subagentTokens : facts.tokens;
+        totals.input += asNumber(usage?.input_tokens);
+        totals.output += asNumber(usage?.output_tokens);
+        totals.cacheRead += asNumber(usage?.cache_read_input_tokens);
+        totals.cacheCreation += asNumber(usage?.cache_creation_input_tokens);
+    }
+}
+export function applyToolBlocks(message, subagent, facts, advisorIds) {
+    const blocks = Array.isArray(message?.content) ? message.content : [];
+    for (const block of blocks) {
+        const value = asRecord(block);
+        if (!value)
+            continue;
+        if (value.type === 'tool_use' || value.type === 'server_tool_use') {
+            facts.toolCalls++;
+            if (subagent)
+                facts.subagentToolCalls++;
+            if (value.name === 'advisor' && typeof value.id === 'string')
+                advisorIds.add(value.id);
+            if (value.name === 'Bash' || value.name === 'bash') {
+                const command = asRecord(value.input)?.command;
+                if (typeof command === 'string')
+                    applyCommand(command, facts);
+            }
+        }
+        else if ((value.type === 'tool_result' && value.is_error === true) ||
+            (typeof value.type === 'string' && value.type.endsWith('_tool_result_error')))
+            facts.failedToolCalls++;
+        else if (value.type === 'advisor_tool_result' && typeof value.tool_use_id === 'string')
+            advisorIds.add(value.tool_use_id);
+    }
+}