night-orch 0.3.2 → 0.4.0

package/dist/web/snapshots.d.ts

@@ -0,0 +1,159 @@
+import type { MCPDependencies } from '../mcp/server.js';
+import { loadTuiStats } from '../state/stats.js';
+import { type RuntimeSettingSnapshot } from '../settings/runtime.js';
+import { type SettingValue } from '../settings/registry.js';
+interface DashboardSnapshot {
+    generatedAt: string;
+    status: unknown;
+    runs: unknown;
+    cost: unknown;
+    build: {
+        version: string;
+        gitSha: string | null;
+    };
+    config: {
+        repos: string[];
+        pollIntervalSeconds: number;
+    };
+    stats: ReturnType<typeof loadTuiStats>;
+}
+interface SettingsSnapshot {
+    generatedAt: string;
+    settings: SettingsSnapshotEntry[];
+}
+interface SettingsSnapshotEntry extends RuntimeSettingSnapshot {
+    hasYamlValue: boolean;
+    yamlValue: SettingValue | null;
+}
+type CommandSpec = string | string[];
+type CommandWhen = 'always' | 'dedicated' | 'shared';
+interface ProjectsSnapshot {
+    generatedAt: string;
+    githubDefaults: {
+        tokenEnv: string;
+        apiBaseUrl: string;
+    };
+    workerProfiles: Record<string, ProjectWorkerProfileSummary>;
+    repos: ProjectRepoSummary[];
+}
+interface ProjectWorkerProfileSummary {
+    type: string;
+    command: string;
+    args: string[];
+    workerTimeoutSeconds: number;
+    minimalEnv: boolean;
+    runtimeWrapper: string | null;
+    envKeys: string[];
+}
+interface ProjectLabels {
+    ready: string[];
+    running: string;
+    blocked: string;
+    needsHuman: string;
+    reviewReady: string;
+    error: string;
+    retry: string;
+    planning: string;
+    mergeQueued: string;
+    merging: string;
+    mergeFailed: string;
+}
+interface ProjectRepoSummary {
+    repo: string;
+    forge: 'github' | 'forgejo';
+    linkedProjects: string[];
+    apiBaseUrl?: string;
+    tokenEnv?: string;
+    maxConcurrentRuns: number;
+    localPath: string;
+    baseBranch: string;
+    branchPrefix: string;
+    labels: ProjectLabels;
+    kanban?: {
+        triggerLabel: string;
+        labels: ProjectLabels;
+    };
+    labelConfig: Record<string, {
+        color?: string;
+        description?: string;
+    }>;
+    defaults: {
+        planner: 'claude' | 'codex' | 'opencode';
+        coder: 'claude' | 'codex' | 'opencode';
+        reviewer: 'claude' | 'codex' | 'opencode';
+        doneMode: 'pr-ready' | 'manual-only';
+        notifyPriority: 'normal' | 'high';
+        prMentions: string[];
+    };
+    environment?: {
+        defaultMode: 'shared' | 'dedicated';
+        dedicated?: {
+            compose: {
+                file: string;
+                services: string[];
+                projectName: string;
+            };
+            env: {
+                copyFrom: string;
+                overrideKeys: string[];
+                overrideFiles: string[];
+            };
+            healthcheck?: CommandSpec;
+            teardownOnComplete: boolean;
+        };
+        shared?: {
+            requireRunning: boolean;
+            healthcheck?: CommandSpec;
+        };
+        bootstrap: Array<{
+            command: CommandSpec;
+            when: CommandWhen;
+            failureHints?: Array<{
+                contains: string;
+                message: string;
+                output: 'combined' | 'stdout' | 'stderr';
+            }>;
+        }>;
+        cleanup: Array<{
+            command: CommandSpec;
+            when: CommandWhen;
+            failureHints?: Array<{
+                contains: string;
+                message: string;
+                output: 'combined' | 'stdout' | 'stderr';
+            }>;
+        }>;
+    };
+    verify: CommandSpec[];
+    prompts: {
+        plannerSystem: boolean;
+        coderSystem: boolean;
+        reviewerSystem: boolean;
+    };
+    planning: {
+        prdDirectory: string;
+    };
+    selectors: {
+        includeLabelsAny: string[];
+        excludeLabelsAny: string[];
+    };
+    agents: Record<string, string>;
+    workflow?: string;
+    workflowByTriage?: {
+        trivial?: string;
+        standard?: string;
+    };
+    mergeQueue: {
+        enabled: boolean;
+        batchSize: number;
+        mergeMethod: 'merge' | 'squash' | 'rebase';
+        retryFlakyOnce: boolean;
+        requireApproval: boolean;
+        stagingBranchPrefix: string;
+    };
+}
+export declare function buildDashboardSnapshot(deps: MCPDependencies): Promise<DashboardSnapshot>;
+export declare function buildProjectsSnapshot(deps: MCPDependencies): ProjectsSnapshot;
+export declare function buildSettingsSnapshot(deps: MCPDependencies, rawConfig: unknown): SettingsSnapshot;
+export {};
+//# sourceMappingURL=snapshots.d.ts.map

