fix: report Claude Code's API error message as a notice in v2 (#1582 )

## Problem When an API request fails, Claude Code writes its own assistant message into the conversation, e.g. "API Error: Connection lost mid-response. The response above may be incomplete." The SDK marks it with `error` on a `<synthetic>` message. The v2 agent forwarded that message as an ordinary `agent_message_chunk`, so clients showed it as Claude's own prose. Right after a thinking block it reads as if Claude wrote it, and a client cannot tell it apart without matching the string. ## Change The v2 agent no longer sends that message as Claude's text: - When the turn fails, the idle's `error` already carries the failure, so nothing else is sent. - Otherwise the text goes out as a `notice` with severity `error`, once, before the turn's idle. A result that repeats the same text is not shown again. Claude Code's sign-in message is handled as before. ## Not changed - v1 keeps its current behaviour: clients with the session-failure extension already drop this text, and others keep the transcript line. - `session/load` replay still shows these messages as text. `getSessionMessages` strips the `error` marker, so replay cannot identify them without matching prose. ## Testing - New v2 cases: a notice when the turn ends normally, one notice when the result repeats the text, and no notice when the idle fails. They fail without the change. - `npm run check` and `npm run test:run` pass.
refactor: move the v1 client connection out of acp-agent.ts (#1576 )
2026-11-11 11:51:14 +00:00 · 2026-11-10 18:51:11 +01:00 · 2026-11-10 17:54:17 +01:00 · 2026-11-10 14:48:59 +01:00 · 2026-11-10 14:41:44 +01:00 · 2026-11-10 13:25:20 +00:00
16 changed files with 562 additions and 269 deletions
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "0.104.0"
+  ".": "0.104.1"
 }
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog

