chore(main): release 0.54.0 (#823 )

🤖 I have created a release *beep* *boop* --- ## [0.54.0](https://github.com/agentclientprotocol/claude-agent-acp/compare/v0.53.0...v0.54.0) (2026-06-30) ### Features * Add Fast mode session config support ([#828](https://github.com/agentclientprotocol/claude-agent-acp/issues/828)) ([fa949a2](fa949a20db)) * **deps-dev:** bump prettier from 3.9.1 to 3.9.3 in the minor group ([#821](https://github.com/agentclientprotocol/claude-agent-acp/issues/821)) ([b8df8e0](b8df8e0e54)) * **deps:** bump @anthropic-ai/claude-agent-sdk to 0.3.197 for Sonnet 5 ([#826](https://github.com/agentclientprotocol/claude-agent-acp/issues/826)) ([ef42c46](ef42c46e5a)) * **deps:** bump fast-uri from 3.1.2 to 3.1.3 ([#822](https://github.com/agentclientprotocol/claude-agent-acp/issues/822)) ([64aa130](64aa130c66)) --- 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>
feat(deps): bump @anthropic-ai/claude-agent-sdk to 0.3.197 for Sonnet 5 (#826 )
2026-11-12 04:12:45 +00:00 · 2026-06-30 21:01:39 +02:00 · 2026-06-30 18:40:35 +00:00 · 2026-06-30 18:13:43 +00:00 · 2026-06-29 16:31:16 +02:00 · 2026-06-29 16:30:53 +02:00
13 changed files with 1455 additions and 458 deletions
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "0.51.0"
+  ".": "0.54.0"
 }
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,38 @@
 # Changelog

+## [0.54.0](https://github.com/agentclientprotocol/claude-agent-acp/compare/v0.53.0...v0.54.0) (2026-06-30)
+
+
+### Features
+
+* Add Fast mode session config support ([#828](https://github.com/agentclientprotocol/claude-agent-acp/issues/828)) ([fa949a2](https://github.com/agentclientprotocol/claude-agent-acp/commit/fa949a20db0e33f2d63aebeb37e9fea212d8ee95))
+* **deps-dev:** bump prettier from 3.9.1 to 3.9.3 in the minor group ([#821](https://github.com/agentclientprotocol/claude-agent-acp/issues/821)) ([b8df8e0](https://github.com/agentclientprotocol/claude-agent-acp/commit/b8df8e0e5460fd782214f4dde488f7476c80c454))
+* **deps:** bump @anthropic-ai/claude-agent-sdk to 0.3.197 for Sonnet 5 ([#826](https://github.com/agentclientprotocol/claude-agent-acp/issues/826)) ([ef42c46](https://github.com/agentclientprotocol/claude-agent-acp/commit/ef42c46e5aea3bb53f433b9f9dd36a62a9f2df6a))
+* **deps:** bump fast-uri from 3.1.2 to 3.1.3 ([#822](https://github.com/agentclientprotocol/claude-agent-acp/issues/822)) ([64aa130](https://github.com/agentclientprotocol/claude-agent-acp/commit/64aa130c66c299f9835193796ba372b3ed40e7c1))
+
+## [0.53.0](https://github.com/agentclientprotocol/claude-agent-acp/compare/v0.52.0...v0.53.0) (2026-06-29)
+
+
+### Features
+
+* Add ACP logout support ([#816](https://github.com/agentclientprotocol/claude-agent-acp/issues/816)) ([0a0468c](https://github.com/agentclientprotocol/claude-agent-acp/commit/0a0468c72092b7ceccc551b4353dd92f9c22cbb8))
+* **deps:** bump @anthropic-ai/claude-agent-sdk to 0.3.195 ([#818](https://github.com/agentclientprotocol/claude-agent-acp/issues/818)) ([5dd8746](https://github.com/agentclientprotocol/claude-agent-acp/commit/5dd87462376597eb7b695200f4c716af46e764d6))
+
+
+### Bug Fixes
+
+* Emit tool_call before permission request ([#820](https://github.com/agentclientprotocol/claude-agent-acp/issues/820)) ([c95fc88](https://github.com/agentclientprotocol/claude-agent-acp/commit/c95fc884e82e5a297d1b17b8965690260867835b))
+
+## [0.52.0](https://github.com/agentclientprotocol/claude-agent-acp/compare/v0.51.0...v0.52.0) (2026-06-25)
+
+
+### Features
+
+* Add version flag handling ([#813](https://github.com/agentclientprotocol/claude-agent-acp/issues/813)) ([9616bda](https://github.com/agentclientprotocol/claude-agent-acp/commit/9616bdac47505e4a14c36d667fcffc9ae97e1f2a)), closes [#809](https://github.com/agentclientprotocol/claude-agent-acp/issues/809)
+* **deps-dev:** bump expect-type from 1.3.0 to 1.4.0 in the minor group ([#814](https://github.com/agentclientprotocol/claude-agent-acp/issues/814)) ([61272ac](https://github.com/agentclientprotocol/claude-agent-acp/commit/61272acb30dcafaa2455d334b11ce2ad97339707))
+* **deps:** Update @anthropic-ai/claude-agent-sdk to 0.3.191 ([#810](https://github.com/agentclientprotocol/claude-agent-acp/issues/810)) ([228f02e](https://github.com/agentclientprotocol/claude-agent-acp/commit/228f02ecfb23be16e59e121c6b42c0f2b2f40a4e))
+* Push session title updates at turn end ([#812](https://github.com/agentclientprotocol/claude-agent-acp/issues/812)) ([1fe7ec0](https://github.com/agentclientprotocol/claude-agent-acp/commit/1fe7ec09a3a7bcb7501231dae4b0ffe6ef9b70a4))
+
 ## [0.51.0](https://github.com/agentclientprotocol/claude-agent-acp/compare/v0.50.0...v0.51.0) (2026-06-24)


--- a/package-lock.json
+++ b/package-lock.json
@@ -1,32 +1,32 @@
 {
  "name": "@agentclientprotocol/claude-agent-acp",
-  "version": "0.51.0",
+  "version": "0.54.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@agentclientprotocol/claude-agent-acp",
-      "version": "0.51.0",
+      "version": "0.54.0",
      "license": "Apache-2.0",
      "dependencies": {
-        "@agentclientprotocol/sdk": "1.0.0",
-        "@anthropic-ai/claude-agent-sdk": "0.3.191",
+        "@agentclientprotocol/sdk": "1.1.0",
+        "@anthropic-ai/claude-agent-sdk": "0.3.197",
        "zod": "^3.25.0 || ^4.0.0"
      },
      "bin": {
        "claude-agent-acp": "dist/index.js"
      },
      "devDependencies": {
-        "@anthropic-ai/sdk": "0.106.0",
+        "@anthropic-ai/sdk": "0.108.0",
        "@eslint/js": "10.0.1",
        "@tsconfig/node22": "22.0.5",
        "@types/node": "26.0.1",
-        "@typescript-eslint/eslint-plugin": "8.62.0",
-        "@typescript-eslint/parser": "8.62.0",
-        "eslint": "10.5.0",
+        "@typescript-eslint/eslint-plugin": "8.62.1",
+        "@typescript-eslint/parser": "8.62.1",
+        "eslint": "10.6.0",
        "eslint-config-prettier": "10.1.8",
        "globals": "17.7.0",
-        "prettier": "3.8.4",
+        "prettier": "3.9.4",
        "ts-node": "10.9.2",
        "typescript": "6.0.3",
        "vitest": "4.1.9"
@@ -36,31 +36,31 @@
      }
    },
    "node_modules/@agentclientprotocol/sdk": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@agentclientprotocol/sdk/-/sdk-1.0.0.tgz",
-      "integrity": "sha512-5FHgLbLZhSAq9F+9SU7AOCXTDzaw/IYx/AvMjrZDs/YFZ9ZPxkdn9ti3fSkny0huHfj2hrqF6pqdns9gN5/Fig==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@agentclientprotocol/sdk/-/sdk-1.1.0.tgz",
+      "integrity": "sha512-NT2KqphUJ3w6EksUL51ZhJgIYgq/ZLGcBPkyMKgRSO5PMVwe9DnKKX+Htnvk6KHh6dUuh34UHK4gKp+4te1Mdg==",
      "license": "Apache-2.0",
      "peerDependencies": {
        "zod": "^3.25.0 || ^4.0.0"
      }
    },
    "node_modules/@anthropic-ai/claude-agent-sdk": {
-      "version": "0.3.191",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk/-/claude-agent-sdk-0.3.191.tgz",
-      "integrity": "sha512-DM9oYbt+WAb/CiD8l/CO6akqPKfyZ4sL1e+lP2O2eS9IR0f58sf90xWeji7V+/zfnIp+jyH3hJ3V6r7odCdB8g==",
+      "version": "0.3.197",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk/-/claude-agent-sdk-0.3.197.tgz",
+      "integrity": "sha512-XNIi8W1tb+QfMkcK+5kepOC6BsxG8wtupd72H+pIPzIJypVQhHy7FoX+KBMtTRYwtl+5dsjKyABhjWXebeUilw==",
      "license": "SEE LICENSE IN README.md",
      "engines": {
        "node": ">=18.0.0"
      },
      "optionalDependencies": {
-        "@anthropic-ai/claude-agent-sdk-darwin-arm64": "0.3.191",
-        "@anthropic-ai/claude-agent-sdk-darwin-x64": "0.3.191",
-        "@anthropic-ai/claude-agent-sdk-linux-arm64": "0.3.191",
-        "@anthropic-ai/claude-agent-sdk-linux-arm64-musl": "0.3.191",
-        "@anthropic-ai/claude-agent-sdk-linux-x64": "0.3.191",
-        "@anthropic-ai/claude-agent-sdk-linux-x64-musl": "0.3.191",
-        "@anthropic-ai/claude-agent-sdk-win32-arm64": "0.3.191",
-        "@anthropic-ai/claude-agent-sdk-win32-x64": "0.3.191"
+        "@anthropic-ai/claude-agent-sdk-darwin-arm64": "0.3.197",
+        "@anthropic-ai/claude-agent-sdk-darwin-x64": "0.3.197",
+        "@anthropic-ai/claude-agent-sdk-linux-arm64": "0.3.197",
+        "@anthropic-ai/claude-agent-sdk-linux-arm64-musl": "0.3.197",
+        "@anthropic-ai/claude-agent-sdk-linux-x64": "0.3.197",
+        "@anthropic-ai/claude-agent-sdk-linux-x64-musl": "0.3.197",
+        "@anthropic-ai/claude-agent-sdk-win32-arm64": "0.3.197",
+        "@anthropic-ai/claude-agent-sdk-win32-x64": "0.3.197"
      },
      "peerDependencies": {
        "@anthropic-ai/sdk": ">=0.93.0",
@@ -69,9 +69,9 @@
      }
    },
    "node_modules/@anthropic-ai/claude-agent-sdk-darwin-arm64": {
-      "version": "0.3.191",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-darwin-arm64/-/claude-agent-sdk-darwin-arm64-0.3.191.tgz",
-      "integrity": "sha512-rmpi5ONfuuw7oXdzyr9QJB5sK9Rr1MmdOUsiGutVFpcAqqSXpVYLmMvfaarmXvItgfwgGprzrGDfcAeAQHSUGw==",
+      "version": "0.3.197",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-darwin-arm64/-/claude-agent-sdk-darwin-arm64-0.3.197.tgz",
+      "integrity": "sha512-jC6WvH5Hr6APTfbMjo4nC6LlyMMqbpCMwiHXIw7/AsQXIHQhZ+cRRMesQlV6UFI1l3O53gLZHzsG9cXwfrPHKw==",
      "cpu": [
        "arm64"
      ],
@@ -82,9 +82,9 @@
      ]
    },
    "node_modules/@anthropic-ai/claude-agent-sdk-darwin-x64": {
-      "version": "0.3.191",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-darwin-x64/-/claude-agent-sdk-darwin-x64-0.3.191.tgz",
-      "integrity": "sha512-b/4pfSFTC2gkc0RoGSJ5B3DWo77qZFMi2hRlx8kwaRDiefeIOnbJu42gDBrs4F8nSJJug77HM9AsG6XHXvt5Fg==",
+      "version": "0.3.197",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-darwin-x64/-/claude-agent-sdk-darwin-x64-0.3.197.tgz",
+      "integrity": "sha512-ZQNvGkMrTyatBlHTIQ4w2i2aLBuvq355UP/FDLnVXIH8l23RsL1x/0w9P+dqB7EmY9OZi/cPxSrpskpo+dZWLA==",
      "cpu": [
        "x64"
      ],
@@ -95,9 +95,9 @@
      ]
    },
    "node_modules/@anthropic-ai/claude-agent-sdk-linux-arm64": {
-      "version": "0.3.191",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-linux-arm64/-/claude-agent-sdk-linux-arm64-0.3.191.tgz",
-      "integrity": "sha512-vm526e3InpItmh+Ua8a49eGTpFJvZTYLURX9ppKrtFb+Wo7rOgoXmK/Hzf/crEU7h72xtaD7PIOXm4P+psxO3w==",
+      "version": "0.3.197",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-linux-arm64/-/claude-agent-sdk-linux-arm64-0.3.197.tgz",
+      "integrity": "sha512-pWhQgCtAft4EGM4Zn24HRad1a/k2u6oA+2uM/KCdjehfKtooDiHfMNd1yzXY/n9AEBWP0RHB2Vz3mJ30X2pVAg==",
      "cpu": [
        "arm64"
      ],
@@ -111,9 +111,9 @@
      ]
    },
    "node_modules/@anthropic-ai/claude-agent-sdk-linux-arm64-musl": {
-      "version": "0.3.191",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-linux-arm64-musl/-/claude-agent-sdk-linux-arm64-musl-0.3.191.tgz",
-      "integrity": "sha512-+Gg7lKwYDr8uiA37EBMYI63if+YGdbrFt2tcRFBB4IhdVf5r1IkKwQ8rEYV6Y0nqGTKoXLh3bRc5QWOe5JwgbQ==",
+      "version": "0.3.197",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-linux-arm64-musl/-/claude-agent-sdk-linux-arm64-musl-0.3.197.tgz",
+      "integrity": "sha512-VuIGXsLGK/aqSQ0tTBqqPVNzjefWS5SWnK8mlYyQitT4s5UDzHXJm0UZBTGxRtlcS0e2+QAHKwbGBCq1ZKSXjg==",
      "cpu": [
        "arm64"
      ],
@@ -127,9 +127,9 @@
      ]
    },
    "node_modules/@anthropic-ai/claude-agent-sdk-linux-x64": {
-      "version": "0.3.191",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-linux-x64/-/claude-agent-sdk-linux-x64-0.3.191.tgz",
-      "integrity": "sha512-wj43/l0Behb4UWYt6Lomq2W7jhmuU7ARsEP0el6gLGCR348PDeqLGcB4dMOcYMGRZv8TYKfnhDwJnX4pJBT1vQ==",
+      "version": "0.3.197",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-linux-x64/-/claude-agent-sdk-linux-x64-0.3.197.tgz",
+      "integrity": "sha512-AUccrbdcv4Hy/GteP/gYLjG/zDP+fe2BFtDMctEfRFVz40DazYDcOyW1+nIgSTQtxf5jSTAVVf3cNuXB2CZwlw==",
      "cpu": [
        "x64"
      ],
@@ -143,9 +143,9 @@
      ]
    },
    "node_modules/@anthropic-ai/claude-agent-sdk-linux-x64-musl": {
-      "version": "0.3.191",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-linux-x64-musl/-/claude-agent-sdk-linux-x64-musl-0.3.191.tgz",
-      "integrity": "sha512-tUwwIXpPBrzJge3E4SQJQX8PuC+lxPb5xQBmyLsWxyjttlgpFpTG/jWPVQO5qH0HgYaEJS5JALHFiYcXwVrEkg==",
+      "version": "0.3.197",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-linux-x64-musl/-/claude-agent-sdk-linux-x64-musl-0.3.197.tgz",
+      "integrity": "sha512-3Tuy7XhD4UIKE4A4RPmKJcbL7Q/3dcB1hEWQt2lKP7c/DlixeEv+tRzvpnFZKhFX2hy0tkBk3QjkozSAacMC/w==",
      "cpu": [
        "x64"
      ],
@@ -159,9 +159,9 @@
      ]
    },
    "node_modules/@anthropic-ai/claude-agent-sdk-win32-arm64": {
-      "version": "0.3.191",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-win32-arm64/-/claude-agent-sdk-win32-arm64-0.3.191.tgz",
-      "integrity": "sha512-J8aTOi7n6AM7tHFlKt6hlJ4rue0TbY2glqcI2r6K3iK7Fmzvt9zfg00+l8fWKOais4K+8jqJCC4WSCUlz6+tKQ==",
+      "version": "0.3.197",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-win32-arm64/-/claude-agent-sdk-win32-arm64-0.3.197.tgz",
+      "integrity": "sha512-Wx8uiAKBenDuL8lWQmrqnX5ppljaH5unQ9cKiCz2/9Kgf09dgnrwbX8n/FhndCZR8PmYw539eWwYVrSVc/bl6w==",
      "cpu": [
        "arm64"
      ],
@@ -172,9 +172,9 @@
      ]
    },
    "node_modules/@anthropic-ai/claude-agent-sdk-win32-x64": {
-      "version": "0.3.191",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-win32-x64/-/claude-agent-sdk-win32-x64-0.3.191.tgz",
-      "integrity": "sha512-1rYlPuM9PS37IPCE/sAG7A7oCrWnIb0J7EY6eQBdImdXHEjwBngZ3E8KbtEM79fUTA3C810LqrnFpjOmNExLMA==",
+      "version": "0.3.197",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk-win32-x64/-/claude-agent-sdk-win32-x64-0.3.197.tgz",
+      "integrity": "sha512-ZXJO/VvR3SI4G0gwthWeFXWdHB5RXPu3rtfGRcKZ/YgtDeW17rQ+LZIJTk2ywzbLb8EvlghR5JPgn293hC179Q==",
      "cpu": [
        "x64"
      ],
@@ -185,9 +185,9 @@
      ]
    },
    "node_modules/@anthropic-ai/sdk": {
-      "version": "0.106.0",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/sdk/-/sdk-0.106.0.tgz",
-      "integrity": "sha512-ufwVvYNDBj2dzOGupBCTaNzBLxqcTnGOzI4z8Wouxlt+mT3J3HuOmatgCy1VmwCHOUueqZ41ERhm0O99OUcbWA==",
+      "version": "0.108.0",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/sdk/-/sdk-0.108.0.tgz",
+      "integrity": "sha512-XBnl7Nszpbzg0aLnOCmdBi0bOU5goAsQ/L+NPNiuUPowDj8Mbzx0vlIIc1M79BjIvmw5nUM5G3jbrCBStT/0fQ==",
      "license": "MIT",
      "dependencies": {
        "json-schema-to-ts": "^3.1.1",
@@ -944,17 +944,17 @@
      }
    },
    "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.62.0.tgz",
-      "integrity": "sha512-o+mpz7EYiMzXoySXiKmzlabIvTVqUuK5yLrAedRPRDA0IpPFMUV1IXt6OqljIxX/kumN6EjUYp41Hqelh6p/Dw==",
+      "version": "8.62.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.62.1.tgz",
+      "integrity": "sha512-4EQM77WgVNxj7OkL/5b/D/xZsw00G577+UriYTC7JF5opcF3T2AuoeY7ueLaZgSVjSgCS6yOAJB5bRGLPSJUzA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@eslint-community/regexpp": "^4.12.2",
-        "@typescript-eslint/scope-manager": "8.62.0",
-        "@typescript-eslint/type-utils": "8.62.0",
-        "@typescript-eslint/utils": "8.62.0",
-        "@typescript-eslint/visitor-keys": "8.62.0",
+        "@typescript-eslint/scope-manager": "8.62.1",
+        "@typescript-eslint/type-utils": "8.62.1",
+        "@typescript-eslint/utils": "8.62.1",
+        "@typescript-eslint/visitor-keys": "8.62.1",
        "ignore": "^7.0.5",
        "natural-compare": "^1.4.0",
        "ts-api-utils": "^2.5.0"
@@ -967,22 +967,22 @@
        "url": "https://opencollective.com/typescript-eslint"
      },
      "peerDependencies": {
-        "@typescript-eslint/parser": "^8.62.0",
+        "@typescript-eslint/parser": "^8.62.1",
        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
        "typescript": ">=4.8.4 <6.1.0"
      }
    },
    "node_modules/@typescript-eslint/parser": {
-      "version": "8.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.62.0.tgz",
-      "integrity": "sha512-dzHeT2gySzZtLDsuqxU9AkYgIsQoHAHtRBpOqM+Ofzx1Bwrd2RcCjQJ+6iQbsHOIR6NS33bF2W1k3blN1zLDrA==",
+      "version": "8.62.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.62.1.tgz",
+      "integrity": "sha512-sPhE4iHuJDSvoAiec+Ro8JyXw8f0ql13HFR82P99nCm9GwTEKG0KYLvDe6REk8BCXuit6vJAv/Yxg5ABaNS2rA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/scope-manager": "8.62.0",
-        "@typescript-eslint/types": "8.62.0",
-        "@typescript-eslint/typescript-estree": "8.62.0",
-        "@typescript-eslint/visitor-keys": "8.62.0",
+        "@typescript-eslint/scope-manager": "8.62.1",
+        "@typescript-eslint/types": "8.62.1",
+        "@typescript-eslint/typescript-estree": "8.62.1",
+        "@typescript-eslint/visitor-keys": "8.62.1",
        "debug": "^4.4.3"
      },
      "engines": {
@@ -998,14 +998,14 @@
      }
    },
    "node_modules/@typescript-eslint/project-service": {
-      "version": "8.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.62.0.tgz",
-      "integrity": "sha512-wexnCqiTg7BOGtbLDftYpRWlmLq4xfoMd7BKFR6Y75sZS3QmRKLdN3yWLhmIYgqMmP/OXWpj3H8odkb5nGURCQ==",
+      "version": "8.62.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.62.1.tgz",
+      "integrity": "sha512-yQ3RgY5RkSBpsNS1Bx/JQEcA24FOSdfGktoyprAr5u18390UQdtVcfnEv4nIrIshNnavlVyZBKxQwT1fIAE6cg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.62.0",
-        "@typescript-eslint/types": "^8.62.0",
+        "@typescript-eslint/tsconfig-utils": "^8.62.1",
+        "@typescript-eslint/types": "^8.62.1",
        "debug": "^4.4.3"
      },
      "engines": {
@@ -1020,14 +1020,14 @@
      }
    },
    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.62.0.tgz",
-      "integrity": "sha512-1lX38kNxXIRb8mEc3lbq5mdHq1Pf2+U0nFU65KfT18mtPxxl0fvjuEE92mHuXPuCtElJhOrddOpyMlM3Z0umEA==",
+      "version": "8.62.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.62.1.tgz",
+      "integrity": "sha512-r4d249KbQ1SFdpeStvob8Ih6aPPIzfqllPVOtvhve6ZcpuVcYo5/7zUWckKpHE7StASX4kTKZTLf0WQm/wPkcg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/types": "8.62.0",
-        "@typescript-eslint/visitor-keys": "8.62.0"
+        "@typescript-eslint/types": "8.62.1",
+        "@typescript-eslint/visitor-keys": "8.62.1"
      },
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1038,9 +1038,9 @@
      }
    },
    "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.62.0.tgz",
-      "integrity": "sha512-y2GAdB6ykaXUvuspbYnizQc4oDDz0Tz/Yc7iWrXf9mx8vm/L/0vLHCe0tS2boG96Zy+DivnVDQ9ZUEWoHqqx1g==",
+      "version": "8.62.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.62.1.tgz",
+      "integrity": "sha512-xadytJqX9vJVQ2fdQjkcIVigwaOJNWkpjdLt6cEQ+xPnrI1fkp+/jZE/I97k9KUjqtpd25i0HeyZf3T6dutv2g==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -1055,15 +1055,15 @@
      }
    },
    "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.62.0.tgz",
-      "integrity": "sha512-+g5O3j0w2ldzC86Pv6fvbO/xhAonbJFIdf/MKQ1d30gndlsVzUOE83ldfSE15Qrl9fhFjK6AovHs5Wpp6vx86w==",
+      "version": "8.62.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.62.1.tgz",
+      "integrity": "sha512-aXM5xlqXiTxPibXB93cLAURfT3rlizf7uMXISCXy66Isr/9hISJx3yDsKl0L7lKa51b8JpFuNKby0/O0pEm9jg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/types": "8.62.0",
-        "@typescript-eslint/typescript-estree": "8.62.0",
-        "@typescript-eslint/utils": "8.62.0",
+        "@typescript-eslint/types": "8.62.1",
+        "@typescript-eslint/typescript-estree": "8.62.1",
+        "@typescript-eslint/utils": "8.62.1",
        "debug": "^4.4.3",
        "ts-api-utils": "^2.5.0"
      },
@@ -1080,9 +1080,9 @@
      }
    },
    "node_modules/@typescript-eslint/types": {
-      "version": "8.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.62.0.tgz",
-      "integrity": "sha512-KvAclkktORPvM54TgLgA4z9HIV1M8zOgw9ZVNXl9f/8dLYfXYX1wkMXP7qmabpijQRV5bHJLOmoyGQbLMaUYeg==",
+      "version": "8.62.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.62.1.tgz",
+      "integrity": "sha512-ooCzJFaf+Hg+uG6fA3NRFGuFjlfNlDhBthbv4ZPU/0elCAFUfnyXUvf/WOpHz/jYwSmvU2GkR2LtyUfy1AxZ1Q==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -1094,16 +1094,16 @@
      }
    },
    "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.62.0.tgz",
-      "integrity": "sha512-+hVbNxtW64pIcZWDPGbyaKF7vp2IBTVY5ma1blwwksrjdsbdqqEKvJWMGbBofei4F6Dovx1M0RJgoFeNu2279A==",
+      "version": "8.62.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.62.1.tgz",
+      "integrity": "sha512-xMcW9oP9u7fAMXYs9A65CVmtLQe2r//oXINHfi8HV+oiqhih17sbLdhXr4540YWlgpDKQdY854OL5ZrdCiQsAA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/project-service": "8.62.0",
-        "@typescript-eslint/tsconfig-utils": "8.62.0",
-        "@typescript-eslint/types": "8.62.0",
-        "@typescript-eslint/visitor-keys": "8.62.0",
+        "@typescript-eslint/project-service": "8.62.1",
+        "@typescript-eslint/tsconfig-utils": "8.62.1",
+        "@typescript-eslint/types": "8.62.1",
+        "@typescript-eslint/visitor-keys": "8.62.1",
        "debug": "^4.4.3",
        "minimatch": "^10.2.2",
        "semver": "^7.7.3",
@@ -1122,16 +1122,16 @@
      }
    },
    "node_modules/@typescript-eslint/utils": {
-      "version": "8.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.62.0.tgz",
-      "integrity": "sha512-82r66fi9zYwZ+mTq3vKgwjbZ1PVk/DJzrXFLpG6RnBbdvH8TEGVHIs9H4d2drhkOzf0syZuD/OZvvlu6GDbP4g==",
+      "version": "8.62.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.62.1.tgz",
+      "integrity": "sha512-sHtbPfuKNZCG+ih8SyjjucqRntSVmp8XgL5u6o9mAhiSn8ds5o/M/XdM0abweme2Tln3szOstOrZ9OXitvPh0g==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.9.1",
-        "@typescript-eslint/scope-manager": "8.62.0",
-        "@typescript-eslint/types": "8.62.0",
-        "@typescript-eslint/typescript-estree": "8.62.0"
+        "@typescript-eslint/scope-manager": "8.62.1",
+        "@typescript-eslint/types": "8.62.1",
+        "@typescript-eslint/typescript-estree": "8.62.1"
      },
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1146,13 +1146,13 @@
      }
    },
    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.62.0.tgz",