package/dist/web/snapshots.d.ts.map

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

package/dist/web/snapshots.js

@@ -0,0 +1,231 @@
+import { handleToolCall } from '../mcp/tools/index.js';
+import { loadTuiStats } from '../state/stats.js';
+import { getBuildInfo } from '../utils/build-info.js';
+import { nowUtcIso } from '../utils/time.js';
+import { listRuntimeSettings, resolveConfigWithRuntimeSettings, } from '../settings/runtime.js';
+import { getSettingDefinition, resolveSettingYamlValue, sanitizeSettingValueForDisplay, } from '../settings/registry.js';
+const BUILD_INFO = getBuildInfo();
+export async function buildDashboardSnapshot(deps) {
+    const runtimeConfig = resolveConfigWithRuntimeSettings(deps.config, deps.db);
+    const runtimeDeps = {
+        ...deps,
+        config: runtimeConfig,
+    };
+    const [status, runs, cost] = await Promise.all([
+        handleToolCall('night-orch-status', {}, runtimeDeps),
+        handleToolCall('night-orch-list-runs', { limit: 100 }, runtimeDeps),
+        handleToolCall('night-orch-cost-report', { days: 7 }, runtimeDeps),
+    ]);
+    return {
+        generatedAt: nowUtcIso(),
+        status,
+        runs,
+        cost,
+        build: BUILD_INFO,
+        config: {
+            repos: runtimeConfig.repos.map((repo) => repo.repo),
+            pollIntervalSeconds: runtimeConfig.github.pollIntervalSeconds,
+        },
+        stats: loadTuiStats(runtimeDeps.db, { costModel: runtimeConfig.cost.model }),
+    };
+}
+export function buildProjectsSnapshot(deps) {
+    return {
+        generatedAt: nowUtcIso(),
+        githubDefaults: {
+            tokenEnv: deps.config.github.tokenEnv,
+            apiBaseUrl: deps.config.github.apiBaseUrl,
+        },
+        workerProfiles: Object.fromEntries(Object.entries(deps.config.workerProfiles).map(([name, profile]) => [
+            name,
+            sanitizeWorkerProfile(profile),
+        ])),
+        repos: deps.config.repos.map((repo) => sanitizeProjectRepo(repo)),
+    };
+}
+export function buildSettingsSnapshot(deps, rawConfig) {
+    const runtimeSettings = listRuntimeSettings(deps.config, deps.db);
+    return {
+        generatedAt: nowUtcIso(),
+        settings: runtimeSettings.map((setting) => {
+            const definition = getSettingDefinition(setting.key);
+            if (!definition) {
+                return {
+                    ...setting,
+                    hasYamlValue: false,
+                    yamlValue: null,
+                };
+            }
+            const { hasYamlValue, yamlValue } = resolveSettingYamlValue(definition, rawConfig, deps.config);
+            return {
+                ...setting,
+                hasYamlValue,
+                yamlValue: sanitizeSettingValueForDisplay(definition, yamlValue),
+            };
+        }),
+    };
+}
+function sanitizeWorkerProfile(profile) {
+    return {
+        type: profile.type,
+        command: profile.command,
+        args: [...profile.args],
+        workerTimeoutSeconds: profile.workerTimeoutSeconds,
+        minimalEnv: profile.minimalEnv,
+        runtimeWrapper: profile.runtimeWrapper,
+        envKeys: Object.keys(profile.env),
+    };
+}
+function sanitizeProjectRepo(repo) {
+    return {
+        repo: repo.repo,
+        forge: repo.forge,
+        linkedProjects: [...repo.linkedProjects],
+        apiBaseUrl: repo.apiBaseUrl,
+        tokenEnv: repo.tokenEnv,
+        maxConcurrentRuns: repo.maxConcurrentRuns,
+        localPath: repo.localPath,
+        baseBranch: repo.baseBranch,
+        branchPrefix: repo.branchPrefix,
+        labels: sanitizeLabels(repo.labels),
+        ...(repo.kanban
+            ? {
+                kanban: {
+                    triggerLabel: repo.kanban.triggerLabel,
+                    labels: sanitizeLabels(repo.kanban.labels),
+                },
+            }
+            : {}),
+        labelConfig: Object.fromEntries(Object.entries(repo.labelConfig).map(([label, config]) => [
+            label,
+            {
+                ...(config.color ? { color: config.color } : {}),
+                ...(config.description ? { description: config.description } : {}),
+            },
+        ])),
+        defaults: {
+            planner: repo.defaults.planner,
+            coder: repo.defaults.coder,
+            reviewer: repo.defaults.reviewer,
+            doneMode: repo.defaults.doneMode,
+            notifyPriority: repo.defaults.notifyPriority,
+            prMentions: [...repo.defaults.prMentions],
+        },
+        ...(repo.environment ? { environment: sanitizeEnvironment(repo.environment) } : {}),
+        verify: repo.verify.map((command) => copyCommandSpec(command)),
+        prompts: {
+            plannerSystem: Boolean(repo.prompts?.plannerSystem),
+            coderSystem: Boolean(repo.prompts?.coderSystem),
+            reviewerSystem: Boolean(repo.prompts?.reviewerSystem),
+        },
+        planning: {
+            prdDirectory: repo.planning.prdDirectory,
+        },
+        selectors: {
+            includeLabelsAny: [...repo.selectors.includeLabelsAny],
+            excludeLabelsAny: [...repo.selectors.excludeLabelsAny],
+        },
+        agents: { ...repo.agents },
+        ...(repo.workflow ? { workflow: repo.workflow } : {}),
+        ...(repo.workflowByTriage ? { workflowByTriage: { ...repo.workflowByTriage } } : {}),
+        mergeQueue: {
+            enabled: repo.mergeQueue.enabled,
+            batchSize: repo.mergeQueue.batchSize,
+            mergeMethod: repo.mergeQueue.mergeMethod,
+            retryFlakyOnce: repo.mergeQueue.retryFlakyOnce,
+            requireApproval: repo.mergeQueue.requireApproval,
+            stagingBranchPrefix: repo.mergeQueue.stagingBranchPrefix,
+        },
+    };
+}
+function sanitizeEnvironment(environment) {
+    return {
+        defaultMode: environment.defaultMode,
+        ...(environment.dedicated
+            ? {
+                dedicated: {
+                    compose: {
+                        file: environment.dedicated.compose.file,
+                        services: [...environment.dedicated.compose.services],
+                        projectName: environment.dedicated.compose.projectName,
+                    },
+                    env: {
+                        copyFrom: environment.dedicated.env.copyFrom,
+                        overrideKeys: Object.keys(environment.dedicated.env.overrides),
+                        overrideFiles: [...environment.dedicated.env.overrideFiles],
+                    },
+                    ...(environment.dedicated.healthcheck
+                        ? { healthcheck: copyCommandSpec(environment.dedicated.healthcheck) }
+                        : {}),
+                    teardownOnComplete: environment.dedicated.teardownOnComplete,
+                },
+            }
+            : {}),
+        ...(environment.shared
+            ? {
+                shared: {
+                    requireRunning: environment.shared.requireRunning,
+                    ...(environment.shared.healthcheck
+                        ? { healthcheck: copyCommandSpec(environment.shared.healthcheck) }
+                        : {}),
+                },
+            }
+            : {}),
+        bootstrap: environment.bootstrap.map((step) => ({
+            when: step.when,
+            command: copyCommandSpec(step.command),
+            ...(step.failureHints && step.failureHints.length > 0
+                ? {
+                    failureHints: step.failureHints.map((hint) => ({
+                        contains: hint.contains,
+                        message: hint.message,
+                        output: hint.output,
+                    })),
+                }
+                : {}),
+        })),
+        cleanup: environment.cleanup.map((step) => ({
+            when: step.when,
+            command: copyCommandSpec(step.command),
+            ...(step.failureHints && step.failureHints.length > 0
+                ? {
+                    failureHints: step.failureHints.map((hint) => ({
+                        contains: hint.contains,
+                        message: hint.message,
+                        output: hint.output,
+                    })),
+                }
+                : {}),
+        })),
+    };
+}
+function sanitizeLabels(labels) {
+    return {
+        ready: [...labels.ready],
+        running: labels.running,
+        blocked: normalizeLabelValue(labels.blocked),
+        needsHuman: labels.needsHuman,
+        reviewReady: labels.reviewReady,
+        error: labels.error,
+        retry: labels.retry,
+        planning: labels.planning,
+        mergeQueued: labels.mergeQueued,
+        merging: labels.merging,
+        mergeFailed: labels.mergeFailed,
+    };
+}
+function normalizeLabelValue(value) {
+    if (typeof value === 'string')
+        return value;
+    if (Array.isArray(value)) {
+        return value.find((entry) => typeof entry === 'string') ?? '';
+    }
+    return '';
+}
+function copyCommandSpec(command) {
+    if (Array.isArray(command)) {
+        return [...command];
+    }
+    return command;
+}
+//# sourceMappingURL=snapshots.js.map