+## [0.104.1](https://github.com/agentclientprotocol/claude-agent-acp/compare/v0.104.0...v0.104.1) (2026-11-10)
+
+
+### Bug Fixes
+
+* carry the auth detail in the ACP account label ([#1573](https://github.com/agentclientprotocol/claude-agent-acp/issues/1573)) ([3d6eb7b](https://github.com/agentclientprotocol/claude-agent-acp/commit/3d6eb7b5b650a1f9e5d2e869e92e313c32dbdc86))
+* distinguish Ultra from Max in auth status ([#1574](https://github.com/agentclientprotocol/claude-agent-acp/issues/1574)) ([7d95d30](https://github.com/agentclientprotocol/claude-agent-acp/commit/7d95d30ec3a4813d580b3bfdedb08f03d93a3571))
+* update to @anthropic-ai/claude-agent-sdk 0.3.322 ([#1577](https://github.com/agentclientprotocol/claude-agent-acp/issues/1577)) ([b89e449](https://github.com/agentclientprotocol/claude-agent-acp/commit/b89e4497da9184072e7f3c4bb28de79801659222))
+
 ## [0.104.0](https://github.com/agentclientprotocol/claude-agent-acp/compare/v0.103.0...v0.104.0) (2026-11-10)


--- a/docs/air-extensions.md
+++ b/docs/air-extensions.md
@@ -228,7 +228,7 @@ The adapter keeps them where they are.

 ## Auth source display

-The connection-scoped `_auth/status_update` continues to report agent-owned authentication, not client-owned `providers/set` routing. The adapter also reports the same identity through the ACP `auth/status` method and `auth/status_update` notification (advertised as `auth.status`), with `kind`, `detail` and `plan` under the account's `_meta.claudeCode`. Each notification is sent when its own payload changed. `auth/status` answers with the identity last reported and starts a new read, whose change arrives as a notification. When the active key source is `apiKeyHelper`, the adapter reads the effective helper command through SDK `resolveSettings` / the session's `SettingsManager`, including programmatic settings overrides.
+The connection-scoped `_auth/status_update` continues to report agent-owned authentication, not client-owned `providers/set` routing. The adapter also reports the same identity through the ACP `auth/status` method and `auth/status_update` notification (advertised as `auth.status`), with `kind`, `detail` and `plan` under the account's `_meta.claudeCode`. The account's `label` also carries a `detail` in parentheses, e.g. `Anthropic API key (ANTHROPIC_API_KEY)`. Each notification is sent when its own payload changed. `auth/status` answers with the identity last reported and starts a new read, whose change arrives as a notification. When the active key source is `apiKeyHelper`, the adapter reads the effective helper command through SDK `resolveSettings` / the session's `SettingsManager`, including programmatic settings overrides.

 A command containing the whole word `central` and the word sequence `proxy start` is displayed as:

@@ -240,6 +240,8 @@ Matching is case-insensitive and accepts multiple whitespace characters between

 Other active helpers use `label: "Anthropic API key"` and `detail: "API key helper"`; unknown key-source identifiers are not exposed as display text. CLI and SDK reads share this presentation, retain stale-probe protection, and suppress unchanged notifications.

+For Max subscriptions, the existing `claude auth status --json` probe's optional `planTier` distinguishes `max_20x` (displayed as `Claude Ultra`) from `max_5x` (`Claude Max`). Missing, unrecognized, or malformed tiers fall back to the subscription's usual label. Other subscriptions and auth sources keep their existing classification. The raw `account.plan` and ACP `_meta.claudeCode.plan` remain unchanged. SDK account reads lack the tier, so they preserve the known label for the same account and plan; a fresh CLI read replaces it, including when the tier is absent. This is display metadata, not an entitlement check, and requires no additional probe or direct credential-file reads.
+
 ## Zed conventions

 The adapter keeps these Zed and upstream conventions unchanged for every client.
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,16 +1,16 @@
 {
  "name": "@agentclientprotocol/claude-agent-acp",
-  "version": "0.104.0",
+  "version": "0.104.1",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@agentclientprotocol/claude-agent-acp",
-      "version": "0.104.0",
+      "version": "0.104.1",
      "license": "Apache-2.0",
      "dependencies": {
        "@agentclientprotocol/sdk": "2.5.0",
-        "@anthropic-ai/claude-agent-sdk": "0.3.321",
+        "@anthropic-ai/claude-agent-sdk": "0.3.322",
        "diff": "9.0.0",
        "zod": "4.6.7"
      },
@@ -53,22 +53,22 @@
      }
    },
    "node_modules/@anthropic-ai/claude-agent-sdk": {
-      "version": "0.3.321",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk/-/claude-agent-sdk-0.3.321.tgz",
-      "integrity": "sha512-Smer/h/jQLTtT+l4sxaAUwZq7wif/9RzzuqltS5Gy+kAFo/iP89H7JHa8avhVT0xGkPBvBD/1Bbdg3pcArhQcw==",
+      "version": "0.3.322",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk/-/claude-agent-sdk-0.3.322.tgz",
+      "integrity": "sha512-r88ij7R3SPV2j3BtFuavgrbWZNE8SVVS42AOQ1KxlS+QnSwNNnUhmVXV3Es2dniZySBYX8ENebL43ffhiB0azw==",
      "license": "SEE LICENSE IN README.md",
      "engines": {
        "node": ">=18.14.0"
      },
      "optionalDependencies": {
-        "@anthropic-ai/claude-agent-sdk-darwin-arm64": "0.3.321",
-        "@anthropic-ai/claude-agent-sdk-darwin-x64": "0.3.321",
-        "@anthropic-ai/claude-agent-sdk-linux-arm64": "0.3.321",
-        "@anthropic-ai/claude-agent-sdk-linux-arm64-musl": "0.3.321",
-        "@anthropic-ai/claude-agent-sdk-linux-x64": "0.3.321",
-        "@anthropic-ai/claude-agent-sdk-linux-x64-musl": "0.3.321",
-        "@anthropic-ai/claude-agent-sdk-win32-arm64": "0.3.321",
-        "@anthropic-ai/claude-agent-sdk-win32-x64": "0.3.321"
+        "@anthropic-ai/claude-agent-sdk-darwin-arm64": "0.3.322",
+        "@anthropic-ai/claude-agent-sdk-darwin-x64": "0.3.322",
+        "@anthropic-ai/claude-agent-sdk-linux-arm64": "0.3.322",
+        "@anthropic-ai/claude-agent-sdk-linux-arm64-musl": "0.3.322",
+        "@anthropic-ai/claude-agent-sdk-linux-x64": "0.3.322",
+        "@anthropic-ai/claude-agent-sdk-linux-x64-musl": "0.3.322",
+        "@anthropic-ai/claude-agent-sdk-win32-arm64": "0.3.322",
+        "@anthropic-ai/claude-agent-sdk-win32-x64": "0.3.322"
      },
      "peerDependencies": {
        "@anthropic-ai/sdk": ">=0.93.0",
@@ -77,9 +77,9 @@
      }
    },
    "node_modules/@anthropic-ai/claude-agent-sdk-darwin-arm64": {
-      "version": "0.3.321",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-darwin-arm64/-/claude-agent-sdk-darwin-arm64-0.3.321.tgz",
-      "integrity": "sha512-r718mW98hvRbmCa0TtSgImHkgyPUjPXSHOsORrehn2a8Z0FU1A2RkX9gCjY7EzZgL0RNbZXsBbkuab//kUjzJw==",
+      "version": "0.3.322",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-darwin-arm64/-/claude-agent-sdk-darwin-arm64-0.3.322.tgz",
+      "integrity": "sha512-LoKkldW2zkLfaOLQD44mL1Ot4Aup8dBIo356LEeO3v2vF7JVNhMllQIXhhGpbYRz57QaYsGvOe0Kb4SbssHwcg==",
      "cpu": [
        "arm64"
      ],
@@ -90,9 +90,9 @@
      ]
    },
    "node_modules/@anthropic-ai/claude-agent-sdk-darwin-x64": {
-      "version": "0.3.321",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-darwin-x64/-/claude-agent-sdk-darwin-x64-0.3.321.tgz",
-      "integrity": "sha512-C08vEnnDylWDaFprx/B1B13RZK3la1HOqR986igkZSwhY//Yxsk5eRI+gz7sxMfhcLZX2NS8PftCOiXr3S74/Q==",
+      "version": "0.3.322",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-darwin-x64/-/claude-agent-sdk-darwin-x64-0.3.322.tgz",
+      "integrity": "sha512-rTvLS9G1OzjMIaSXrJglQtmRtVcaRmMbJQC+ND02+atCA463ac7Ty/Wc6tyzBGk8zFFGKWnfAhKtLZTNg91eMg==",
      "cpu": [
        "x64"
      ],
@@ -103,9 +103,9 @@
      ]
    },
    "node_modules/@anthropic-ai/claude-agent-sdk-linux-arm64": {
-      "version": "0.3.321",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-linux-arm64/-/claude-agent-sdk-linux-arm64-0.3.321.tgz",
-      "integrity": "sha512-vdk9tON09SnsSh/6ULzYTBgsKRat6FyIaqnh4snYl3uy3qX0jpv5UuFUWgS5tvQ1ewI0qYF2k+D78El4gi7/iQ==",
+      "version": "0.3.322",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-linux-arm64/-/claude-agent-sdk-linux-arm64-0.3.322.tgz",
+      "integrity": "sha512-H1v33+MxB5JMPlnJLZffiOQ+6muxyA7tgHPyYQ+So4TH7uRhaPcjv2X03CUo5U9gXleO6u+X8ngNNDRFtfUaSg==",
      "cpu": [
        "arm64"
      ],
@@ -119,9 +119,9 @@
      ]
    },
    "node_modules/@anthropic-ai/claude-agent-sdk-linux-arm64-musl": {
-      "version": "0.3.321",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-linux-arm64-musl/-/claude-agent-sdk-linux-arm64-musl-0.3.321.tgz",
-      "integrity": "sha512-+8zFXMpJT2r+0j4E1v9BgRf+Qjtmmp4IG/3mDLT6jB6iA+9UvG9RLex+cqct09d+7xP2mDP8kL4cD1WtKUFX1w==",
+      "version": "0.3.322",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-linux-arm64-musl/-/claude-agent-sdk-linux-arm64-musl-0.3.322.tgz",
+      "integrity": "sha512-zvgvVA/Mxpu1QttICZ1DGDlmgGo62HdVgKg6WbDGDQ3dgxtRC/kpCIepjtGEL8O1iO5NRxQ4mv8okLwCFcyrLQ==",
      "cpu": [
        "arm64"
      ],
@@ -135,9 +135,9 @@
      ]
    },
    "node_modules/@anthropic-ai/claude-agent-sdk-linux-x64": {
-      "version": "0.3.321",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-linux-x64/-/claude-agent-sdk-linux-x64-0.3.321.tgz",
-      "integrity": "sha512-i/Y8Ps4q68SRwWB54yFXyItBwn5YHIOYY4R1gla6p4UwF/pM+xxrHycv+yecbC7oU30ShuBYKWN9mRIZ/BCMqw==",
+      "version": "0.3.322",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-linux-x64/-/claude-agent-sdk-linux-x64-0.3.322.tgz",
+      "integrity": "sha512-M/i7uV5wQf1kvjiPJr2KF5PeA9BpftUpMTtwE+DpQ0Tj+scthQXSMsEhDvau/Rh/MfFOc+UHED4tltignmA5+Q==",
      "cpu": [
        "x64"
      ],
@@ -151,9 +151,9 @@
      ]
    },
    "node_modules/@anthropic-ai/claude-agent-sdk-linux-x64-musl": {
-      "version": "0.3.321",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-linux-x64-musl/-/claude-agent-sdk-linux-x64-musl-0.3.321.tgz",
-      "integrity": "sha512-ils3IGsNKIDiURuOgSWorLsjMOlKcMdXQCQyaygEycdtPFItPoIBIYDVjoC1I0XV4tlfXXCHfUvNrs23g4HKNw==",
+      "version": "0.3.322",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-linux-x64-musl/-/claude-agent-sdk-linux-x64-musl-0.3.322.tgz",
+      "integrity": "sha512-jprUZMcQ3XcpoxwKRQ0fi3qAM1zYcytmNGhlD0gWDknbbSu8di5jLU7231ihJrCr4gbbtDu3FiFUd6w9EBEjfw==",
      "cpu": [
        "x64"
      ],
@@ -167,9 +167,9 @@
      ]
    },
    "node_modules/@anthropic-ai/claude-agent-sdk-win32-arm64": {
-      "version": "0.3.321",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-win32-arm64/-/claude-agent-sdk-win32-arm64-0.3.321.tgz",
-      "integrity": "sha512-v6/8ikUcYRSYhH5PSGcHq8L6+DKRq/M4I3BzFckis6kMh3degvSuUD1u3+M/oSJ/bcSOA8tXbUgTTwKrlOgvwQ==",
+      "version": "0.3.322",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-win32-arm64/-/claude-agent-sdk-win32-arm64-0.3.322.tgz",
+      "integrity": "sha512-o5sPmBKT4NOglODC45wSTFmjD1AQIboC9NdGFQFOTa8kMF3bok+YqpB0DF81RmMDf3iR5tieonZvOXdYm1TDjQ==",
      "cpu": [
        "arm64"
      ],
@@ -180,9 +180,9 @@
      ]
    },
    "node_modules/@anthropic-ai/claude-agent-sdk-win32-x64": {
-      "version": "0.3.321",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-win32-x64/-/claude-agent-sdk-win32-x64-0.3.321.tgz",
-      "integrity": "sha512-9i7ziCR+Wg47cRhYONHnUpTGxUgxfy/+J3N3/4F8YGqz7WLSNH3hpGRj6uJzNK4EMyEhFsca532uD2we0ZMckQ==",
+      "version": "0.3.322",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-win32-x64/-/claude-agent-sdk-win32-x64-0.3.322.tgz",
+      "integrity": "sha512-gONOkYx76of3p73opgWAT9gqpV7PRL8+az3vKoWXLc4xaDW6vhZF7fixpCnLDeUmPWxjXhnQxf30WGpKneTzNw==",
      "cpu": [
        "x64"
      ],
@@ -555,9 +555,9 @@
      }
    },
    "node_modules/@rolldown/binding-android-arm-eabi": {
-      "version": "1.2.16",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm-eabi/-/binding-android-arm-eabi-1.2.16.tgz",
-      "integrity": "sha512-ia3DwAs0OsMGS7+IConptSiyk9pEXkOx/AbJ2n/lAGxH3QkWQus1t8d7gnAT38FCU2sQu8lUbeR6AiZFv4JxaA==",
+      "version": "1.2.18",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm-eabi/-/binding-android-arm-eabi-1.2.18.tgz",
+      "integrity": "sha512-ubTG+4KlidvioxjOFdsdEa2F6JVGZb8m2ByJUqQ7fYzUeT1cEn194POcsQ10PKH4p//q0YQn4SB3YpSuzcA1Yg==",
      "cpu": [
        "arm"
      ],
@@ -573,9 +573,9 @@
      }
    },
    "node_modules/@rolldown/binding-android-arm64": {
-      "version": "1.2.16",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.2.16.tgz",
-      "integrity": "sha512-kx5wBiMB6E7TEvpl2B9gjLU004BkvEm2Dr941BFjx/SontPwSzNuQUIoVKxHHoSjpFIfHMmcguyLOtyn0hObRg==",
+      "version": "1.2.18",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.2.18.tgz",
+      "integrity": "sha512-2Xa1t/JeFGTZn5TbzgPppcCftF8sCVnTNvrIvoSdcZhoFzAuVy1L3xxQUQ4sfWDtwVzg1u6Yi1R3SlJugRNV2Q==",
      "cpu": [
        "arm64"
      ],
@@ -591,9 +591,9 @@
      }
    },
    "node_modules/@rolldown/binding-darwin-arm64": {
-      "version": "1.2.16",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.2.16.tgz",
-      "integrity": "sha512-qslZrXnKJU4cUpjoAmtAo/KQM9e2IRMlmpig6Zpwj+8KWxW8v+nkAf9216Bsek9lOC1jvg2yCjygCFo2f83msQ==",
+      "version": "1.2.18",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.2.18.tgz",
+      "integrity": "sha512-iUzw9HshVvrWci9gVXjxWS7/M/IcLvNo67vu2c/w9zKBz4hIvPRixdUpIW/iCfhldLaq9ER2hecsI9UY5z0/yA==",
      "cpu": [
        "arm64"
      ],
@@ -609,9 +609,9 @@
      }
    },
    "node_modules/@rolldown/binding-darwin-x64": {
-      "version": "1.2.16",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.2.16.tgz",
-      "integrity": "sha512-FdF+y48ND13eAyM2mQn+85kvAqNlvRWROy2rhgA463X/0Gv4vGtazZtfaF1mRBLscYvtOlh4QnLjOWiFzX69OQ==",
+      "version": "1.2.18",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.2.18.tgz",
+      "integrity": "sha512-XuDHFzbFEtZl0QGJi92+fmG67tfnp1iZ9VOeDkwasGyTq2VG3/5PnJnvAr+MTzFh/rNScJ3VhN+XpZyyGsN7Jw==",
      "cpu": [
        "x64"
      ],
@@ -627,9 +627,9 @@
      }
    },
    "node_modules/@rolldown/binding-freebsd-x64": {
-      "version": "1.2.16",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.2.16.tgz",
-      "integrity": "sha512-ddjqFM5e95AgLbUPtKIS7V1KTVlA0RUgCVr5mn+/IEhsdy3pr+Vuj/HZ7nlMN2FyxIwUktOH1LEPIQXO1v9y1Q==",
+      "version": "1.2.18",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.2.18.tgz",
+      "integrity": "sha512-MM8opLfsLK15oEXDz6iBc0t3ahu+ew9jsAmha+ovZ33hSwYgqo7YmpRITqFTfW7xA71BLEQ3jJdTsaCmhB1c9w==",
      "cpu": [
        "x64"
      ],
@@ -645,9 +645,9 @@
      }
    },
    "node_modules/@rolldown/binding-linux-arm-gnueabihf": {
-      "version": "1.2.16",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.2.16.tgz",
-      "integrity": "sha512-tHdKWbFkFBI687iim3LIyIvyL7j66VvQYkDPss5Stn/qyE2tWkR1YD0dXmXPFKKqT/o5ZEJVsaRsWS2meQwGOA==",
+      "version": "1.2.18",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.2.18.tgz",
+      "integrity": "sha512-J6EoCWiy5RnFQzHrKyHXXevZ9lukQfGpnchX/zG/k/WC2nc9O9XyS1JgA8kI9VxMFggMbCPjpv7LcikriXfehw==",
      "cpu": [
        "arm"
      ],
@@ -663,9 +663,9 @@
      }
    },
    "node_modules/@rolldown/binding-linux-arm64-gnu": {
-      "version": "1.2.16",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.2.16.tgz",
-      "integrity": "sha512-FJiLGAblPBMlBEdbOqw6kW6QcXDWAf/oJu7gYs9ZJZwmg+K+/zjFLxPTIY9izJUzxzc24FHvmseyA0IvJSl17w==",
+      "version": "1.2.18",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.2.18.tgz",
+      "integrity": "sha512-HIkFuLF7CdDeki+1aCZLLbLq0hk/PHntb+z4/YCTo47JbksTD6jJEELIz92tYROmDmvMrNqUMqBi71BkJLDR+A==",
      "cpu": [
        "arm64"
      ],
@@ -684,9 +684,9 @@
      }
    },
    "node_modules/@rolldown/binding-linux-arm64-musl": {
-      "version": "1.2.16",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.2.16.tgz",
-      "integrity": "sha512-hrJpblMsrQ58U9veWpbXzkhV5zStunds6HWLprqq1qauvgBr1E6P+24kLj6lSLI9vjRn/RYpjprhkHQPKGWpNg==",
+      "version": "1.2.18",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.2.18.tgz",
+      "integrity": "sha512-4oqWItLLYt7IceOnElCct8T2ek5p7PmD7LN04TRJRXGo5f3HtKTgGH6PhYRFK4C2ICkq/LMUU0BVPvvlAKhm8g==",
      "cpu": [
        "arm64"
      ],
@@ -705,9 +705,9 @@
      }
    },
    "node_modules/@rolldown/binding-linux-ppc64-gnu": {
-      "version": "1.2.16",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.2.16.tgz",
-      "integrity": "sha512-qJd/dC6j6CwLG9/s/RP2nb1RZ0GIgj7Ioj7x/SYa3RzjVrlzrmH0fhIOpfvqQDeIsdP0loi+kHaMhJzY1PBIaA==",
+      "version": "1.2.18",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.2.18.tgz",
+      "integrity": "sha512-+AkRly5SrCEgnPhGRfub7pucASYEC2fTsxZg7VCcnozpA2+Wn/gCYy1t7LuJS67/xyJu/7noYBJncDUkbwgw2A==",
      "cpu": [
        "ppc64"
      ],
@@ -726,9 +726,9 @@
      }
    },
    "node_modules/@rolldown/binding-linux-s390x-gnu": {
-      "version": "1.2.16",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.2.16.tgz",
-      "integrity": "sha512-Vx7Xg5uUJuNcujJjI70OICaH0EYj80BtOLZTSN7uOYg8QOLlyKnaG0IW7Fn/J0IpJsaKzmDKMhOQv1JBM9m9vg==",
+      "version": "1.2.18",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.2.18.tgz",
+      "integrity": "sha512-Ttg1r9vVykMnQrE/GwYO9icKtXiuiMfRe/w74xJkeoVuvhRG+WtT6LEMOf58Yl63yd77lhHzO8Y55R8CC3XALA==",
      "cpu": [
        "s390x"
      ],
@@ -747,9 +747,9 @@
      }
    },
    "node_modules/@rolldown/binding-linux-x64-gnu": {
-      "version": "1.2.16",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.2.16.tgz",
-      "integrity": "sha512-TNKhgE3uJTsTzatUSSYt0Kgo+Oa2uSlSjz4r1aEIea7HX6ULBym4fAlYUhG1i6pjNf2njfCUAfKwr6C3E9Xg1w==",
+      "version": "1.2.18",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.2.18.tgz",
+      "integrity": "sha512-xX1Tt4o5jUMma0vJsXp5eRZA9nOuyigb2dKJMMzZRmzMxLYGE9PaKKSqHPzPvSQgM8ZOEacSTQwDQcwWfh0xmQ==",
      "cpu": [
        "x64"
      ],
@@ -768,9 +768,9 @@
      }
    },
    "node_modules/@rolldown/binding-linux-x64-musl": {
-      "version": "1.2.16",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.2.16.tgz",
-      "integrity": "sha512-7chXdpjXZ8qG0+mIxECN3cT9kvhZ3/oZhMX6Pp876P7CDrIy8nJswva6Mq357JR7eYXfuskwZxMeV1SzoZdHrA==",
+      "version": "1.2.18",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.2.18.tgz",
+      "integrity": "sha512-4VVlGI5K2kociZlW3lSN8VjG3TW5yQIlAcfCdBXMgGjJxZll15Fa4ocRHXHvIVVnwlibCw/NQajJrNDiqqpiiw==",
      "cpu": [
        "x64"
      ],
@@ -789,9 +789,9 @@
      }
    },
    "node_modules/@rolldown/binding-openharmony-arm64": {
-      "version": "1.2.16",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.2.16.tgz",
-      "integrity": "sha512-Kwjt+7uNTJK5/MDkGWGVO2KQPnj8yAV75dMpfwyHZrJSXWHrniOB0aUEWlVYf3H1hOqFLIStLdM5QXq6bnKmOQ==",
+      "version": "1.2.18",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.2.18.tgz",
+      "integrity": "sha512-PApTsgH1jLYuyy3tSCz9De82Gq5qXwi7vImVZhEzTgX1C4150Cp5M2ZfL3pLvbCvbEHL0oJeC6pd6podtv8Y5w==",
      "cpu": [
        "arm64"
      ],
@@ -807,9 +807,9 @@
      }
    },
    "node_modules/@rolldown/binding-win32-arm64-msvc": {
-      "version": "1.2.16",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.2.16.tgz",
-      "integrity": "sha512-/LH6WfjDRXXJz/p5xl4TmU+jpcnwcxbKEQBW/GZE0JHfN0lGIyTtsUEGaQ/q/GikkGJ2yLKe6pwm7AnEWO8pdw==",
+      "version": "1.2.18",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.2.18.tgz",
+      "integrity": "sha512-J2XjWjx/SP+4x0H4r6dz3Vzb5WVkg7re40Do9K7HJ3sK2/xcmZrWwakXlSwaMvOkvruLJCD4CL/3wqsIR/thgg==",
      "cpu": [
        "arm64"
      ],
@@ -825,9 +825,9 @@
      }
    },
    "node_modules/@rolldown/binding-win32-x64-msvc": {
-      "version": "1.2.16",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.2.16.tgz",
-      "integrity": "sha512-1lv1KvX0Z871zfk7vw+dnXMMnHNyDwMzWG8Kv3HxDXMOhzCX4SHc7HK319fInP0i+0p9D8brkfzL7pJOaGl+tw==",
+      "version": "1.2.18",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.2.18.tgz",
+      "integrity": "sha512-XwRJxRQvkuEtS0hIIt29QrqPJ+JzMJSNYHJw4ae/mc6uEarfRG1ceyg4HmmWiBdL/YCb6g7N5BLbSvmRJRYZHw==",
      "cpu": [
        "x64"
      ],
@@ -1945,9 +1945,9 @@
      }
    },
    "node_modules/express-rate-limit": {
-      "version": "8.7.3",
-      "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-8.7.3.tgz",
-      "integrity": "sha512-zPLqDI2f0gV2WmGnacLf9XSSqn4VldRyP5LCzOwx0BKH40mO6+2PCFkoSsRO2jePx87/Kf6NUF6P2QOTKXHbQA==",
+      "version": "8.7.4",
+      "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-8.7.4.tgz",
+      "integrity": "sha512-LKBXzX700wz3zAGNNmVnjRI5mEbYkLv7UbMI4+9Xa+JPcg2UZh6AgY/2CZh9RrJjFM5ttC/N1lD+KzyFoZITCw==",
      "license": "MIT",
      "peer": true,
      "dependencies": {
@@ -2408,9 +2408,9 @@
      "license": "ISC"
    },
    "node_modules/jose": {
-      "version": "6.2.16",
-      "resolved": "https://registry.npmjs.org/jose/-/jose-6.2.16.tgz",
-      "integrity": "sha512-4LSJpbuBuPdGrONCdZUy0xnxtLf8eEz+EY0SMXdHQEBU7bgUHDVblU/JAjryv3wID9/LK7/YuwFwq+AQNfMscQ==",
+      "version": "6.2.17",
+      "resolved": "https://registry.npmjs.org/jose/-/jose-6.2.17.tgz",
+      "integrity": "sha512-wOuK9V1yujQFH5S0ZWmLcDZN7+IKh9bUCC2ZPCf2HDlol3WWHy+PPyNjEI75FXRLMp3vDKQcupP59xhVU95hcg==",
      "license": "MIT",
      "peer": true,
      "funding": {
@@ -3275,9 +3275,9 @@
      }
    },
    "node_modules/rolldown": {
-      "version": "1.2.16",
-      "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.16.tgz",
-      "integrity": "sha512-bWvlMpFKiTfDKfnK7FC2MPgPeWCf/Kpwsq49ApdW+FQaBZb6O6dZ4MAPbPUjp7hYQrw/RobqCzn64BRrQecGHw==",
+      "version": "1.2.18",
+      "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.18.tgz",
+      "integrity": "sha512-C1uuT3UR60SShuCaPQFAAZyefJCWZlAKB02BV3BuPE2Rs4fevRQltEKoFO2tV5W9/eJhU5RieV6vJj3euulfNQ==",
      "dev": true,
      "license": "MIT",
      "peer": true,
@@ -3292,21 +3292,21 @@
        "node": "^20.19.0 || >=22.12.0"
      },
      "optionalDependencies": {
-        "@rolldown/binding-android-arm-eabi": "1.2.16",
-        "@rolldown/binding-android-arm64": "1.2.16",
-        "@rolldown/binding-darwin-arm64": "1.2.16",
-        "@rolldown/binding-darwin-x64": "1.2.16",
-        "@rolldown/binding-freebsd-x64": "1.2.16",
-        "@rolldown/binding-linux-arm-gnueabihf": "1.2.16",
-        "@rolldown/binding-linux-arm64-gnu": "1.2.16",
-        "@rolldown/binding-linux-arm64-musl": "1.2.16",
-        "@rolldown/binding-linux-ppc64-gnu": "1.2.16",
-        "@rolldown/binding-linux-s390x-gnu": "1.2.16",
-        "@rolldown/binding-linux-x64-gnu": "1.2.16",
-        "@rolldown/binding-linux-x64-musl": "1.2.16",
-        "@rolldown/binding-openharmony-arm64": "1.2.16",
-        "@rolldown/binding-win32-arm64-msvc": "1.2.16",
-        "@rolldown/binding-win32-x64-msvc": "1.2.16"
+        "@rolldown/binding-android-arm-eabi": "1.2.18",
+        "@rolldown/binding-android-arm64": "1.2.18",
+        "@rolldown/binding-darwin-arm64": "1.2.18",
+        "@rolldown/binding-darwin-x64": "1.2.18",
+        "@rolldown/binding-freebsd-x64": "1.2.18",
+        "@rolldown/binding-linux-arm-gnueabihf": "1.2.18",
+        "@rolldown/binding-linux-arm64-gnu": "1.2.18",
+        "@rolldown/binding-linux-arm64-musl": "1.2.18",
+        "@rolldown/binding-linux-ppc64-gnu": "1.2.18",
+        "@rolldown/binding-linux-s390x-gnu": "1.2.18",
+        "@rolldown/binding-linux-x64-gnu": "1.2.18",
+        "@rolldown/binding-linux-x64-musl": "1.2.18",
+        "@rolldown/binding-openharmony-arm64": "1.2.18",
+        "@rolldown/binding-win32-arm64-msvc": "1.2.18",
+        "@rolldown/binding-win32-x64-msvc": "1.2.18"
      }
    },
    "node_modules/router": {
@@ -3699,9 +3699,9 @@
      }
    },
    "node_modules/vite": {
-      "version": "8.3.6",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-8.3.6.tgz",
-      "integrity": "sha512-UI7dK29NnS54Fk+mmo7o+jI6U8Fp7hDl+X5Q1k45WH+d4dSlbLVUETGQ+hfkNgvLQGyoElPj837nZyv4MBc0VA==",
+      "version": "8.3.7",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-8.3.7.tgz",
+      "integrity": "sha512-oxh0dMxrayBr33ScJvvBJ2HBQ2jc1TBrXKR2NyL/MJ9WPuX19mN2DXWUmywKdyw5RFVQBo8hmtb2FMC0LHrnng==",
      "dev": true,
      "license": "MIT",
      "peer": true,
@@ -3709,7 +3709,7 @@
        "lightningcss": "^1.33.0",
        "picomatch": "^4.0.7",
        "postcss": "^8.5.32",
-        "rolldown": "~1.2.16",
+        "rolldown": "~1.2.18",
        "tinyglobby": "^0.2.17"
      },
      "bin": {
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
  "publishConfig": {
    "access": "public"
  },
-  "version": "0.104.0",
+  "version": "0.104.1",
  "description": "An ACP-compatible coding agent powered by the Claude Agent SDK (TypeScript)",
  "main": "dist/lib.js",
  "types": "dist/lib.d.ts",
@@ -69,7 +69,7 @@
  },
  "dependencies": {
    "@agentclientprotocol/sdk": "2.5.0",
-    "@anthropic-ai/claude-agent-sdk": "0.3.321",
+    "@anthropic-ai/claude-agent-sdk": "0.3.322",
    "diff": "9.0.0",
    "zod": "4.6.7"
  },