-      "integrity": "sha512-CY3uyFSRbcQv3nnSv8S0+lDftMVz6P963PoRlxrV7ew/Md564g9ut60PYzdLM5qW4jFn93GBF+Soi90ISAN+GQ==",
+      "version": "8.62.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.62.1.tgz",
+      "integrity": "sha512-4g3BLxfdTMy8iZG0MaBkadnlRrCJ74cQiFbyEVMrkwIoqdyaXXQM22cotDvrl4x28wgIZ9rEJRoM+mmhSJpJ1g==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/types": "8.62.0",
+        "@typescript-eslint/types": "8.62.1",
        "eslint-visitor-keys": "^5.0.0"
      },
      "engines": {
@@ -1441,9 +1441,9 @@
      }
    },
    "node_modules/brace-expansion": {
-      "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.6.tgz",
-      "integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==",
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.7.tgz",
+      "integrity": "sha512-7oFy703dxfY3/NLxC1fh2SUCQ0H9rmAY+5EpDVfXjUTTs+HEwR2nYaqLv+GWcTsumwxPfiz6CzCNkwXwBUwqCA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -1701,9 +1701,9 @@
      }
    },
    "node_modules/es-module-lexer": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.1.0.tgz",
-      "integrity": "sha512-n27zTYMjYu1aj4MjCWzSP7G9r75utsaoc8m61weK+W8JMBGGQybd43GstCXZ3WNmSFtGT9wi59qQTW6mhTR5LQ==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.2.0.tgz",
+      "integrity": "sha512-3lGxdTXCLfe1MYfTz1y2ksAAUM4NAOP6rPEjxGJVKO7TZ5+tvHCaQWGpC4Y3IXvW3ece0Cz1cIP4FWBxOnGCTQ==",
      "dev": true,
      "license": "MIT"
    },
