@newrelic/preflight 1.71.0 → 1.72.0

package/dist/index.d.ts.map

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

package/dist/index.js

@@ -18,7 +18,7 @@ import { WorkflowStore } from './dashboard/workflow-store.js';
 import { isCopilotSdkExtensionMissing } from './hooks/copilot-sdk-extension-health.js';
 import { CopilotAppUsageWatcher } from './hooks/copilot-app-usage-watcher.js';
 import { CopilotUsageWatcher } from './hooks/copilot-usage-watcher.js';
-import { HookEventProcessor } from './hooks/index.js';
+import { DEFAULT_MAX_PENDING, HookEventProcessor } from './hooks/index.js';
 import { isPlatformDetectionFellBack } from './hooks/platform-detection-health.js';
 import { ParentTranscriptWatcher } from './hooks/parent-transcript-watcher.js';
 import { BilledTurnLedger, pruneBilledTurns } from './hooks/billed-turn-ledger.js';
@@ -45,10 +45,10 @@ import { ContextWindowTracker } from './metrics/context-window-tracker.js';
 import { initModelPricing } from './metrics/pricing-init.js';
 import { buildCostForecastFromInputs } from './metrics/cost-forecast.js';
 import { CostPerOutcomeAnalyzer } from './metrics/cost-per-outcome.js';
-import { buildCostTrackerSeed } from './metrics/cost-tracker-seed.js';
 import { CostTracker } from './metrics/cost-tracker.js';
 import { DecisionTracker } from './metrics/decision-tracker.js';
 import { EfficiencyScorer } from './metrics/efficiency-score.js';
+import { FirstSaveBaselines } from './metrics/first-save-baselines.js';
 import { GitEfficiencyTracker, parseDefaultBranchFromSymbolicRef, } from './metrics/git-efficiency-tracker.js';
 import { WorktreeIdentityResolver } from './metrics/git-workspace-identity.js';
 import { GitWorkspaceReporter, replaySessionToActivityRecords, } from './metrics/git-workspace-reporter.js';
@@ -65,11 +65,11 @@ import { RetryDetector } from './metrics/retry-detector.js';
 import { SessionTracker } from './metrics/session-tracker.js';
 import { SkillActivationTracker } from './metrics/skill-activation-tracker.js';
 import { TaskCompletionTracker } from './metrics/task-completion-tracker.js';
-import { buildTaskDetectorSeed } from './metrics/task-detector-seed.js';
 import { TaskDetector } from './metrics/task-detector.js';
 import { ToolSelectionScorer } from './metrics/tool-selection-scorer.js';
 import { TranscriptMessageTracker } from './metrics/transcript-message-tracker.js';
 import { TrendAnalyzer } from './metrics/trend-analyzer.js';
+import { tokenUsageFromSubagentTurn, tokenUsageFromTokenEvent } from './metrics/token-usage.js';
 import { TurnCostAttributor } from './metrics/turn-cost-attributor.js';
 import { TurnTracker } from './metrics/turn-tracker.js';
 import { WorkflowRunTracker } from './metrics/workflow-run-tracker.js';
@@ -82,6 +82,7 @@ import { LocalStore } from './storage/index.js';
 import { computeHistoricalCosts } from './storage/historical-costs.js';
 import { purgeOldSessions, purgeOldWeeklySummaries } from './storage/retention.js';
 import { buildSessionSummary, SessionStore, sessionSummaryToDriftRecord, } from './storage/session-store.js';
+import { amendRecord } from './storage/types.js';
 import { WeeklySummaryGenerator } from './storage/weekly-summary.js';
 import { registerPendingTools, registerTools } from './tools/session-stats.js';
 import { FeedbackCollector } from './tools/workflow-tools.js';