package/dist/web/snapshots.js.map

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

package/dist/workers/acp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"acp.d.ts","sourceRoot":"","sources":["../../src/workers/acp.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAQlF,qBAAa,gBAAiB,YAAW,aAAa;IAC9C,OAAO,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAyH1D,iBAAiB,IAAI,OAAO,CAAC;QAAE,SAAS,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;CAQnF"}
+{"version":3,"file":"acp.d.ts","sourceRoot":"","sources":["../../src/workers/acp.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAQlF,qBAAa,gBAAiB,YAAW,aAAa;IAC9C,OAAO,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA2I1D,iBAAiB,IAAI,OAAO,CAAC;QAAE,SAAS,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;CAQnF"}

package/dist/workers/acp.js

@@ -19,6 +19,11 @@ export class AcpWorkerAdapter {
         });
         const onSessionUpdate = (notification) => {
             emitAcpUpdateEvent(notification, input);
+            const usageFromUpdate = extractAcpTokenUsageFromNotification(notification);
+            if (usageFromUpdate) {
+                const isTurnComplete = notification['type'] === 'turn_complete';
+                tokenUsage = mergeTokenUsage(tokenUsage, usageFromUpdate, isTurnComplete ? 'sum-completion' : 'max');
+            }
             if (notification['type'] === 'text' && typeof notification['text'] === 'string') {
                 textParts.push(notification['text']);
             }
@@ -36,6 +41,7 @@ export class AcpWorkerAdapter {
                         timeoutMs: input.timeoutSeconds * 1000,
                     });
                     sessionId = typeof result['sessionId'] === 'string' ? result['sessionId'] : null;