--- a/src/acp-client.ts
+++ b/src/acp-client.ts
@@ -16,7 +16,7 @@ import type { AcpPermissionRequest } from "./permissions/presentation.js";
 * Client-facing surface the agent calls back into. This is the subset of ACP
 * client methods the agent actually uses, expressed as a narrow interface so
 * tests can supply lightweight mocks. In the v1 agent it is backed by
- * `ClientConnection` (`v1/acp-agent.ts`) over the SDK's typed `AgentContext`.
+ * `ClientConnection` (`v1/client-connection.ts`) over the SDK's typed `AgentContext`.
 * The v2 session output passes one that only takes `sessionUpdate`
 * (`v2/stream.ts`).
 */
--- a/src/auth-status-reporter.ts
+++ b/src/auth-status-reporter.ts
@@ -188,8 +188,8 @@ export class AuthStatusReporter {
  /**
   * Report the identity behind a session's `AccountInfo`.
   *
-   * `AccountInfo` is richer than the CLI probe (it is what the live query
-   * actually authenticates with). The v1 core calls it before the
+   * `AccountInfo` describes what the live query authenticates with, but lacks
+   * the CLI's plan tier. The v1 core calls it before the
   * `--hide-claude-auth` guard may refuse the session or the turn: that flag
   * blocks the *use* of a subscription, it does not make the state secret, and
   * a refusal is when the client most needs to know the account it was
@@ -225,7 +225,7 @@ export class AuthStatusReporter {
    }
    const fromSession = fromAccountInfo(account, apiKeyHelper);
    if (fromSession) {
-      this.set(fromSession);
+      this.set(mergeAuthStatus(this.current, fromSession, "session"));
    } else if (!this.loggedUninformativeAccount) {
      this.loggedUninformativeAccount = true;
      this.options.logger.log(
@@ -337,7 +337,7 @@ export class AuthStatusReporter {
    // The CLI probe can be poorer than the session `AccountInfo` for the very
    // same login (no organization, say). Keep those extra fields rather than
    // regressing the payload; a different identity replaces it wholesale.
-    const merged = mergeAuthStatus(this.current, status);
+    const merged = mergeAuthStatus(this.current, status, "cli");
    this.set(merged);
    this.options.onProbe?.(status.kind);
    return merged;
--- a/src/auth-status.ts
+++ b/src/auth-status.ts
@@ -104,8 +104,10 @@ export type AcpAuthStatus = Pick<AuthStatusResponse, "state" | "accounts">;
 * - No identity read yet (`undefined`): `unknown`, no accounts.
 * - `kind: "none"`: `unauthenticated`, no accounts.
 * - Any other kind: `authenticated`, with the identity as the one account,
- *   marked `active`. `_meta.claudeCode` carries the `kind`, `detail` and
- *   `plan` that the account fields have no place for.
+ *   marked `active`. The account has no field for `detail`, so its label
+ *   carries it in parentheses, e.g. "Anthropic API key (ANTHROPIC_API_KEY)",
+ *   for clients that show only the standard fields. `_meta.claudeCode`
+ *   carries the `kind`, `detail` and `plan` on their own.
 *
 * `--hide-claude-auth` does not change the payload: it reports the login the
 * CLI holds, also when the subscription guard refuses to use it.
@@ -117,7 +119,8 @@ export function toAcpAuthStatus(status: AuthStatus | undefined): AcpAuthStatus {
  if (status.kind === "none") {
    return { state: "unauthenticated" };
  }
-  const account: AuthAccount = { label: status.label, active: true };
+  const label = status.detail ? `${status.label} (${status.detail})` : status.label;
+  const account: AuthAccount = { label, active: true };
  if (status.account?.email) account.email = status.account.email;
  if (status.account?.organization) account.organization = status.account.organization;
  account._meta = {
@@ -141,6 +144,8 @@ export type CliAuthStatus = {
  orgId?: string;
  orgName?: string;
  subscriptionType?: string;
+  /** CLI-only tier, e.g. "max_5x" or "max_20x"; not in SDK AccountInfo. */
+  planTier?: string;
 };

 const NOT_LOGGED_IN: AuthStatus = {
@@ -267,6 +272,7 @@ export function fromCliStatus(stdout: string, apiKeyHelper?: string): AuthStatus
  return mapAuthFields({
    apiProvider: status.apiProvider,
    subscriptionType: status.subscriptionType,
+    planTier: status.planTier,
    apiKeySource: status.apiKeySource,
    email: status.email,
    organization: status.orgName,
@@ -287,6 +293,7 @@ export function fromCliStatus(stdout: string, apiKeyHelper?: string): AuthStatus
 function mapAuthFields(fields: {
  apiProvider?: string;
  subscriptionType?: string;
+  planTier?: string;
  apiKeySource?: string;
  email?: string;
  organization?: string;
@@ -326,7 +333,7 @@ function mapAuthFields(fields: {
    if (organization) account.organization = organization;
    return {
      kind: "account",
-      label: planLabel(subscriptionType),
+      label: planLabel(subscriptionType, fields.planTier),
      // No detail: the client falls back to `account.email` for line 2.
      account,
    };
@@ -334,12 +341,14 @@ function mapAuthFields(fields: {
  return notLoggedInAuthStatus();
 }

-/** Names the plan with exactly one "Claude". A newer CLI already reports
- *  "Claude Max", an older one reports "max", and both must read "Claude Max".
- *  Each word is title-cased; a word that already carries capitals is kept. */
-function planLabel(plan: string): string {
+/** Names the plan with exactly one "Claude". Without a tier, "Claude Max"
+ *  from a newer CLI and "max" from an older one both read "Claude Max".
+ *  Each word is title-cased; a word that already carries capitals is kept.
+ *  The CLI's max_20x tier identifies Ultra; other tiers keep the plan label. */
+function planLabel(plan: string, planTier?: string): string {
  const titled = plan.replace(/\S+/g, (word) => word.charAt(0).toUpperCase() + word.slice(1));
-  return /^claude(\s|$)/i.test(plan) ? titled : `Claude ${titled}`;
+  const label = /^claude(\s|$)/i.test(plan) ? titled : `Claude ${titled}`;
+  return label.toLowerCase() === "claude max" && planTier === "max_20x" ? "Claude Ultra" : label;
 }

 /**
@@ -367,8 +376,14 @@ export function sameIdentity(a: AuthStatus, b: AuthStatus): boolean {
 * organization the CLI probe omits. So when the read describes the same
 * identity, its values win field by field but the fields it lacks are kept;
 * when it describes a different identity, it replaces the old one wholesale.
+ * Session reads lack the CLI's plan tier, so keep the label for the same plan.
+ * A CLI read always replaces the label, including when its tier is absent.
 */
-export function mergeAuthStatus(previous: AuthStatus | undefined, next: AuthStatus): AuthStatus {
+export function mergeAuthStatus(
+  previous: AuthStatus | undefined,
+  next: AuthStatus,
+  source: "cli" | "session",
+): AuthStatus {
  if (!previous || !sameIdentity(previous, next)) {
    return next;
  }
@@ -379,6 +394,14 @@ export function mergeAuthStatus(previous: AuthStatus | undefined, next: AuthStat
  if (previous.account || next.account) {
    merged.account = { ...previous.account, ...next.account };
  }
+  if (
+    source === "session" &&
+    previous.account?.plan &&
+    next.account?.plan &&
+    planLabel(previous.account.plan).toLowerCase() === planLabel(next.account.plan).toLowerCase()
+  ) {
+    merged.label = previous.label;
+  }
  if (merged.vendor === undefined && previous.vendor !== undefined) {
    merged.vendor = previous.vendor;
  }
--- a/src/tests/v1/auth-status.test.ts
+++ b/src/tests/v1/auth-status.test.ts
@@ -220,7 +220,7 @@ describe("auth status mappers", () => {
        state: "authenticated",
        accounts: [
          {
-            label: "Anthropic API key",
+            label: "Anthropic API key (env)",
            active: true,
            _meta: { claudeCode: { kind: "api_key", detail: "env" } },
          },
@@ -363,6 +363,48 @@ describe("auth status mappers", () => {
    ).toEqual({ kind: "account", label: "Claude subscription", detail: "OAuth token" });
  });

+  it.each([
+    ["max", "max_20x", "Claude Ultra"],
+    ["Claude Max", "max_20x", "Claude Ultra"],
+    ["max", "max_5x", "Claude Max"],
+    ["max", "max_other", "Claude Max"],
+    ["max", undefined, "Claude Max"],
+    ["max", "future_tier", "Claude Max"],
+    ["max", null, "Claude Max"],
+    ["max", 20, "Claude Max"],
+    ["max", { tier: "max_20x" }, "Claude Max"],
+    ["max", ["max_20x"], "Claude Max"],
+    ["pro", "max_20x", "Claude Pro"],
+    ["Future Plan", "future_tier", "Claude Future Plan"],
+  ])("labels CLI plan %j with tier %j as %j", (subscriptionType, planTier, label) => {
+    expect(
+      fromCliStatus(
+        JSON.stringify({
+          ...JSON.parse(CLI_SUBSCRIPTION),
+          subscriptionType,
+          planTier,
+        }),
+      ),
+    ).toEqual({
+      kind: "account",
+      label,
+      account: { plan: subscriptionType, email: "user@example.com", organization: "ACME" },
+    });
+  });
+
+  it.each([
+    [{ apiKeySource: "env" }, { kind: "api_key", label: "Anthropic API key", detail: "env" }],
+    [{ apiProvider: "bedrock" }, { kind: "external", label: "AWS Bedrock" }],
+    [{ apiProvider: "gateway" }, { kind: "gateway", label: "Custom model gateway" }],
+    [{ loggedIn: false }, { kind: "none", label: "Not logged in" }],
+  ])("does not let a subscription tier override auth fields %j", (fields, expected) => {
+    expect(
+      fromCliStatus(
+        JSON.stringify({ ...JSON.parse(CLI_SUBSCRIPTION), planTier: "max_20x", ...fields }),
+      ),
+    ).toEqual(expected);
+  });
+
  it("lets a third-party backend outrank the logged-out flag", () => {
    // `loggedIn` tracks the claude.ai login only; on Bedrock the credentials
    // are external and the agent is authenticated all the same.
@@ -384,19 +426,27 @@ describe("auth status mappers", () => {
    };
    // Same login, read from a source without the organization: it survives.
    expect(
-      mergeAuthStatus(stored, {
-        kind: "account",
-        label: "Claude Max",
-        account: { plan: "max", email: "user@example.com" },
-      }),
+      mergeAuthStatus(
+        stored,
+        {
+          kind: "account",
+          label: "Claude Max",
+          account: { plan: "max", email: "user@example.com" },
+        },
+        "cli",
+      ),
    ).toEqual(stored);
    // A different login replaces everything, organization included.
    expect(
-      mergeAuthStatus(stored, {
-        kind: "account",
-        label: "Claude Pro",
-        account: { plan: "pro", email: "other@example.com" },
-      }),
+      mergeAuthStatus(
+        stored,
+        {
+          kind: "account",
+          label: "Claude Pro",
+          account: { plan: "pro", email: "other@example.com" },
+        },
+        "cli",
+      ),
    ).toEqual({
      kind: "account",
      label: "Claude Pro",
@@ -404,7 +454,11 @@ describe("auth status mappers", () => {
    });
    // A different kind never merges, even when it looks adjacent.
    expect(
-      mergeAuthStatus(stored, { kind: "api_key", label: "Anthropic API key", detail: "env" }),
+      mergeAuthStatus(
+        stored,
+        { kind: "api_key", label: "Anthropic API key", detail: "env" },
+        "cli",
+      ),
    ).toEqual({ kind: "api_key", label: "Anthropic API key", detail: "env" });
    // Key sources identify api_key payloads.
    expect(
@@ -414,6 +468,29 @@ describe("auth status mappers", () => {
      ),
    ).toBe(false);
  });
+
+  it.each<["cli" | "session", string, string, string | undefined, string]>([
+    ["session", "max", "user@example.com", undefined, "Claude Ultra"],
+    ["session", "Claude Max", "user@example.com", undefined, "Claude Ultra"],
+    ["session", "pro", "user@example.com", undefined, "Claude Pro"],
+    ["session", "max", "other@example.com", undefined, "Claude Max"],
+    ["cli", "max", "user@example.com", "max_5x", "Claude Max"],
+    ["cli", "max", "user@example.com", undefined, "Claude Max"],
+    ["cli", "max", "user@example.com", "future_tier", "Claude Max"],
+  ])(
+    "merges a %s read of %s for %s with tier %s as %s",
+    (source, subscriptionType, email, planTier, label) => {
+      const previous = fromCliStatus(
+        JSON.stringify({ ...JSON.parse(CLI_SUBSCRIPTION), planTier: "max_20x" }),
+      );
+      const fields = { apiProvider: "firstParty" as const, subscriptionType, email };
+      const next =
+        source === "session"
+          ? fromAccountInfo(fields)
+          : fromCliStatus(JSON.stringify({ ...fields, loggedIn: true, planTier }));
+      expect(mergeAuthStatus(previous, next!, source).label).toBe(label);
+    },
+  );
 });

 describe("auth status over ACP", () => {
@@ -765,7 +842,7 @@ describe("auth status over ACP", () => {
      state: "authenticated",
      accounts: [
        {
-          label: "Custom model gateway",
+          label: "Custom model gateway (gw.example.com)",
          active: true,
          _meta: { claudeCode: { kind: "gateway", detail: "gw.example.com" } },
        },
@@ -783,7 +860,7 @@ describe("auth status over ACP", () => {
    agent.setAuthStatus({ kind: "api_key", label: "Anthropic API key", detail: "env" });
    expect(await agent.authStatusResponse()).toMatchObject({
      state: "authenticated",
-      accounts: [{ label: "Anthropic API key" }],
+      accounts: [{ label: "Anthropic API key (env)" }],
    });
  });

@@ -859,6 +936,32 @@ describe("auth status over ACP", () => {
    });
  });

+  it.each(["max_5x", undefined, "future_tier"])(
+    "keeps Ultra across session reads and refreshes the label for CLI tier %j",
+    async (planTier) => {
+      statusStdout = JSON.stringify({ ...JSON.parse(CLI_SUBSCRIPTION), planTier: "max_20x" });
+      await initialize();
+      const sessionId = await scriptedSession({
+        apiProvider: "firstParty",
+        subscriptionType: "Claude Max",
+        email: "user@example.com",
+      });
+      await promptOnce(sessionId);
+      expect(updates().every((call) => call[1].authStatus.label === "Claude Ultra")).toBe(true);
+      expect(await agent.authStatusResponse()).toMatchObject({
+        accounts: [{ label: "Claude Ultra", _meta: { claudeCode: { plan: "max" } } }],
+      });
+      await settle();
+
+      statusStdout = JSON.stringify({ ...JSON.parse(CLI_SUBSCRIPTION), planTier });
+      await promptOnce(sessionId);
+      expect(lastPush()?.label).toBe("Claude Max");
+      expect(authStatusUpdate.mock.calls.at(-1)?.[0]).toMatchObject({
+        accounts: [{ label: "Claude Max" }],
+      });
+    },
+  );
+
  it("lets a probe of a different identity replace the stored one wholesale", async () => {
    const sessionId = await scriptedSession({
      apiProvider: "firstParty",
--- a/src/tests/v2/acp-v2.test.ts
+++ b/src/tests/v2/acp-v2.test.ts
@@ -9379,6 +9379,48 @@ describe("ACP v2 auth", () => {
    expect(acpAuthUpdates).toEqual([status]);
  });

+  it.each(["max_5x", undefined, "future_tier"])(
+    "keeps Ultra across session reads and refreshes the label for CLI tier %j",
+    async (nextTier) => {
+      let planTier: string | undefined = "max_20x";
+      execFileSpy.mockImplementation((...invocation: unknown[]) => {
+        const callback = invocation[invocation.length - 1] as (...a: unknown[]) => void;
+        callback(null, {
+          stdout: JSON.stringify({ ...JSON.parse(CLI_SUBSCRIPTION), planTier }),
+          stderr: "",
+        });
+      });
+      const account = {
+        apiProvider: "firstParty",
+        subscriptionType: "Claude Max",
+        email: "user@example.com",
+      };
+      const initializationResult = sdk.initializationResult;
+      sdk.initializationResult = async () => ({ ...(await initializationResult()), account });
+      sdk.accountInfo = async () => account;
+      const { app, authUpdate, acpAuthUpdates } = v2Client();
+      await app.connectWith(connectRouter(), async (agent) => {
+        await initializeV2(agent);
+        expect((await authUpdate(1)).authStatus.label).toBe("Claude Ultra");
+        await agent.request(v2.methods.agent.session.new, { cwd });
+        expect(await agent.request(v2.methods.agent.auth.status, {})).toMatchObject({
+          accounts: [{ label: "Claude Ultra" }],
+        });
+        expect(
+          acpAuthUpdates.every((update) => update.accounts?.[0].label === "Claude Ultra"),
+        ).toBe(true);
+
+        planTier = nextTier;
+        await agent.request(v2.methods.agent.auth.status, {});
+        await vi.waitFor(() =>
+          expect(acpAuthUpdates.at(-1)).toMatchObject({
+            accounts: [{ label: "Claude Max", _meta: { claudeCode: { plan: "max" } } }],
+          }),
+        );
+      });
+    },
+  );
+
  /**
   * In a remote environment with --hide-claude-auth, initialize offers the
   * console login as a terminal method and hides the TUI subscription login.
--- a/src/tests/v2/v2.test.ts
+++ b/src/tests/v2/v2.test.ts
@@ -2119,6 +2119,44 @@ describe("ACP v2 core", () => {
    });
  });

+  it.each([
+    ["a notice when the turn goes on to end", { result: "" }, "end_turn", 1],
+    ["a notice once when the result repeats its text", {}, "end_turn", 1],
+    ["the idle's error when the turn fails", { is_error: true }, "error", 0],
+  ])(
+    "reports Claude Code's message for a failed API request as %s, not as Claude's text",
+    async (_, fields, stopReason, notices) => {
+      const text = "API Error: Connection lost mid-response. The response above may be incomplete.";
+      const client = v2Client();
+      await client.connect(async (agent) => {
+        const { claude } = await openSession(agent);
+        claude.send(cycleStart());
+        claude.send({
+          ...assistant("msg_api_error", [{ type: "text", text }]),
+          message: {
+            id: "msg_api_error",
+            type: "message",
+            role: "assistant",
+            model: "<synthetic>",
+            content: [{ type: "text", text }],
+            usage: {},
+          },
+          error: "server_error",
+        });
+        claude.send(result({ result: text, ...fields }));
+        await vi.waitFor(() => expect(client.states()).toEqual(["running", "idle"]));
+      });
+
+      expect(
+        client.sessionUpdates.filter((update) => update.sessionUpdate === "agent_message_chunk"),
+      ).toEqual([]);
+      expect(client.sessionUpdates.filter((update) => update.sessionUpdate === "notice")).toEqual(
+        Array(notices).fill({ sessionUpdate: "notice", severity: "error", title: text }),
+      );
+      expect(client.sessionUpdates.at(-1)).toMatchObject({ state: "idle", stopReason });
+    },
+  );
+
  it.each([
    [
      "an error at the turn limit",
--- a/src/v1/acp-agent.ts
+++ b/src/v1/acp-agent.ts
@@ -1,15 +1,12 @@
 import {
  agent as acpAgent,
  AgentApp,
-  AgentContext,
  AuthenticateRequest,
  AuthMethod,
  AuthStatusResponse,
-  AuthStatusUpdateNotification,
  AvailableCommand,
  CancelNotification,
  ClientCapabilities,
-  CompleteElicitationNotification,
  CreateElicitationRequest,
  CreateElicitationResponse,
  DisableProviderRequest,
@@ -36,7 +33,6 @@ import {
  RequestError,
  SetProviderRequest,
  SetProviderResponse,
-  RequestPermissionRequest,
  RequestPermissionResponse,
  ResumeSessionRequest,
  ResumeSessionResponse,
@@ -305,7 +301,7 @@ import {
 } from "../session-usage.js";
 import { previewPatchContent } from "../diff.js";
 import { backgroundedBashToolCall, withRunningTerminal } from "../tool-calls/background.js";
-import { ChangedMetaFilter } from "./tool-calls/changed-meta-filter.js";
+import { ChangedMetaClient, ClientConnection } from "./client-connection.js";
 import { ToolCallFieldTracker } from "../tool-calls/field-tracker.js";
 import { ClientCapabilities as ToolCallClientCapabilities } from "../tool-calls/client-capabilities.js";
 import {
@@ -1751,116 +1747,6 @@ const LIMIT_FAILURE_CATEGORY = {
  error_max_structured_output_retries: "provider_error",
 } as const satisfies Record<string, ClaudeFailureKind>;

-/**
- * Bridges {@link AcpClient} to the connection-scoped {@link AgentContext}
- * exposed by `AgentApp.connect(...)` as `connection.client`. The peer handle is
- * valid for the entire connection lifetime, so it is captured once at
- * construction.
- */
-class ClientConnection implements AcpClient {
-  constructor(private readonly ctx: AgentContext) {}
-
-  sessionUpdate(params: AcpSessionNotification): Promise<void> {
-    return this.ctx.notify(methods.client.session.update, asSdkSessionNotification(params));
-  }
-
-  requestPermission(
-    params: RequestPermissionRequest,
-    signal?: AbortSignal,
-  ): Promise<RequestPermissionResponse> {
-    return this.ctx.request(methods.client.session.requestPermission, params, {
-      cancellationSignal: signal,
-      stopWaitingOnCancel: true,
-    });
-  }
-
-  readTextFile(params: ReadTextFileRequest): Promise<ReadTextFileResponse> {
-    return this.ctx.request(methods.client.fs.readTextFile, params);
-  }
-
-  writeTextFile(params: WriteTextFileRequest): Promise<WriteTextFileResponse> {
-    return this.ctx.request(methods.client.fs.writeTextFile, params);
-  }
-
-  createElicitation(
-    params: CreateElicitationRequest,
-    signal?: AbortSignal,
-  ): Promise<CreateElicitationResponse> {
-    return this.ctx.request(methods.client.elicitation.create, params, {
-      cancellationSignal: signal,
-      stopWaitingOnCancel: true,
-    });
-  }
-
-  completeElicitation(params: CompleteElicitationNotification): Promise<void> {
-    return this.ctx.notify(methods.client.elicitation.complete, params);
-  }
-
-  authStatusUpdate(params: AuthStatusUpdateNotification): Promise<void> {
-    return this.ctx.notify(methods.client.auth.statusUpdate, params);
-  }
-
-  extNotification(method: string, params: Record<string, unknown>): Promise<void> {
-    return this.ctx.notify(method, params);
-  }
-}
-
-/**
- * The client that the agent talks to. For an AIR client, every session update
- * passes the {@link ChangedMetaFilter} last, after the native subagent routing,
- * so a `tool_call_update` carries only the `_meta` keys that changed. ACP
- * merges only the top-level tool call fields, not the `_meta` keys. So another
- * client gets the full `_meta` on each update.
- */
-class ChangedMetaClient implements AcpClient {
-  private readonly filter = new ChangedMetaFilter();
-
-  constructor(
-    private readonly inner: AcpClient,
-    private readonly airClient: () => boolean,
-  ) {}
-
-  async sessionUpdate(params: AcpSessionNotification): Promise<void> {
-    if (!this.airClient()) return this.inner.sessionUpdate(params);
-    const update = this.filter.apply(params.update as SessionNotification["update"]);
-    if (update) await this.inner.sessionUpdate({ ...params, update } as AcpSessionNotification);
-  }
-
-  requestPermission(
-    params: AcpPermissionRequest,
-    signal?: AbortSignal,
-  ): Promise<RequestPermissionResponse> {
-    return this.inner.requestPermission(params, signal);
-  }
-
-  readTextFile(params: ReadTextFileRequest): Promise<ReadTextFileResponse> {
-    return this.inner.readTextFile(params);
-  }
-
-  writeTextFile(params: WriteTextFileRequest): Promise<WriteTextFileResponse> {
-    return this.inner.writeTextFile(params);
-  }
-
-  createElicitation(
-    params: CreateElicitationRequest,
-    signal?: AbortSignal,
-  ): Promise<CreateElicitationResponse> {
-    return this.inner.createElicitation(params, signal);
-  }
-
-  completeElicitation(params: CompleteElicitationNotification): Promise<void> {
-    return this.inner.completeElicitation(params);
-  }
-
-  authStatusUpdate(params: AuthStatusUpdateNotification): Promise<void> {
-    return this.inner.authStatusUpdate(params);
-  }
-
-  extNotification(method: string, params: Record<string, unknown>): Promise<void> {
-    return this.inner.extNotification(method, params);
-  }
-}
-
 function raceWithAbort<T>(operation: Promise<T>, signal: AbortSignal): Promise<T> {
  return new Promise<T>((resolve, reject) => {
    const cleanup = () => signal.removeEventListener("abort", onAbort);
--- a/src/v1/client-connection.ts
+++ b/src/v1/client-connection.ts
@@ -0,0 +1,129 @@
+import {
+  AgentContext,
+  AuthStatusUpdateNotification,
+  CompleteElicitationNotification,
+  CreateElicitationRequest,
+  CreateElicitationResponse,
+  methods,
+  ReadTextFileRequest,
+  ReadTextFileResponse,
+  RequestPermissionRequest,
+  RequestPermissionResponse,
+  SessionNotification,
+  WriteTextFileRequest,
+  WriteTextFileResponse,
+} from "@agentclientprotocol/sdk/unstable";
+import type { AcpClient } from "../acp-client.js";
+import { AcpSessionNotification, asSdkSessionNotification } from "../acp-subagents.js";
+import { ChangedMetaFilter } from "./tool-calls/changed-meta-filter.js";
+import type { AcpPermissionRequest } from "../permissions/presentation.js";
+
+/**
+ * Bridges {@link AcpClient} to the connection-scoped {@link AgentContext}
+ * exposed by `AgentApp.connect(...)` as `connection.client`. The peer handle is
+ * valid for the entire connection lifetime, so it is captured once at
+ * construction.
+ */
+export class ClientConnection implements AcpClient {
+  constructor(private readonly ctx: AgentContext) {}
+
+  sessionUpdate(params: AcpSessionNotification): Promise<void> {
+    return this.ctx.notify(methods.client.session.update, asSdkSessionNotification(params));
+  }
+
+  requestPermission(
+    params: RequestPermissionRequest,
+    signal?: AbortSignal,
+  ): Promise<RequestPermissionResponse> {
+    return this.ctx.request(methods.client.session.requestPermission, params, {
+      cancellationSignal: signal,
+      stopWaitingOnCancel: true,
+    });
+  }
+
+  readTextFile(params: ReadTextFileRequest): Promise<ReadTextFileResponse> {
+    return this.ctx.request(methods.client.fs.readTextFile, params);
+  }
+
+  writeTextFile(params: WriteTextFileRequest): Promise<WriteTextFileResponse> {
+    return this.ctx.request(methods.client.fs.writeTextFile, params);
+  }
+
+  createElicitation(
+    params: CreateElicitationRequest,
+    signal?: AbortSignal,
+  ): Promise<CreateElicitationResponse> {
+    return this.ctx.request(methods.client.elicitation.create, params, {
+      cancellationSignal: signal,
+      stopWaitingOnCancel: true,
+    });
+  }
+
+  completeElicitation(params: CompleteElicitationNotification): Promise<void> {
+    return this.ctx.notify(methods.client.elicitation.complete, params);
+  }
+
+  authStatusUpdate(params: AuthStatusUpdateNotification): Promise<void> {
+    return this.ctx.notify(methods.client.auth.statusUpdate, params);
+  }
+
+  extNotification(method: string, params: Record<string, unknown>): Promise<void> {
+    return this.ctx.notify(method, params);
+  }
+}
+
+/**
+ * The client that the agent talks to. For an AIR client, every session update
+ * passes the {@link ChangedMetaFilter} last, after the native subagent routing,
+ * so a `tool_call_update` carries only the `_meta` keys that changed. ACP
+ * merges only the top-level tool call fields, not the `_meta` keys. So another
+ * client gets the full `_meta` on each update.
+ */
+export class ChangedMetaClient implements AcpClient {
+  private readonly filter = new ChangedMetaFilter();
+
+  constructor(
+    private readonly inner: AcpClient,
+    private readonly airClient: () => boolean,
+  ) {}
+
+  async sessionUpdate(params: AcpSessionNotification): Promise<void> {
+    if (!this.airClient()) return this.inner.sessionUpdate(params);
+    const update = this.filter.apply(params.update as SessionNotification["update"]);
+    if (update) await this.inner.sessionUpdate({ ...params, update } as AcpSessionNotification);
+  }
+
+  requestPermission(
+    params: AcpPermissionRequest,
+    signal?: AbortSignal,
+  ): Promise<RequestPermissionResponse> {
+    return this.inner.requestPermission(params, signal);
+  }
+
+  readTextFile(params: ReadTextFileRequest): Promise<ReadTextFileResponse> {
+    return this.inner.readTextFile(params);
+  }
+
+  writeTextFile(params: WriteTextFileRequest): Promise<WriteTextFileResponse> {
+    return this.inner.writeTextFile(params);
+  }
+
+  createElicitation(
+    params: CreateElicitationRequest,
+    signal?: AbortSignal,
+  ): Promise<CreateElicitationResponse> {
+    return this.inner.createElicitation(params, signal);
+  }
+
+  completeElicitation(params: CompleteElicitationNotification): Promise<void> {
+    return this.inner.completeElicitation(params);
+  }
+
+  authStatusUpdate(params: AuthStatusUpdateNotification): Promise<void> {
+    return this.inner.authStatusUpdate(params);
+  }
+
+  extNotification(method: string, params: Record<string, unknown>): Promise<void> {
+    return this.inner.extNotification(method, params);
+  }
+}
--- a/src/v2/outcome.ts
+++ b/src/v2/outcome.ts
@@ -17,7 +17,7 @@ import type {
 import { AUTONOMOUS_RESULT_ORIGINS } from "../result-end.js";
 import { isSyntheticLoginMessage } from "../message-filters.js";
 import { resultEnd } from "../result-end.js";
-import { providerFailureCategory } from "../session-failure-extension.js";
+import { assistantMessageText, providerFailureCategory } from "../session-failure-extension.js";
 import {
  getMatchingModelUsage,
  modelUsageIncrement,
@@ -109,8 +109,8 @@ function failed(error: RequestError): IdleOutcome {

 /**
 * What the assistant messages of the open turn reported about its end: the
- * error kind of a failed API request, Claude Code's sign-in message, and a
- * refusal's explanation. Read from the main conversation's messages.
+ * error kind and text of a failed API request, Claude Code's sign-in message,
+ * and a refusal's explanation. Read from the main conversation's messages.
 */
 export class TurnReport {
  errorKind: SDKAssistantMessageError | undefined;
@@ -118,12 +118,22 @@ export class TurnReport {
  loginRequired = false;
  /** The explanation of the turn's refusal. */
  refusalExplanation: string | undefined;
+  /**
+   * The text of the message that Claude Code wrote for a failed API request,
+   * e.g. "API Error: Connection lost mid-response. The response above may be
+   * incomplete.", until {@link takeApiError} reads it.
+   */
+  private apiError: string | undefined;

  /**
-   * An assistant message of the main conversation. Returns whether it is
-   * Claude Code's sign-in message, which the client is not shown: its
-   * `/login` instruction is for Claude Code's terminal, and the turn's idle
-   * fails with `authRequired` instead.
+   * An assistant message of the main conversation. Returns whether the
+   * client is not shown it as Claude's text:
+   *
+   * - Claude Code's sign-in message. Its `/login` instruction is for Claude
+   *   Code's terminal, and the turn's idle fails with `authRequired` instead.
+   * - The message that Claude Code wrote for a failed API request (`error` on
+   *   a `<synthetic>` message). The turn's idle carries it when the turn
+   *   fails, and a notice otherwise (see {@link takeApiError}).
   */
  assistant(message: SDKAssistantMessage): boolean {
    if (message.error) this.errorKind = message.error;
@@ -131,11 +141,24 @@ export class TurnReport {
      this.refusalExplanation =
        message.message.stop_details?.explanation ?? this.refusalExplanation;
    }
-    if (!isSyntheticLoginMessage(message.message)) return false;
-    this.loginRequired = true;
+    if (isSyntheticLoginMessage(message.message)) {
+      this.loginRequired = true;
+      return true;
+    }
+    if (!message.error || message.message.model !== "<synthetic>") return false;
+    const text = assistantMessageText(message.message);
+    if (!text) return false;
+    this.apiError = text;
    return true;
  }

+  /** The text of the turn's failed API request that no notice or idle reported yet. */
+  takeApiError(): string | undefined {
+    const text = this.apiError;
+    this.apiError = undefined;
+    return text;
+  }
+
  /**
   * Claude Code's `model_refusal_no_fallback`: the explanation when the
   * refused message carried none (older CLIs, gateways that drop
@@ -155,6 +178,7 @@ export class TurnReport {
    this.errorKind = undefined;
    this.loginRequired = false;
    this.refusalExplanation = undefined;
+    this.apiError = undefined;
  }
 }

--- a/src/v2/reports.ts
+++ b/src/v2/reports.ts
@@ -41,6 +41,7 @@ import {
  mcpServerStartupNotice,
  normalizeNoticeText,
  noticeUpdate,
+  splitNoticeText,
 } from "../session-notices.js";
 import {
  DEFAULT_CONTEXT_WINDOW,
@@ -223,6 +224,24 @@ export class SessionReports {
    );
  }

+  /**
+   * A notice of the message that Claude Code wrote for a failed API request
+   * (see `TurnReport.takeApiError`). It is a turn's notice, so a result that
+   * repeats its text is not shown again.
+   */
+  apiError(text: string): void {
+    this.host.emit([
+      {
+        sessionId: this.host.sessionId,
+        update: noticeUpdate({
+          severity: "error",
+          ...splitNoticeText(text, "Claude reported an API error"),
+        }),
+      },
+    ]);
+    this.noticeTexts.push(normalizeNoticeText(text));
+  }
+
  /**
   * Claude Code's session state went `idle`: the idle compaction may arm, and
   * the title may have landed (see {@link SessionTitles.onTurnEnd}).
--- a/src/v2/session.ts
+++ b/src/v2/session.ts
@@ -917,7 +917,8 @@ export class V2Session implements RequestTarget {
        if (message.parent_tool_use_id === null) this.usage.assistant(message.message.model);
        if (this.stopped.drops(message)) return;
        if (message.parent_tool_use_id === null) {
-          // Claude Code's sign-in message is not shown (see `TurnReport`).
+          // Claude Code's sign-in message and its message for a failed API
+          // request are not shown as Claude's text (see `TurnReport`).
          if (this.turnReport.assistant(message)) return;
          this.outputStarts();
          this.reports.assistant(message);
@@ -1121,6 +1122,8 @@ export class V2Session implements RequestTarget {
      this.fastModeReported(message);
    }
    this.reports.result(message);
+    // Before the result's text below, which can repeat the failed request's.
+    this.reportApiError(end);
    // The turn goes on in a fresh context (see `ClearContext`).
    if (this.clearContext.holdsResult(message, end)) {
      this.turnReport.reset();
@@ -1172,6 +1175,19 @@ export class V2Session implements RequestTarget {
    return reporting.then(() => this.closeTurn());
  }

+  /**
+   * Sends the text of a failed API request that Claude Code wrote into the
+   * conversation (see `TurnReport.assistant`) as a notice. A turn whose idle
+   * fails sends none: its error carries the failure. `end` is the turn's
+   * result, if it has one.
+   */
+  private reportApiError(end: TurnEnd | undefined): void {
+    const text = this.turnReport.takeApiError();
+    if (!text) return;
+    if (idleOutcome(end, this.cancelledWork, this.turnReport).stopReason === "error") return;
+    this.reports.apiError(text);
+  }
+
  /**
   * Claude Code's `idle`. The one that follows a result is that result's, and
   * can come after the next cycle's first output. Any other ends the open
@@ -1281,6 +1297,8 @@ export class V2Session implements RequestTarget {
        if (request.coveredByCancel) request.abort.abort();
      }
    }
+    // A turn that ends without a result, such as an interrupted one.
+    this.reportApiError(this.lastEnd);
    this.reports.turnEnded();
    this.elicitations.turnEnded();
    this.fileChanges?.turnClosed(cancelled);
Author	SHA1	Message	Date
Ben Brandt	99cc1f3245	fix: report Claude Code's API error message as a notice in v2 (#1582 ) ## Problem When an API request fails, Claude Code writes its own assistant message into the conversation, e.g. "API Error: Connection lost mid-response. The response above may be incomplete." The SDK marks it with `error` on a `<synthetic>` message. The v2 agent forwarded that message as an ordinary `agent_message_chunk`, so clients showed it as Claude's own prose. Right after a thinking block it reads as if Claude wrote it, and a client cannot tell it apart without matching the string. ## Change The v2 agent no longer sends that message as Claude's text: - When the turn fails, the idle's `error` already carries the failure, so nothing else is sent. - Otherwise the text goes out as a `notice` with severity `error`, once, before the turn's idle. A result that repeats the same text is not shown again. Claude Code's sign-in message is handled as before. ## Not changed - v1 keeps its current behaviour: clients with the session-failure extension already drop this text, and others keep the transcript line. - `session/load` replay still shows these messages as text. `getSessionMessages` strips the `error` marker, so replay cannot identify them without matching prose. ## Testing - New v2 cases: a notice when the turn ends normally, one notice when the result repeats the text, and no notice when the idle fails. They fail without the change. - `npm run check` and `npm run test:run` pass.	2026-11-10 18:51:11 +01:00
Mark Tkachenko	bce309f482	refactor: move the v1 client connection out of acp-agent.ts (#1576 ) Moves `ClientConnection` and `ChangedMetaClient` verbatim from `src/v1/acp-agent.ts` into `src/v1/client-connection.ts`. No behaviour change. - Both classes gain `export`; nothing else in them changes. - `client-connection.ts` imports nothing from `acp-agent.ts`. - The `acp-client.ts` comment that names where `ClientConnection` lives now points to the new file. - Emitted JS differs from `main` only in `dist/v1/acp-agent.js` (the import and the two classes) plus the new `dist/v1/client-connection.js`. Review with `git diff --color-moved` to see the move.	2026-11-10 17:54:17 +01:00
acp-release-bot[bot]	6b86f7b46a	chore(main): release 0.104.1 (#1575 ) 🤖 I have created a release beep boop --- ## [0.104.1](https://github.com/agentclientprotocol/claude-agent-acp/compare/v0.104.0...v0.104.1) (2026-11-10) ### Bug Fixes * carry the auth detail in the ACP account label ([#1573](https://github.com/agentclientprotocol/claude-agent-acp/issues/1573)) ([`3d6eb7b`](`3d6eb7b5b6`)) * distinguish Ultra from Max in auth status ([#1574](https://github.com/agentclientprotocol/claude-agent-acp/issues/1574)) ([`7d95d30`](`7d95d30ec3`)) * update to @anthropic-ai/claude-agent-sdk 0.3.322 ([#1577](https://github.com/agentclientprotocol/claude-agent-acp/issues/1577)) ([`b89e449`](`b89e4497da`)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: acp-release-bot[bot] <246668977+acp-release-bot[bot]@users.noreply.github.com>	2026-11-10 14:48:59 +01:00
Ben Brandt	b89e4497da	fix: update to @anthropic-ai/claude-agent-sdk 0.3.322 (#1577 ) - Bumps `@anthropic-ai/claude-agent-sdk` 0.3.321 → 0.3.322. - Runs `npm update` for in-range lockfile bumps: `rolldown` 1.2.16 → 1.2.18, `vite` 6.2.16 → 6.2.17, `express-rate-limit` 8.3.6 → 8.3.7, `jose` 8.7.3 → 8.7.4. TypeScript stays at 6.0.3: 7.0.2 is out, but the latest `@typescript-eslint/parser` (8.72.2) requires `typescript <6.1.0`. `npm run build`, `npm run check` and `npm run test:run` pass locally. One test failed once after `npm update` (not captured); four later full runs all passed, so it looks flaky.	2026-11-10 14:41:44 +01:00
Ben Brandt	7d95d30ec3	fix: distinguish Ultra from Max in auth status (#1574 ) ## Summary - Read the optional `planTier` field from the existing `claude auth status --json` probe. Display Max subscriptions with `max_20x` as Claude Ultra, while `max_5x` remains Claude Max. - Fall back to the existing subscription label when the tier is missing, unknown, or malformed. Preserve auth-source precedence and raw plan metadata. - Keep the CLI-derived label when a session SDK account read reports the same identity and plan without a tier. A fresh CLI probe can still replace the label, including when its tier is absent. - Cover ACP v1 and v2 notifications and responses, and document the display behavior. The SDK AccountInfo omits the plan tier, but the bundled CLI already emits it in auth-status JSON. This uses that CLI-only field as best-effort display metadata, without additional probes, direct credential-file reads, or entitlement checks. ## Validation - `npm run build` - `npm run check` - `npm run test:run` — 4,002 passed, 33 skipped - Targeted v1 auth-status and v2 protocol tests — 341 passed - Local bundled CLI smoke check: `subscriptionType: "max"`, `planTier: "max_20x"` maps to `Claude Ultra` - Live model integration tests were not run.	2026-11-10 13:25:20 +00:00
Ben Brandt	3d6eb7b5b6	fix: carry the auth detail in the ACP account label (#1573 ) ## Summary The ACP `auth/status` account (`label`, `active`, `name`, `email`, `organization`) has no field for the identity's `detail`: an API key's source, a gateway's host, or "OAuth token". It was only in `_meta.claudeCode.detail`, so a client that shows the standard fields could not tell which API key or gateway is in use. `toAcpAuthStatus` now appends the detail to the account's `label` in parentheses: - `Anthropic API key (ANTHROPIC_API_KEY)` - `Custom model gateway (gw.example.com)` - `Claude subscription (OAuth token)` An identity without a detail keeps its label as it was (`Claude Max`). ## Unchanged - `_meta.claudeCode` still carries `kind`, `detail` and `plan` on their own. - The `_auth/status_update` extension payload (`label` and `detail` as separate fields). - The mapping is shared, so v1 and v2 report the same label in `auth/status` and `auth/status_update`. ## Testing - `src/tests/v1/auth-status.test.ts` expectations updated for the API key and gateway labels. - `npm run test:run`, `npm run check` and `npm run build` pass.	2026-11-10 14:21:33 +01:00