@@ -262,6 +263,7 @@ export function runMaintenanceGcPass(deps) {
     try {
         localStore.gcStaleBreadcrumbs();
         localStore.gcDeadLocalInstances();
+        localStore.gcCountedToolUseIds();
         const live = localStore.getActiveSessionIdsFromHeartbeats();
         if (liveSessionRegistry) {
             for (const id of liveSessionRegistry.getLiveSessions({ includeSynthetic: true })) {
@@ -716,6 +718,7 @@ async function main() {
         ppidCorrectionAbort?.abort();
         logger.info('Shutting down...');
         try {
+            eventProcessor?.stop();
             persistSession?.();
             if (config?.otlp?.transport !== 'nr-events-api' &&
                 sessionTracker &&
@@ -763,7 +766,6 @@ async function main() {
                 }
                 alertRulesWatcher = undefined;
             }
-            eventProcessor?.stop();
             activeSubagentWatcher?.stop();
             activeWorkflowWatcher?.stop();
             activeParentTranscriptWatcher?.stop();
@@ -965,7 +967,7 @@ async function main() {
                 storagePath: config.storagePath,
                 retainSessionsDays: config.retainSessionsDays,
             }) ?? undefined;
-        sessionTracker = new SessionTracker(sessionTraceId);
+        sessionTracker = new SessionTracker(sessionTraceId, DEFAULT_MAX_PENDING);
         // Combine the two independent correction factors here so CostTracker only
         // ever deals with one number (see its constructor doc comment) — the raw
         // config fields (costRateMultiplier, dataResidencyPremium) stay unmerged
@@ -1167,6 +1169,19 @@ async function main() {
         // below can call this again for a *different* id after a pending->real
         // transition or a PPID correction.
         const rehydratedTrackerSessionIds = new Set();
+        const firstSaveBaselines = new FirstSaveBaselines();
+        const saveSessionRememberingBaseline = (summary) => {
+            const saved = sessionStore.saveSession(summary);
+            // Only a --stdio engine ever adopts a real session id and seeds it.
+            if (saved && options.stdio && !rehydratedTrackerSessionIds.has(summary.sessionId)) {
+                firstSaveBaselines.recordSave({
+                    sessionId: summary.sessionId,
+                    previous: saved.previous,
+                    ownSession: summary.sessionId === sessionTraceId,
+                });
+            }
+            return saved !== null;
+        };
         const rehydrateTrackersIfResumed = (sessionId) => {
             if (isSyntheticSessionId(sessionId))
                 return;
@@ -1174,36 +1189,25 @@ async function main() {
                 return;
             rehydratedTrackerSessionIds.add(sessionId);
             try {
-                const persisted = sessionStore.loadSession(sessionId);
-                if (!persisted)
-                    return;
-                costTracker.seedFromPersisted(buildCostTrackerSeed(persisted));
-                sessionTracker.seedFromPersisted({
-                    toolCallCount: persisted.toolCallCount,
-                    bashCommandCount: persisted.bashCommandCount,
-                });
-                budgetTracker.seedFiredThresholdsFromSessionTotal(costTracker.getMetrics().sessionTotalCostUsd ?? 0);
-                modelUsageTracker.seedFromPersisted(persisted.modelBreakdown);
-                qualityProxyTracker.seedFromPersisted(persisted.qualityProxy);
-                // Non-null: taskDetector is assigned unconditionally earlier in this
-                // same setup path (see line ~980), before rehydrateTrackersIfResumed
-                // can be invoked — same pattern as the other `taskDetector!` use
-                // below, needed because its declared type stays `| undefined` for
-                // callers outside this path.
-                taskDetector.seedFromPersisted(buildTaskDetectorSeed(persisted));
-                if (persisted.efficiencyScore !== null &&
-                    persisted.efficiencyScoreComponents &&
-                    (persisted.efficiencyScoreSampleCount ?? 0) > 0) {
-                    efficiencyScorer.seedFromPersisted({
-                        score: persisted.efficiencyScore,
-                        components: persisted.efficiencyScoreComponents,
-                        sampleCount: persisted.efficiencyScoreSampleCount ?? 0,
+                const { cost, toolCalls } = firstSaveBaselines.take(sessionId, () => sessionStore.loadSession(sessionId));
+                if (cost) {
+                    costTracker.seedFromPersisted(cost.costTracker);
+                    budgetTracker.seedFiredThresholdsFromSessionTotal(cost.estimatedCostUsd ?? 0);
+                    modelUsageTracker.seedFromPersisted(cost.modelBreakdown);
+                }
+                if (toolCalls) {
+                    sessionTracker.seedFromPersisted(toolCalls.sessionTracker);
+                    qualityProxyTracker.seedFromPersisted(toolCalls.qualityProxy);
+                    taskDetector.seedFromPersisted(toolCalls.taskDetector);
+                    if (toolCalls.efficiency)
+                        efficiencyScorer.seedFromPersisted(toolCalls.efficiency);
+                }
+                if (cost || toolCalls) {
+                    logger.info('Rehydrated trackers from a prior checkpoint for this session', {
+                        sessionId,
+                        estimatedCostUsd: cost?.estimatedCostUsd ?? null,
                     });
                 }
-                logger.info('Rehydrated trackers from a prior checkpoint for this session', {
-                    sessionId,
-                    estimatedCostUsd: persisted.estimatedCostUsd,
-                });
             }
             catch (err) {
                 logger.warn('Failed to rehydrate trackers from a prior checkpoint', {
@@ -1811,6 +1815,14 @@ async function main() {
             // live sessions' events. After real session ID resolution the processor
             // is hot-swapped to the scoped store via replaceStore().
             drainAllSessions: !options.stdio || isProvisional,
+            onRecordAmend: (record) => {
+                sessionTracker?.amendToolCall(record);
+                localSessionAggregator.amendToolCall(record);
+                subagentAttribution.recordAgentToolCall(record);
+                const index = toolCallBuffer.findIndex((r) => r.id === record.id);
+                if (index >= 0)
+                    toolCallBuffer[index] = amendRecord(toolCallBuffer[index], record);
+            },
             onRecord: (incomingRecord) => {
                 // Attributed before any consumer (notably auditTrail below) sees the
                 // record, so audit/security events carry agentId and agentType.
@@ -2064,14 +2076,7 @@ async function main() {
                 const closedTurn = turnCostAttributor.recordTokenEvent(tokenEvent);
                 if (isOwnEvent)
                     capturedNrIngest?.ingestTurnCost(closedTurn);
-                const usage = {
-                    inputTokens: tokenEvent.inputTokens,
-                    outputTokens: tokenEvent.outputTokens,
-                    thinkingTokens: 0,
-                    cacheReadTokens: tokenEvent.cacheReadTokens,
-                    cacheCreationTokens: tokenEvent.cacheCreationTokens,
-                    totalTokens: tokenEvent.inputTokens + tokenEvent.outputTokens,
-                };
+                const usage = tokenUsageFromTokenEvent(tokenEvent);
                 let breakdown;
                 if (!isOwnEvent) {
                     breakdown = costTracker.priceUsage(usage, tokenEvent.model);
@@ -2172,21 +2177,7 @@ async function main() {
                 // the buffer.
                 subagentAttribution.recordSubagentTurn(turn);
                 const agentType = subagentAttribution.agentTypeFor(turn.agentId);
-                const usage = {
-                    inputTokens: turn.inputTokens,
-                    outputTokens: turn.outputTokens,
-                    // Subagent reasoning tokens (extended thinking) live under
-                    // `output_tokens_details.reasoning_tokens`; map to `thinkingTokens`
-                    // so the existing `thinkingPerMTok` rate column charges correctly.
-                    thinkingTokens: turn.reasoningTokens,
-                    cacheReadTokens: turn.cacheReadTokens,
-                    cacheCreationTokens: turn.cacheCreationTokens,
-                    totalTokens: turn.inputTokens +
-                        turn.outputTokens +
-                        turn.reasoningTokens +
-                        turn.cacheReadTokens +
-                        turn.cacheCreationTokens,
-                };
+                const usage = tokenUsageFromSubagentTurn(turn);
                 const breakdown = costTracker.recordTokenUsage(usage, turn.model, {
                     timestampMs: turn.timestampMs,
                     workflowRunId: turn.workflowRunId,
@@ -2379,9 +2370,8 @@ async function main() {
                         toolSelectionScorer,
                         repoResolver: repoNameResolver,
                     });
-                    for (const rollup of rollups) {
-                        sessionStore.saveSession(rollup);
-                    }
+                    const saved = rollups.filter((rollup) => saveSessionRememberingBaseline(rollup));
+                    eventProcessor?.persistCountedIdsOfSavedSessions(saved.map((r) => String(r.sessionId)));
                     if (!opts?.periodic) {
                         logger.info('Persisted observed sessions on behalf of synthetic owner', {
                             sessionId: summary.sessionId,
@@ -2390,7 +2380,9 @@ async function main() {
                     }
                     return;
                 }
-                sessionStore.saveSession(summary);
+                if (saveSessionRememberingBaseline(summary)) {
+                    eventProcessor?.persistCountedIdsOfSavedSessions([summary.sessionId]);
+                }
                 // checkAndGenerateLastWeek() is idempotent (existsSync check before
                 // any real work), so calling it on every periodic checkpoint too is
                 // cheap — and necessary: it otherwise only ran on the clean-shutdown
@@ -2653,6 +2645,7 @@ async function main() {
                 // path, which is keyed by whatever id the hook collector script
                 // wrote — never the wrong guess — so toolCallCount/timeline stay
                 // clean through the whole unconfirmed window regardless.
+                firstSaveBaselines.forget(sessionTraceId);
                 costTracker.reset(realId);
                 modelUsageTracker.reset(realId);
                 contextCompositionTracker.reset(realId);