+                    tokenUsage = mergeTokenUsage(tokenUsage, extractAcpTokenUsageFromResult(result), 'max');
                     assistantText = textParts.join('');
                 }
                 catch (resumeErr) {
@@ -53,6 +59,7 @@ export class AcpWorkerAdapter {
                         sessionOptions: { maxTurns: 50 },
                     });
                     sessionId = typeof result['sessionId'] === 'string' ? result['sessionId'] : null;
+                    tokenUsage = mergeTokenUsage(tokenUsage, extractAcpTokenUsageFromResult(result), 'max');
                     assistantText = textParts.join('');
                 }
             }
@@ -69,6 +76,7 @@ export class AcpWorkerAdapter {
                     sessionOptions: { maxTurns: 50 },
                 });
                 sessionId = typeof result['sessionId'] === 'string' ? result['sessionId'] : null;
+                tokenUsage = mergeTokenUsage(tokenUsage, extractAcpTokenUsageFromResult(result), 'max');
                 assistantText = textParts.join('');
             }
         }
@@ -99,6 +107,13 @@ export class AcpWorkerAdapter {
         const durationMs = Date.now() - start;
         if (!assistantText)
             assistantText = textParts.join('');
+        if (!tokenUsage && assistantText.trim().length > 0) {
+            logger.warn({
+                runId: input.runId ?? null,
+                role: input.role,
+                phase: input.phase ?? null,
+            }, 'ACP token extraction unavailable; falling back to duration-based cost estimate');
+        }
         logger.info({ role: input.role, textLength: assistantText.length, sessionId, durationMs }, 'ACP worker completed');
         const { parsed, parseError } = parseOutput(input.role, assistantText);
         emitWorkerEvent(input, 'session_end', {
@@ -187,4 +202,105 @@ function parseOutput(role, raw) {
             return { parsed: null, parseError: `Unknown role: ${role}` };
     }
 }
+function extractAcpTokenUsageFromNotification(notification) {
+    const directUsage = tokenUsageFromCandidate(notification['usage']);
+    if (directUsage)
+        return directUsage;
+    const eventUsage = tokenUsageFromCandidate(notification['event']);
+    if (eventUsage)
+        return eventUsage;
+    if (notification['sessionUpdate'] === 'usage_update') {
+        const usageUpdate = tokenUsageFromCandidate(notification);
+        if (usageUpdate)
+            return usageUpdate;
+    }
+    if (notification['type'] === 'turn_complete') {
+        const tokenCount = parseTokenCount(notification['tokenCount']);
+        if (tokenCount > 0) {
+            return {
+                promptTokens: 0,
+                completionTokens: tokenCount,
+            };
+        }
+    }
+    return undefined;
+}
+function extractAcpTokenUsageFromResult(result) {
+    const directUsage = tokenUsageFromCandidate(result['usage']);
+    if (directUsage)
+        return directUsage;
+    const record = result['record'];
+    if (isRecord(record)) {
+        const cumulative = tokenUsageFromCandidate(record['cumulative_token_usage']);
+        if (cumulative)
+            return cumulative;
+        const requestUsage = record['request_token_usage'];
+        if (isRecord(requestUsage)) {
+            let merged;
+            for (const value of Object.values(requestUsage)) {
+                merged = mergeTokenUsage(merged, tokenUsageFromCandidate(value), 'max');
+            }
+            if (merged)
+                return merged;
+        }
+    }
+    return undefined;
+}
+function tokenUsageFromCandidate(candidate) {
+    if (!isRecord(candidate))
+        return undefined;
+    const usageMeta = candidate['_meta'];
+    const source = isRecord(usageMeta) && isRecord(usageMeta['usage'])
+        ? usageMeta['usage']
+        : candidate;
+    const promptTokens = parseTokenCount(source['input_tokens']
+        ?? source['inputTokens']
+        ?? source['cache_creation_input_tokens']
+        ?? source['cacheCreationInputTokens']);
+    const completionTokens = parseTokenCount(source['output_tokens'] ?? source['outputTokens']);
+    const cacheReadTokens = parseTokenCount(source['cache_read_input_tokens']
+        ?? source['cacheReadInputTokens']
+        ?? source['cachedReadTokens']);
+    const promptFromSource = parseTokenCount(source['input_tokens'] ?? source['inputTokens'])
+        + parseTokenCount(source['cache_creation_input_tokens'] ?? source['cacheCreationInputTokens']);
+    const normalizedPromptTokens = promptFromSource > 0 ? promptFromSource : promptTokens;
+    if (normalizedPromptTokens <= 0 && completionTokens <= 0 && cacheReadTokens <= 0)
+        return undefined;
+    return {
+        promptTokens: normalizedPromptTokens,
+        completionTokens,
+        ...(cacheReadTokens > 0 ? { cacheReadTokens } : {}),
+    };
+}
+function mergeTokenUsage(existing, incoming, strategy) {
+    if (!incoming)
+        return existing;
+    if (!existing)
+        return incoming;
+    const existingCache = existing.cacheReadTokens ?? 0;
+    const incomingCache = incoming.cacheReadTokens ?? 0;
+    if (strategy === 'sum-completion') {
+        const completionTokens = existing.completionTokens + incoming.completionTokens;
+        const promptTokens = Math.max(existing.promptTokens, incoming.promptTokens);
+        const cacheReadTokens = Math.max(existingCache, incomingCache);
+        return {
+            promptTokens,
+            completionTokens,
+            ...(cacheReadTokens > 0 ? { cacheReadTokens } : {}),
+        };
+    }
+    const promptTokens = Math.max(existing.promptTokens, incoming.promptTokens);
+    const completionTokens = Math.max(existing.completionTokens, incoming.completionTokens);
+    const cacheReadTokens = Math.max(existingCache, incomingCache);
+    return {
+        promptTokens,
+        completionTokens,
+        ...(cacheReadTokens > 0 ? { cacheReadTokens } : {}),
+    };
+}
+function parseTokenCount(value) {
+    if (typeof value !== 'number' || !Number.isFinite(value))
+        return 0;
+    return Math.max(0, Math.floor(value));
+}
 //# sourceMappingURL=acp.js.map

package/dist/workers/acp.js.map

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

package/dist/workers/claude.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claude.d.ts","sourceRoot":"","sources":["../../src/workers/claude.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAYlF,qBAAa,mBAAoB,YAAW,aAAa;IACjD,OAAO,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA8F1D,iBAAiB,IAAI,OAAO,CAAC;QAAE,SAAS,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;CAenF"}
+{"version":3,"file":"claude.d.ts","sourceRoot":"","sources":["../../src/workers/claude.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAYlF,qBAAa,mBAAoB,YAAW,aAAa;IACjD,OAAO,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAwG1D,iBAAiB,IAAI,OAAO,CAAC;QAAE,SAAS,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;CAenF"}

package/dist/workers/claude.js

@@ -52,6 +52,13 @@ export class ClaudeWorkerAdapter {
         // Fall back to raw text if not parseable as JSON.
         const { assistantText, sessionId } = extractFromJsonOutput(result.stdout);
         const tokenUsage = extractClaudeTokenUsage(result.stdout);
+        if (!tokenUsage && result.stdout.trim().length > 0) {
+            logger.warn({
+                runId: input.runId ?? null,
+                role: input.role,
+                phase: input.phase ?? null,
+            }, 'Claude token extraction unavailable; falling back to duration-based cost estimate');
+        }
         logger.info({ role: input.role, rawLength: result.stdout.length, textLength: assistantText.length, sessionId }, 'Claude output received');
         if (result.stdout.length === 0 && result.stderr.length > 0) {
             logger.warn({ role: input.role, stderrTail: result.stderr.slice(-1000) }, 'Claude produced no stdout — stderr may contain error details');
@@ -283,14 +290,16 @@ function extractClaudeTokenUsage(raw) {
         return undefined;
     let promptTokens = 0;
     let completionTokens = 0;
+    let cacheReadTokens = 0;
     const addUsage = (usageCandidate) => {
         if (!isRecord(usageCandidate))
             return;
         const inputTokens = parseTokenCount(usageCandidate['input_tokens'])
-            + parseTokenCount(usageCandidate['cache_creation_input_tokens'])
-            + parseTokenCount(usageCandidate['cache_read_input_tokens']);
+            + parseTokenCount(usageCandidate['cache_creation_input_tokens']);
+        const cacheRead = parseTokenCount(usageCandidate['cache_read_input_tokens']);
         const outputTokens = parseTokenCount(usageCandidate['output_tokens']);
         promptTokens += inputTokens;
+        cacheReadTokens += cacheRead;
         completionTokens += outputTokens;
     };
     if (Array.isArray(parsed)) {
@@ -307,11 +316,12 @@ function extractClaudeTokenUsage(raw) {
             addUsage(parsed['usage']);
         }
     }
-    if (promptTokens <= 0 && completionTokens <= 0)
+    if (promptTokens <= 0 && completionTokens <= 0 && cacheReadTokens <= 0)
         return undefined;
     return {
         promptTokens,
         completionTokens,
+        ...(cacheReadTokens > 0 ? { cacheReadTokens } : {}),
     };
 }
 function parseTokenCount(value) {