@unbrained/pm-cli 2026.10.15 → 2026.10.18

package/docs/SDK_STORAGE_LIFECYCLE.md

@@ -1,6 +1,9 @@
 # SDK Storage Lifecycle
 
-Tracked by [pm-p5u6](../.agents/pm/chores/pm-p5u6.toon).
+Tracked by [pm-p5u6](https://github.com/unbraind/pm-cli/blob/main/.agents/pm/chores/pm-p5u6.toon) and
+[pm-xj80p9](https://github.com/unbraind/pm-cli/blob/main/.agents/pm/issues/pm-xj80p9.toon).
+
+Tracker records live in the repository and are excluded from the npm package.
 
 Detached telemetry reads existing settings without scaffolding schemas/identity.
 Locks, queue/state rewrites and event/OTLP completion preserve owner-removed
@@ -10,7 +13,17 @@ storage. Delivery stays best effort/nonblocking; foreground defaults create pare
 import { acquireLock, writeFileAtomic } from "@unbrained/pm-cli/sdk";
 
 const policy = { createParentDirectories: false };
-const release = await acquireLock(root, "job", 60, "worker", false, true, 5000, policy);
+const lockOptions = { ...policy, maxWaitMs: 0 };
+const release = await acquireLock(
+  root,
+  "job",
+  60,
+  "worker",
+  false,
+  true,
+  5000,
+  lockOptions,
+);
 try {
   await writeFileAtomic(resultPath, serializedResult, policy);
 } finally {
@@ -22,6 +35,15 @@ Owners initialize lock/result parents; absence fails without recreation. The
 policy cannot pin identity or prevent symlink/replacement races. Extension lock
 overrides own their lifecycle.
 
+For optional background work, pass `maxWaitMs: 0` in the final `acquireLock`
+options object. The built-in lock then fails fast for active contention, even
+when `PM_LOCK_WAIT_MS` requests a longer wait. Stale-lock handling may still
+retry creation after removing a confirmed stale owner. A positive `maxWaitMs` caps the normal
+environment-or-caller retry budget without increasing it. Filesystem calls and
+extension execution still take their ordinary execution time; the cap is not a
+wall-clock timeout. Extension lock overrides receive `max_wait_ms` and remain
+responsible for observing it.
+
 Async scripts use `registerTempOperation`: signal children, check after
 uncancellable SDK work, `finish` after finally disposal. Interrupts close admission
 and await completion; timeout retains evidence. Sync scripts use

package/docs/TESTING.md

@@ -209,6 +209,14 @@ Use focused runs while iterating, then run coverage before closure when risk or
 
 ## CI Retry and Timeout Diagnostics
 
+The required `Gates (coverage)` job runs after the coverage matrix settles and
+explicitly requires every shard to succeed. Failed, canceled, skipped, or missing
+shard outcomes fail that required context before checkout or report merging.
+Shard artifacts retain failure diagnostics. After successful shard admission,
+coverage-threshold failures still retain merged reports and Codecov uploads.
+This enforcement is tracked by [pm-0p4aal](https://github.com/unbraind/pm-cli/blob/main/.agents/pm/issues/pm-0p4aal.toon).
+Tracker records live in the repository and are excluded from the npm package.
+
 Platform regressions from [pm-hrhfgi](../.agents/pm/issues/pm-hrhfgi.toon) and
 [pm-zk67yf](../.agents/pm/issues/pm-zk67yf.toon) have portable negative controls.
 Complete source scans process at most 32 item files per batch; the descriptor
@@ -650,6 +658,21 @@ pm test <item-id> --run --workspace-context snapshot --override-linked-workspace
   The real filesystem and CLI snapshot suite runs in the required Node 22
   telemetry regression job and native Windows regression job before merge.
 
+  Windows execution is tracked by [pm-bj7rq0](../.agents/pm/issues/pm-bj7rq0.toon).
+  Script and native keeper cohorts run independently on Windows Node 24. Their
+  source/script keeper steps retain the two-worker cap, and each cohort retains
+  the 12-minute deadline. The required
+  `Windows regression (Node 24)` check waits for both cohorts and fails if either
+  fails, is cancelled, or is skipped. This preserves every selected regression
+  while avoiding a shared serial job deadline. See GitHub's
+  [job dependency semantics](https://docs.github.com/en/actions/how-tos/write-workflows/choose-what-workflows-do/use-jobs#defining-prerequisite-jobs).
+
+  The real point-read corpus keeper runs with the lifecycle latency keeper in
+  the existing sequential performance phase after parallel contracts. Its
+  1,500-item corpus, work-observer assertions and 30-second deadline remain
+  unchanged. Standalone script identity is resolved from the test module URL,
+  independently of temporary SDK working directories.
+
   The real-filesystem regression for this contract is tracked by
   [pm-5iwfkj](../.agents/pm/issues/pm-5iwfkj.toon).
 

package/docs/examples/ci/github-actions-pm-extension-gate.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
         with:
-          version: 11.10.0
+          version: 11.28.5
 
       - name: Setup Node
         uses: actions/setup-node@v4

package/docs/examples/ci/gitlab-ci-pm-extension-gate.yml

@@ -8,7 +8,7 @@ stages:
 
 before_script:
   - corepack enable
-  - corepack prepare pnpm@11.10.0 --activate
+  - corepack prepare pnpm@11.28.5 --activate
   - pnpm install --frozen-lockfile
 
 build:

package/docs/examples/ci/jenkins-pm-extension-gate.Jenkinsfile

@@ -9,7 +9,7 @@ pipeline {
     stage("Install") {
       steps {
         sh "corepack enable"
-        sh "corepack prepare pnpm@11.10.0 --activate"
+        sh "corepack prepare pnpm@11.28.5 --activate"
         sh "pnpm install --frozen-lockfile"
       }
     }

package/docs/generated/FLAG_LEXICON_BUDGETS.md

@@ -68,7 +68,7 @@ This file is generated by `listPmFlagLexicon()`. Compatibility aliases do not co
 | `workspace` | workspace | 23 | 23 |
 | `contracts` | quality | 29 | 29 |
 | `claim` | lifecycle | 39 | 39 |
-| `release` | lifecycle | 24 | 24 |
+| `release` | lifecycle | 25 | 25 |
 | `start-task` | lifecycle | 23 | 23 |
 | `pause-task` | lifecycle | 23 | 23 |
 | `close-task` | lifecycle | 24 | 24 |

package/docs/generated/REFUSAL_CLOSURE_CENSUS.md

@@ -4,12 +4,12 @@ Tracker: `pm-f05lsg`.
 
 Every catalog code is listed. An `uncovered` row is an explicit closure obligation, never an omission or implied approval.
 
-- Catalog error codes: 406
+- Catalog error codes: 419
 - Executable error codes: 19
 - Executable-code ratchet floor: 18
 - Required executable canonical codes: `bulk_ids_input_empty`, `bulk_ids_input_missing_path`, `bulk_ids_input_unreadable`, `invalid_argument_value`, `manifest_unknown_key`, `missing_lifecycle_target`, `missing_required_argument`, `no_version_bounds_declared`, `projection_options_mutually_exclusive`, `tracker_not_initialized`, `tracker_root_missing`, `tracker_root_not_directory`, `tracker_root_unreadable`, `unknown_context_intent`, `unknown_field_projection`, `unknown_option`, `unknown_subcommand`
-- Uncovered error codes: 387
-- Coverage fraction: 0.046798
+- Uncovered error codes: 400
+- Coverage fraction: 0.045346
 - Closed-domain probes: 19
 - Grammar probes: 117
 
@@ -36,6 +36,7 @@ Every catalog code is listed. An `uncovered` row is an explicit closure obligati
 | `body_file_missing_path` | `body_file_missing_path` | uncovered | none | 0 |
 | `body_file_unreadable` | `body_file_unreadable` | uncovered | none | 0 |
 | `budget_exceeded` | `budget_exceeded` | uncovered | none | 0 |
+| `bulk_create_route` | `bulk_create_route` | uncovered | none | 0 |
 | `bulk_ids_input_empty` | `bulk_ids_input_empty` | executable | owned_state | 1 |
 | `bulk_ids_input_missing_path` | `bulk_ids_input_missing_path` | executable | owned_state | 1 |
 | `bulk_ids_input_unreadable` | `bulk_ids_input_unreadable` | executable | owned_state | 1 |
@@ -89,6 +90,7 @@ Every catalog code is listed. An `uncovered` row is an explicit closure obligati
 | `extension_dependency_name_unsafe` | `extension_dependency_name_unsafe` | uncovered | none | 0 |
 | `extension_dependency_spec_invalid` | `extension_dependency_spec_invalid` | uncovered | none | 0 |
 | `extension_dependency_version_unsafe` | `extension_dependency_version_unsafe` | uncovered | none | 0 |
+| `extension_flag_value_invalid` | `extension_flag_value_invalid` | uncovered | none | 0 |
 | `extension_install_incomplete_source_scan` | `extension_install_incomplete_source_scan` | uncovered | none | 0 |
 | `extension_install_soft_failed` | `extension_install_soft_failed` | uncovered | none | 0 |
 | `extension_install_source_contains_destination` | `extension_install_source_contains_destination` | uncovered | none | 0 |
@@ -241,6 +243,8 @@ Every catalog code is listed. An `uncovered` row is an explicit closure obligati
 | `module_import_failed` | `module_import_failed` | uncovered | none | 0 |
 | `multi_target_github_install_ambiguous` | `multi_target_github_install_ambiguous` | uncovered | none | 0 |
 | `mutation_author_required` | `mutation_author_required` | uncovered | none | 0 |
+| `mutation_document_unreadable` | `mutation_document_unreadable` | uncovered | none | 0 |
+| `mutation_option_value_invalid` | `mutation_option_value_invalid` | uncovered | none | 0 |
 | `mutation_secret_guard_blocked` | `mutation_secret_guard_blocked` | uncovered | none | 0 |
 | `no_matching_tests` | `no_matching_tests` | uncovered | none | 0 |
 | `no_projects_matched_filters` | `no_projects_matched_filters` | uncovered | none | 0 |
@@ -328,11 +332,15 @@ Every catalog code is listed. An `uncovered` row is an explicit closure obligati
 | `terminal_state_conflict` | `terminal_state_conflict` | uncovered | none | 0 |
 | `test_measure_requires_execution` | `test_measure_requires_execution` | uncovered | none | 0 |
 | `test_measure_requires_run` | `test_measure_requires_run` | uncovered | none | 0 |
+| `text_unpaired_surrogate` | `text_unpaired_surrogate` | uncovered | none | 0 |
 | `tracked_runtime_cache_files` | `tracked_runtime_cache_files` | uncovered | none | 0 |
 | `tracker_not_initialized` | `tracker_not_initialized` | executable | owned_state | 1 |
 | `tracker_root_missing` | `tracker_root_missing` | executable | owned_state | 1 |
 | `tracker_root_not_directory` | `tracker_root_not_directory` | executable | owned_state | 1 |
 | `tracker_root_unreadable` | `tracker_root_unreadable` | executable | owned_state | 1 |
+| `transaction_create_compensated` | `transaction_create_compensated` | uncovered | none | 0 |
+| `transaction_journal_invalid` | `transaction_journal_invalid` | uncovered | none | 0 |
+| `transaction_plan_mismatch` | `transaction_plan_mismatch` | uncovered | none | 0 |
 | `transaction_preview_external_schema` | `transaction_preview_external_schema` | uncovered | none | 0 |
 | `transaction_preview_non_regular_file` | `transaction_preview_non_regular_file` | uncovered | none | 0 |
 | `transaction_preview_snapshot_changed` | `transaction_preview_snapshot_changed` | uncovered | none | 0 |
@@ -355,6 +363,11 @@ Every catalog code is listed. An `uncovered` row is an explicit closure obligati
 | `unknown_subcommand` | `unknown_subcommand` | executable | grammar, owned_state | 14 |
 | `unsafe_init_recovery` | `unsafe_init_recovery` | uncovered | none | 0 |
 | `unsupported_update_option` | `unsupported_update_option` | uncovered | none | 0 |
+| `upsert_key_ambiguous` | `upsert_key_ambiguous` | uncovered | none | 0 |
+| `upsert_key_conflict` | `upsert_key_conflict` | uncovered | none | 0 |
+| `upsert_key_duplicate` | `upsert_key_duplicate` | uncovered | none | 0 |
+| `upsert_key_missing` | `upsert_key_missing` | uncovered | none | 0 |
+| `upsert_match_changed` | `upsert_match_changed` | uncovered | none | 0 |
 | `validate_command_references_stale_pm_ids` | `validate_command_references_stale_pm_ids` | uncovered | none | 0 |
 | `validate_files_missing_linked_paths` | `validate_files_missing_linked_paths` | uncovered | none | 0 |
 | `validate_files_orphaned_paths` | `validate_files_orphaned_paths` | uncovered | none | 0 |

package/marketplace.json

@@ -1 +1 @@
-{"name":"pm","owner":{"name":"unbrained","url":"https://github.com/unbraind/pm-cli"},"description":"Official marketplace for pm CLI — native git-based project management for Claude Code and AI coding agents.","version":"2026.10.15","plugins":[{"name":"pm-claude","source":"./plugins/pm-claude","description":"Native pm CLI integration for Claude Code — 32 MCP tools, 14 workflow skills with slash invocations, 4 subagents, hybrid TUI task tracking, session context injection, and coordination subagents for git-based project management without leaving Claude Code.","version":"2026.10.15","author":{"name":"unbrained","url":"https://github.com/unbraind/pm-cli"},"homepage":"https://github.com/unbraind/pm-cli","repository":"https://github.com/unbraind/pm-cli","license":"MIT","keywords":["pm-cli","project-management","mcp","tasks","agents","workflows","git-native","task-tracker","ai"],"category":"productivity"}]}
+{"name":"pm","owner":{"name":"unbrained","url":"https://github.com/unbraind/pm-cli"},"description":"Official marketplace for pm CLI — native git-based project management for Claude Code and AI coding agents.","version":"2026.10.18","plugins":[{"name":"pm-claude","source":"./plugins/pm-claude","description":"Native pm CLI integration for Claude Code — 32 MCP tools, 14 workflow skills with slash invocations, 4 subagents, hybrid TUI task tracking, session context injection, and coordination subagents for git-based project management without leaving Claude Code.","version":"2026.10.18","author":{"name":"unbrained","url":"https://github.com/unbraind/pm-cli"},"homepage":"https://github.com/unbraind/pm-cli","repository":"https://github.com/unbraind/pm-cli","license":"MIT","keywords":["pm-cli","project-management","mcp","tasks","agents","workflows","git-native","task-tracker","ai"],"category":"productivity"}]}

package/node_modules/@opentelemetry/core/package.json

@@ -86,7 +86,8 @@
     "@opentelemetry/api": ">=1.0.0 <1.10.0"
   },
   "dependencies": {
-    "@opentelemetry/semantic-conventions": "^1.29.0"
+    "@opentelemetry/semantic-conventions": "^1.29.0",
+    "@opentelemetry/api": "1.9.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-core",
   "sideEffects": false,

package/node_modules/@opentelemetry/instrumentation/package.json

@@ -72,7 +72,8 @@
   "dependencies": {
     "@opentelemetry/api-logs": "0.220.0",
     "import-in-the-middle": "^3.0.0",
-    "require-in-the-middle": "^8.0.0"
+    "require-in-the-middle": "^8.0.0",
+    "@opentelemetry/api": "1.9.1"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.3.0"

package/node_modules/@opentelemetry/resources/package.json

@@ -83,7 +83,8 @@
   },
   "dependencies": {
     "@opentelemetry/core": "2.12.0",
-    "@opentelemetry/semantic-conventions": "^1.29.0"
+    "@opentelemetry/semantic-conventions": "^1.29.0",
+    "@opentelemetry/api": "1.9.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-resources",
   "sideEffects": false,

package/node_modules/@opentelemetry/sdk-trace/package.json

@@ -92,7 +92,8 @@
   "dependencies": {
     "@opentelemetry/core": "2.12.0",
     "@opentelemetry/resources": "2.12.0",
-    "@opentelemetry/semantic-conventions": "^1.29.0"
+    "@opentelemetry/semantic-conventions": "^1.29.0",
+    "@opentelemetry/api": "1.9.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/sdk-trace",
   "sideEffects": false,

package/node_modules/@opentelemetry/sdk-trace-base/package.json

@@ -92,7 +92,8 @@
     "@opentelemetry/core": "2.12.0",
     "@opentelemetry/resources": "2.12.0",
     "@opentelemetry/sdk-trace": "2.12.0",
-    "@opentelemetry/semantic-conventions": "^1.29.0"
+    "@opentelemetry/semantic-conventions": "^1.29.0",
+    "@opentelemetry/api": "1.9.1"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-sdk-trace-base",
   "sideEffects": false,

package/node_modules/@sentry/core/build/cjs/client.js

@@ -333,8 +333,10 @@ class Client {
     this.emit("beforeSendEvent", event, hint);
     const genAiSpanItem = extractGenAiSpans.extractGenAiSpansFromEvent(event, this);
     let env = envelope.createEventEnvelope(event, this._dsn, this._options._metadata, this._options.tunnel);
-    for (const attachment of hint.attachments || []) {
-      env = envelope$1.addItemToEnvelope(env, envelope$1.createAttachmentEnvelopeItem(attachment));
+    if (!eventUtils.isInternalException(hint)) {
+      for (const attachment of hint.attachments || []) {
+        env = envelope$1.addItemToEnvelope(env, envelope$1.createAttachmentEnvelopeItem(attachment));
+      }
     }
     if (genAiSpanItem) {
       env = envelope$1.addItemToEnvelope(env, genAiSpanItem);
@@ -588,8 +590,7 @@ class Client {
         this.recordDroppedEvent("event_processor", dataCategory);
         throw _makeDoNotSendEventError("An event processor returned `null`, will not send event.");
       }
-      const isInternalException = hint.data?.__sentry__ === true;
-      if (isInternalException) {
+      if (eventUtils.isInternalException(hint)) {
         return prepared;
       }
       const result = processBeforeSend(this, options, prepared, hint);

package/node_modules/@sentry/core/build/cjs/tracing/ai/gen-ai-attributes.js

@@ -31,8 +31,6 @@ const GEN_AI_RESPONSE_TOOL_CALLS_ATTRIBUTE = "gen_ai.response.tool_calls";
 const GEN_AI_AGENT_NAME_ATTRIBUTE = "gen_ai.agent.name";
 const GEN_AI_PIPELINE_NAME_ATTRIBUTE = "gen_ai.pipeline.name";
 const GEN_AI_CONVERSATION_ID_ATTRIBUTE = "gen_ai.conversation.id";
-const GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS_ATTRIBUTE = "gen_ai.usage.cache_creation_input_tokens";
-const GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS_ATTRIBUTE = "gen_ai.usage.cache_read_input_tokens";
 const GEN_AI_USAGE_INPUT_TOKENS_CACHE_WRITE_ATTRIBUTE = "gen_ai.usage.input_tokens.cache_write";
 const GEN_AI_USAGE_INPUT_TOKENS_CACHED_ATTRIBUTE = "gen_ai.usage.input_tokens.cached";
 const GEN_AI_INVOKE_AGENT_OPERATION_ATTRIBUTE = "gen_ai.invoke_agent";
@@ -84,8 +82,6 @@ exports.GEN_AI_TOOL_INPUT_ATTRIBUTE = GEN_AI_TOOL_INPUT_ATTRIBUTE;
 exports.GEN_AI_TOOL_NAME_ATTRIBUTE = GEN_AI_TOOL_NAME_ATTRIBUTE;
 exports.GEN_AI_TOOL_OUTPUT_ATTRIBUTE = GEN_AI_TOOL_OUTPUT_ATTRIBUTE;
 exports.GEN_AI_TOOL_TYPE_ATTRIBUTE = GEN_AI_TOOL_TYPE_ATTRIBUTE;
-exports.GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS_ATTRIBUTE = GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS_ATTRIBUTE;
-exports.GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS_ATTRIBUTE = GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS_ATTRIBUTE;
 exports.GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE = GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE;
 exports.GEN_AI_USAGE_INPUT_TOKENS_CACHED_ATTRIBUTE = GEN_AI_USAGE_INPUT_TOKENS_CACHED_ATTRIBUTE;
 exports.GEN_AI_USAGE_INPUT_TOKENS_CACHE_WRITE_ATTRIBUTE = GEN_AI_USAGE_INPUT_TOKENS_CACHE_WRITE_ATTRIBUTE;

package/node_modules/@sentry/core/build/cjs/tracing/ai/utils.js

@@ -1,5 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
+const attributes = require('@sentry/conventions/attributes');
 const currentScopes = require('../../currentScopes.js');
 const hasSpanStreamingEnabled = require('../spans/hasSpanStreamingEnabled.js');
 const is = require('../../utils/is.js');
@@ -27,23 +28,26 @@ function shouldEnableTruncation(enableTruncation) {
 function buildMethodPath(currentPath, prop) {
   return currentPath ? `${currentPath}.${prop}` : prop;
 }
-function setTokenUsageAttributes(span, promptTokens, completionTokens, cachedInputTokens, cachedOutputTokens) {
-  if (promptTokens !== void 0) {
-    span.setAttributes({
-      [genAiAttributes.GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: promptTokens
-    });
-  }
-  if (completionTokens !== void 0) {
-    span.setAttributes({
-      [genAiAttributes.GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE]: completionTokens
-    });
-  }
-  if (promptTokens !== void 0 || completionTokens !== void 0 || cachedInputTokens !== void 0 || cachedOutputTokens !== void 0) {
-    const totalTokens = (promptTokens ?? 0) + (completionTokens ?? 0) + (cachedInputTokens ?? 0) + (cachedOutputTokens ?? 0);
-    span.setAttributes({
-      [genAiAttributes.GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE]: totalTokens
-    });
+function getTokenUsageAttributes(promptTokens, completionTokens, cacheCreationInputTokens, cacheReadInputTokens, totalTokens) {
+  const attributes$1 = {};
+  if (typeof promptTokens === "number") {
+    attributes$1[genAiAttributes.GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE] = promptTokens;
   }
+  if (typeof cacheCreationInputTokens === "number") {
+    attributes$1[attributes.GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS] = cacheCreationInputTokens;
+  }
+  if (typeof cacheReadInputTokens === "number") {
+    attributes$1[attributes.GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS] = cacheReadInputTokens;
+  }
+  if (typeof completionTokens === "number") {
+    attributes$1[genAiAttributes.GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE] = completionTokens;
+  }
+  if (typeof totalTokens === "number") {
+    attributes$1[genAiAttributes.GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE] = totalTokens;
+  } else if (typeof promptTokens === "number" || typeof completionTokens === "number") {
+    attributes$1[genAiAttributes.GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE] = (typeof promptTokens === "number" ? promptTokens : 0) + (typeof completionTokens === "number" ? completionTokens : 0);
+  }
+  return attributes$1;
 }
 function endStreamSpan(span, state, recordOutputs) {
   if (!span.isRecording()) {
@@ -54,12 +58,18 @@ function endStreamSpan(span, state, recordOutputs) {
   };
   if (state.responseId) attrs[genAiAttributes.GEN_AI_RESPONSE_ID_ATTRIBUTE] = state.responseId;
   if (state.responseModel) attrs[genAiAttributes.GEN_AI_RESPONSE_MODEL_ATTRIBUTE] = state.responseModel;
-  if (state.promptTokens !== void 0) attrs[genAiAttributes.GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE] = state.promptTokens;
-  if (state.completionTokens !== void 0) attrs[genAiAttributes.GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE] = state.completionTokens;
-  if (state.totalTokens !== void 0) {
-    attrs[genAiAttributes.GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE] = state.totalTokens;
-  } else if (state.promptTokens !== void 0 || state.completionTokens !== void 0 || state.cacheCreationInputTokens !== void 0 || state.cacheReadInputTokens !== void 0) {
-    attrs[genAiAttributes.GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE] = (state.promptTokens ?? 0) + (state.completionTokens ?? 0) + (state.cacheCreationInputTokens ?? 0) + (state.cacheReadInputTokens ?? 0);
+  Object.assign(
+    attrs,
+    getTokenUsageAttributes(
+      state.promptTokens,
+      state.completionTokens,
+      state.cacheCreationInputTokens,
+      state.cacheReadInputTokens,
+      state.totalTokens
+    )
+  );
+  if (typeof state.reasoningOutputTokens === "number") {
+    attrs[attributes.GEN_AI_USAGE_REASONING_OUTPUT_TOKENS] = state.reasoningOutputTokens;
   }
   if (state.finishReasons.length) {
     attrs[genAiAttributes.GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE] = JSON.stringify(state.finishReasons);
@@ -135,9 +145,9 @@ function wrapPromiseWithMethods(originalPromiseLike, instrumentedPromise) {
 exports.buildMethodPath = buildMethodPath;
 exports.endStreamSpan = endStreamSpan;
 exports.extractSystemInstructions = extractSystemInstructions;
+exports.getTokenUsageAttributes = getTokenUsageAttributes;
 exports.getTruncatedJsonString = getTruncatedJsonString;
 exports.resolveAIRecordingOptions = resolveAIRecordingOptions;
-exports.setTokenUsageAttributes = setTokenUsageAttributes;
 exports.shouldEnableTruncation = shouldEnableTruncation;
 exports.wrapPromiseWithMethods = wrapPromiseWithMethods;
 //# sourceMappingURL=utils.js.map

package/node_modules/@sentry/core/build/cjs/tracing/anthropic-ai/index.js

@@ -77,12 +77,13 @@ function addMetadataAttributes(span, response) {
       [genAiAttributes.GEN_AI_RESPONSE_MODEL_ATTRIBUTE]: response.model
     });
     if ("usage" in response && response.usage) {
-      utils$1.setTokenUsageAttributes(
-        span,
-        response.usage.input_tokens,
-        response.usage.output_tokens,
-        response.usage.cache_creation_input_tokens,
-        response.usage.cache_read_input_tokens
+      span.setAttributes(
+        utils$1.getTokenUsageAttributes(
+          response.usage.input_tokens + (response.usage.cache_creation_input_tokens ?? 0) + (response.usage.cache_read_input_tokens ?? 0),
+          response.usage.output_tokens,
+          response.usage.cache_creation_input_tokens,
+          response.usage.cache_read_input_tokens
+        )
       );
     }
   }

package/node_modules/@sentry/core/build/cjs/tracing/anthropic-ai/streaming.js

@@ -28,7 +28,9 @@ function handleMessageMetadata(event, state) {
     if (message.id) state.responseId = message.id;
     if (message.model) state.responseModel = message.model;
     if (message.usage) {
-      if (typeof message.usage.input_tokens === "number") state.promptTokens = message.usage.input_tokens;
+      if (typeof message.usage.input_tokens === "number") {
+        state.promptTokens = message.usage.input_tokens + (message.usage.cache_creation_input_tokens ?? 0) + (message.usage.cache_read_input_tokens ?? 0);
+      }
       if (typeof message.usage.cache_creation_input_tokens === "number")
         state.cacheCreationInputTokens = message.usage.cache_creation_input_tokens;
       if (typeof message.usage.cache_read_input_tokens === "number")

package/node_modules/@sentry/core/build/cjs/tracing/google-genai/index.js

@@ -1,5 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
+const attributes = require('@sentry/conventions/attributes');
 const semanticAttributes = require('../../semanticAttributes.js');
 const string = require('../../utils/string.js');
 const spanstatus = require('../spanstatus.js');
@@ -114,20 +115,18 @@ function addResponseAttributes(span, response, recordOutputs) {
   }
   if (response.usageMetadata && typeof response.usageMetadata === "object") {
     const usage = response.usageMetadata;
-    if (typeof usage.promptTokenCount === "number") {
-      span.setAttributes({
-        [genAiAttributes.GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: usage.promptTokenCount
-      });
-    }
-    if (typeof usage.candidatesTokenCount === "number") {
-      span.setAttributes({
-        [genAiAttributes.GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE]: usage.candidatesTokenCount
-      });
-    }
-    if (typeof usage.totalTokenCount === "number") {
-      span.setAttributes({
-        [genAiAttributes.GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE]: usage.totalTokenCount
-      });
+    const hasOutput = typeof usage.candidatesTokenCount === "number" || typeof usage.thoughtsTokenCount === "number";
+    span.setAttributes(
+      utils$1.getTokenUsageAttributes(
+        usage.promptTokenCount,
+        hasOutput ? (usage.candidatesTokenCount ?? 0) + (usage.thoughtsTokenCount ?? 0) : void 0,
+        void 0,
+        usage.cachedContentTokenCount,
+        usage.totalTokenCount
+      )
+    );
+    if (typeof usage.thoughtsTokenCount === "number") {
+      span.setAttribute(attributes.GEN_AI_USAGE_REASONING_OUTPUT_TOKENS, usage.thoughtsTokenCount);
     }
   }
   if (recordOutputs && Array.isArray(response.candidates) && response.candidates.length > 0) {

package/node_modules/@sentry/core/build/cjs/tracing/google-genai/streaming.js

@@ -22,8 +22,13 @@ function handleResponseMetadata(chunk, state) {
   const usage = chunk.usageMetadata;
   if (usage) {
     if (typeof usage.promptTokenCount === "number") state.promptTokens = usage.promptTokenCount;
-    if (typeof usage.candidatesTokenCount === "number") state.completionTokens = usage.candidatesTokenCount;
+    if (typeof usage.candidatesTokenCount === "number") state.candidateTokens = usage.candidatesTokenCount;
+    if (typeof usage.thoughtsTokenCount === "number") state.reasoningOutputTokens = usage.thoughtsTokenCount;
+    if (state.candidateTokens !== void 0 || state.reasoningOutputTokens !== void 0) {
+      state.completionTokens = (state.candidateTokens ?? 0) + (state.reasoningOutputTokens ?? 0);
+    }
     if (typeof usage.totalTokenCount === "number") state.totalTokens = usage.totalTokenCount;
+    if (typeof usage.cachedContentTokenCount === "number") state.cacheReadInputTokens = usage.cachedContentTokenCount;
   }
 }
 function handleCandidateContent(chunk, state, recordOutputs) {

package/node_modules/@sentry/core/build/cjs/tracing/langchain/utils.js

@@ -1,7 +1,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
+const attributes = require('@sentry/conventions/attributes');
 const semanticAttributes = require('../../semanticAttributes.js');
 const string = require('../../utils/string.js');
+const is = require('../../utils/is.js');
 const genAiAttributes = require('../ai/gen-ai-attributes.js');
 const mediaStripping = require('../ai/mediaStripping.js');
 const utils = require('../ai/utils.js');
@@ -172,29 +174,76 @@ function addToolCallsAttributes(generations, attrs) {
     setIfDefined(attrs, genAiAttributes.GEN_AI_RESPONSE_TOOL_CALLS_ATTRIBUTE, string.stringify(toolCalls, String));
   }
 }
-function addTokenUsageAttributes(llmOutput, attrs) {
+function extractMessageTokenUsageAttributes(message) {
+  const usage = message.usage_metadata;
+  if (is.isObjectLike(usage)) {
+    const details = is.isObjectLike(usage.input_token_details) ? usage.input_token_details : void 0;
+    return utils.getTokenUsageAttributes(
+      usage.input_tokens,
+      usage.output_tokens,
+      details?.cache_creation,
+      details?.cache_read,
+      usage.total_tokens
+    );
+  }
+  const metadata = message.response_metadata;
+  const tokenUsage = is.isObjectLike(metadata) && is.isObjectLike(metadata.tokenUsage) ? metadata.tokenUsage : void 0;
+  return utils.getTokenUsageAttributes(
+    tokenUsage?.promptTokens,
+    tokenUsage?.completionTokens,
+    void 0,
+    void 0,
+    tokenUsage?.totalTokens
+  );
+}
+function addTokenUsageAttributes(llmResult, attrs) {
+  const normalizedUsage = {};
+  const legacyMessageUsage = {};
+  for (const generations of llmResult.generations ?? []) {
+    const message = generations[0]?.message;
+    if (message) {
+      const usage = is.isObjectLike(message.usage_metadata) ? normalizedUsage : legacyMessageUsage;
+      for (const [key, value] of Object.entries(extractMessageTokenUsageAttributes(message))) {
+        usage[key] = (usage[key] ?? 0) + value;
+      }
+    }
+  }
+  Object.assign(attrs, Object.keys(normalizedUsage).length > 0 ? normalizedUsage : legacyMessageUsage);
+  const llmOutput = llmResult.llmOutput;
   if (!llmOutput) return;
   const tokenUsage = llmOutput.tokenUsage;
   const anthropicUsage = llmOutput.usage;
-  if (tokenUsage) {
-    setNumberIfDefined(attrs, genAiAttributes.GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE, tokenUsage.promptTokens);
-    setNumberIfDefined(attrs, genAiAttributes.GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE, tokenUsage.completionTokens);
-    setNumberIfDefined(attrs, genAiAttributes.GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE, tokenUsage.totalTokens);
-  } else if (anthropicUsage) {
-    setNumberIfDefined(attrs, genAiAttributes.GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE, anthropicUsage.input_tokens);
-    setNumberIfDefined(attrs, genAiAttributes.GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE, anthropicUsage.output_tokens);
-    const input = Number(anthropicUsage.input_tokens);
-    const output = Number(anthropicUsage.output_tokens);
-    const total = (Number.isNaN(input) ? 0 : input) + (Number.isNaN(output) ? 0 : output);
-    if (total > 0) setNumberIfDefined(attrs, genAiAttributes.GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE, total);
-    if (anthropicUsage.cache_creation_input_tokens !== void 0)
-      setNumberIfDefined(
-        attrs,
-        genAiAttributes.GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS_ATTRIBUTE,
-        anthropicUsage.cache_creation_input_tokens
-      );
-    if (anthropicUsage.cache_read_input_tokens !== void 0)
-      setNumberIfDefined(attrs, genAiAttributes.GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS_ATTRIBUTE, anthropicUsage.cache_read_input_tokens);
+  if (anthropicUsage && Object.keys(normalizedUsage).length === 0 && Object.keys(legacyMessageUsage).length === 0) {
+    const { input_tokens, output_tokens, cache_creation_input_tokens, cache_read_input_tokens } = anthropicUsage;
+    const hasInput = input_tokens !== void 0 || cache_creation_input_tokens !== void 0 || cache_read_input_tokens !== void 0;
+    Object.assign(
+      attrs,
+      utils.getTokenUsageAttributes(
+        hasInput ? (input_tokens ?? 0) + (cache_creation_input_tokens ?? 0) + (cache_read_input_tokens ?? 0) : void 0,
+        output_tokens,
+        cache_creation_input_tokens,
+        cache_read_input_tokens
+      )
+    );
+  } else if (tokenUsage && Object.keys(normalizedUsage).length === 0 && Object.keys(legacyMessageUsage).length === 0) {
+    Object.assign(
+      attrs,
+      utils.getTokenUsageAttributes(
+        tokenUsage.promptTokens,
+        tokenUsage.completionTokens,
+        void 0,
+        void 0,
+        tokenUsage.totalTokens
+      )
+    );
+  }
+  if (anthropicUsage) {
+    if (typeof anthropicUsage.cache_creation_input_tokens === "number" && !(attributes.GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS in attrs)) {
+      attrs[attributes.GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS] = anthropicUsage.cache_creation_input_tokens;
+    }
+    if (typeof anthropicUsage.cache_read_input_tokens === "number" && !(attributes.GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS in attrs)) {
+      attrs[attributes.GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS] = anthropicUsage.cache_read_input_tokens;
+    }
   }
 }
 function extractLlmResponseAttributes(llmResult, recordOutputs) {
@@ -221,7 +270,7 @@ function extractLlmResponseAttributes(llmResult, recordOutputs) {
       }
     }
   }
-  addTokenUsageAttributes(llmResult.llmOutput, attrs);
+  addTokenUsageAttributes(llmResult, attrs);
   const llmOutput = llmResult.llmOutput;
   const firstGeneration = llmResult.generations?.[0]?.[0];
   const v1Message = firstGeneration?.message;
@@ -294,6 +343,7 @@ exports._INTERNAL_mergeLangChainCallbackHandler = _INTERNAL_mergeLangChainCallba
 exports.extractChatModelRequestAttributes = extractChatModelRequestAttributes;
 exports.extractLLMRequestAttributes = extractLLMRequestAttributes;
 exports.extractLlmResponseAttributes = extractLlmResponseAttributes;
+exports.extractMessageTokenUsageAttributes = extractMessageTokenUsageAttributes;
 exports.extractToolDefinitions = extractToolDefinitions;
 exports.getAgentNameFromMetadata = getAgentNameFromMetadata;
 exports.getInvocationParams = getInvocationParams;