@@ -1741,9 +1741,9 @@
      }
    },
    "node_modules/eslint": {
-      "version": "10.5.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.5.0.tgz",
-      "integrity": "sha512-1y+7C+vi12bUK1IpZeaV3gsH9fHLBmPvYmPx42pvT/E9yG0IC8g3PUZZgp0+JLJl7ZDK0flc2gc+Aw9dpCvIsQ==",
+      "version": "10.6.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.6.0.tgz",
+      "integrity": "sha512-6lVbcqSodALYo+4ELD0heG6lFiFxnLMuLkiMi2qV8LMp54N8tE8FT1GMH+ev4Ti00nFjNze2+Su6DsV5OQW3Dg==",
      "dev": true,
      "license": "MIT",
      "workspaces": [
@@ -2015,9 +2015,9 @@
      }
    },
    "node_modules/expect-type": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.3.0.tgz",
-      "integrity": "sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.4.0.tgz",
+      "integrity": "sha512-KfYbmpRm0VbLjEvVa9yGwCi9GI34xvi7A/HXYWQO65CSD2u3MczUJSuwXKFIxlGsgBQizV9q5J9NHj4VG0n+pA==",
      "dev": true,
      "license": "Apache-2.0",
      "engines": {
@@ -2114,9 +2114,9 @@
      "license": "Unlicense"
    },
    "node_modules/fast-uri": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz",
-      "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.3.tgz",
+      "integrity": "sha512-i70LwGWUduXqzicKXWshooq+sWL1K3WUU5rKZNG/0i3a1OSoX3HqhH5WbWwTmqWfor4urUakGPiRQcleRZTwOg==",
      "funding": [
        {
          "type": "github",
@@ -3188,9 +3188,9 @@
      }
    },
    "node_modules/postcss": {
-      "version": "8.5.15",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.15.tgz",
-      "integrity": "sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==",
+      "version": "8.5.16",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.16.tgz",
+      "integrity": "sha512-vuwillviilfKZsg0VGj5R/YwwcHx4SLsIOI/7K6mQkWx+l5cUHTjj5g0AasTBcyXsbfTgrwsUNmVUb5xVwyPwg==",
      "dev": true,
      "funding": [
        {
@@ -3227,9 +3227,9 @@
      }
    },
    "node_modules/prettier": {
-      "version": "3.8.4",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.4.tgz",
-      "integrity": "sha512-N2MylSdi48+5N/6S5j+maeHbUSIzzZ5uOcX5Hm4QpV8Dkb1HFjfAKTKX6yNPJQD9AhcT3ifHNB66tWTTJDi11Q==",
+      "version": "3.9.4",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.4.tgz",
+      "integrity": "sha512-yWG/o/4oJfo036EKAfK6ACAoDOfHeRHx4tuxkfBZiauURiaSmYwlpOr5LQqKtIkRD2z1PLteme2WoxEnj4tHTg==",
      "dev": true,
      "license": "MIT",
      "bin": {
@@ -3284,13 +3284,17 @@
      }
    },
    "node_modules/range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.3.0.tgz",
+      "integrity": "sha512-hek2mFQpPuI4E1BBKrSto+BU3e3x4xuarsbiwr3+lf7p44juvFMV0XFWQAP3xUyqXA4RrXLIoaSUGbSt056ZMw==",
      "license": "MIT",
      "peer": true,
      "engines": {
        "node": ">= 0.6"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
      }
    },
    "node_modules/raw-body": {
@@ -3822,16 +3826,16 @@
      }
    },
    "node_modules/vite": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-8.1.0.tgz",
-      "integrity": "sha512-BuJcQK/56NQTWDGn4ABea3q4SSBdNPWwNZKTkkUpcMPnLoquSYH8llRtSUIgoL1KSCpHt5eghLShn50mH36y7Q==",
+      "version": "8.1.2",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-8.1.2.tgz",
+      "integrity": "sha512-6YYPbRXTxx6bRXmOn7XdnQAy5DQNHhDgtjhDHI13oe4pY93kkcdGJWxpGwOm++/Wh0QpQhDrpIoVMrmrsI5AGQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "lightningcss": "^1.32.0",
        "picomatch": "^4.0.4",
-        "postcss": "^8.5.15",
-        "rolldown": "~1.1.2",
+        "postcss": "^8.5.16",
+        "rolldown": "~1.1.3",
        "tinyglobby": "^0.2.17"
      },
      "bin": {
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
  "publishConfig": {
    "access": "public"
  },
-  "version": "0.51.0",
+  "version": "0.54.0",
  "description": "An ACP-compatible coding agent powered by the Claude Agent SDK (TypeScript)",
  "main": "dist/lib.js",
  "types": "dist/lib.d.ts",
@@ -63,21 +63,21 @@
    "node": ">=22"
  },
  "dependencies": {
-    "@agentclientprotocol/sdk": "1.0.0",
-    "@anthropic-ai/claude-agent-sdk": "0.3.191",
+    "@agentclientprotocol/sdk": "1.1.0",
+    "@anthropic-ai/claude-agent-sdk": "0.3.197",
    "zod": "^3.25.0 || ^4.0.0"
  },
  "devDependencies": {
-    "@anthropic-ai/sdk": "0.106.0",
+    "@anthropic-ai/sdk": "0.108.0",
    "@eslint/js": "10.0.1",
    "@tsconfig/node22": "22.0.5",
    "@types/node": "26.0.1",
-    "@typescript-eslint/eslint-plugin": "8.62.0",
-    "@typescript-eslint/parser": "8.62.0",
-    "eslint": "10.5.0",
+    "@typescript-eslint/eslint-plugin": "8.62.1",
+    "@typescript-eslint/parser": "8.62.1",
+    "eslint": "10.6.0",
    "eslint-config-prettier": "10.1.8",
    "globals": "17.7.0",
-    "prettier": "3.8.4",
+    "prettier": "3.9.4",
    "ts-node": "10.9.2",
    "typescript": "6.0.3",
    "vitest": "4.1.9"
--- a/src/acp-agent.ts
+++ b/src/acp-agent.ts
--- a/src/elicitation.ts
+++ b/src/elicitation.ts
@@ -232,8 +232,7 @@ export function askUserQuestionsToCreateRequest(

 /** Outcome of an AskUserQuestion elicitation, decoupled from any transport. */
 export type AskUserQuestionOutcome =
-  | { action: "answered"; updatedInput: Record<string, unknown> }
-  | { action: "cancel" };
+  { action: "answered"; updatedInput: Record<string, unknown> } | { action: "cancel" };

 /**
 * Fold an ACP elicitation response into the AskUserQuestion tool's input.
--- a/src/index.ts
+++ b/src/index.ts
@@ -4,10 +4,10 @@ import { resolveSettings } from "@anthropic-ai/claude-agent-sdk";
 import { claudeCliPath, runAcp } from "./acp-agent.js";
 import packageJson from "../package.json" with { type: "json" };

-if (process.argv.includes("--version") || process.argv.includes("-v")) {
-  console.log(packageJson.version);
-  process.exit(0);
-} else if (process.argv.includes("--cli")) {
+// `--cli` is checked first so that `--version`/`-v` (and any other flags) are
+// forwarded to the wrapped native CLI rather than swallowed by our own version
+// handler below. Our version flag only applies when not delegating.
+if (process.argv.includes("--cli")) {
  const { spawn } = await import("node:child_process");
  const args = process.argv.slice(2).filter((arg) => arg !== "--cli");
  const child = spawn(await claudeCliPath(), args, { stdio: "inherit" });
@@ -37,6 +37,9 @@ if (process.argv.includes("--version") || process.argv.includes("-v")) {
    console.error(err);
    process.exit(1);
  });
+} else if (process.argv.includes("--version") || process.argv.includes("-v")) {
+  console.log(packageJson.version);
+  process.exit(0);
 } else {
  // Apply env vars from the managed-policy tier before any SDK call so the
  // SDK subprocess inherits them. Going through resolveSettings (vs. a raw
--- a/src/tests/acp-agent.test.ts
+++ b/src/tests/acp-agent.test.ts
@@ -37,6 +37,7 @@ import {
  streamEventToAcpNotifications,
  messageIdForGrouping,
  buildConfigOptions,
+  createFastModeConfigOption,
  discoverCustomAgents,
  runPromptWithCancellation,
  type AcpClient,
@@ -118,7 +119,7 @@ function mockSessionState(overrides: Record<string, any> = {}) {
    contextWindowSize: 200000,
    taskState: new Map(),
    toolUseCache: {},
-    waitingForToolCall: new Map(),
+    emittedToolCalls: new Set(),
    messageIdToUuid: new Map(),
    ...overrides,
  } as any;
@@ -873,7 +874,6 @@ describe("tool conversions", () => {
        received.message.role,
        "test",
        {},
-        new Map(),
        {} as AcpClient,
        console,
      ),
@@ -1811,56 +1811,18 @@ describe("permission request cancellation", () => {
      configOptions: [],
      agents: [],
      currentAgent: "default",
+      fastModeEnabled: false,
      abortController: new AbortController(),
      emitRawSDKMessages: false,
      contextWindowSize: 200000,
      taskState: new Map(),
      toolUseCache: {},
-      waitingForToolCall: new Map(),
+      emittedToolCalls: new Set(),
      messageIdToUuid: new Map(),
    } as any;
    return agent.sessions[sessionId]!;
  }

-  it("waits for the first tool_call before requesting permission", async () => {
-    const requestPermission = vi.fn(async () => ({
-      outcome: { outcome: "selected", optionId: "allow" },
-    }));
-    const mockClient = {
-      sessionUpdate: async () => {},
-      requestPermission,
-    } as unknown as AcpClient;
-    const agent = new ClaudeAcpAgent(mockClient, { log: () => {}, error: () => {} });
-    const session = injectSession(agent, "session-1");
-
-    const pending = agent.canUseTool("session-1")("Bash", { command: "echo hello" }, {
-      signal: new AbortController().signal,
-      suggestions: [],
-      toolUseID: "tool-1",
-    } as any);
-
-    await Promise.resolve();
-    expect(requestPermission).not.toHaveBeenCalled();
-    expect(session.waitingForToolCall.has("tool-1")).toBe(true);
-
-    const notifications = toAcpNotifications(
-      [{ type: "tool_use", id: "tool-1", name: "Bash", input: { command: "echo hello" } }],
-      "assistant",
-      "session-1",
-      session.toolUseCache,
-      session.waitingForToolCall,
-      mockClient,
-      console,
-    );
-
-    expect(notifications[0].update.sessionUpdate).toBe("tool_call");
-    expect(requestPermission).not.toHaveBeenCalled();
-
-    await expect(pending).resolves.toMatchObject({ behavior: "allow" });
-    expect(requestPermission).toHaveBeenCalledTimes(1);
-    expect(session.waitingForToolCall.has("tool-1")).toBe(false);
-  });
-
  it("forwards the tool-call signal so a pending permission request is cancelled on abort", async () => {
    let receivedSignal: AbortSignal | undefined;
    const mockClient = {
@@ -1878,12 +1840,10 @@ describe("permission request cancellation", () => {
    } as unknown as AcpClient;
    const agent = new ClaudeAcpAgent(mockClient, { log: () => {}, error: () => {} });
    const session = injectSession(agent, "session-1");
-    session.toolUseCache["tool-1"] = {
-      type: "tool_use",
-      id: "tool-1",
-      name: "Bash",
-      input: { command: "ls" },
-    };
+    // The tool_call was already surfaced by the streamed tool_use chunk, so the
+    // permission request goes straight to requestPermission without first
+    // emitting one.
+    session.emittedToolCalls.add("tool-1");

    const controller = new AbortController();
    const pending = agent.canUseTool("session-1")("Bash", { command: "ls" }, {
@@ -1908,13 +1868,7 @@ describe("permission request cancellation", () => {
      requestPermission: async () => ({ outcome: { outcome: "cancelled" } }),
    } as unknown as AcpClient;
    const agent = new ClaudeAcpAgent(mockClient, { log: () => {}, error: () => {} });
-    const session = injectSession(agent, "session-1");
-    session.toolUseCache["tool-1"] = {
-      type: "tool_use",
-      id: "tool-1",
-      name: "Bash",
-      input: { command: "ls" },
-    };
+    injectSession(agent, "session-1");

    await expect(
      agent.canUseTool("session-1")("Bash", { command: "ls" }, {
@@ -1926,6 +1880,136 @@ describe("permission request cancellation", () => {
  });
 });

+describe("tool_call emitted before permission request", () => {
+  // The SDK can invoke canUseTool before the assistant message's tool_use block
+  // streams to us. ACP clients expect the tool_call a permission request
+  // references to already exist, so the permission flow emits it eagerly and the
+  // streamed chunk later refines it with a tool_call_update (deduped via
+  // session.emittedToolCalls) rather than emitting a duplicate.
+  function setup(overrides: Record<string, any> = {}) {
+    const events: string[] = [];
+    const updates: SessionNotification[] = [];
+    const mockClient = {
+      sessionUpdate: async (n: SessionNotification) => {
+        events.push(`update:${n.update.sessionUpdate}`);
+        updates.push(n);
+      },
+      requestPermission: async () => {
+        events.push("permission");
+        return { outcome: { outcome: "selected", optionId: "allow" } };
+      },
+    } as unknown as AcpClient;
+    const agent = new ClaudeAcpAgent(mockClient, { log: () => {}, error: () => {} });
+    agent.sessions["session-1"] = mockSessionState(overrides);
+    return { agent, events, updates, session: agent.sessions["session-1"]! };
+  }
+
+  it("emits the tool_call (then asks permission) when the stream hasn't yet", async () => {
+    const { agent, events, updates, session } = setup();
+
+    const result = await agent.canUseTool("session-1")("Bash", { command: "ls" }, {
+      signal: new AbortController().signal,
+      suggestions: [],
+      toolUseID: "tool-1",
+    } as any);
+
+    // tool_call is sent before the permission request is raised.
+    expect(events).toEqual(["update:tool_call", "permission"]);
+    expect(updates[0].update).toMatchObject({
+      sessionUpdate: "tool_call",
+      toolCallId: "tool-1",
+      status: "pending",
+    });
+    expect(session.emittedToolCalls.has("tool-1")).toBe(true);
+    expect(result).toMatchObject({ behavior: "allow" });
+  });
+
+  it("does not re-emit the tool_call when the stream already surfaced it", async () => {
+    const { agent, events } = setup();
+    agent.sessions["session-1"]!.emittedToolCalls.add("tool-1");
+
+    await agent.canUseTool("session-1")("Bash", { command: "ls" }, {
+      signal: new AbortController().signal,
+      suggestions: [],
+      toolUseID: "tool-1",
+    } as any);
+
+    expect(events).toEqual(["permission"]);
+  });
+
+  it("refines the eagerly-emitted tool_call with a tool_call_update when the chunk streams", () => {
+    const { session } = setup();
+    // Permission flow already emitted the tool_call for this id.
+    session.emittedToolCalls.add("tool-1");
+
+    const notifications = toAcpNotifications(
+      [{ type: "tool_use", id: "tool-1", name: "Bash", input: { command: "ls" } }],
+      "assistant",
+      "session-1",
+      session.toolUseCache,
+      {} as AcpClient,
+      console,
+      { emittedToolCalls: session.emittedToolCalls },
+    );
+
+    expect(notifications).toHaveLength(1);
+    expect(notifications[0].update.sessionUpdate).toBe("tool_call_update");
+  });
+
+  it("does not emit a tool_call for suppressed tools (TodoWrite) on a permission request", async () => {
+    const { agent, events, session } = setup();
+
+    await agent.canUseTool("session-1")(
+      "TodoWrite",
+      { todos: [{ content: "x", status: "pending" }] },
+      { signal: new AbortController().signal, suggestions: [], toolUseID: "todo-1" } as any,
+    );
+
+    expect(events).toEqual(["permission"]);
+    expect(session.emittedToolCalls.has("todo-1")).toBe(false);
+  });
+
+  it("includes Bash terminal_info _meta in the eager tool_call so terminal output can attach", async () => {
+    const { agent, updates } = setup();
+    // Terminal-capable client (e.g. Zed). The eager tool_call must carry
+    // terminal_info.terminal_id, otherwise the later terminal_output/terminal_exit
+    // updates (keyed by terminal_id) have nothing to attach to.
+    (agent as any).clientCapabilities = { _meta: { terminal_output: true } };
+
+    await agent.canUseTool("session-1")("Bash", { command: "ls" }, {
+      signal: new AbortController().signal,
+      suggestions: [],
+      toolUseID: "tool-1",
+    } as any);
+
+    expect(updates[0].update).toMatchObject({
+      sessionUpdate: "tool_call",
+      toolCallId: "tool-1",
+      _meta: { terminal_info: { terminal_id: "tool-1" } },
+    });
+  });
+
+  it("prunes the emission marker on a tool_result even when the tool_use was never cached", () => {
+    const { session } = setup();
+    // Eager-emitted via the permission flow, but the tool_use chunk never
+    // streamed (e.g. cancelled), so toolUseCache has no entry for it.
+    session.emittedToolCalls.add("tool-1");
+
+    toAcpNotifications(
+      [{ type: "tool_result", tool_use_id: "tool-1", content: [{ type: "text", text: "x" }] }],
+      "user",
+      "session-1",
+      session.toolUseCache,
+      {} as AcpClient,
+      // Silence the expected "tool result for tool use that wasn't tracked" log.
+      { log: () => {}, error: () => {} },
+      { emittedToolCalls: session.emittedToolCalls },
+    );
+
+    expect(session.emittedToolCalls.has("tool-1")).toBe(false);
+  });
+});
+
 describe("runPromptWithCancellation", () => {
  function deferred<T>() {
    let resolve!: (value: T) => void;
@@ -2185,6 +2269,77 @@ describe("stop reason propagation", () => {
    expect(response.usage?.outputTokens).toBe(promptResult.usage.output_tokens);
  });

+  it("only reconciles Fast mode from user-driven results, not task-notification followups", async () => {
+    const updates: any[] = [];
+    const mockClient = {
+      sessionUpdate: async (n: any) => {
+        updates.push(n);
+      },
+    } as unknown as AcpClient;
+    const agent = new ClaudeAcpAgent(mockClient, { log: () => {}, error: () => {} });
+    (agent as any).clientCapabilities = { session: { configOptions: { boolean: {} } } };
+
+    const input = new Pushable<any>();
+
+    // A background followup reports fast_mode_state="on". It must NOT flip the
+    // user's toggle or emit a config_option_update (every other side effect in
+    // the result handler is likewise gated behind !isTaskNotification).
+    const backgroundTaskResult = {
+      ...createResultMessage({ subtype: "success", stop_reason: null, is_error: false }),
+      origin: { kind: "task-notification" },
+      fast_mode_state: "on",
+    };
+
+    // The user prompt's own result reports the same state — this one IS a user
+    // turn, so it reconciles and notifies.
+    const promptResult = {
+      ...createResultMessage({ subtype: "success", stop_reason: null, is_error: false }),
+      fast_mode_state: "on",
+    };
+
+    async function* messageGenerator() {
+      yield { type: "system", subtype: "init", session_id: "test-session" };
+      yield backgroundTaskResult;
+
+      const iter = input[Symbol.asyncIterator]();
+      const { value: userMessage } = await iter.next();
+      yield {
+        type: "user",
+        message: userMessage.message,
+        parent_tool_use_id: null,
+        uuid: userMessage.uuid,
+        session_id: "test-session",
+        isReplay: true,
+      };
+
+      yield promptResult;
+      yield { type: "system", subtype: "session_state_changed", state: "idle" };
+    }
+
+    agent.sessions["test-session"] = mockSessionState({
+      query: wrapQuery(messageGenerator()),
+      input,
+      fastModeEnabled: false,
+      configOptions: [createFastModeConfigOption(false, true)],
+    });
+
+    await agent.prompt({
+      sessionId: "test-session",
+      prompt: [{ type: "text", text: "test" }],
+    });
+
+    // The user-turn result flipped the toggle and emitted exactly one
+    // config_option_update; the background result contributed none.
+    expect((agent.sessions["test-session"] as any).fastModeEnabled).toBe(true);
+    const configUpdates = updates.filter(
+      (n: any) => n.update?.sessionUpdate === "config_option_update",
+    );
+    expect(configUpdates).toHaveLength(1);
+    expect(configUpdates[0].update.configOptions).toContainEqual(
+      createFastModeConfigOption(true, true),
+    );
+  });
+
  it("does not fold a task-notification result's tokens into an already-active turn's usage", async () => {
    const agent = createMockAgent();

@@ -2577,6 +2732,24 @@ describe("stop reason propagation", () => {
  });
 });

+describe("logout", () => {
+  function createMockAgent() {
+    const mockClient = {
+      sessionUpdate: async () => {},
+    } as unknown as AcpClient;
+    return new ClaudeAcpAgent(mockClient, { log: () => {}, error: () => {} });
+  }
+
+  it("advertises the logout capability during initialize", async () => {
+    const agent = createMockAgent();
+    const response = await agent.initialize({
+      protocolVersion: 1,
+      clientCapabilities: {},
+    });
+    expect(response.agentCapabilities?.auth?.logout).toEqual({});
+  });
+});
+
 describe("session/close", () => {
  function createMockAgent() {
    const mockClient = {
@@ -2613,12 +2786,13 @@ describe("session/close", () => {
      configOptions: [],
      agents: [],
      currentAgent: "default",
+      fastModeEnabled: false,
      abortController: new AbortController(),
      emitRawSDKMessages: false,
      contextWindowSize: 200000,
      taskState: new Map(),
      toolUseCache: {},
-      waitingForToolCall: new Map(),
+      emittedToolCalls: new Set(),
      messageIdToUuid: new Map(),
    };
    return agent.sessions[sessionId]!;
@@ -2699,12 +2873,13 @@ describe("session/delete", () => {
      configOptions: [],
      agents: [],
      currentAgent: "default",
+      fastModeEnabled: false,
      abortController: new AbortController(),
      emitRawSDKMessages: false,
      contextWindowSize: 200000,
      taskState: new Map(),
      toolUseCache: {},
-      waitingForToolCall: new Map(),
+      emittedToolCalls: new Set(),
      messageIdToUuid: new Map(),
    };
    return agent.sessions[sessionId]!;
@@ -2802,12 +2977,13 @@ describe("getOrCreateSession param change detection", () => {
      configOptions: [],
      agents: [],
      currentAgent: "default",
+      fastModeEnabled: false,
      abortController: new AbortController(),
      emitRawSDKMessages: false,
      contextWindowSize: 200000,
      taskState: new Map(),
      toolUseCache: {},
-      waitingForToolCall: new Map(),
+      emittedToolCalls: new Set(),
      messageIdToUuid: new Map(),
    };
    return agent.sessions[sessionId]!;
@@ -5017,12 +5193,13 @@ describe("post-error recovery", () => {
      configOptions: [],
      agents: [],
      currentAgent: "default",
+      fastModeEnabled: false,
      abortController: new AbortController(),
      emitRawSDKMessages: false,
      contextWindowSize: 200000,
      taskState: new Map(),
      toolUseCache: {},
-      waitingForToolCall: new Map(),
+      emittedToolCalls: new Set(),
      messageIdToUuid: new Map(),
    };
    return { interrupt };
@@ -5588,12 +5765,13 @@ describe("session/cancel wedge recovery (issue #680)", () => {
      configOptions: [],
      agents: [],
      currentAgent: "default",
+      fastModeEnabled: false,
      abortController: new AbortController(),
      emitRawSDKMessages: false,
      contextWindowSize: 200000,
      taskState: new Map(),
      toolUseCache: {},
-      waitingForToolCall: new Map(),
+      emittedToolCalls: new Set(),
      messageIdToUuid: new Map(),
    };
    return { interrupt };
@@ -5725,8 +5903,9 @@ describe("streamEventToAcpNotifications", () => {
      pingMessage,
      "test-session",
      {},
-      new Map(),
-      { sessionUpdate: async () => {} } as unknown as AcpClient,
+      { sessionUpdate: async () => {} } as unknown as Parameters<
+        typeof streamEventToAcpNotifications
+      >[3],
      logger,
    );

@@ -5748,17 +5927,9 @@ describe("streamEventToAcpNotifications", () => {
      },
    } as Parameters<typeof streamEventToAcpNotifications>[0];

-    const result = streamEventToAcpNotifications(
-      message,
-      "test",
-      {},
-      new Map(),
-      {} as AcpClient,
-      console,
-      {
-        messageId,
-      },
-    );
+    const result = streamEventToAcpNotifications(message, "test", {}, {} as AcpClient, console, {
+      messageId,
+    });

    expect(result).toEqual([
      {
@@ -5782,7 +5953,6 @@ describe("toAcpNotifications messageId", () => {
      "assistant",
      "test",
      {},
-      new Map(),
      {} as AcpClient,
      console,
      { messageId },
@@ -5806,7 +5976,6 @@ describe("toAcpNotifications messageId", () => {
      "user",
      "test",
      {},
-      new Map(),
      {} as AcpClient,
      console,
      { messageId },
@@ -5821,7 +5990,6 @@ describe("toAcpNotifications messageId", () => {
      "assistant",
      "test",
      {},
-      new Map(),
      {} as AcpClient,
      console,
      { messageId },
@@ -5833,15 +6001,7 @@ describe("toAcpNotifications messageId", () => {
  });

  it("omits messageId when none is supplied", () => {
-    const result = toAcpNotifications(
-      "hello",
-      "assistant",
-      "test",
-      {},
-      new Map(),
-      {} as AcpClient,
-      console,
-    );
+    const result = toAcpNotifications("hello", "assistant", "test", {}, {} as AcpClient, console);
    expect(result[0].update).not.toHaveProperty("messageId");
  });

@@ -5858,7 +6018,6 @@ describe("toAcpNotifications messageId", () => {
      "assistant",
      "test",
      {},
-      new Map(),
      {} as AcpClient,
      console,
      { messageId, registerHooks: false },
@@ -5875,7 +6034,6 @@ describe("toAcpNotifications thinking chunks", () => {
      "assistant",
      "test",
      {},
-      new Map(),
      {} as AcpClient,
      console,
    );
@@ -5897,7 +6055,6 @@ describe("toAcpNotifications thinking chunks", () => {
      "assistant",
      "test",
      {},
-      new Map(),
      {} as AcpClient,
      console,
    );
@@ -5911,7 +6068,6 @@ describe("toAcpNotifications thinking chunks", () => {
      "assistant",
      "test",
      {},
-      new Map(),
      {} as AcpClient,
      console,
    );
@@ -6064,12 +6220,13 @@ describe("agent selection config option", () => {
        configOptions: buildConfigOptions(baseModes, baseModels, [], undefined, agents, "default"),
        agents,
        currentAgent: "default",
+        fastModeEnabled: false,
        abortController: new AbortController(),
        emitRawSDKMessages: false,
        contextWindowSize: 200000,
        taskState: new Map(),
        toolUseCache: {},
-        waitingForToolCall: new Map(),
+        emittedToolCalls: new Set(),
        messageIdToUuid: new Map(),
      };
      return { session: agent.sessions[sessionId]!, applyFlagSettings };
--- a/src/tests/fast-mode-config.test.ts
+++ b/src/tests/fast-mode-config.test.ts
@@ -0,0 +1,341 @@
+import { describe, it, expect, vi } from "vitest";
+import type { ClientCapabilities, SessionNotification } from "@agentclientprotocol/sdk";
+import type { ModelInfo } from "@anthropic-ai/claude-agent-sdk";
+import {
+  buildConfigOptions,
+  clientSupportsBooleanConfigOptions,
+  createFastModeConfigOption,
+  fastModeStateEnabled,
+  resolveFastModeEnabled,
+  FAST_MODE_CONFIG_ID,
+  FAST_MODE_ON,
+  FAST_MODE_OFF,
+  ClaudeAcpAgent,
+  type AcpClient,
+} from "../acp-agent.js";
+
+const MODES = {
+  currentModeId: "default",
+  availableModes: [{ id: "default", name: "Default", description: "Standard behavior" }],
+};
+
+const MODELS = {
+  currentModelId: "claude-opus-4-8",
+  availableModels: [
+    { modelId: "claude-opus-4-8", name: "Claude Opus", description: "Most capable" },
+  ],
+};
+
+const MODEL_INFOS: ModelInfo[] = [
+  { value: "claude-opus-4-8", displayName: "Claude Opus", description: "Most capable" },
+];
+
+describe("createFastModeConfigOption", () => {
+  it("produces a native boolean toggle when the client opted in", () => {
+    expect(createFastModeConfigOption(true, true)).toEqual({
+      id: FAST_MODE_CONFIG_ID,
+      name: "Fast mode",
+      description: expect.any(String),
+      category: "model_config",
+      type: "boolean",
+      currentValue: true,
+    });
+  });
+
+  it("falls back to an on/off select when the client did not opt in", () => {
+    const option = createFastModeConfigOption(false, false);
+    expect(option).toMatchObject({
+      id: FAST_MODE_CONFIG_ID,
+      type: "select",
+      category: "model_config",
+      currentValue: FAST_MODE_OFF,
+      options: [
+        { value: FAST_MODE_ON, name: "On" },
+        { value: FAST_MODE_OFF, name: "Off" },
+      ],
+    });
+    expect(option).not.toHaveProperty("currentValue", true);
+  });
+});
+
+describe("clientSupportsBooleanConfigOptions", () => {
+  it("is true only when session.configOptions.boolean is present", () => {
+    expect(
+      clientSupportsBooleanConfigOptions({ session: { configOptions: { boolean: {} } } }),
+    ).toBe(true);
+  });
+
+  it("is false when the capability is omitted or null at any level", () => {
+    expect(clientSupportsBooleanConfigOptions(undefined)).toBe(false);
+    expect(clientSupportsBooleanConfigOptions(null)).toBe(false);
+    expect(clientSupportsBooleanConfigOptions({})).toBe(false);
+    expect(clientSupportsBooleanConfigOptions({ session: { configOptions: {} } })).toBe(false);
+    expect(
+      clientSupportsBooleanConfigOptions({ session: { configOptions: { boolean: null } } }),
+    ).toBe(false);
+  });
+});
+
+describe("resolveFastModeEnabled", () => {
+  const base = { sessionId: "s", configId: FAST_MODE_CONFIG_ID };
+
+  it("accepts native boolean values", () => {
+    expect(resolveFastModeEnabled({ ...base, type: "boolean", value: true })).toBe(true);
+    expect(resolveFastModeEnabled({ ...base, type: "boolean", value: false })).toBe(false);
+  });
+
+  it("accepts the on/off select fallback", () => {
+    expect(resolveFastModeEnabled({ ...base, value: FAST_MODE_ON })).toBe(true);
+    expect(resolveFastModeEnabled({ ...base, value: FAST_MODE_OFF })).toBe(false);
+  });
+
+  it("rejects any other value", () => {
+    expect(() => resolveFastModeEnabled({ ...base, value: "maybe" })).toThrow(
+      /Invalid value for config option fast/,
+    );
+  });
+});
+
+describe("fastModeStateEnabled", () => {
+  it("treats cooldown as on (the user's intent persists through rate-limit cooldown)", () => {
+    expect(fastModeStateEnabled("on")).toBe(true);
+    expect(fastModeStateEnabled("cooldown")).toBe(true);
+    expect(fastModeStateEnabled("off")).toBe(false);
+  });
+});
+
+describe("buildConfigOptions Fast mode", () => {
+  it("omits the Fast mode option when the model does not support it", () => {
+    const options = buildConfigOptions(MODES, MODELS, MODEL_INFOS, undefined, [], "default", {
+      supported: false,
+      enabled: false,
+      useBooleanOption: true,
+    });
+    expect(options.find((o) => o.id === FAST_MODE_CONFIG_ID)).toBeUndefined();
+  });
+
+  it("omits the Fast mode option when no fast mode state is provided", () => {
+    const options = buildConfigOptions(MODES, MODELS, MODEL_INFOS, undefined, [], "default");
+    expect(options.find((o) => o.id === FAST_MODE_CONFIG_ID)).toBeUndefined();
+  });
+
+  it("surfaces a boolean toggle when supported and the client opted in", () => {
+    const options = buildConfigOptions(MODES, MODELS, MODEL_INFOS, undefined, [], "default", {
+      supported: true,
+      enabled: true,
+      useBooleanOption: true,
+    });
+    expect(options).toContainEqual(createFastModeConfigOption(true, true));
+  });
+
+  it("surfaces a select fallback when supported but the client did not opt in", () => {
+    const options = buildConfigOptions(MODES, MODELS, MODEL_INFOS, undefined, [], "default", {
+      supported: true,
+      enabled: false,
+      useBooleanOption: false,
+    });
+    expect(options).toContainEqual(createFastModeConfigOption(false, false));
+  });
+});
+
+describe("setSessionConfigOption Fast mode toggle", () => {
+  const SESSION_ID = "fast-session";
+
+  function setup(opts: { useBooleanOption: boolean }) {
+    const sessionUpdates: SessionNotification[] = [];
+    const client = {
+      sessionUpdate: async (n: SessionNotification) => {
+        sessionUpdates.push(n);
+      },
+      requestPermission: async () => ({ outcome: { outcome: "cancelled" } }),
+      readTextFile: async () => ({ content: "" }),
+      writeTextFile: async () => ({}),
+    } as unknown as AcpClient;
+
+    const agent = new ClaudeAcpAgent(client);
+    const clientCapabilities: ClientCapabilities = opts.useBooleanOption
+      ? { session: { configOptions: { boolean: {} } } }
+      : {};
+    (agent as unknown as { clientCapabilities: ClientCapabilities }).clientCapabilities =
+      clientCapabilities;
+
+    const applyFlagSettings = vi.fn();
+    (agent as unknown as { sessions: Record<string, unknown> }).sessions[SESSION_ID] = {
+      query: { applyFlagSettings },
+      fastModeEnabled: false,
+      configOptions: [createFastModeConfigOption(false, opts.useBooleanOption)],
+    };
+
+    return { agent, applyFlagSettings, sessionUpdates };
+  }
+
+  it("toggles Fast mode on/off through a boolean value", async () => {
+    const { agent, applyFlagSettings } = setup({ useBooleanOption: true });
+
+    const onResponse = await agent.setSessionConfigOption({
+      sessionId: SESSION_ID,
+      configId: FAST_MODE_CONFIG_ID,
+      type: "boolean",
+      value: true,
+    });
+    expect(applyFlagSettings).toHaveBeenCalledWith({ fastMode: true });
+    expect(onResponse.configOptions).toContainEqual(createFastModeConfigOption(true, true));
+    expect(
+      (agent as unknown as { sessions: Record<string, { fastModeEnabled: boolean }> }).sessions[
+        SESSION_ID
+      ].fastModeEnabled,
+    ).toBe(true);
+
+    const offResponse = await agent.setSessionConfigOption({
+      sessionId: SESSION_ID,
+      configId: FAST_MODE_CONFIG_ID,
+      type: "boolean",
+      value: false,
+    });
+    expect(applyFlagSettings).toHaveBeenLastCalledWith({ fastMode: false });
+    expect(offResponse.configOptions).toContainEqual(createFastModeConfigOption(false, true));
+  });
+
+  it("toggles Fast mode through the on/off select fallback", async () => {
+    const { agent, applyFlagSettings } = setup({ useBooleanOption: false });
+
+    const response = await agent.setSessionConfigOption({
+      sessionId: SESSION_ID,
+      configId: FAST_MODE_CONFIG_ID,
+      value: FAST_MODE_ON,
+    });
+    expect(applyFlagSettings).toHaveBeenCalledWith({ fastMode: true });
+    expect(response.configOptions).toContainEqual(createFastModeConfigOption(true, false));
+  });
+
+  it("does not change session state when the SDK rejects the flag", async () => {
+    const { agent, applyFlagSettings } = setup({ useBooleanOption: true });
+    applyFlagSettings.mockRejectedValueOnce(new Error("nope"));
+
+    await expect(
+      agent.setSessionConfigOption({
+        sessionId: SESSION_ID,
+        configId: FAST_MODE_CONFIG_ID,
+        type: "boolean",
+        value: true,
+      }),
+    ).rejects.toThrow("nope");
+
+    const session = (agent as unknown as { sessions: Record<string, { fastModeEnabled: boolean }> })
+      .sessions[SESSION_ID];
+    expect(session.fastModeEnabled).toBe(false);
+  });
+});
+
+describe("syncFastModeState (SDK-driven state changes)", () => {
+  const SESSION_ID = "fast-session";
+
+  function setup(opts: { fastModeEnabled: boolean; withOption: boolean }) {
+    const sessionUpdates: SessionNotification[] = [];
+    const client = {
+      sessionUpdate: async (n: SessionNotification) => {
+        sessionUpdates.push(n);
+      },
+      requestPermission: async () => ({ outcome: { outcome: "cancelled" } }),
+      readTextFile: async () => ({ content: "" }),
+      writeTextFile: async () => ({}),
+    } as unknown as AcpClient;
+
+    const agent = new ClaudeAcpAgent(client);
+    (agent as unknown as { clientCapabilities: ClientCapabilities }).clientCapabilities = {
+      session: { configOptions: { boolean: {} } },
+    };
+
+    const session = {
+      query: {},
+      fastModeEnabled: opts.fastModeEnabled,
+      configOptions: opts.withOption
+        ? [createFastModeConfigOption(opts.fastModeEnabled, true)]
+        : [],
+    };
+    (agent as unknown as { sessions: Record<string, unknown> }).sessions[SESSION_ID] = session;
+
+    const sync = (
+      agent as unknown as {
+        syncFastModeState: (
+          sessionId: string,
+          session: unknown,
+          state: string | undefined,
+        ) => Promise<void>;
+      }
+    ).syncFastModeState.bind(agent);
+
+    return { sync, session, sessionUpdates };
+  }
+
+  it("emits a config_option_update when the SDK reports a new state", async () => {
+    const { sync, session, sessionUpdates } = setup({ fastModeEnabled: false, withOption: true });
+
+    await sync(SESSION_ID, session, "on");
+
+    expect(session.fastModeEnabled).toBe(true);
+    expect(session.configOptions).toContainEqual(createFastModeConfigOption(true, true));
+    expect(sessionUpdates).toHaveLength(1);
+    expect(sessionUpdates[0].update).toMatchObject({
+      sessionUpdate: "config_option_update",
+    });
+    const updated = (
+      sessionUpdates[0].update as { configOptions: ReturnType<typeof createFastModeConfigOption>[] }
+    ).configOptions;
+    expect(updated).toContainEqual(createFastModeConfigOption(true, true));
+  });
+
+  it("leaves the toggle on and quiet during a rate-limit cooldown", async () => {
+    const { sync, session, sessionUpdates } = setup({ fastModeEnabled: true, withOption: true });
+
+    // cooldown is a transient suspension of an already-enabled fast mode.
+    await sync(SESSION_ID, session, "cooldown");
+
+    expect(session.fastModeEnabled).toBe(true);
+    expect(sessionUpdates).toHaveLength(0);
+  });
+
+  it("never lets a stray cooldown spuriously enable a toggle the user has off", async () => {
+    const { sync, session, sessionUpdates } = setup({ fastModeEnabled: false, withOption: true });
+
+    await sync(SESSION_ID, session, "cooldown");
+
+    expect(session.fastModeEnabled).toBe(false);
+    expect(sessionUpdates).toHaveLength(0);
+  });
+
+  it("clears the toggle when the SDK reports off", async () => {
+    const { sync, session, sessionUpdates } = setup({ fastModeEnabled: true, withOption: true });
+
+    await sync(SESSION_ID, session, "off");
+
+    expect(session.fastModeEnabled).toBe(false);
+    expect(session.configOptions).toContainEqual(createFastModeConfigOption(false, true));
+    expect(sessionUpdates).toHaveLength(1);
+  });
+
+  it("is a no-op when the reported state is undefined or unchanged", async () => {
+    const { sync, session, sessionUpdates } = setup({ fastModeEnabled: false, withOption: true });
+
+    await sync(SESSION_ID, session, undefined);
+    await sync(SESSION_ID, session, "off");
+
+    expect(sessionUpdates).toHaveLength(0);
+  });
+
+  it("preserves the retained setting (no clobber) when the model has no Fast mode option", async () => {
+    // Model without fast support: the SDK reports a capability-driven state, not
+    // the user's intent. We must leave session.fastModeEnabled untouched so it's
+    // correct when a supporting model is reselected — reconciling here was the
+    // original intent-clobber bug.
+    const enabledCase = setup({ fastModeEnabled: true, withOption: false });
+    await enabledCase.sync(SESSION_ID, enabledCase.session, "off");
+    expect(enabledCase.session.fastModeEnabled).toBe(true);
+    expect(enabledCase.sessionUpdates).toHaveLength(0);
+
+    const disabledCase = setup({ fastModeEnabled: false, withOption: false });
+    await disabledCase.sync(SESSION_ID, disabledCase.session, "on");
+    expect(disabledCase.session.fastModeEnabled).toBe(false);
+    expect(disabledCase.sessionUpdates).toHaveLength(0);
+  });
+});
--- a/src/tests/model-resolution.test.ts
+++ b/src/tests/model-resolution.test.ts
@@ -0,0 +1,118 @@
+import { describe, it, expect } from "vitest";
+import { randomUUID } from "crypto";
+import { query } from "@anthropic-ai/claude-agent-sdk";
+import type { ModelInfo } from "@anthropic-ai/claude-agent-sdk";
+import { resolveModelPreference, applyAvailableModelsAllowlist } from "../acp-agent.js";
+
+// Mirrors a real `supportedModels()` response: alias rows carry
+// `resolvedModel`, and "Sonnet 5" has no `major.minor` dot unlike older
+// "claude-opus-4-6"-style ids.
+const LIVE_SHAPED_MODELS: ModelInfo[] = [
+  {
+    value: "default",
+    resolvedModel: "claude-opus-4-8[1m]",
+    displayName: "Default (recommended)",
+    description: "Use the default model (currently Opus 4.8 (1M context))",
+  },
+  {
+    value: "opus[1m]",
+    resolvedModel: "claude-opus-4-8[1m]",
+    displayName: "Opus",
+    description: "Opus 4.8 with 1M context · Best for everyday, complex tasks",
+  },
+  {
+    value: "sonnet",
+    resolvedModel: "claude-sonnet-5",
+    displayName: "Sonnet",
+    description: "Sonnet 5 · Efficient for routine tasks",
+  },
+  {
+    value: "haiku",
+    resolvedModel: "claude-haiku-4-5-20251001",
+    displayName: "Haiku",
+    description: "Haiku 4.5 · Fastest for quick answers",
+  },
+];
+
+describe("resolveModelPreference - resolvedModel matching", () => {
+  it("matches a preference that equals an alias's resolvedModel exactly", () => {
+    expect(resolveModelPreference(LIVE_SHAPED_MODELS, "claude-sonnet-5")?.value).toBe("sonnet");
+    expect(resolveModelPreference(LIVE_SHAPED_MODELS, "claude-opus-4-8[1m]")?.value).toBe(
+      "opus[1m]",
+    );
+    expect(resolveModelPreference(LIVE_SHAPED_MODELS, "claude-haiku-4-5-20251001")?.value).toBe(
+      "haiku",
+    );
+  });
+
+  it("is case-insensitive", () => {
+    expect(resolveModelPreference(LIVE_SHAPED_MODELS, "CLAUDE-SONNET-5")?.value).toBe("sonnet");
+  });
+
+  it("still resolves plain aliases via the direct-match tier", () => {
+    expect(resolveModelPreference(LIVE_SHAPED_MODELS, "sonnet")?.value).toBe("sonnet");
+    expect(resolveModelPreference(LIVE_SHAPED_MODELS, "opus[1m]")?.value).toBe("opus[1m]");
+  });
+
+  it("does not let a retired dated id drift onto a same-family alias of a different generation", () => {
+    expect(resolveModelPreference(LIVE_SHAPED_MODELS, "claude-sonnet-4-6")).toBeNull();
+  });
+
+  // "opus[1m]"'s `value` has no dotted version, just the context-hint digit
+  // in "[1m]" — unstripped, that reads as version "1" and blocks the match
+  // before the matcher reaches the description's real "4.8".
+  it("does not mistake an alias's context-hint suffix for its version", () => {
+    expect(resolveModelPreference(LIVE_SHAPED_MODELS, "claude-opus-4-8")?.value).toBe("opus[1m]");
+  });
+
+  it("returns null for a preference that matches nothing", () => {
+    expect(resolveModelPreference(LIVE_SHAPED_MODELS, "claude-gpt-99")).toBeNull();
+  });
+});
+
+describe("applyAvailableModelsAllowlist - resolvedModel matching", () => {
+  it("resolves an allowlist entry pinned to a canonical resolvedModel id", () => {
+    const result = applyAvailableModelsAllowlist(LIVE_SHAPED_MODELS, ["claude-sonnet-5"]);
+    const entry = result.find((m) => m.value === "claude-sonnet-5");
+    expect(entry).toBeDefined();
+    expect(entry?.displayName).toBe("Sonnet");
+  });
+});
+
+// Runs against the real SDK (no mocks) so the fixture above is flagged the
+// moment the SDK's actual model list shape drifts from it. Requires a usable
+// ANTHROPIC_API_KEY, hence opt-in via RUN_INTEGRATION_TESTS.
+describe.skipIf(!process.env.RUN_INTEGRATION_TESTS)("model resolution (real SDK)", () => {
+  it("every model's resolvedModel (when present) resolves back to that same row", async () => {
+    const q = query({ prompt: "hi", options: { sessionId: randomUUID() } });
+    try {
+      const models = await q.supportedModels();
+      expect(models.length).toBeGreaterThan(0);
+
+      for (const model of models) {
+        // "default" shares a resolvedModel with the CLI's recommended named
+        // alias, and resolution intentionally prefers that alias on a tie.
+        if (!model.resolvedModel || model.value === "default") continue;
+        const resolved = resolveModelPreference(models, model.resolvedModel);
+        expect(resolved?.value).toBe(model.value);
+      }
+    } finally {
+      q.return(undefined);
+    }
+  }, 30000);
+
+  it("resolves the well-known 'sonnet' and 'opus' aliases to a model bearing their family name", async () => {
+    const q = query({ prompt: "hi", options: { sessionId: randomUUID() } });
+    try {
+      const models = await q.supportedModels();
+
+      const sonnet = resolveModelPreference(models, "sonnet");
+      expect(sonnet?.resolvedModel?.toLowerCase()).toContain("sonnet");
+
+      const opus = resolveModelPreference(models, "opus");
+      expect(opus?.resolvedModel?.toLowerCase()).toContain("opus");
+    } finally {
+      q.return(undefined);
+    }
+  }, 30000);
+});
--- a/src/tests/session-config-options.test.ts
+++ b/src/tests/session-config-options.test.ts
@@ -113,19 +113,17 @@ describe("session config options", () => {
      settingsManager: {},
      modes: structuredClone(MOCK_MODES),
      models: structuredClone(MOCK_MODELS),
-      modelInfos: MOCK_MODELS.availableModels.map(
-        (m): ModelInfo => ({
-          value: m.modelId,
-          displayName: m.name,
-          description: m.description,
-          supportsEffort: true,
-          supportedEffortLevels: ["low", "medium", "high"],
-        }),
-      ),
+      modelInfos: MOCK_MODELS.availableModels.map((m): ModelInfo => ({
+        value: m.modelId,
+        displayName: m.name,
+        description: m.description,
+        supportsEffort: true,
+        supportedEffortLevels: ["low", "medium", "high"],
+      })),
      configOptions: structuredClone(MOCK_CONFIG_OPTIONS),
      contextWindowSize: 200000,
      toolUseCache: {},
-      waitingForToolCall: new Map(),
+      emittedToolCalls: new Set(),
    };
  }

@@ -1114,12 +1112,10 @@ describe("session config options", () => {
          { id: "dontAsk", name: "Don't Ask", description: "Deny if not pre-approved" },
        ],
      };
-      session.toolUseCache["toolu_1"] = {
-        type: "tool_use",
-        id: "toolu_1",
-        name: "ExitPlanMode",
-        input: { plan: "do stuff" },
-      };
+
+      // The tool_call was already surfaced (by the streamed tool_use chunk), so
+      // the permission request won't re-emit one — keep this focused on options.
+      session.emittedToolCalls.add("toolu_1");

      const canUseTool = (agent as any).canUseTool(SESSION_ID);
      const signal = new AbortController().signal;
@@ -1152,12 +1148,10 @@ describe("session config options", () => {
        ],
      };
      permissionResponse = { outcome: { outcome: "selected", optionId: "auto" } };
-      session.toolUseCache["toolu_2"] = {
-        type: "tool_use",
-        id: "toolu_2",
-        name: "ExitPlanMode",
-        input: { plan: "do stuff" },
-      };
+      // The tool_call was already surfaced (by the streamed tool_use chunk), so
+      // the permission request won't re-emit one — the deny path below should
+      // produce no session updates at all.
+      session.emittedToolCalls.add("toolu_2");

      const canUseTool = (agent as any).canUseTool(SESSION_ID);
      const result = await canUseTool(
@@ -1185,12 +1179,10 @@ describe("session config options", () => {
          { id: "dontAsk", name: "Don't Ask", description: "Deny if not pre-approved" },
        ],
      };
-      session.toolUseCache["toolu_3"] = {
-        type: "tool_use",
-        id: "toolu_3",
-        name: "ExitPlanMode",
-        input: { plan: "do stuff" },
-      };
+
+      // The tool_call was already surfaced (by the streamed tool_use chunk), so
+      // the permission request won't re-emit one — keep this focused on options.
+      session.emittedToolCalls.add("toolu_3");

      const canUseTool = (agent as any).canUseTool(SESSION_ID);
      const signal = new AbortController().signal;
--- a/src/tests/tools.test.ts
+++ b/src/tests/tools.test.ts
@@ -10,13 +10,7 @@ import {
  BetaBashCodeExecutionResultBlock,
  BetaBashCodeExecutionToolResultBlockParam,
 } from "@anthropic-ai/sdk/resources/beta.mjs";
-import {
-  AcpClient,
-  toAcpNotifications,
-  ToolUseCache,
-  Logger,
-  WaitingForToolCall,
-} from "../acp-agent.js";
+import { AcpClient, toAcpNotifications, ToolUseCache, Logger } from "../acp-agent.js";
 import {
  toolUpdateFromToolResult,
  createPostToolUseHook,
@@ -43,7 +37,6 @@ describe("rawOutput in tool call updates", () => {
        input: { command: "echo hello" },
      },
    };
-    const waitingForToolCall: WaitingForToolCall = new Map();

    const toolResult: ToolResultBlockParam = {
      type: "tool_result",
@@ -57,7 +50,6 @@ describe("rawOutput in tool call updates", () => {
      "assistant",
      "test-session",
      toolUseCache,
-      waitingForToolCall,
      mockClient,
      mockLogger,
    );
@@ -80,7 +72,6 @@ describe("rawOutput in tool call updates", () => {
        input: { file_path: "/test/file.txt" },
      },
    };
-    const waitingForToolCall: WaitingForToolCall = new Map();

    // ToolResultBlockParam content can be string or array of TextBlockParam
    const toolResult: ToolResultBlockParam = {
@@ -95,7 +86,6 @@ describe("rawOutput in tool call updates", () => {
      "assistant",
      "test-session",
      toolUseCache,
-      waitingForToolCall,
      mockClient,
      mockLogger,
    );
@@ -118,7 +108,6 @@ describe("rawOutput in tool call updates", () => {
        input: { query: "test" },
      },
    };
-    const waitingForToolCall: WaitingForToolCall = new Map();

    // BetaMCPToolResultBlock content can be string or Array<BetaTextBlock>
    const toolResult: BetaMCPToolResultBlock = {
@@ -133,7 +122,6 @@ describe("rawOutput in tool call updates", () => {
      "assistant",
      "test-session",
      toolUseCache,
-      waitingForToolCall,
      mockClient,
      mockLogger,
    );
@@ -156,7 +144,6 @@ describe("rawOutput in tool call updates", () => {
        input: { term: "test" },
      },
    };
-    const waitingForToolCall: WaitingForToolCall = new Map();

    // BetaTextBlock requires citations field
    const arrayContent: BetaTextBlock[] = [
@@ -176,7 +163,6 @@ describe("rawOutput in tool call updates", () => {
      "assistant",
      "test-session",
      toolUseCache,
-      waitingForToolCall,
      mockClient,
      mockLogger,
    );
@@ -199,7 +185,6 @@ describe("rawOutput in tool call updates", () => {
        input: { query: "test search" },
      },
    };
-    const waitingForToolCall: WaitingForToolCall = new Map();

    // BetaWebSearchResultBlock from SDK
    const searchResults: BetaWebSearchResultBlock[] = [
@@ -223,7 +208,6 @@ describe("rawOutput in tool call updates", () => {
      "assistant",
      "test-session",
      toolUseCache,
-      waitingForToolCall,
      mockClient,
      mockLogger,
    );
@@ -246,7 +230,6 @@ describe("rawOutput in tool call updates", () => {
        input: { command: "ls -la" },
      },
    };
-    const waitingForToolCall: WaitingForToolCall = new Map();

    // BetaBashCodeExecutionResultBlock from SDK
    const bashResult: BetaBashCodeExecutionResultBlock = {
@@ -268,7 +251,6 @@ describe("rawOutput in tool call updates", () => {
      "assistant",
      "test-session",
      toolUseCache,
-      waitingForToolCall,
      mockClient,
      mockLogger,
    );
@@ -291,7 +273,6 @@ describe("rawOutput in tool call updates", () => {
        input: { command: "invalid_command" },
      },
    };
-    const waitingForToolCall: WaitingForToolCall = new Map();

    const toolResult: ToolResultBlockParam = {
      type: "tool_result",
@@ -305,7 +286,6 @@ describe("rawOutput in tool call updates", () => {
      "assistant",
      "test-session",
      toolUseCache,
-      waitingForToolCall,
      mockClient,
      mockLogger,
    );
@@ -328,7 +308,6 @@ describe("rawOutput in tool call updates", () => {
        input: { todos: [{ content: "Test task", status: "pending" }] },
      },
    };
-    const waitingForToolCall: WaitingForToolCall = new Map();

    const toolResult: ToolResultBlockParam = {
      type: "tool_result",
@@ -342,7 +321,6 @@ describe("rawOutput in tool call updates", () => {
      "assistant",
      "test-session",
      toolUseCache,
-      waitingForToolCall,
      mockClient,
      mockLogger,
    );
@@ -373,14 +351,11 @@ describe("rawOutput in tool call updates", () => {
      is_error: false,
    };

-    const waitingForToolCall: WaitingForToolCall = new Map();
-
    const notifications = toAcpNotifications(
      [toolResult],
      "assistant",
      "test-session",
      toolUseCache,
-      waitingForToolCall,
      mockClient,
      mockLogger,
    );
@@ -408,7 +383,6 @@ describe("rawOutput in tool call updates", () => {
        input: { file_path: "/test/image.png" },
      },
    };
-    const waitingForToolCall: WaitingForToolCall = new Map();

    const imageBlock: ImageBlockParam = {
      type: "image",
@@ -427,7 +401,6 @@ describe("rawOutput in tool call updates", () => {
      "assistant",
      "test-session",
      toolUseCache,
-      waitingForToolCall,
      mockClient,
      mockLogger,
    );
@@ -806,7 +779,6 @@ describe("Bash terminal output", () => {
    // Reset before each test: toAcpNotifications prunes the cache entry once it
    // maps the tool_result, so a shared object would be empty by the 2nd test.
    let toolUseCache: ToolUseCache;
-    const waitingForToolCall: WaitingForToolCall = new Map();
    beforeEach(() => {
      toolUseCache = {
        toolu_bash: {
@@ -842,7 +814,6 @@ describe("Bash terminal output", () => {
        "assistant",
        "test-session",
        toolUseCache,
-        waitingForToolCall,
        mockClient,
        mockLogger,
        { clientCapabilities },
@@ -883,7 +854,6 @@ describe("Bash terminal output", () => {
        "assistant",
        "test-session",
        toolUseCache,
-        waitingForToolCall,
        mockClient,
        mockLogger,
      );
@@ -910,7 +880,6 @@ describe("Bash terminal output", () => {
        "assistant",
        "test-session",
        toolUseCache,
-        waitingForToolCall,
        mockClient,
        mockLogger,
        { clientCapabilities },
@@ -926,7 +895,6 @@ describe("Bash terminal output", () => {
        "assistant",
        "test-session",
        toolUseCache,
-        waitingForToolCall,
        mockClient,
        mockLogger,
        { clientCapabilities: { _meta: { terminal_output: true } } },
@@ -947,7 +915,6 @@ describe("Bash terminal output", () => {
        "assistant",
        "test-session",
        toolUseCacheWithoutSupport,
-        waitingForToolCall,
        mockClient,
        mockLogger,
      );
@@ -980,7 +947,6 @@ describe("Bash terminal output", () => {
        "assistant",
        "test-session",
        toolUseCache,
-        waitingForToolCall,
        mockClient,
        mockLogger,
        { clientCapabilities },
@@ -1003,7 +969,6 @@ describe("Bash terminal output", () => {
  describe("toolUseCache pruning", () => {
    it("retains the tool_use entry until its result, then prunes it", () => {
      const toolUseCache: ToolUseCache = {};
-      const waitingForToolCall: WaitingForToolCall = new Map();
      const toolUse = {
        type: "tool_use" as const,
        id: "toolu_read",
@@ -1012,15 +977,7 @@ describe("Bash terminal output", () => {
      };

      // tool_use is cached and kept (the matching result hasn't arrived yet).
-      toAcpNotifications(
-        [toolUse],
-        "assistant",
-        "s",
-        toolUseCache,
-        waitingForToolCall,
-        mockClient,
-        mockLogger,
-      );
+      toAcpNotifications([toolUse], "assistant", "s", toolUseCache, mockClient, mockLogger);
      expect(toolUseCache.toolu_read).toBeDefined();

      // tool_result resolves it, so the entry is pruned to bound memory.
@@ -1029,15 +986,7 @@ describe("Bash terminal output", () => {
        tool_use_id: "toolu_read",
        content: [{ type: "text", text: "hello" }],
      };
-      toAcpNotifications(
-        [toolResult],
-        "assistant",
-        "s",
-        toolUseCache,
-        waitingForToolCall,
-        mockClient,
-        mockLogger,
-      );
+      toAcpNotifications([toolResult], "assistant", "s", toolUseCache, mockClient, mockLogger);
      expect(toolUseCache.toolu_read).toBeUndefined();
    });
  });
@@ -1045,7 +994,6 @@ describe("Bash terminal output", () => {
  describe("post-tool-use hook sends diff content for Edit tool", () => {
    it("should include content and locations from structuredPatch in hook update", async () => {
      const toolUseCache: ToolUseCache = {};
-      const waitingForToolCall: WaitingForToolCall = new Map();

      const hookUpdates: any[] = [];
      const mockClientWithUpdate = {
@@ -1071,7 +1019,6 @@ describe("Bash terminal output", () => {
        "assistant",
        "test-session",
        toolUseCache,
-        waitingForToolCall,
        mockClientWithUpdate,
        mockLogger,
      );
@@ -1126,7 +1073,6 @@ describe("Bash terminal output", () => {

    it("should include multiple diff blocks for replaceAll with multiple hunks", async () => {
      const toolUseCache: ToolUseCache = {};
-      const waitingForToolCall: WaitingForToolCall = new Map();

      const hookUpdates: any[] = [];
      const mockClientWithUpdate = {
@@ -1152,7 +1098,6 @@ describe("Bash terminal output", () => {
        "assistant",
        "test-session",
        toolUseCache,
-        waitingForToolCall,
        mockClientWithUpdate,
        mockLogger,
      );
@@ -1213,7 +1158,6 @@ describe("Bash terminal output", () => {

    it("should not include content/locations for non-Edit tools", async () => {
      const toolUseCache: ToolUseCache = {};
-      const waitingForToolCall: WaitingForToolCall = new Map();

      const hookUpdates: any[] = [];
      const mockClientWithUpdate = {
@@ -1234,7 +1178,6 @@ describe("Bash terminal output", () => {
        "assistant",
        "test-session",
        toolUseCache,
-        waitingForToolCall,
        mockClientWithUpdate,
        mockLogger,
      );
@@ -1270,7 +1213,6 @@ describe("Bash terminal output", () => {
    // tool_use time and was never corrected after the tool ran.
    it("should emit a real diff for Write of an existing file (type: update)", async () => {
      const toolUseCache: ToolUseCache = {};
-      const waitingForToolCall: WaitingForToolCall = new Map();
      const hookUpdates: any[] = [];
      const mockClientWithUpdate = {
        sessionUpdate: async (notification: any) => {
@@ -1293,7 +1235,6 @@ describe("Bash terminal output", () => {
        "assistant",
        "test-session",
        toolUseCache,
-        waitingForToolCall,
        mockClientWithUpdate,
        mockLogger,
      );
@@ -1348,7 +1289,6 @@ describe("Bash terminal output", () => {

    it("should still emit a sensible diff for Write of a brand-new file (type: create)", async () => {
      const toolUseCache: ToolUseCache = {};
-      const waitingForToolCall: WaitingForToolCall = new Map();
      const hookUpdates: any[] = [];
      const mockClientWithUpdate = {
        sessionUpdate: async (notification: any) => {
@@ -1371,7 +1311,6 @@ describe("Bash terminal output", () => {
        "assistant",
        "test-session",
        toolUseCache,
-        waitingForToolCall,
        mockClientWithUpdate,
        mockLogger,
      );
@@ -1429,7 +1368,6 @@ describe("Bash terminal output", () => {
      };

      const toolUseCache: ToolUseCache = {};
-      const waitingForToolCall: WaitingForToolCall = new Map();

      // Capture session updates sent by the hook callback
      const hookUpdates: any[] = [];
@@ -1451,7 +1389,6 @@ describe("Bash terminal output", () => {
        "assistant",
        "test-session",
        toolUseCache,
-        waitingForToolCall,
        mockClientWithUpdate,
        mockLogger,
        { clientCapabilities },
@@ -1481,7 +1418,6 @@ describe("Bash terminal output", () => {
        "assistant",
        "test-session",
        toolUseCache,
-        waitingForToolCall,
        mockClientWithUpdate,
        mockLogger,
        { clientCapabilities },
@@ -1533,7 +1469,6 @@ describe("Bash terminal output", () => {

    it("should not include terminal _meta in hook update when client lacks terminal_output support", async () => {
      const toolUseCache: ToolUseCache = {};
-      const waitingForToolCall: WaitingForToolCall = new Map();

      const hookUpdates: any[] = [];
      const mockClientWithUpdate = {
@@ -1555,7 +1490,6 @@ describe("Bash terminal output", () => {
        "assistant",
        "test-session",
        toolUseCache,
-        waitingForToolCall,
        mockClientWithUpdate,
        mockLogger,
        // No clientCapabilities — terminal_output not supported
@@ -1580,7 +1514,6 @@ describe("Bash terminal output", () => {
        "assistant",
        "test-session",
        toolUseCache,
-        waitingForToolCall,
        mockClientWithUpdate,
        mockLogger,
      );
@@ -1681,6 +1614,68 @@ describe("toolInfoFromToolUse - undefined input regression", () => {
    const info = toolInfoFromToolUse(toolUse, false);
    expect(info.title).toBe("Update TODOs");
  });
+
+  it("ReportFindings with undefined input should not throw", () => {
+    const toolUse = { name: "ReportFindings", id: "toolu_findings_undef", input: undefined };
+    const info = toolInfoFromToolUse(toolUse, false);
+    expect(info.title).toBe("Report findings: none found");
+    expect(info.content).toEqual([]);
+  });
+});
+
+describe("toolInfoFromToolUse - ReportFindings", () => {
+  it("should summarize findings count and list each in content", () => {
+    const toolUse = {
+      name: "ReportFindings",
+      id: "toolu_findings_1",
+      input: {
+        findings: [
+          {
+            file: "src/foo.ts",
+            line: 42,
+            summary: "Off-by-one in loop bound",
+            failure_scenario: "Empty array → index out of bounds crash",
+          },
+          {
+            file: "src/bar.ts",
+            summary: "Unhandled promise rejection",
+            failure_scenario: "Network failure → unhandled rejection",
+          },
+        ],
+      },
+    };
+
+    const info = toolInfoFromToolUse(toolUse, false);
+
+    expect(info.kind).toBe("think");
+    expect(info.title).toBe("Report 2 findings");
+    expect(info.content).toEqual([
+      {
+        type: "content",
+        content: { type: "text", text: "**src/foo.ts:42** — Off-by-one in loop bound" },
+      },
+      {
+        type: "content",
+        content: { type: "text", text: "**src/bar.ts** — Unhandled promise rejection" },
+      },
+    ]);
+  });
+
+  it("should report a singular title and empty findings array", () => {
+    const oneFinding = {
+      name: "ReportFindings",
+      id: "toolu_findings_2",
+      input: { findings: [{ file: "src/baz.ts", summary: "Leak", failure_scenario: "..." }] },
+    };
+    expect(toolInfoFromToolUse(oneFinding, false).title).toBe("Report 1 finding");
+
+    const noFindings = {
+      name: "ReportFindings",
+      id: "toolu_findings_3",
+      input: { findings: [] },
+    };
+    expect(toolInfoFromToolUse(noFindings, false).title).toBe("Report findings: none found");
+  });
 });

 describe("planEntries - undefined input regression", () => {
@@ -1712,7 +1707,6 @@ describe("toAcpNotifications - TodoWrite with undefined input regression", () =>

  it("should not throw when TodoWrite tool_use has undefined input", () => {
    const toolUseCache: ToolUseCache = {};
-    const waitingForToolCall: WaitingForToolCall = new Map();

    const notifications = toAcpNotifications(
      [
@@ -1726,7 +1720,6 @@ describe("toAcpNotifications - TodoWrite with undefined input regression", () =>
      "assistant",
      "test-session",
      toolUseCache,
-      waitingForToolCall,
      mockClient,
      mockLogger,
    );
@@ -1738,7 +1731,6 @@ describe("toAcpNotifications - TodoWrite with undefined input regression", () =>

  it("should still emit plan update when TodoWrite has valid input", () => {
    const toolUseCache: ToolUseCache = {};
-    const waitingForToolCall: WaitingForToolCall = new Map();

    const notifications = toAcpNotifications(
      [
@@ -1752,7 +1744,6 @@ describe("toAcpNotifications - TodoWrite with undefined input regression", () =>
      "assistant",
      "test-session",
      toolUseCache,
-      waitingForToolCall,
      mockClient,
      mockLogger,
    );
@@ -1851,7 +1842,6 @@ describe("toAcpNotifications - Task* tools", () => {

  it("suppresses tool_call for TaskCreate/TaskUpdate/TaskList/TaskGet on tool_use", () => {
    const toolUseCache: ToolUseCache = {};
-    const waitingForToolCall: WaitingForToolCall = new Map();
    const taskState: TaskState = new Map();

    const notifications = toAcpNotifications(
@@ -1869,7 +1859,6 @@ describe("toAcpNotifications - Task* tools", () => {
      "assistant",
      "test-session",
      toolUseCache,
-      waitingForToolCall,
      mockClient,
      mockLogger,
      { taskState },
@@ -1881,7 +1870,6 @@ describe("toAcpNotifications - Task* tools", () => {

  it("emits a plan snapshot after a TaskCreate tool_result and accumulates state", () => {
    const toolUseCache: ToolUseCache = {};
-    const waitingForToolCall: WaitingForToolCall = new Map();
    const taskState: TaskState = new Map();

    toAcpNotifications(
@@ -1896,7 +1884,6 @@ describe("toAcpNotifications - Task* tools", () => {
      "assistant",
      "test-session",
      toolUseCache,
-      waitingForToolCall,
      mockClient,
      mockLogger,
      { taskState },
@@ -1914,7 +1901,6 @@ describe("toAcpNotifications - Task* tools", () => {
      "user",
      "test-session",
      toolUseCache,
-      waitingForToolCall,
      mockClient,
      mockLogger,
      { taskState },
@@ -1939,7 +1925,6 @@ describe("toAcpNotifications - Task* tools", () => {
      "assistant",
      "test-session",
      toolUseCache,
-      waitingForToolCall,
      mockClient,
      mockLogger,
      { taskState },
@@ -1957,7 +1942,6 @@ describe("toAcpNotifications - Task* tools", () => {
      "user",
      "test-session",
      toolUseCache,
-      waitingForToolCall,
      mockClient,
      mockLogger,
      { taskState },
@@ -1974,7 +1958,6 @@ describe("toAcpNotifications - Task* tools", () => {

  it("emits a plan snapshot reflecting status changes after a TaskUpdate tool_result", () => {
    const toolUseCache: ToolUseCache = {};
-    const waitingForToolCall: WaitingForToolCall = new Map();
    const taskState: TaskState = new Map([["1", { subject: "First", status: "pending" as const }]]);
    toolUseCache["update-1"] = {
      type: "tool_use",
@@ -1999,7 +1982,6 @@ describe("toAcpNotifications - Task* tools", () => {
      "user",
      "test-session",
      toolUseCache,
-      waitingForToolCall,
      mockClient,
      mockLogger,
      { taskState },
@@ -2017,7 +1999,6 @@ describe("toAcpNotifications - Task* tools", () => {
      "list-1": { type: "tool_use", id: "list-1", name: "TaskList", input: {} },
      "get-1": { type: "tool_use", id: "get-1", name: "TaskGet", input: { taskId: "1" } },
    };
-    const waitingForToolCall: WaitingForToolCall = new Map();
    const taskState: TaskState = new Map([
      ["1", { subject: "Existing", status: "in_progress" as const }],
    ]);
@@ -2030,7 +2011,6 @@ describe("toAcpNotifications - Task* tools", () => {
      "user",
      "test-session",
      toolUseCache,
-      waitingForToolCall,
      mockClient,
      mockLogger,
      { taskState },
@@ -2049,7 +2029,6 @@ describe("toAcpNotifications - Task* tools", () => {
        input: { subject: "A", description: "" },
      },
    };
-    const waitingForToolCall: WaitingForToolCall = new Map();
    const taskState: TaskState = new Map();

    const notifications = toAcpNotifications(
@@ -2064,7 +2043,6 @@ describe("toAcpNotifications - Task* tools", () => {
      "user",
      "test-session",
      toolUseCache,
-      waitingForToolCall,
      mockClient,
      mockLogger,
      { taskState },
--- a/src/tools.ts
+++ b/src/tools.ts
@@ -15,6 +15,7 @@ import {
  FileWriteInput,
  GlobInput,
  GrepInput,
+  ReportFindingsInput,
  TaskCreateInput,
  TaskCreateOutput,
  TaskUpdateInput,
@@ -371,6 +372,25 @@ export function toolInfoFromToolUse(
      };
    }

+    case "ReportFindings": {
+      const input = toolUse.input as ReportFindingsInput | undefined;
+      const findings = input?.findings ?? [];
+      return {
+        title:
+          findings.length === 0
+            ? "Report findings: none found"
+            : `Report ${findings.length} finding${findings.length === 1 ? "" : "s"}`,
+        kind: "think",
+        content: findings.map((finding) => ({
+          type: "content" as const,
+          content: {
+            type: "text" as const,
+            text: `**${finding.file}${finding.line ? `:${finding.line}` : ""}** — ${finding.summary}`,
+          },
+        })),
+      };
+    }
+
    case "TaskCreate": {
      const input = toolUse.input as TaskCreateInput | undefined;
      return {