tui: open transcript images on click

Make inline transcript images clickable and show the full preview. Use bounded thumbnails so image attachments remain usable without crowding the session view.
fix(tui): gate transcript image previews
2026-07-31 07:26:47 -04:00 · 2026-07-31 11:07:44 +02:00 · 2026-07-31 11:07:44 +02:00 · 2026-07-31 11:07:44 +02:00 · 2026-07-31 11:07:44 +02:00 · 2026-07-31 11:07:44 +02:00
100 changed files with 3703 additions and 1351 deletions
@@ -619,9 +619,9 @@
      },
      "peerDependencies": {
        "@opencode-ai/theme": "workspace:*",
-        "@opentui/core": ">=0.4.5",
-        "@opentui/keymap": ">=0.4.5",
-        "@opentui/solid": ">=0.4.5",
+        "@opentui/core": "0.0.0-20260731-669d7f5c",
+        "@opentui/keymap": "0.0.0-20260731-669d7f5c",
+        "@opentui/solid": "0.0.0-20260731-669d7f5c",
        "solid-js": ">=1.9.0",
      },
      "optionalPeers": [
@@ -912,7 +912,6 @@
        "@opentui/keymap": "catalog:",
        "@opentui/solid": "catalog:",
        "@solid-primitives/event-bus": "1.1.2",
-        "clipboardy": "4.0.0",
        "diff": "catalog:",
        "effect": "catalog:",
        "fuzzysort": "catalog:",
@@ -1099,9 +1098,9 @@
    "@ai-sdk/google@3.0.73": "patches/@ai-sdk%2Fgoogle@3.0.73.patch",
  },
  "overrides": {
-    "@opentui/core": "catalog:",
-    "@opentui/keymap": "catalog:",
-    "@opentui/solid": "catalog:",
+    "@opentui/core": "0.0.0-20260731-669d7f5c",
+    "@opentui/keymap": "0.0.0-20260731-669d7f5c",
+    "@opentui/solid": "0.0.0-20260731-669d7f5c",
    "@types/bun": "catalog:",
    "@types/node": "catalog:",
    "effect": "catalog:",
@@ -1119,9 +1118,9 @@
    "@npmcli/arborist": "9.4.0",
    "@octokit/rest": "22.0.0",
    "@openauthjs/openauth": "0.0.0-20250322224806",
-    "@opentui/core": "0.4.5",
-    "@opentui/keymap": "0.4.5",
-    "@opentui/solid": "0.4.5",
+    "@opentui/core": "0.0.0-20260731-669d7f5c",
+    "@opentui/keymap": "0.0.0-20260731-669d7f5c",
+    "@opentui/solid": "0.0.0-20260731-669d7f5c",
    "@pierre/diffs": "1.2.10",
    "@playwright/test": "1.59.1",
    "@sentry/solid": "10.36.0",
@@ -2160,27 +2159,27 @@

    "@opentelemetry/semantic-conventions": ["@opentelemetry/semantic-conventions@1.43.0", "", {}, "sha512-eSYWTm620tTk45EKSedaUL8MFYI8hW164hIXsgIHyxu3VobUB3fFCu5t0hQby6OoWRPsG1KkKUG2M5UadiLiVg=="],

-    "@opentui/core": ["@opentui/core@0.4.5", "", { "dependencies": { "bun-ffi-structs": "0.2.4", "diff": "9.0.0", "marked": "17.0.1", "string-width": "7.2.0", "strip-ansi": "7.1.2" }, "optionalDependencies": { "@opentui/core-darwin-arm64": "0.4.5", "@opentui/core-darwin-x64": "0.4.5", "@opentui/core-linux-arm64": "0.4.5", "@opentui/core-linux-arm64-musl": "0.4.5", "@opentui/core-linux-x64": "0.4.5", "@opentui/core-linux-x64-musl": "0.4.5", "@opentui/core-win32-arm64": "0.4.5", "@opentui/core-win32-x64": "0.4.5" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-JsgRTPkA6e+Vxmumxai6SElOSlRQkbzNKHlCfemlArRiLhfC1IZ9RXJo2QH4xSu+uBOWAM90uss73/pPlkdEig=="],
+    "@opentui/core": ["@opentui/core@0.0.0-20260731-669d7f5c", "", { "dependencies": { "bun-ffi-structs": "0.3.1", "diff": "9.0.0", "marked": "17.0.1", "string-width": "7.2.0", "strip-ansi": "7.1.2" }, "optionalDependencies": { "@opentui/core-darwin-arm64": "0.0.0-20260731-669d7f5c", "@opentui/core-darwin-x64": "0.0.0-20260731-669d7f5c", "@opentui/core-linux-arm64": "0.0.0-20260731-669d7f5c", "@opentui/core-linux-arm64-musl": "0.0.0-20260731-669d7f5c", "@opentui/core-linux-x64": "0.0.0-20260731-669d7f5c", "@opentui/core-linux-x64-musl": "0.0.0-20260731-669d7f5c", "@opentui/core-win32-arm64": "0.0.0-20260731-669d7f5c", "@opentui/core-win32-x64": "0.0.0-20260731-669d7f5c" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-1+EQqoS+kaUIqzUdt1RJXWS10vcCWPJ5EmAj/3hS6VavuG54nCreBS59QTtiJ+iEQMomxG9rTP9uvPPuOmRiIA=="],

-    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.4.5", "", { "os": "darwin", "cpu": "arm64" }, "sha512-8KUG0oRidnR+oW1RSZJ72/PhZLl+qRRMk5U/mieF4c0SJ5V3tYACpBZAKzQfHNd1f7QzD8FHZct1lPpQgtmkWg=="],
+    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.0.0-20260731-669d7f5c", "", { "os": "darwin", "cpu": "arm64" }, "sha512-qS5kQzig/Nm5QJv0y5WPBZH9GzF+vsNyVcens+VJBC7KdiEQmFX3lsT4vMy51Bnp3lzrOhWXKudxJKUkvVEHxA=="],

-    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.4.5", "", { "os": "darwin", "cpu": "x64" }, "sha512-R2bocsg55gwjOqCp/MWFgFYzRmsduKegB6nzgFAPCvAD/L5Jf30xpWJWFlSg3x8vxe1L9WJ84dfqa4M7mZZ3wA=="],
+    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.0.0-20260731-669d7f5c", "", { "os": "darwin", "cpu": "x64" }, "sha512-HPPUQLEjU25OGeLAr4Os2Bt60fCd5Nz6aDSKpArrpOfQAjLg5VT8qaw9EzAg76LEJeXY65Dp2qRiTb4eevoozw=="],

-    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.4.5", "", { "os": "linux", "cpu": "arm64" }, "sha512-R4MZ25a4CzOAGVjW9aj1hUfzQGVfCJwrwBDbNs2SXaIvzcZqkxCVtU4FoQ5LsaD0j/BdNQVg2CIfFkFsm1fDuQ=="],
+    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.0.0-20260731-669d7f5c", "", { "os": "linux", "cpu": "arm64" }, "sha512-bYXbkpMFPxGO4yjXKT4fxEcffW2oNEpPFtmf279OG6ym06TlD3APW+zufTLImHj9pH8jAYLZ5mbsIuF9v4jRVg=="],

-    "@opentui/core-linux-arm64-musl": ["@opentui/core-linux-arm64-musl@0.4.5", "", { "os": "linux", "cpu": "arm64" }, "sha512-ieqdyKI6EIYPalYAETB2wsdP83hr5Ifi+dFnBFUmdEEFHsoKwBmn2S7bsTOYlX7Bg03F4/YPIg+IvRpeC+cUJw=="],
+    "@opentui/core-linux-arm64-musl": ["@opentui/core-linux-arm64-musl@0.0.0-20260731-669d7f5c", "", { "os": "linux", "cpu": "arm64" }, "sha512-B5YlOSwgCz2Oa+m/mXB7iz3vgmvyVyc33Pm+sQJ8ytYPw33Nr/VuX4ubpuK/fWhyLcBriqIY1PrLvOZ9k2PRJA=="],

-    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.4.5", "", { "os": "linux", "cpu": "x64" }, "sha512-SNyuQoxMKI1vuJhgxSSW96adWM6LqFl2SoS3GM4tGeneGOanVVG2Y06PvlytXvF4cKik97t0rqkVMRetmOs93w=="],
+    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.0.0-20260731-669d7f5c", "", { "os": "linux", "cpu": "x64" }, "sha512-17yYVxmesDJgpP8YwGVEtctFTYC2UnN8oit0s40mg0lQQOrTMckUlTnj9WxCffYOS6Ae6jQCXe78Cio/W79UrA=="],

-    "@opentui/core-linux-x64-musl": ["@opentui/core-linux-x64-musl@0.4.5", "", { "os": "linux", "cpu": "x64" }, "sha512-mKVKcIcPiSVVZZsdPSBoWwoa2/TCeQAaMDeHF7PFw2kt5bTXZPP7xxWfRQLCNIcA1eaGl59UuwUWHDR2Ve548Q=="],
+    "@opentui/core-linux-x64-musl": ["@opentui/core-linux-x64-musl@0.0.0-20260731-669d7f5c", "", { "os": "linux", "cpu": "x64" }, "sha512-oFiZxe2LhJZHbpLAYQi+NIAwyyzodYVnVrg7A3uUNXLVY3EOmJwCeg6psSTgH+w+2H//Wv8o7qdAr+c0W2IVGg=="],

-    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.4.5", "", { "os": "win32", "cpu": "arm64" }, "sha512-GHTTsqeR45q2Iek9Rb7ty+x/hAKn2jZ1ujlCgPR8LBKyF7h0E1dNFryoZ7ehMc3kJndP1sKn836IemKFqxuDdQ=="],
+    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.0.0-20260731-669d7f5c", "", { "os": "win32", "cpu": "arm64" }, "sha512-h+rAkfCsWUoFimDm8h5CqMm9PCsZzObOxFx1rPVtEFqe3doDflj1KDejsWMPugOImEae4jK+AYn82gq92pQv3Q=="],

-    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.4.5", "", { "os": "win32", "cpu": "x64" }, "sha512-Y8T/yXCDGagRGiQrtmuB6AhRcPucKFs/Dre3v8kJwNYqDccI4FzUPKclZ7djfmRZNjl7JUqPhZZP/PwDpQocMg=="],
+    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.0.0-20260731-669d7f5c", "", { "os": "win32", "cpu": "x64" }, "sha512-SgpwoRSiPPBb/ppD2J3Re9slyPJcPuEU64Kmfew4JcTQtp9NxTjXMDhe7Ur/X6Fa6HvRH42WQgUMCqbbOay6mA=="],

-    "@opentui/keymap": ["@opentui/keymap@0.4.5", "", { "dependencies": { "@opentui/core": "0.4.5" }, "peerDependencies": { "@opentui/react": "0.4.5", "@opentui/solid": "0.4.5", "react": ">=19.2.0", "solid-js": "1.9.12" }, "optionalPeers": ["@opentui/react", "@opentui/solid", "react", "solid-js"] }, "sha512-S1wzKHhF70zT6bH+VBFY+lSeTImLcIFW28JNQiME8MoPcy6KGPs7rKFSHrb/U7P8rsTJeRfW5A4d1Cy6PKodDg=="],
+    "@opentui/keymap": ["@opentui/keymap@0.0.0-20260731-669d7f5c", "", { "dependencies": { "@opentui/core": "0.0.0-20260731-669d7f5c" }, "peerDependencies": { "@opentui/react": "0.0.0-20260731-669d7f5c", "@opentui/solid": "0.0.0-20260731-669d7f5c", "react": ">=19.2.0", "solid-js": "1.9.12" }, "optionalPeers": ["@opentui/react", "@opentui/solid", "react", "solid-js"] }, "sha512-N4aluwBylEtmvtO4SvOZJwycSt4nnmVSEEr21lNHydbQ9+JyUQjCHUR0jqhc7RmZYVYoZLZQKkfeeDJaoAzo3Q=="],

-    "@opentui/solid": ["@opentui/solid@0.4.5", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.4.5", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.12", "entities": "7.0.1", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.12" } }, "sha512-B0RSkXnrtPVfEJOX+Hj+axjLJ3lzbG1BZw5I7Pvb9OPp48Vzg2cW2a3cSa86/q48ndLt647i/XwFPIw/jqnI5g=="],
+    "@opentui/solid": ["@opentui/solid@0.0.0-20260731-669d7f5c", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.0.0-20260731-669d7f5c", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.12", "entities": "7.0.1", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.12" } }, "sha512-EMt5PF9F6gS3YpbhcrdFpfDQFA2dCSJNJfoRV6mokodwopBB96pmpIaeSn/NfYOeKFMzm+x4blgrFrc6v68+KQ=="],

    "@orama/orama": ["@orama/orama@3.1.18", "", {}, "sha512-a61ljmRVVyG5MC/698C8/FfFDw5a8LOIvyOLW5fztgUXqUpc1jOfQzOitSCbge657OgXXThmY3Tk8fpiDb4UcA=="],

@@ -3528,7 +3527,7 @@

    "builder-util-runtime": ["builder-util-runtime@9.7.0", "", { "dependencies": { "debug": "^4.3.4", "sax": "^1.2.4" } }, "sha512-g/kR520giAFYkSXTzcmF3kqQq7wi8F6N6SzeDgZrqTBN+VHdmgWOyTdD1yD7AATDId/yXLvuP34CxW46/BwCdw=="],

-    "bun-ffi-structs": ["bun-ffi-structs@0.2.4", "", { "peerDependencies": { "typescript": "^5" } }, "sha512-AJzsqoVFs1KBbJbWHIYrVZLDC3NhTqqh25awRXqzoLzmBAKr5oqk6+CwuYHAekKx+VBCYVohBoKuRq40dV+TYg=="],
+    "bun-ffi-structs": ["bun-ffi-structs@0.3.1", "", { "peerDependencies": { "typescript": "^5" } }, "sha512-3gM7PpVWLyrwxWjcilSiGuhWanhZivvo6l0u573NziPH6f/gwk6McbaYgn7oJWov6pKGRTDbrg94W5DcJsKTtQ=="],

    "bun-pty": ["bun-pty@0.4.8", "", {}, "sha512-rO70Mrbr13+jxHHHu2YBkk2pNqrJE5cJn29WE++PUr+GFA0hq/VgtQPZANJ8dJo6d7XImvBk37Innt8GM7O28w=="],

@@ -3608,8 +3607,6 @@

    "cli-truncate": ["cli-truncate@4.0.0", "", { "dependencies": { "slice-ansi": "^5.0.0", "string-width": "^7.0.0" } }, "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA=="],

-    "clipboardy": ["clipboardy@4.0.0", "", { "dependencies": { "execa": "^8.0.1", "is-wsl": "^3.1.0", "is64bit": "^2.0.0" } }, "sha512-5mOlNS0mhX0707P2I0aZ2V/cmHUEO/fL7VFLqszkhUsxt7RwnmrInf/eEQKlf5GzvYeHIjT+Ov1HRfNmymlG0w=="],
-
    "cliui": ["cliui@8.0.1", "", { "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", "wrap-ansi": "^7.0.0" } }, "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ=="],

    "clone": ["clone@2.1.2", "", {}, "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w=="],
@@ -4026,7 +4023,7 @@

    "eventsource-parser": ["eventsource-parser@3.1.0", "", {}, "sha512-kJezFj9YFAMLeORyi7aCLxLbD5/qWMQnoMVlVPyHIll7lgRJCc3JVln9Vgl9nwQi0YkMnhdGTMNn7CkRRAptMg=="],

-    "execa": ["execa@8.0.1", "", { "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^8.0.1", "human-signals": "^5.0.0", "is-stream": "^3.0.0", "merge-stream": "^2.0.0", "npm-run-path": "^5.1.0", "onetime": "^6.0.0", "signal-exit": "^4.1.0", "strip-final-newline": "^3.0.0" } }, "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg=="],
+    "execa": ["execa@5.1.1", "", { "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.0", "human-signals": "^2.1.0", "is-stream": "^2.0.0", "merge-stream": "^2.0.0", "npm-run-path": "^4.0.1", "onetime": "^5.1.2", "signal-exit": "^3.0.3", "strip-final-newline": "^2.0.0" } }, "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg=="],

    "exit-hook": ["exit-hook@2.2.1", "", {}, "sha512-eNTPlAD67BmP31LDINZ3U7HSF8l57TxOY2PmBJ1shpCvpnxBF93mWCE8YHBnXs8qiUZJc9WDcWIeC3a2HIAMfw=="],

@@ -4308,7 +4305,7 @@

    "https-proxy-agent": ["https-proxy-agent@7.0.6", "", { "dependencies": { "agent-base": "^7.1.2", "debug": "4" } }, "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw=="],

-    "human-signals": ["human-signals@5.0.0", "", {}, "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ=="],
+    "human-signals": ["human-signals@2.1.0", "", {}, "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="],

    "humanize-ms": ["humanize-ms@1.2.1", "", { "dependencies": { "ms": "^2.0.0" } }, "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ=="],

@@ -4452,8 +4449,6 @@

    "is-wsl": ["is-wsl@3.1.1", "", { "dependencies": { "is-inside-container": "^1.0.0" } }, "sha512-e6rvdUCiQCAuumZslxRJWR/Doq4VpPR82kqclvcS0efgt430SlGIk05vdCN58+VrzgtIcfNODjozVielycD4Sw=="],

-    "is64bit": ["is64bit@2.0.0", "", { "dependencies": { "system-architecture": "^0.1.0" } }, "sha512-jv+8jaWCl0g2lSBkNSVXdzfBA0npK1HGC2KtWM9FumFRoGS94g3NbCCLVnCYHLjp4GrW2KZeeSTMo5ddtznmGw=="],
-
    "isarray": ["isarray@2.0.5", "", {}, "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="],

    "isbinaryfile": ["isbinaryfile@5.0.7", "", {}, "sha512-gnWD14Jh3FzS3CPhF0AxNOJ8CxqeblPTADzI38r0wt8ZyQl5edpy75myt08EG2oKvpyiqSqsx+Wkz9vtkbTqYQ=="],
@@ -4792,7 +4787,7 @@

    "mime-types": ["mime-types@3.0.2", "", { "dependencies": { "mime-db": "^1.54.0" } }, "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A=="],

-    "mimic-fn": ["mimic-fn@4.0.0", "", {}, "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw=="],
+    "mimic-fn": ["mimic-fn@2.1.0", "", {}, "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="],

    "mimic-function": ["mimic-function@5.0.1", "", {}, "sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA=="],

@@ -4912,7 +4907,7 @@

    "npm-registry-fetch": ["npm-registry-fetch@19.1.1", "", { "dependencies": { "@npmcli/redact": "^4.0.0", "jsonparse": "^1.3.1", "make-fetch-happen": "^15.0.0", "minipass": "^7.0.2", "minipass-fetch": "^5.0.0", "minizlib": "^3.0.1", "npm-package-arg": "^13.0.0", "proc-log": "^6.0.0" } }, "sha512-TakBap6OM1w0H73VZVDf44iFXsOS3h+L4wVMXmbWOQroZgFhMch0juN6XSzBNlD965yIKvWg2dfu7NSiaYLxtw=="],

-    "npm-run-path": ["npm-run-path@5.3.0", "", { "dependencies": { "path-key": "^4.0.0" } }, "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ=="],
+    "npm-run-path": ["npm-run-path@4.0.1", "", { "dependencies": { "path-key": "^3.0.0" } }, "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="],

    "nth-check": ["nth-check@2.1.1", "", { "dependencies": { "boolbase": "^1.0.0" } }, "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w=="],

@@ -4938,7 +4933,7 @@

    "once": ["once@1.4.0", "", { "dependencies": { "wrappy": "1" } }, "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="],

-    "onetime": ["onetime@6.0.0", "", { "dependencies": { "mimic-fn": "^4.0.0" } }, "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ=="],
+    "onetime": ["onetime@5.1.2", "", { "dependencies": { "mimic-fn": "^2.1.0" } }, "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="],

    "oniguruma-parser": ["oniguruma-parser@0.12.2", "", {}, "sha512-6HVa5oIrgMC6aA6WF6XyyqbhRPJrKR02L20+2+zpDtO5QAzGHAUGw5TKQvwi5vctNnRHkJYmjAhRVQF2EKdTQw=="],

@@ -5538,7 +5533,7 @@

    "strip-bom-string": ["strip-bom-string@1.0.0", "", {}, "sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g=="],

-    "strip-final-newline": ["strip-final-newline@3.0.0", "", {}, "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw=="],
+    "strip-final-newline": ["strip-final-newline@2.0.0", "", {}, "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="],

    "strip-indent": ["strip-indent@3.0.0", "", { "dependencies": { "min-indent": "^1.0.0" } }, "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ=="],

@@ -5570,8 +5565,6 @@

    "svgo": ["svgo@4.0.2", "", { "dependencies": { "commander": "^11.1.0", "css-select": "^5.1.0", "css-tree": "^3.0.1", "css-what": "^6.1.0", "csso": "^5.0.5", "picocolors": "^1.1.1", "sax": "^1.5.0" }, "bin": "./bin/svgo.js" }, "sha512-ekx94z1rRc5LDi6oSUaeRnYhd0UOJxdtQCL2rF8xpWxD3TPAsISWOrxezqGovqS38GRZOdpDfvQe3ts6F7nsng=="],

-    "system-architecture": ["system-architecture@0.1.0", "", {}, "sha512-ulAk51I9UVUyJgxlv9M6lFot2WP3e7t8Kz9+IS6D4rVba1tR9kON+Ey69f+1R4Q8cd45Lod6a4IcJIxnzGc/zA=="],
-
    "tagged-tag": ["tagged-tag@1.0.0", "", {}, "sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng=="],

    "tailwindcss": ["tailwindcss@4.1.11", "", {}, "sha512-2E9TBm6MDD/xKYe+dvJZAmg3yxIEDNRc0jwlNyDg/4Fil2QcSLjFKGVff0lAf1jjeaArlG/M75Ey/EYr/OJtBA=="],
@@ -6512,8 +6505,6 @@

    "@vercel/cli-config/zod": ["zod@4.1.11", "", {}, "sha512-WPsqwxITS2tzx1bzhIKsEs19ABD5vmCVa4xBo2tq/SrV4RNZtfws1EnCWQXM6yh8bD08a1idvkB5MZSBiZsjwg=="],

-    "@vercel/cli-exec/execa": ["execa@5.1.1", "", { "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.0", "human-signals": "^2.1.0", "is-stream": "^2.0.0", "merge-stream": "^2.0.0", "npm-run-path": "^4.0.1", "onetime": "^5.1.2", "signal-exit": "^3.0.3", "strip-final-newline": "^2.0.0" } }, "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg=="],
-
    "@vercel/functions/@vercel/oidc": ["@vercel/oidc@3.8.1", "", { "dependencies": { "@vercel/cli-config": "0.2.1", "@vercel/cli-exec": "1.0.0", "jose": "^5.9.6" } }, "sha512-ufdalm2MWOYksyj8KVpWjoOFPJO6zoYpuyvIggIQ2bB0CFCjTCiTkGXHqAKwG77GVRjOaN3/8S5ITlZpXWmqOw=="],

    "@vercel/nft/acorn": ["acorn@8.17.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg=="],
@@ -6696,9 +6687,11 @@

    "estree-util-to-js/source-map": ["source-map@0.7.6", "", {}, "sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ=="],

-    "execa/get-stream": ["get-stream@8.0.1", "", {}, "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA=="],
+    "execa/get-stream": ["get-stream@6.0.1", "", {}, "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="],

-    "execa/is-stream": ["is-stream@3.0.0", "", {}, "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA=="],
+    "execa/is-stream": ["is-stream@2.0.1", "", {}, "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="],
+
+    "execa/signal-exit": ["signal-exit@3.0.7", "", {}, "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="],

    "express/cookie": ["cookie@0.7.2", "", {}, "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w=="],

@@ -6772,8 +6765,6 @@

    "node-gyp/undici": ["undici@6.28.0", "", {}, "sha512-LIY910g9TI13YS95lrMFrs8Rm/u/irgHeTWoKCoteeJ04CUJ92eEfj0rVn+7VKMPBpUPiUoBKfhNyLI23EE/KA=="],

-    "npm-run-path/path-key": ["path-key@4.0.0", "", {}, "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ=="],
-
    "openid-client/jose": ["jose@4.15.9", "", {}, "sha512-1vUQX+IdDMVPj4k8kOxgUqlcK518yluMuGZwqlr44FS1ppZB/5GWh4rZG89erpOBOJjU/OBsnCVFfapsRz6nEA=="],

    "openid-client/lru-cache": ["lru-cache@6.0.0", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="],
@@ -7548,20 +7539,6 @@

    "@tailwindcss/oxide-wasm32-wasi/@napi-rs/wasm-runtime/@tybys/wasm-util": ["@tybys/wasm-util@0.10.3", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg=="],

-    "@vercel/cli-exec/execa/get-stream": ["get-stream@6.0.1", "", {}, "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="],
-
-    "@vercel/cli-exec/execa/human-signals": ["human-signals@2.1.0", "", {}, "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="],
-
-    "@vercel/cli-exec/execa/is-stream": ["is-stream@2.0.1", "", {}, "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="],
-
-    "@vercel/cli-exec/execa/npm-run-path": ["npm-run-path@4.0.1", "", { "dependencies": { "path-key": "^3.0.0" } }, "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="],
-
-    "@vercel/cli-exec/execa/onetime": ["onetime@5.1.2", "", { "dependencies": { "mimic-fn": "^2.1.0" } }, "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="],
-
-    "@vercel/cli-exec/execa/signal-exit": ["signal-exit@3.0.7", "", {}, "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="],
-
-    "@vercel/cli-exec/execa/strip-final-newline": ["strip-final-newline@2.0.0", "", {}, "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="],
-
    "@vercel/functions/@vercel/oidc/jose": ["jose@5.9.6", "", {}, "sha512-AMlnetc9+CV9asI19zHmrgS/WYsWUwCn2R7RzlbJWD7F9eWYUTGyBmU9o6PxngtLGOiDGPRu+Uc4fhKzbpteZQ=="],

    "@vercel/routing-utils/ajv/json-schema-traverse": ["json-schema-traverse@0.4.1", "", {}, "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="],
@@ -8616,8 +8593,6 @@

    "@solidjs/start/shiki/@shikijs/engine-javascript/oniguruma-to-es": ["oniguruma-to-es@2.3.0", "", { "dependencies": { "emoji-regex-xs": "^1.0.0", "regex": "^5.1.1", "regex-recursion": "^5.1.1" } }, "sha512-bwALDxriqfKGfUufKGGepCzu9x7nJQuoRoAFp4AnwehhC2crqrDIAP/uN2qdlsAvSMpeRC3+Yzhqc7hLmle5+g=="],

-    "@vercel/cli-exec/execa/onetime/mimic-fn": ["mimic-fn@2.1.0", "", {}, "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="],
-
    "ansi-align/string-width/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="],

    "app-builder-lib/@electron/get/fs-extra/universalify": ["universalify@0.1.2", "", {}, "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="],
@@ -45,9 +45,9 @@
      "@octokit/rest": "22.0.0",
      "@hono/standard-validator": "0.2.0",
      "@hono/zod-validator": "0.4.2",
-      "@opentui/core": "0.4.5",
-      "@opentui/keymap": "0.4.5",
-      "@opentui/solid": "0.4.5",
+      "@opentui/core": "0.0.0-20260731-669d7f5c",
+      "@opentui/keymap": "0.0.0-20260731-669d7f5c",
+      "@opentui/solid": "0.0.0-20260731-669d7f5c",
      "@tanstack/solid-virtual": "3.13.32",
      "@shikijs/stream": "4.2.0",
      "@standard-schema/spec": "1.1.0",
@@ -148,9 +148,9 @@
    "electron"
  ],
  "overrides": {
-    "@opentui/core": "catalog:",
-    "@opentui/keymap": "catalog:",
-    "@opentui/solid": "catalog:",
+    "@opentui/core": "0.0.0-20260731-669d7f5c",
+    "@opentui/keymap": "0.0.0-20260731-669d7f5c",
+    "@opentui/solid": "0.0.0-20260731-669d7f5c",
    "@types/bun": "catalog:",
    "@types/node": "catalog:",
    "effect": "catalog:"
@@ -12,6 +12,8 @@

 Per-type constructors live on the type, not as top-level re-exports. Use `Message.system(...)`, `Message.user(...)`, `Message.assistant(...)`, `Message.tool(...)`, `Model.make(...)`, `ToolDefinition.make(...)`, `ToolCallPart.make(...)`, `ToolResultPart.make(...)`, `ToolChoice.make(...)`, `ToolChoice.named(...)`, `SystemPart.make(...)`, and `GenerationOptions.make(...)` directly. The top-level `LLM` namespace is reserved for request-shaped call APIs: `LLM.request`, `LLM.generate`, `LLM.stream`, `LLM.updateRequest`, and `LLM.generateObject`. Two ways to construct the same thing is one too many.

+- Keep provider-defined string enums forward-compatible. Expose known values for autocomplete while accepting future values with `Known | (string & {})`; use `Schema.String` at runtime unless rejecting unknown values is required for correctness.
+
 ## Tests

 - Use `testEffect(...)` from `test/lib/effect.ts` for tests requiring Effect layers.
@@ -29,9 +29,30 @@ export const DEFAULT_BASE_URL = "https://generativelanguage.googleapis.com/v1bet

 export interface OptionsInput {
  readonly [key: string]: unknown
+  readonly cachedContent?: string
+  readonly safetySettings?: ReadonlyArray<{
+    readonly category:
+      | "HARM_CATEGORY_UNSPECIFIED"
+      | "HARM_CATEGORY_HATE_SPEECH"
+      | "HARM_CATEGORY_DANGEROUS_CONTENT"
+      | "HARM_CATEGORY_HARASSMENT"
+      | "HARM_CATEGORY_SEXUALLY_EXPLICIT"
+      | "HARM_CATEGORY_CIVIC_INTEGRITY"
+      | (string & {})
+    readonly threshold:
+      | "HARM_BLOCK_THRESHOLD_UNSPECIFIED"
+      | "BLOCK_LOW_AND_ABOVE"
+      | "BLOCK_MEDIUM_AND_ABOVE"
+      | "BLOCK_ONLY_HIGH"
+      | "BLOCK_NONE"
+      | "OFF"
+      | (string & {})
+  }>
+  readonly serviceTier?: "standard" | "flex" | "priority" | (string & {})
  readonly thinkingConfig?: {
    readonly thinkingBudget?: number
    readonly includeThoughts?: boolean
+    readonly thinkingLevel?: "minimal" | "low" | "medium" | "high" | (string & {})
  }
 }

@@ -111,6 +132,12 @@ const GeminiToolConfig = Schema.Struct({
 const GeminiThinkingConfig = Schema.Struct({
  thinkingBudget: Schema.optional(Schema.Number),
  includeThoughts: Schema.optional(Schema.Boolean),
+  thinkingLevel: Schema.optional(Schema.String),
+})
+
+const GeminiSafetySetting = Schema.Struct({
+  category: Schema.String,
+  threshold: Schema.String,
 })

 const GeminiGenerationConfig = Schema.Struct({
@@ -123,7 +150,10 @@ const GeminiGenerationConfig = Schema.Struct({
 })

 const GeminiBodyFields = {
+  cachedContent: Schema.optional(Schema.String),
  contents: Schema.Array(GeminiContent),
+  safetySettings: optionalArray(GeminiSafetySetting),
+  serviceTier: Schema.optional(Schema.String),
  systemInstruction: Schema.optional(GeminiSystemInstruction),
  tools: optionalArray(GeminiTool),
  toolConfig: Schema.optional(GeminiToolConfig),
@@ -316,17 +346,38 @@ const lowerMessages = Effect.fn("Gemini.lowerMessages")(function* (request: LLMR
 })

 const resolveOptions = (request: LLMRequest) => {
-  const value = request.providerOptions?.gemini?.thinkingConfig
-  if (!ProviderShared.isRecord(value)) return {}
+  const input = request.providerOptions?.gemini
+  const value = input?.thinkingConfig
  const thinkingConfig = {
-    thinkingBudget: typeof value.thinkingBudget === "number" ? value.thinkingBudget : undefined,
-    includeThoughts: typeof value.includeThoughts === "boolean" ? value.includeThoughts : undefined,
+    thinkingBudget:
+      ProviderShared.isRecord(value) && typeof value.thinkingBudget === "number" ? value.thinkingBudget : undefined,
+    includeThoughts:
+      ProviderShared.isRecord(value) && typeof value.includeThoughts === "boolean"
+        ? value.includeThoughts
+        : ProviderShared.isRecord(value)
+          ? true
+          : undefined,
+    thinkingLevel:
+      ProviderShared.isRecord(value) && typeof value.thinkingLevel === "string" ? value.thinkingLevel : undefined,
  }
  return {
+    cachedContent: typeof input?.cachedContent === "string" ? input.cachedContent : undefined,
+    safetySettings: mapSafetySettings(input?.safetySettings),
+    serviceTier: typeof input?.serviceTier === "string" ? input.serviceTier : undefined,
    thinkingConfig: Object.values(thinkingConfig).some((item) => item !== undefined) ? thinkingConfig : undefined,
  }
 }

+function mapSafetySettings(value: unknown) {
+  if (!Array.isArray(value)) return undefined
+  const settings = value.flatMap((item) =>
+    ProviderShared.isRecord(item) && typeof item.category === "string" && typeof item.threshold === "string"
+      ? [{ category: item.category, threshold: item.threshold }]
+      : [],
+  )
+  return settings
+}
+
 const fromRequest = Effect.fn("Gemini.fromRequest")(function* (request: LLMRequest) {
  const hasTools = request.tools.length > 0
  const generation = request.generation
@@ -342,7 +393,10 @@ const fromRequest = Effect.fn("Gemini.fromRequest")(function* (request: LLMReque
  }

  return {
+    cachedContent: options.cachedContent,
    contents: yield* lowerMessages(request),
+    safetySettings: options.safetySettings,
+    serviceTier: options.serviceTier,
    systemInstruction:
      request.system.length === 0 ? undefined : { parts: [{ text: ProviderShared.joinText(request.system) }] },
    tools: hasTools
@@ -5,7 +5,7 @@ import { Endpoint, type EndpointPatch } from "./endpoint"
 import { RequestExecutor } from "./executor"
 import { Framing } from "./framing"
 import { HttpTransport } from "./transport"
-import type { Transport, TransportRuntime } from "./transport"
+import type { HttpRequestTransform, Transport, TransportRuntime } from "./transport"
 import { WebSocketExecutor } from "./transport"
 import type { Protocol } from "./protocol"
 import { applyCachePolicy } from "../cache-policy"
@@ -46,7 +46,11 @@ export interface Route<Body, Prepared = unknown> {
  readonly body: RouteBody<Body>
  readonly with: (patch: RoutePatch<Body, Prepared>) => Route<Body, Prepared>
  readonly model: <Options extends ProviderOptions = ProviderOptions>(input: RouteMappedModelInput) => Model<Options>
-  readonly prepareTransport: (body: Body, request: LLMRequest) => Effect.Effect<Prepared, LLMError>
+  readonly prepareTransport: (
+    body: Body,
+    request: LLMRequest,
+    options?: StreamOptions,
+  ) => Effect.Effect<Prepared, LLMError>
  readonly streamPrepared: (
    prepared: Prepared,
    request: LLMRequest,
@@ -145,12 +149,16 @@ export interface Interface {
  readonly generate: GenerateMethod
 }

+export interface StreamOptions {
+  readonly transform?: HttpRequestTransform
+}
+
 export interface StreamMethod {
-  (request: LLMRequest): Stream.Stream<LLMEvent, LLMError>
+  (request: LLMRequest, options?: StreamOptions): Stream.Stream<LLMEvent, LLMError>
 }

 export interface GenerateMethod {
-  (request: LLMRequest): Effect.Effect<LLMResponse, LLMError>
+  (request: LLMRequest, options?: StreamOptions): Effect.Effect<LLMResponse, LLMError>
 }

 export class Service extends Context.Service<Service, Interface>()("@opencode/LLMClient") {}
@@ -286,7 +294,7 @@ function makeFromTransport<Body, Prepared, Frame, Event, State>(
      },
      model: <Options extends ProviderOptions = ProviderOptions>(input: RouteMappedModelInput) =>
        makeRouteModel<Options>(route, input),
-      prepareTransport: (body, request) =>
+      prepareTransport: (body, request, options) =>
        routeInput.transport.prepare({
          body,
          request,
@@ -294,6 +302,7 @@ function makeFromTransport<Body, Prepared, Frame, Event, State>(
          auth: routeInput.auth ?? Auth.none,
          encodeBody,
          headers: routeInput.headers,
+          transform: options?.transform,
        }),
      streamPrepared: (prepared: Prepared, request: LLMRequest, runtime: TransportRuntime) => {
        const route = `${request.model.provider}/${request.model.route.id}`
@@ -359,14 +368,14 @@ export function make<Body, Prepared, Frame, Event, State>(
  })
 }

-const compile = Effect.fn("LLM.compile")(function* (request: LLMRequest) {
+const compile = Effect.fn("LLM.compile")(function* (request: LLMRequest, options?: StreamOptions) {
  const resolved = applyCachePolicy(resolveRequestOptions(request))
  const route = resolved.model.route

  const body = yield* route.body
    .from(resolved)
    .pipe(Effect.flatMap(ProviderShared.validateWith(Schema.decodeUnknownEffect(route.body.schema))))
-  const prepared = yield* route.prepareTransport(body, resolved)
+  const prepared = yield* route.prepareTransport(body, resolved, options)

  return {
    request: resolved,
@@ -389,17 +398,17 @@ export const compileRequest = Effect.fn("LLM.compileRequest")(function* (request
  }
 })

-const streamRequestWith = (runtime: TransportRuntime) => (request: LLMRequest) =>
+const streamRequestWith = (runtime: TransportRuntime) => (request: LLMRequest, options?: StreamOptions) =>
  Stream.unwrap(
    Effect.gen(function* () {
-      const compiled = yield* compile(request)
+      const compiled = yield* compile(request, options)
      return compiled.route.streamPrepared(compiled.prepared, compiled.request, runtime)
    }),
  )

 const generateWith = (stream: Interface["stream"]) =>
-  Effect.fn("LLM.generate")(function* (request: LLMRequest) {
-    const state = yield* stream(request).pipe(Stream.runFold(LLMResponse.empty, LLMResponse.reduce))
+  Effect.fn("LLM.generate")(function* (request: LLMRequest, options?: StreamOptions) {
+    const state = yield* stream(request, options).pipe(Stream.runFold(LLMResponse.empty, LLMResponse.reduce))
    const response = LLMResponse.complete(state)
    if (response) return response
    return yield* ProviderShared.eventError(
@@ -408,24 +417,24 @@ const generateWith = (stream: Interface["stream"]) =>
    )
  })

-export function stream(request: LLMRequest): Stream.Stream<LLMEvent, LLMError> {
+export function stream(request: LLMRequest, options?: StreamOptions): Stream.Stream<LLMEvent, LLMError> {
  return Stream.unwrap(
    Effect.gen(function* () {
-      return (yield* Service).stream(request)
+      return (yield* Service).stream(request, options)
    }),
  ) as Stream.Stream<LLMEvent, LLMError>
 }

-export function generate(request: LLMRequest): Effect.Effect<LLMResponse, LLMError> {
+export function generate(request: LLMRequest, options?: StreamOptions): Effect.Effect<LLMResponse, LLMError> {
  return Effect.gen(function* () {
-    return yield* (yield* Service).generate(request)
+    return yield* (yield* Service).generate(request, options)
  }) as Effect.Effect<LLMResponse, LLMError>
 }

-export const streamRequest = (request: LLMRequest) =>
+export const streamRequest = (request: LLMRequest, options?: StreamOptions) =>
  Stream.unwrap(
    Effect.gen(function* () {
-      return (yield* Service).stream(request)
+      return (yield* Service).stream(request, options)
    }),
  )

@@ -8,6 +8,7 @@ export type {
  AnyRoute,
  Interface as LLMClientShape,
  Service as LLMClientService,
+  StreamOptions,
 } from "./client"
 export * from "./executor"
 export { Auth } from "./auth"
@@ -22,4 +23,4 @@ export type { ApiKeyMode, AuthOverride, ProviderAuthOption } from "./auth-option
 export type { Definition as EndpointFn, EndpointInput } from "./endpoint"
 export type { Definition as FramingDef } from "./framing"
 export type { Protocol as ProtocolDef } from "./protocol"
-export type { Transport as TransportDef, TransportRuntime } from "./transport"
+export type { HttpRequest, HttpRequestTransform, Transport as TransportDef, TransportRuntime } from "./transport"
@@ -120,14 +120,19 @@ export const httpJson = <Body, Frame>(input: HttpJsonInput<Body, Frame>): HttpJs
  id: "http-json",
  with: (patch) => httpJson({ ...input, ...patch }),
  prepare: (prepareInput) =>
-    jsonRequestParts({
-      ...prepareInput,
-    }).pipe(
-      Effect.map((parts) => ({
-        request: ProviderShared.jsonPost({ url: parts.url, body: parts.bodyText, headers: parts.headers }),
+    Effect.gen(function* () {
+      const parts = yield* jsonRequestParts({ ...prepareInput })
+      const request = { url: parts.url, method: "POST", headers: { ...parts.headers }, body: parts.bodyText }
+      yield* (prepareInput.transform?.(request) ?? Effect.void)
+      return {
+        request: ProviderShared.jsonPost({
+          url: request.url,
+          body: request.body ?? "",
+          headers: Headers.fromInput(request.headers),
+        }),
        framing: input.framing,
-      })),
-    ),
+      }
+    }),
  frames: (prepared, request, runtime) =>
    Stream.unwrap(
      runtime.http
@@ -10,6 +10,15 @@ export interface TransportRuntime {
  readonly webSocket?: WebSocketExecutorInterface
 }

+export interface HttpRequest {
+  url: string
+  readonly method: string
+  headers: Record<string, string>
+  body: string | undefined
+}
+
+export type HttpRequestTransform = (request: HttpRequest) => Effect.Effect<void>
+
 export interface Transport<Body, Prepared, Frame> {
  readonly id: string
  readonly prepare: (input: TransportPrepareInput<Body>) => Effect.Effect<Prepared, LLMError>
@@ -27,6 +36,7 @@ export interface TransportPrepareInput<Body> {
  readonly auth: Auth.Definition
  readonly encodeBody: (body: Body) => string
  readonly headers?: (input: { readonly request: LLMRequest }) => Record<string, string>
+  readonly transform?: HttpRequestTransform
 }

 export * as HttpTransport from "./http"
@@ -137,6 +137,40 @@ describe("request option precedence", () => {
    ),
  )

+  it.effect("transforms the final HTTP request after serialization and authentication", () =>
+    LLMClient.generate(
+      LLM.request({
+        model: OpenAIChat.route
+          .with({ endpoint: { baseURL: "https://api.openai.test/v1/" }, auth: Auth.bearer("fresh-key") })
+          .model({ id: "gpt-4o-mini" }),
+        prompt: "Say hello.",
+      }),
+      {
+        transform: (request) =>
+          Effect.sync(() => {
+            expect(request.headers.authorization).toBe("Bearer fresh-key")
+            request.url = "https://proxy.test/v1/chat/completions"
+            request.headers["x-plugin"] = "transformed"
+            request.body = JSON.stringify({ transformed: true })
+          }),
+      },
+    ).pipe(
+      Effect.provide(
+        dynamicResponse((input) =>
+          Effect.gen(function* () {
+            const web = yield* HttpClientRequest.toWeb(input.request).pipe(Effect.orDie)
+            expect(web.url).toBe("https://proxy.test/v1/chat/completions")
+            expect(web.headers.get("x-plugin")).toBe("transformed")
+            expect(decodeJson(input.text)).toEqual({ transformed: true })
+            return input.respond(sseEvents(deltaChunk({}, "stop")), {
+              headers: { "content-type": "text/event-stream" },
+            })
+          }),
+        ),
+      ),
+    ),
+  )
+
  it.effect("rejects raw body overlays for protocol-owned roots", () =>
    Effect.gen(function* () {
      const model = OpenAIChat.route
@@ -9,9 +9,39 @@ LLM.request({
  providerOptions: { gemini: { thinkingConfig: { thinkingBudget: 1024 } } },
 })

+LLM.request({
+  model,
+  prompt: "Hello",
+  providerOptions: {
+    gemini: {
+      // @ts-expect-error Gemini safety settings require a threshold for every category.
+      safetySettings: [{ category: "HARM_CATEGORY_HATE_SPEECH" }],
+    },
+  },
+})
+
+LLM.request({
+  model,
+  prompt: "Hello",
+  providerOptions: {
+    gemini: {
+      cachedContent: "cachedContents/example",
+      safetySettings: [{ category: "HARM_CATEGORY_HATE_SPEECH", threshold: "BLOCK_ONLY_HIGH" }],
+      serviceTier: "future-tier",
+      thinkingConfig: { thinkingLevel: "high", includeThoughts: true },
+    },
+  },
+})
+
 LLM.request({
  model,
  prompt: "Hello",
  // @ts-expect-error Gemini thinking budgets must be numeric.
  providerOptions: { gemini: { thinkingConfig: { thinkingBudget: "large" } } },
 })
+
+LLM.request({
+  model,
+  prompt: "Hello",
+  providerOptions: { gemini: { thinkingConfig: { thinkingLevel: "maximum" } } },
+})
@@ -41,7 +41,14 @@ describe("Gemini route", () => {
    Effect.gen(function* () {
      const prepared = yield* compileRequest(
        LLMRequest.update(request, {
-          providerOptions: { gemini: { thinkingConfig: { thinkingBudget: 0, includeThoughts: false } } },
+          providerOptions: {
+            gemini: {
+              cachedContent: "cachedContents/example",
+              safetySettings: [{ category: "HARM_CATEGORY_HATE_SPEECH", threshold: "BLOCK_ONLY_HIGH" }],
+              serviceTier: "priority",
+              thinkingConfig: { thinkingBudget: 0, includeThoughts: false, thinkingLevel: "high" },
+            },
+          },
        }),
      )
      const filtered = yield* compileRequest(
@@ -49,12 +56,33 @@ describe("Gemini route", () => {
          providerOptions: { gemini: { thinkingConfig: { thinkingBudget: "invalid", includeThoughts: false } } },
        }),
      )
+      const defaulted = yield* compileRequest(
+        LLMRequest.update(request, {
+          providerOptions: { gemini: { thinkingConfig: { thinkingLevel: "high" } } },
+        }),
+      )
+      const emptySafetySettings = yield* compileRequest(
+        LLMRequest.update(request, {
+          providerOptions: { gemini: { safetySettings: [] } },
+        }),
+      )

      expect(prepared.body.generationConfig?.thinkingConfig).toEqual({
        thinkingBudget: 0,
        includeThoughts: false,
+        thinkingLevel: "high",
      })
+      expect(prepared.body.cachedContent).toBe("cachedContents/example")
+      expect(prepared.body.safetySettings).toEqual([
+        { category: "HARM_CATEGORY_HATE_SPEECH", threshold: "BLOCK_ONLY_HIGH" },
+      ])
+      expect(prepared.body.serviceTier).toBe("priority")
      expect(filtered.body.generationConfig?.thinkingConfig).toEqual({ includeThoughts: false })
+      expect(defaulted.body.generationConfig?.thinkingConfig).toEqual({
+        includeThoughts: true,
+        thinkingLevel: "high",
+      })
+      expect(emptySafetySettings.body.safetySettings).toEqual([])
    }),
  )

@@ -11,6 +11,7 @@ import { SessionTabAvatar } from "@/pages/layout/session-tab-avatar"
 import type { Session } from "@opencode-ai/sdk/v2"
 import { canOpenTabRename, forwardTabRef } from "./titlebar-tab-gesture"
 import { TabPreviewPopover } from "./titlebar-tab-popover"
+import { sessionTitle } from "@/utils/session-title"
 import "./titlebar-tab-nav.css"

 // MouseEvent.button uses 1 for the middle/wheel button.
@@ -54,7 +55,10 @@ export function TabNavItem(props: {
    if (!session) return
    return projectForSession(session, serverCtx()?.projects.list() ?? [])
  })
-  const title = createMemo(() => props.session()?.title ?? props.fallbackTitle)
+  const title = createMemo(() => {
+    const session = props.session()
+    return session ? sessionTitle(session.title, session.parentID) : props.fallbackTitle
+  })

  const projectName = createMemo(() => {
    const session = props.session()
@@ -143,7 +147,7 @@ export function TabNavItem(props: {
    if (!canOpenTabRename(props.dragging, editing(), rename.isPending)) return
    const session = props.session()
    if (!session) return
-    titleEl.textContent = session.title
+    titleEl.textContent = session.title ?? ""
    setEditing(true)

    requestAnimationFrame(() => {
@@ -302,7 +306,7 @@ export function TabNavItem(props: {
      }}
      data={{
        projectName: projectName(),
-        title: props.session()?.title,
+        title: title(),
        path: previewPath(),
        serverName: serverLabel(),
      }}
@@ -7,6 +7,7 @@ import { createMemo, onCleanup } from "solid-js"
 import { createStore } from "solid-js/store"
 import type { HomeController } from "./home-controller"
 import { homeSessionSearchKey, type HomeSessionRecord, type HomeSessionsController } from "./home-sessions-controller"
+import { sessionTitle } from "@/utils/session-title"

 type HomeSessionSearchSource = Pick<HomeSessionsController, "data" | "session">

@@ -23,7 +24,7 @@ export function createHomeSessionSearchController(home: HomeController, sessions
    if (!value) return []
    return sessions.data
      .searchRecords()
-      .filter((record) => `${record.session.title} ${record.projectName}`.toLowerCase().includes(value))
+      .filter((record) => `${sessionTitle(record.session.title)} ${record.projectName}`.toLowerCase().includes(value))
  })
  const active = createMemo(() => {
    const records = results()
@@ -104,7 +104,7 @@ const SessionRow = (props: {
  warmPress: () => void
  warmFocus: () => void
 }): JSX.Element => {
-  const title = () => sessionTitle(props.session.title)
+  const title = () => sessionTitle(props.session.title, props.session.parentID)

  return (
    <A
@@ -229,7 +229,7 @@ export const SessionItem = (props: SessionItemProps): JSX.Element => {
              fallback={
                <Tooltip
                  placement={props.mobile ? "bottom" : "right"}
-                  value={sessionTitle(props.session.title)}
+                  value={sessionTitle(props.session.title, props.session.parentID)}
                  gutter={10}
                  class="min-w-0 w-full"
                >
@@ -297,7 +297,11 @@ export function MessageTimeline(props: {
    return sync().session.get(id)
  })
  const titleValue = createMemo(() => info()?.title)
-  const titleLabel = createMemo(() => sessionTitle(titleValue()))
+  const titleLabel = createMemo(() => {
+    const session = info()
+    if (!session) return
+    return sessionTitle(titleValue(), session.parentID)
+  })
  const shareUrl = createMemo(() => info()?.share?.url)
  const shareEnabled = createMemo(() => sync().data.config.share !== "disabled")
  const parentID = createMemo(() => info()?.parentID)
@@ -311,7 +315,10 @@ export function MessageTimeline(props: {
    if (!id) return emptyMessages
    return sync().data.message[id] ?? emptyMessages
  })
-  const parentTitle = createMemo(() => sessionTitle(parent()?.title) ?? language.t("command.session.new"))
+  const parentTitle = createMemo(() => {
+    const session = parent()
+    return session ? sessionTitle(session.title, session.parentID) : language.t("command.session.new")
+  })
  const getMsgParts = (msgId: string) => sync().data.part[msgId] ?? emptyParts
  const getMsgPart = (messageID: string, partID: string) => getMsgParts(messageID).find((part) => part.id === partID)
  const childTaskDescription = createMemo(() => {
@@ -329,7 +336,7 @@ export function MessageTimeline(props: {
    if (value) return value
    return language.t("command.session.new")
  })
-  const showHeader = createMemo(() => !!(titleValue() || parentID()))
+  const showHeader = createMemo(() => !!(titleLabel() || parentID()))
  const projection = createTimelineProjection({
    messages: sessionMessages,
    userMessages: () => props.userMessages,
@@ -912,9 +919,10 @@ export function MessageTimeline(props: {
  }

  function DialogDeleteSession(props: { sessionID: string }) {
-    const name = createMemo(
-      () => sessionTitle(sync().session.get(props.sessionID)?.title) ?? language.t("command.session.new"),
-    )
+    const name = createMemo(() => {
+      const session = sync().session.get(props.sessionID)
+      return session ? sessionTitle(session.title, session.parentID) : language.t("command.session.new")
+    })
    const handleDelete = async () => {
      await deleteSession(props.sessionID)
      dialog.close()
@@ -0,0 +1,11 @@
+import { describe, expect, test } from "bun:test"
+import { sessionTitle } from "./session-title"
+
+describe("sessionTitle", () => {
+  test("uses a display fallback without persisting it", () => {
+    expect(sessionTitle(undefined)).toBe("New session")
+    expect(sessionTitle(undefined, "ses_parent")).toBe("Child session")
+    expect(sessionTitle("New session - 2026-07-30T18:45:03.662Z")).toBe("New session")
+    expect(sessionTitle("Generated title")).toBe("Generated title")
+  })
+})
@@ -1,7 +1,7 @@
 const pattern = /^(New session|Child session) - \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/

-export function sessionTitle(title?: string) {
-  if (!title) return title
+export function sessionTitle(title?: string, parentID?: string) {
+  if (!title) return parentID ? "Child session" : "New session"
  const match = title.match(pattern)
  return match?.[1] ?? title
 }
@@ -13,7 +13,7 @@ export function normalizeSessionInfo(input: SessionInfo | Session): Session {
    parentID: input.parentID,
    cost: input.cost,
    tokens: input.tokens,
-    title: input.title,
+    title: input.title ?? `${input.parentID ? "Child" : "New"} session - ${new Date(input.time.created).toISOString()}`,
    agent: input.agent,
    model: input.model,
    version: "",
@@ -213,7 +213,9 @@ export function make(input: { readonly client: OpenCodeClient; readonly connecti
        sessions: page.data.map((session) => ({
          sessionId: session.id,
          cwd: session.location.directory,
-          title: session.title,
+          title:
+            session.title ??
+            `${session.parentID ? "Child" : "New"} session - ${new Date(session.time.created).toISOString()}`,
          updatedAt: new Date(session.time.updated).toISOString(),
        })),
        ...(page.cursor.next ? { nextCursor: page.cursor.next } : {}),
@@ -1757,7 +1757,7 @@ export type SessionInfo = {
  cost: MoneyUSD
  tokens: TokenUsageInfo
  time: { created: number; updated: number; archived?: number }
-  title: string
+  title?: string
  location: LocationRef
  subpath?: string
  revert?: SessionRevert
@@ -2006,7 +2006,7 @@ export type SessionV1Info = {
  cost?: number
  tokens?: { input: number; output: number; reasoning: number; cache: { read: number; write: number } }
  share?: { url: string }
-  title: string
+  title?: string
  agent?: string
  model?: { id: string; providerID: string; variant?: string }
  version: string
@@ -1,9 +1,9 @@
 {
  "version": "7",
  "dialect": "sqlite",
-  "id": "db37a97f-9b5e-4c87-be8b-4feace35136c",
+  "id": "e43ed7e2-b9fc-4178-beae-3646e4a976e1",
  "prevIds": [
-    "a4ba73b4-21bc-41ab-a415-94e2ca38d798"
+    "db37a97f-9b5e-4c87-be8b-4feace35136c"
  ],
  "ddl": [
    {
@@ -1302,7 +1302,7 @@
    },
    {
      "type": "text",
-      "notNull": true,
+      "notNull": false,
      "autoincrement": false,
      "default": null,
      "generated": null,
@@ -1,5 +1,7 @@
 export * as AISDKNative from "./aisdk-native"

+import { isRecord } from "@opencode-ai/ai/utils/record"
+
 export interface Mapping {
  readonly package: string
  readonly settings: Readonly<Record<string, unknown>>
@@ -14,7 +16,7 @@ export function map(packageName: string | undefined, settings: Readonly<Record<s
        settings: {
          ...baseSettings,
          ...mapAPIKey(settings),
-          ...mapProviderOptions("gemini", settings),
+          ...mapGoogleOptions(settings),
        },
      }
    case "@openrouter/ai-sdk-provider":
@@ -32,7 +34,7 @@ export function map(packageName: string | undefined, settings: Readonly<Record<s
        settings: {
          ...baseSettings,
          ...mapAPIKey(settings),
-          ...mapProviderOptions("xai", settings),
+          ...mapXAIOptions(settings),
        },
      }
  }
@@ -48,6 +50,35 @@ function mapAPIKey(settings: Readonly<Record<string, unknown>>) {
  return typeof settings.apiKey === "string" ? { apiKey: settings.apiKey } : {}
 }

+function mapGoogleOptions(settings: Readonly<Record<string, unknown>>) {
+  const input = settings.thinkingConfig
+  const thinkingConfig = {
+    ...(isRecord(input) && typeof input.thinkingBudget === "number" ? { thinkingBudget: input.thinkingBudget } : {}),
+    ...(isRecord(input) && typeof input.includeThoughts === "boolean"
+      ? { includeThoughts: input.includeThoughts }
+      : {}),
+    ...(isRecord(input) && typeof input.thinkingLevel === "string" ? { thinkingLevel: input.thinkingLevel } : {}),
+  }
+  const options = {
+    ...(typeof settings.cachedContent === "string" ? { cachedContent: settings.cachedContent } : {}),
+    ...(Array.isArray(settings.safetySettings) ? { safetySettings: settings.safetySettings } : {}),
+    ...(typeof settings.serviceTier === "string" ? { serviceTier: settings.serviceTier } : {}),
+    ...(Object.keys(thinkingConfig).length > 0 ? { thinkingConfig } : {}),
+  }
+  if (Object.keys(options).length === 0) return {}
+  return { providerOptions: { gemini: options } }
+}
+
+function mapXAIOptions(settings: Readonly<Record<string, unknown>>) {
+  const options = {
+    ...(typeof settings.reasoningEffort === "string" ? { reasoningEffort: settings.reasoningEffort } : {}),
+    ...(typeof settings.store === "boolean" ? { store: settings.store } : {}),
+    ...(typeof settings.promptCacheKey === "string" ? { promptCacheKey: settings.promptCacheKey } : {}),
+  }
+  if (Object.keys(options).length === 0) return {}
+  return { providerOptions: { xai: options } }
+}
+
 function mapProviderOptions(namespace: string, settings: Readonly<Record<string, unknown>>) {
  const values = Object.fromEntries(
    Object.entries(settings).filter(
@@ -58,5 +58,6 @@ export const migrations = (
    import("./migration/20260722011141_delete_tool_progress_events"),
    import("./migration/20260722170000_canonical_tool_results"),
    import("./migration/20260729022634_session_fork_boundary"),
+    import("./migration/20260730195856_optional_session_title"),
  ])
 ).map((module) => module.default) satisfies DatabaseMigration.Migration[]
@@ -0,0 +1,14 @@
+import { Effect } from "effect"
+import type { DatabaseMigration } from "../migration"
+
+export default {
+  id: "20260730195856_optional_session_title",
+  up(tx) {
+    return Effect.gen(function* () {
+      yield* tx.run(`ALTER TABLE \`session\` RENAME COLUMN \`title\` TO \`title_old\``)
+      yield* tx.run(`ALTER TABLE \`session\` ADD COLUMN \`title\` text`)
+      yield* tx.run(`UPDATE \`session\` SET \`title\` = \`title_old\``)
+      yield* tx.run(`ALTER TABLE \`session\` DROP COLUMN \`title_old\``)
+    })
+  },
+} satisfies DatabaseMigration.Migration
@@ -217,7 +217,7 @@ export default {
          \`slug\` text NOT NULL,
          \`directory\` text NOT NULL,
          \`path\` text,
-          \`title\` text NOT NULL,
+          \`title\` text,
          \`version\` text NOT NULL,
          \`share_url\` text,
          \`summary_additions\` integer,
@@ -18,7 +18,6 @@ import { Credential } from "./credential"
 import { Integration } from "./integration"
 import { Capabilities, ID, Info, Ref, VariantID } from "./model"
 import { Npm } from "@opencode-ai/util/npm"
-import { OpenAICodex } from "./plugin/provider/openai-codex"
 import { Provider } from "./provider"

 export class VariantUnavailableError extends Schema.TaggedErrorClass<VariantUnavailableError>()(
@@ -153,12 +152,7 @@ export const fromCatalogModel = (
  const packageName = Provider.packageName(resolved.package)
  const key = apiKey(resolved, credential)

-  if (OpenAICodex.isChatGPT(credential) && !Provider.isAISDK(resolved.package) && isNativeOpenAI(resolved.package)) {
-    return Effect.succeed(codexModel(resolved, credential, key))
-  }
-
  if (Provider.isAISDK(resolved.package) && packageName === "@ai-sdk/openai") {
-    if (OpenAICodex.isChatGPT(credential)) return Effect.succeed(codexModel(resolved, credential, key))
    return Effect.succeed(
      withDefaults(resolved, OpenAIResponses.route)
        .with({ auth: key === undefined ? Auth.none : Auth.bearer(key) })
@@ -227,10 +221,6 @@ export const fromCatalogModel = (
  })
 }

-const isNativeOpenAI = (packageName: string | undefined) =>
-  packageName === "@opencode-ai/ai/providers/openai" ||
-  packageName?.startsWith("@opencode-ai/ai/providers/openai/") === true
-
 const nativeCredentialSettings = (specifier: string, credential: Credential.Value | undefined) => {
  if (!credential) return {}
  if (credential.type === "key") return { apiKey: credential.key }
@@ -252,22 +242,6 @@ const withoutNativeAuthSettings = (settings: Record<string, unknown>) => {
  return rest
 }

-const codexModel = (
-  model: Info,
-  credential: Credential.Value | undefined,
-  key: ReturnType<typeof Auth.value> | undefined,
-) => {
-  const account = OpenAICodex.accountID(credential)
-  return withDefaults(model, OpenAIResponses.route)
-    .with({
-      endpoint: { baseURL: OpenAICodex.baseURL },
-      auth: (key === undefined ? Auth.none : Auth.bearer(key)).andThen(
-        account === undefined ? Auth.none : Auth.headers({ "chatgpt-account-id": account }),
-      ),
-    })
-    .model({ id: model.modelID ?? model.id, compatibility: model.compatibility })
-}
-
 const unsupported = (model: Info) =>
  new UnsupportedPackageError({
    providerID: model.providerID,
@@ -1,42 +0,0 @@
-export * as OpenAICodex from "./openai-codex"
-
-// TEMPORARY SEAM (#34765): plugins have no hook into LLM route construction, so
-// Codex routing lives in ModelResolver and catalog filtering.
-// in OpenAIPlugin, sharing this module. Once the native provider packages land
-// (#33689/#33925/#34462) this should collapse into the native OpenAI provider.
-// The eligibility rules mirror V1's CodexAuthPlugin allowlist; models.dev has no
-// plan-eligibility data for OpenAI today, but models other vendors' subscriptions
-// as dedicated providers (e.g. zai-coding-plan) - a future openai-chatgpt-plan
-// provider entry could replace the hardcoded rules with catalog data.
-
-/** ChatGPT-plan requests must target the codex backend instead of the public API. */
-export const baseURL = "https://chatgpt.com/backend-api/codex"
-
-const methodIDs: readonly string[] = ["chatgpt-browser", "chatgpt-headless"]
-
-/** Structural credential shape so both core and plugin-facing credential types fit. */
-type CredentialLike = {
-  readonly type: string
-  readonly methodID?: string
-  readonly metadata?: Record<string, unknown> | undefined
-}
-
-export const isChatGPT = (credential: CredentialLike | undefined) =>
-  credential?.type === "oauth" && credential.methodID !== undefined && methodIDs.includes(credential.methodID)
-
-export const accountID = (credential: CredentialLike | undefined) => {
-  if (!isChatGPT(credential)) return undefined
-  const value = credential?.metadata?.accountID
-  return typeof value === "string" ? value : undefined
-}
-
-const allowed = new Set(["gpt-5.5", "gpt-5.3-codex-spark", "gpt-5.4", "gpt-5.4-mini"])
-const disallowed = new Set(["gpt-5.5-pro", "gpt-5.6"])
-
-/** Which API model ids a ChatGPT subscription may call through the codex backend. */
-export const eligible = (apiID: string) => {
-  if (allowed.has(apiID)) return true
-  if (disallowed.has(apiID)) return false
-  const match = apiID.match(/^gpt-(\d+\.\d+)/)
-  return match ? Number.parseFloat(match[1]) > 5.4 : false
-}
@@ -10,14 +10,16 @@ import { Model } from "../../model"
 import { OauthCallbackPage } from "../../oauth/page"
 import { Provider } from "../../provider"
 import type { PluginInternal } from "../internal"
-import { OpenAICodex } from "./openai-codex"

 const clientID = "app_EMoamEEZ73f0CkXaXp7hrann"
 const issuer = "https://auth.openai.com"
 const callbackPort = 1455
 const pollingSafetyMargin = 3000
+const codexBaseURL = "https://chatgpt.com/backend-api/codex"
 const browserMethodID = Integration.MethodID.make("chatgpt-browser")
 const headlessMethodID = Integration.MethodID.make("chatgpt-headless")
+const codexAllowed = new Set(["gpt-5.5", "gpt-5.3-codex-spark", "gpt-5.4", "gpt-5.4-mini"])
+const codexDisallowed = new Set(["gpt-5.5-pro", "gpt-5.6"])

 type Pkce = {
  verifier: string
@@ -164,14 +166,18 @@ export const OpenAIPlugin = define({
  effect: Effect.fn(function* (ctx) {
    const bus = yield* Bus.Service
    const loading = Semaphore.makeUnsafe(1)
-    let chatgpt = false
+    let chatgpt: Credential.OAuth | undefined

    const load = Effect.fn("OpenAIPlugin.load")(function* () {
      const connection = yield* ctx.integration.connection.active("openai")
      const credential = connection
        ? yield* ctx.integration.connection.resolve(connection).pipe(Effect.catch(() => Effect.succeed(undefined)))
        : undefined
-      chatgpt = OpenAICodex.isChatGPT(credential)
+      chatgpt =
+        credential?.type === "oauth" &&
+        (credential.methodID === browserMethodID || credential.methodID === headlessMethodID)
+          ? credential
+          : undefined
    })

    yield* ctx.integration.transform((draft) => {
@@ -183,16 +189,19 @@ export const OpenAIPlugin = define({
      for (const item of evt.provider.list()) {
        if (!Provider.isAISDK(item.provider.package)) continue
        if (Provider.packageName(item.provider.package) !== "@ai-sdk/openai") continue
-        if (!item.models.has(Model.ID.make("gpt-5-chat-latest"))) continue
-        evt.model.update(item.provider.id, Model.ID.make("gpt-5-chat-latest"), (model) => {
-          // OpenAIPlugin sends OpenAI models through Responses; this alias is a
-          // chat-completions-only model, so hide it only from OpenAI's catalog.
-          model.enabled = false
+        evt.provider.update(item.provider.id, (provider) => {
+          provider.package = "@opencode-ai/ai/providers/openai"
        })
      }
      if (!chatgpt) return
      const item = evt.provider.get(Provider.ID.openai)
      if (!item) return
+      item.provider.settings = Provider.mergeOverlay(item.provider.settings, { baseURL: codexBaseURL })
+      const account = chatgpt.metadata?.accountID
+      item.provider.headers = Provider.mergeHeaders(
+        item.provider.headers,
+        typeof account === "string" ? { "chatgpt-account-id": account } : undefined,
+      )
      for (const model of item.models.values()) {
        // ChatGPT-plan tokens only authorize codex-eligible models, and the
        // subscription covers usage, so hide the rest and zero the cost.
@@ -201,14 +210,36 @@ export const OpenAIPlugin = define({
            draft.enabled = false
            return
          }
-          if (!OpenAICodex.eligible(draft.modelID ?? draft.id)) {
+          const apiID = draft.modelID ?? draft.id
+          const match = apiID.match(/^gpt-(\d+\.\d+)/)
+          if (
+            !codexAllowed.has(apiID) &&
+            (codexDisallowed.has(apiID) || !match || Number.parseFloat(match[1]) <= 5.4)
+          ) {
            draft.enabled = false
            return
          }
          draft.cost = []
+          if (draft.id.includes("gpt-5.5")) {
+            draft.limit = { context: 400_000, input: 272_000, output: 128_000 }
+          }
+          if (draft.id.includes("gpt-5.6")) {
+            draft.limit = { context: 500_000, input: 372_000, output: 128_000 }
+          }
        })
      }
    })
+    yield* ctx.session.hook("request", (evt) =>
+      Effect.sync(() => {
+        if (!chatgpt || evt.model.providerID !== Provider.ID.openai) return
+        const url = new URL(evt.url)
+        if (url.origin === "https://api.openai.com") {
+          evt.url = `${codexBaseURL}${url.pathname.replace(/^\/v1/, "")}${url.search}`
+        }
+        evt.headers.originator = "opencode"
+        evt.headers["session-id"] = evt.sessionID
+      }),
+    )

    const refresh = () => loading.withPermit(load().pipe(Effect.andThen(ctx.catalog.reload())))
    yield* bus.subscribe(Integration.Event.ConnectionUpdated).pipe(
@@ -216,21 +247,6 @@ export const OpenAIPlugin = define({
      Stream.runForEach(refresh),
      Effect.forkScoped({ startImmediately: true }),
    )
-    yield* ctx.aisdk.hook(
-      "sdk",
-      Effect.fn(function* (evt) {
-        if (evt.package !== "@ai-sdk/openai") return
-        const mod = yield* Effect.promise(() => import("@ai-sdk/openai"))
-        evt.sdk = mod.createOpenAI(evt.options)
-      }),
-    )
-    yield* ctx.aisdk.hook(
-      "language",
-      Effect.fn(function* (evt) {
-        if (evt.model.providerID !== Provider.ID.openai) return
-        evt.language = evt.sdk.responses(evt.model.modelID ?? evt.model.id)
-      }),
-    )
  }),
 } satisfies PluginInternal.InternalPlugin)

@@ -374,7 +374,7 @@ const layer = Layer.effect(
          directory: location.directory,
          path: path.relative(project.directory, location.directory).replaceAll("\\", "/"),
          workspaceID: location.workspaceID ? Workspace.ID.make(location.workspaceID) : undefined,
-          title: input.title ?? `New session - ${new Date(now).toISOString()}`,
+          title: input.title,
          agent: input.agent,
          model: input.model
            ? {
@@ -117,21 +117,20 @@ export const preview = Effect.fn("SessionHistory.preview")(function* (
    .pipe(Effect.catch((error) => (error instanceof Instructions.InitializationBlocked ? error : Effect.die(error))))
 })

-/** Returns the session's sole user message, or `undefined` once a second one exists. */
-export const firstUserMessageIfOnly = Effect.fn("SessionHistory.firstUserMessageIfOnly")(function* (
+/** Returns the session's first user message. */
+export const firstUserMessage = Effect.fn("SessionHistory.firstUserMessage")(function* (
  db: DatabaseService,
  sessionID: SessionSchema.ID,
 ) {
-  const rows = yield* db
+  const row = yield* db
    .select()
    .from(SessionMessageTable)
    .where(and(eq(SessionMessageTable.session_id, sessionID), eq(SessionMessageTable.type, "user")))
    .orderBy(asc(SessionMessageTable.seq))
-    .limit(2)
-    .all()
+    .get()
    .pipe(Effect.orDie)
-  if (rows.length !== 1) return undefined
-  const message = yield* decodeMessageRow(rows[0]).pipe(Effect.catch(() => Effect.succeed(undefined)))
+  if (!row) return undefined
+  const message = yield* decodeMessageRow(row).pipe(Effect.catch(() => Effect.succeed(undefined)))
  return message?.type === "user" ? message : undefined
 })

@@ -17,7 +17,7 @@ export function fromRow(row: typeof SessionTable.$inferSelect): SessionSchema.In
  return SessionSchema.Info.make({
    id: SessionSchema.ID.make(row.id),
    projectID: Project.ID.make(row.project_id),
-    title: row.title,
+    title: row.title ?? undefined,
    parentID: row.parent_id ? SessionSchema.ID.make(row.parent_id) : undefined,
    fork:
      row.fork_session_id && row.fork_boundary
@@ -1,6 +1,7 @@
 export * as SessionModelRequest from "./model-request"

 import { LLM, Message, SystemPart, type LLMRequest } from "@opencode-ai/ai"
+import type { StreamOptions } from "@opencode-ai/ai/route"
 import type { Content } from "@opencode-ai/schema/tool"
 import { SessionError } from "@opencode-ai/schema/session-error"
 import { Cause, Config, Context, Effect, Layer, Result } from "effect"
@@ -37,6 +38,7 @@ const declineDefect = (cause: Cause.Cause<Tool.Error>) => {

 interface Prepared {
  readonly request: LLMRequest
+  readonly options: StreamOptions
  /**
   * One request-scoped execution operation. Unknown, hook-removed, and
   * step-limit-violating calls fail individually through the same seam.
@@ -162,6 +164,26 @@ export const layer = Layer.effect(
        tools: hookedTools,
        toolChoice: stepLimitReached ? "none" : undefined,
      })
+      const options: StreamOptions = {
+        transform: (request) =>
+          hooks
+            .trigger("session", "request", {
+              sessionID: session.id,
+              agent: agent.id,
+              model: resolved.ref,
+              ...request,
+            })
+            .pipe(
+              Effect.tap((event) =>
+                Effect.sync(() => {
+                  request.url = event.url
+                  request.headers = event.headers
+                  request.body = event.body
+                }),
+              ),
+              Effect.asVoid,
+            ),
+      }
      if (promptCacheSnapshots) {
        const current = PromptCacheDiagnostics.snapshot(request)
        const comparison = PromptCacheDiagnostics.compare(promptCacheSnapshots.get(session.id), current)
@@ -190,6 +212,7 @@ export const layer = Layer.effect(
      }
      return {
        request,
+        options,
        executeTool,
        stepLimitReached,
      }
@@ -43,7 +43,8 @@ type Usage = {

 const ForkBatchSize = 500

-const forkTitle = (value: string) => {
+const forkTitle = (value?: string) => {
+  if (value === undefined) return
  const match = value.match(/^(.+) \(fork #(\d+)\)$/)
  if (match) return `${match[1]} (fork #${Number.parseInt(match[2], 10) + 1})`
  return `${value} (fork #1)`
@@ -216,7 +217,7 @@ const projectFork = Effect.fn("SessionProjector.projectFork")(function* (
      slug: Slug.create(),
      directory: parent.directory,
      path: parent.path,
-      title: forkTitle(parent.title),
+      title: forkTitle(parent.title ?? undefined),
      agent: parent.agent,
      model: parent.model,
      version: parent.version,
@@ -93,10 +93,9 @@ const layer = Layer.effect(
    const db = (yield* Database.Service).db
    const compaction = yield* SessionCompaction.Service
    const title = yield* SessionTitle.Service
-    // Title generation is a side effect of the first step; it must not delay step continuation.
-    // Tracked per process so repeated wakes before the second user message arrives don't
-    // re-fire a redundant LLM call; `SessionTitle` itself is idempotent based on durable history.
-    const titleStarted = new Set<SessionSchema.ID>()
+    // Title generation is a side effect of a successful step; it must not delay continuation.
+    // The in-flight set coalesces overlapping steps while title presence records success durably.
+    const titlesRunning = new Set<SessionSchema.ID>()
    const forkTitle = yield* FiberSet.makeRuntime<never, void, never>()
    /**
     * Drains eligible manual compaction and user input until the Session becomes idle.
@@ -125,7 +124,7 @@ const layer = Layer.effect(
      let step = 1
      while (true) {
        const result = yield* runStep(sessionID, promotable, step)
-        yield* startTitleOnce(sessionID)
+        if (step === 1) yield* startTitle(sessionID)
        yield* runPendingCompaction(sessionID)
        if (!result.needsContinuation && !(yield* SessionPending.has(db, sessionID, "steer"))) return
        promotable = "steer"
@@ -279,7 +278,7 @@ const layer = Layer.effect(
      // event durably, fork one fiber per local tool call, and hold back a virgin
      // context-overflow provider error so settlement may recover it via compaction.
      let overflowFailure: ProviderErrorEvent | undefined
-      const providerStream = llm.stream(prepared.request).pipe(
+      const providerStream = llm.stream(prepared.request, prepared.options).pipe(
        Stream.runForEach((event) =>
          Effect.gen(function* () {
            if (overflowFailure || publisher.hasProviderError()) return
@@ -481,11 +480,20 @@ const layer = Layer.effect(
      }
    })

-    /** Fires title generation once per process after the first step makes a user message visible. */
-    const startTitleOnce = Effect.fnUntraced(function* (sessionID: SessionSchema.ID) {
-      if (titleStarted.has(sessionID)) return
-      titleStarted.add(sessionID)
-      forkTitle(title.generateForFirstPrompt(yield* getSession(sessionID)).pipe(Effect.ignore))
+    /** Starts one title request at a time after a successful step makes user input visible. */
+    const startTitle = Effect.fnUntraced(function* (sessionID: SessionSchema.ID) {
+      if (titlesRunning.has(sessionID)) return
+      titlesRunning.add(sessionID)
+      forkTitle(
+        title.generateForFirstPrompt(sessionID).pipe(
+          Effect.ignore,
+          Effect.ensuring(
+            Effect.sync(() => {
+              titlesRunning.delete(sessionID)
+            }),
+          ),
+        ),
+      )
    })

    const getSession = Effect.fn("SessionRunner.getSession")(function* (sessionID: SessionSchema.ID) {
@@ -36,7 +36,7 @@ export const SessionTable = sqliteTable(
    slug: text().notNull(),
    directory: directoryColumn().notNull(),
    path: pathColumn(),
-    title: text().notNull(),
+    title: text(),
    version: text().notNull(),
    share_url: text(),
    summary_additions: integer(),
@@ -1,7 +1,7 @@
 export * as SessionTitle from "./title"

 import { LLM, LLMClient, LLMError, LLMEvent, Message, type LLMRequest } from "@opencode-ai/ai"
-import { Context, Effect, Layer, Stream } from "effect"
+import { Context, DateTime, Effect, Layer, Stream } from "effect"
 import { Agent } from "../agent"
 import { Database } from "../database/database"
 import { Bus } from "../bus"
@@ -14,8 +14,10 @@ import { SessionModelHeaders } from "./model-headers"
 import { SessionRunnerModel } from "./runner/model"
 import { SessionSchema } from "./schema"
 import { SessionUsage } from "./usage"
+import { SessionStore } from "./store"

 const MAX_LENGTH = 100
+const titleChanged = Symbol("Session title changed")

 type Dependencies = {
  readonly app: App.Info
@@ -25,24 +27,30 @@ type Dependencies = {
  }
  readonly agents: Agent.Interface
  readonly models: SessionRunnerModel.Interface
+  readonly store: SessionStore.Interface
 }

 export interface Interface {
-  /** Generates a title from the session's first user message and renames the session. Runs at most once per session. */
-  readonly generateForFirstPrompt: (session: SessionSchema.Info) => Effect.Effect<void>
+  /** Generates a title from the session's first user message when the session remains untitled. */
+  readonly generateForFirstPrompt: (sessionID: SessionSchema.ID) => Effect.Effect<void>
 }

 export class Service extends Context.Service<Service, Interface>()("@opencode/SessionTitle") {}

 const truncate = (value: string) => (value.length <= MAX_LENGTH ? value : `${value.slice(0, MAX_LENGTH - 3)}...`)
+const isUntitled = (session: SessionSchema.Info) =>
+  session.title === undefined || session.title === `New session - ${DateTime.formatIso(session.time.created)}`

 const make = (dependencies: Dependencies) => {
  const generateForFirstPrompt = Effect.fn("SessionTitle.generateForFirstPrompt")(function* (
    db: Database.Interface["db"],
-    session: SessionSchema.Info,
+    sessionID: SessionSchema.ID,
  ) {
+    const session = yield* dependencies.store.get(sessionID)
+    if (!session) return
    if (session.parentID) return
-    const firstUser = yield* SessionHistory.firstUserMessageIfOnly(db, session.id)
+    if (!isUntitled(session)) return
+    const firstUser = yield* SessionHistory.firstUserMessage(db, session.id)
    if (!firstUser) return
    const agent = yield* dependencies.agents.get(Agent.ID.make("title"))
    if (!agent) return
@@ -96,10 +104,19 @@ const make = (dependencies: Dependencies) => {
      .map((line) => line.trim())
      .find((line) => line.length > 0)
    if (!title) return
-    yield* dependencies.bus.publish(SessionEvent.Renamed, {
-      sessionID: session.id,
-      title: truncate(title),
-    })
+    const expectedSequence = (yield* Bus.latestSequence(db, sessionID)) + 1
+    const current = yield* dependencies.store.get(sessionID)
+    if (!current || !isUntitled(current)) return
+    yield* dependencies.bus
+      .publish(
+        SessionEvent.Renamed,
+        {
+          sessionID: session.id,
+          title: truncate(title),
+        },
+        { commit: (sequence) => (sequence === expectedSequence ? Effect.void : Effect.die(titleChanged)) },
+      )
+      .pipe(Effect.catchDefect((defect) => (defect === titleChanged ? Effect.void : Effect.die(defect))))
  })
  return { generateForFirstPrompt }
 }
@@ -111,11 +128,12 @@ export const layer = Layer.effect(
    const llm = yield* LLMClient.Service
    const agents = yield* Agent.Service
    const models = yield* SessionRunnerModel.Service
+    const store = yield* SessionStore.Service
    const database = yield* Database.Service
    const app = yield* App.Metadata
-    const title = make({ bus, llm, agents, models, app })
+    const title = make({ bus, llm, agents, models, store, app })
    return Service.of({
-      generateForFirstPrompt: (session) => title.generateForFirstPrompt(database.db, session),
+      generateForFirstPrompt: (sessionID) => title.generateForFirstPrompt(database.db, sessionID),
    })
  }),
 )
@@ -123,5 +141,5 @@ export const layer = Layer.effect(
 export const node = makeLocationNode({
  service: Service,
  layer,
-  deps: [Bus.node, llmClient, Agent.node, SessionRunnerModel.node, Database.node, App.node],
+  deps: [Bus.node, llmClient, Agent.node, SessionRunnerModel.node, SessionStore.node, Database.node, App.node],
 })
@@ -0,0 +1,106 @@
+import { describe, expect, test } from "bun:test"
+import { AISDKNative } from "@opencode-ai/core/aisdk-native"
+
+describe("AISDKNative", () => {
+  test("maps every Google thinking setting", () => {
+    expect(
+      AISDKNative.map("@ai-sdk/google", {
+        cachedContent: "cachedContents/example",
+        safetySettings: [{ category: "HARM_CATEGORY_HARASSMENT", threshold: "BLOCK_NONE" }],
+        serviceTier: "flex",
+        thinkingConfig: {
+          thinkingBudget: 0,
+          includeThoughts: false,
+          thinkingLevel: "high",
+          unknown: true,
+        },
+      }),
+    ).toEqual({
+      package: "@opencode-ai/ai/providers/google",
+      settings: {
+        providerOptions: {
+          gemini: {
+            cachedContent: "cachedContents/example",
+            safetySettings: [{ category: "HARM_CATEGORY_HARASSMENT", threshold: "BLOCK_NONE" }],
+            serviceTier: "flex",
+            thinkingConfig: {
+              thinkingBudget: 0,
+              includeThoughts: false,
+              thinkingLevel: "high",
+            },
+          },
+        },
+      },
+    })
+  })
+
+  test("maps Google thinking settings independently", () => {
+    for (const thinkingConfig of [{ thinkingBudget: -1 }, { includeThoughts: true }, { thinkingLevel: "medium" }]) {
+      expect(AISDKNative.map("@ai-sdk/google", { thinkingConfig })).toMatchObject({
+        settings: { providerOptions: { gemini: { thinkingConfig } } },
+      })
+    }
+  })
+
+  test("maps Google request options without thinking settings", () => {
+    expect(
+      AISDKNative.map("@ai-sdk/google", {
+        cachedContent: "cachedContents/example",
+        safetySettings: [{ category: "HARM_CATEGORY_HARASSMENT", threshold: "BLOCK_NONE" }],
+        serviceTier: "future-tier",
+      }),
+    ).toMatchObject({
+      settings: {
+        providerOptions: {
+          gemini: {
+            cachedContent: "cachedContents/example",
+            safetySettings: [{ category: "HARM_CATEGORY_HARASSMENT", threshold: "BLOCK_NONE" }],
+            serviceTier: "future-tier",
+          },
+        },
+      },
+    })
+  })
+
+  test("maps supported xAI settings", () => {
+    expect(
+      AISDKNative.map("@ai-sdk/xai", {
+        apiKey: "secret",
+        baseURL: "https://xai.example/v1",
+        reasoningEffort: "custom",
+        store: true,
+        promptCacheKey: "cache-key",
+      }),
+    ).toEqual({
+      package: "@opencode-ai/ai/providers/xai",
+      settings: {
+        apiKey: "secret",
+        baseURL: "https://xai.example/v1",
+        providerOptions: {
+          xai: {
+            reasoningEffort: "custom",
+            store: true,
+            promptCacheKey: "cache-key",
+          },
+        },
+      },
+    })
+  })
+
+  test("omits invalid and unsupported xAI settings", () => {
+    expect(
+      AISDKNative.map("@ai-sdk/xai", {
+        reasoningEffort: 10,
+        store: "yes",
+        include: ["unknown"],
+        logprobs: true,
+        topLogprobs: 8,
+        previousResponseId: "response-id",
+        searchParameters: { mode: "auto" },
+      }),
+    ).toEqual({
+      package: "@opencode-ai/ai/providers/xai",
+      settings: {},
+    })
+  })
+})
@@ -26,6 +26,7 @@ import timeSuspendedMigration from "@opencode-ai/core/database/migration/2026070
 import instructionSyncMigration from "@opencode-ai/core/database/migration/20260710025429_instruction_sync"
 import deleteToolProgressEventsMigration from "@opencode-ai/core/database/migration/20260722011141_delete_tool_progress_events"
 import canonicalToolResultsMigration from "@opencode-ai/core/database/migration/20260722170000_canonical_tool_results"
+import optionalSessionTitleMigration from "@opencode-ai/core/database/migration/20260730195856_optional_session_title"
 import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { LayerNode } from "@opencode-ai/util/effect/layer-node"
 import { Bus } from "@opencode-ai/core/bus"
@@ -399,6 +400,40 @@ describe("DatabaseMigration", () => {
    ).rejects.toThrow("Database is not empty and has no session table")
  })

+  test("makes session titles nullable without deleting dependent rows", async () => {
+    await run(
+      Effect.gen(function* () {
+        const db = yield* makeDb
+        yield* db.run(sql`PRAGMA foreign_keys = ON`)
+        yield* db.run(sql`
+          CREATE TABLE session (
+            id text PRIMARY KEY,
+            title text NOT NULL
+          )
+        `)
+        yield* db.run(sql`
+          CREATE TABLE message (
+            id text PRIMARY KEY,
+            session_id text NOT NULL REFERENCES session(id) ON DELETE CASCADE
+          )
+        `)
+        yield* db.run(sql`INSERT INTO session VALUES ('ses_existing', 'Existing title')`)
+        yield* db.run(sql`INSERT INTO message VALUES ('msg_existing', 'ses_existing')`)
+
+        yield* DatabaseMigration.applyOnly(db, [optionalSessionTitleMigration])
+
+        expect(yield* db.get(sql`SELECT title FROM session WHERE id = 'ses_existing'`)).toEqual({
+          title: "Existing title",
+        })
+        expect(yield* db.get(sql`SELECT id FROM message WHERE id = 'msg_existing'`)).toEqual({ id: "msg_existing" })
+        expect(
+          yield* db.get<{ notnull: number }>(sql`SELECT "notnull" FROM pragma_table_info('session') WHERE name = 'title'`),
+        ).toEqual({ notnull: 0 })
+        expect(yield* db.get<{ foreign_keys: number }>(sql`PRAGMA foreign_keys`)).toEqual({ foreign_keys: 1 })
+      }),
+    )
+  })
+
  test("backfills existing Context Epoch rows to the build agent", async () => {
    await run(
      Effect.gen(function* () {
@@ -307,12 +307,12 @@ describe("ModelResolver", () => {
    }),
  )

-  it.effect("routes ChatGPT OAuth credentials to the codex backend", () =>
+  it.effect("applies plugin-projected OpenAI endpoint and headers", () =>
    Effect.gen(function* () {
      const resolved = yield* ModelResolver.fromCatalogModel(
-        model(Provider.aisdk("@ai-sdk/openai"), {
-          settings: { baseURL: "https://openai.example/v1" },
-          headers: {},
+        model("@opencode-ai/ai/providers/openai", {
+          settings: { baseURL: "https://chatgpt.com/backend-api/codex" },
+          headers: { "chatgpt-account-id": "acct_123" },
          body: {},
        }),
        Credential.OAuth.make({
@@ -337,37 +337,8 @@ describe("ModelResolver", () => {
        id: "openai-responses",
        endpoint: { baseURL: "https://chatgpt.com/backend-api/codex" },
      })
+      expect(resolved.route.defaults.headers).toMatchObject({ "chatgpt-account-id": "acct_123" })
      expect(headers.authorization).toBe("Bearer chatgpt-token")
-      expect(headers["chatgpt-account-id"]).toBe("acct_123")
-    }),
-  )
-
-  it.effect("routes native OpenAI provider packages with ChatGPT credentials to the codex backend", () =>
-    Effect.gen(function* () {
-      const resolved = yield* ModelResolver.fromCatalogModel(
-        model("@opencode-ai/ai/providers/openai", {
-          settings: { baseURL: "https://openai.example/v1" },
-        }),
-        Credential.OAuth.make({
-          type: "oauth",
-          methodID: Integration.MethodID.make("chatgpt-browser"),
-          access: "chatgpt-token",
-          refresh: "refresh",
-          expires: Date.now() + 60_000,
-          metadata: { accountID: "acct_123" },
-        }),
-      )
-      const headers = yield* resolved.route.auth.apply({
-        request: LLM.request({ model: resolved, prompt: "Hello" }),
-        method: "POST",
-        url: "https://chatgpt.com/backend-api/codex/responses",
-        body: "{}",
-        headers: Headers.empty,
-      })
-
-      expect(resolved.route.endpoint.baseURL).toBe("https://chatgpt.com/backend-api/codex")
-      expect(headers.authorization).toBe("Bearer chatgpt-token")
-      expect(headers["chatgpt-account-id"]).toBe("acct_123")
    }),
  )

@@ -407,37 +378,6 @@ describe("ModelResolver", () => {
    }),
  )

-  it.effect("routes ChatGPT OAuth credentials without an account id to the codex backend", () =>
-    Effect.gen(function* () {
-      const resolved = yield* ModelResolver.fromCatalogModel(
-        model(Provider.aisdk("@ai-sdk/openai"), {
-          settings: { baseURL: "https://openai.example/v1" },
-          headers: {},
-          body: {},
-        }),
-        Credential.OAuth.make({
-          type: "oauth",
-          methodID: Integration.MethodID.make("chatgpt-headless"),
-          access: "chatgpt-token",
-          refresh: "refresh",
-          expires: Date.now() + 60_000,
-        }),
-      )
-      const request = LLM.request({ model: resolved, prompt: "Hello" })
-      const headers = yield* resolved.route.auth.apply({
-        request,
-        method: "POST",
-        url: "https://chatgpt.com/backend-api/codex/responses",
-        body: "{}",
-        headers: Headers.empty,
-      })
-
-      expect(resolved.route.endpoint.baseURL).toBe("https://chatgpt.com/backend-api/codex")
-      expect(headers.authorization).toBe("Bearer chatgpt-token")
-      expect(headers["chatgpt-account-id"]).toBeUndefined()
-    }),
-  )
-
  it.effect("keeps non-ChatGPT OAuth credentials on the configured endpoint", () =>
    Effect.gen(function* () {
      const resolved = yield* ModelResolver.fromCatalogModel(
@@ -550,16 +490,31 @@ describe("ModelResolver", () => {
    Effect.gen(function* () {
      const native = yield* ModelResolver.fromCatalogModel(model(Provider.aisdk("@ai-sdk/openai")))
      const packages = [
-        ["@ai-sdk/google", "@opencode-ai/ai/providers/google", "gemini"],
-        ["@openrouter/ai-sdk-provider", "@opencode-ai/ai/providers/openrouter", "openrouter"],
-        ["@ai-sdk/xai", "@opencode-ai/ai/providers/xai", "xai"],
+        [
+          "@ai-sdk/google",
+          "@opencode-ai/ai/providers/google",
+          { thinkingConfig: { thinkingLevel: "high" } },
+          { gemini: { thinkingConfig: { thinkingLevel: "high" } } },
+        ],
+        [
+          "@openrouter/ai-sdk-provider",
+          "@opencode-ai/ai/providers/openrouter",
+          { reasoning: { effort: "high" } },
+          { openrouter: { reasoning: { effort: "high" } } },
+        ],
+        [
+          "@ai-sdk/xai",
+          "@opencode-ai/ai/providers/xai",
+          { reasoningEffort: "high" },
+          { xai: { reasoningEffort: "high" } },
+        ],
      ] as const

-      yield* Effect.forEach(packages, ([catalogPackage, nativePackage, optionKey]) =>
+      yield* Effect.forEach(packages, ([catalogPackage, nativePackage, sourceOptions, providerOptions]) =>
        ModelResolver.fromCatalogModel(
          model(Provider.aisdk(catalogPackage), {
            modelID: "api-model",
-            settings: { baseURL: "https://provider.example/v1", reasoningEffort: "high" },
+            settings: { baseURL: "https://provider.example/v1", ...sourceOptions },
            headers: { "x-provider": "header" },
            body: { custom: true },
          }),
@@ -576,7 +531,7 @@ describe("ModelResolver", () => {
                    headers: { "x-provider": "header" },
                    body: { custom: true },
                    limits: { context: 100, output: 20 },
-                    providerOptions: { [optionKey]: { reasoningEffort: "high" } },
+                    providerOptions,
                  })
                  return Model.make({ id: modelID, provider: "native-provider", route: native.route })
                },
@@ -1,7 +1,7 @@
-import { AISDK } from "@opencode-ai/core/aisdk"
 import { Money } from "@opencode-ai/schema/money"
+import { Agent } from "@opencode-ai/schema/agent"
+import { Session } from "@opencode-ai/schema/session"
 import { describe, expect } from "bun:test"
-import type { LanguageModelV3 } from "@ai-sdk/provider"
 import { Effect } from "effect"
 import { Catalog } from "@opencode-ai/core/catalog"
 import { Credential } from "@opencode-ai/core/credential"
@@ -9,6 +9,7 @@ import { Integration } from "@opencode-ai/core/integration"
 import { Model } from "@opencode-ai/core/model"
 import { Plugin } from "@opencode-ai/core/plugin"
 import { PluginHost } from "@opencode-ai/core/plugin/host"
+import { PluginHooks } from "@opencode-ai/core/plugin/hooks"
 import { OpenAIPlugin } from "@opencode-ai/core/plugin/provider/openai"
 import { Provider } from "@opencode-ai/core/provider"
 import { testEffect } from "../lib/effect"
@@ -18,7 +19,6 @@ const it = testEffect(PluginTestLayer)

 const addPlugin = Effect.fn(function* () {
  const plugin = yield* Plugin.Service
-  const aisdk = yield* AISDK.Service
  const host = yield* PluginHost.make(plugin)
  const integrations = yield* Integration.Service
  yield* OpenAIPlugin.effect(host).pipe(Effect.provideService(Integration.Service, integrations))
@@ -29,19 +29,6 @@ function required<T>(value: T | undefined): T {
  return value
 }

-function fakeSelectorSdk(calls: string[]) {
-  const make = (method: string) => (id: string) => {
-    calls.push(`${method}:${id}`)
-    return { modelId: id, provider: method, specificationVersion: "v3" } as unknown as LanguageModelV3
-  }
-  return {
-    responses: make("responses"),
-    messages: make("messages"),
-    chat: make("chat"),
-    languageModel: make("languageModel"),
-  }
-}
-
 describe("OpenAIPlugin", () => {
  it.effect("registers browser and headless ChatGPT OAuth methods", () =>
    Effect.gen(function* () {
@@ -61,104 +48,6 @@ describe("OpenAIPlugin", () => {
    }),
  )

-  it.effect("creates an OpenAI SDK for @ai-sdk/openai using the provider ID as SDK name", () =>
-    Effect.gen(function* () {
-      const plugin = yield* Plugin.Service
-      const aisdk = yield* AISDK.Service
-      yield* addPlugin()
-      const result = yield* aisdk.runSDK({
-        model: Model.Info.make({
-          ...Model.Info.default(Provider.ID.make("custom-openai"), Model.ID.make("gpt-5")),
-          modelID: Model.ID.make("gpt-5"),
-          package: Provider.aisdk("test-provider"),
-        }),
-        package: "@ai-sdk/openai",
-        options: { name: "custom-openai", apiKey: "test" },
-      })
-      expect(result.sdk?.responses("gpt-5").provider).toBe("custom-openai.responses")
-    }),
-  )
-
-  it.effect("ignores non-OpenAI SDK packages", () =>
-    Effect.gen(function* () {
-      const plugin = yield* Plugin.Service
-      const aisdk = yield* AISDK.Service
-      yield* addPlugin()
-      const result = yield* aisdk.runSDK({
-        model: Model.Info.make({
-          ...Model.Info.default(Provider.ID.openai, Model.ID.make("gpt-5")),
-          modelID: Model.ID.make("gpt-5"),
-          package: Provider.aisdk("test-provider"),
-        }),
-        package: "@ai-sdk/openai-compatible",
-        options: { name: "openai" },
-      })
-      expect(result.sdk).toBeUndefined()
-    }),
-  )
-
-  it.effect("uses the Responses API for language models", () =>
-    Effect.gen(function* () {
-      const plugin = yield* Plugin.Service
-      const aisdk = yield* AISDK.Service
-      const calls: string[] = []
-      yield* addPlugin()
-      const result = yield* aisdk.runLanguage({
-        model: Model.Info.make({
-          ...Model.Info.default(Provider.ID.openai, Model.ID.make("alias")),
-          modelID: Model.ID.make("gpt-5"),
-          package: Provider.aisdk("test-provider"),
-        }),
-        sdk: fakeSelectorSdk(calls),
-        options: {},
-      })
-      expect(calls).toEqual(["responses:gpt-5"])
-      expect(result.language).toBeDefined()
-    }),
-  )
-
-  it.effect("ignores non-OpenAI providers", () =>
-    Effect.gen(function* () {
-      const plugin = yield* Plugin.Service
-      const aisdk = yield* AISDK.Service
-      const calls: string[] = []
-      yield* addPlugin()
-      const result = yield* aisdk.runLanguage({
-        model: Model.Info.make({
-          ...Model.Info.default(Provider.ID.anthropic, Model.ID.make("gpt-5")),
-          modelID: Model.ID.make("gpt-5"),
-          package: Provider.aisdk("test-provider"),
-        }),
-        sdk: fakeSelectorSdk(calls),
-        options: {},
-      })
-      expect(calls).toEqual([])
-      expect(result.language).toBeUndefined()
-    }),
-  )
-
-  it.effect("disables gpt-5-chat-latest during catalog transforms", () =>
-    Effect.gen(function* () {
-      const catalog = yield* Catalog.Service
-      yield* catalog.transform((catalog) => {
-        const item = Provider.Info.make({
-          ...Provider.Info.empty(Provider.ID.openai),
-          package: Provider.aisdk("@ai-sdk/openai"),
-        })
-        catalog.provider.update(item.id, (draft) => {
-          draft.package = item.package
-        })
-        catalog.model.update(item.id, Model.ID.make("gpt-5"), () => {})
-        catalog.model.update(item.id, Model.ID.make("gpt-5-chat-latest"), () => {})
-      })
-      yield* addPlugin()
-      expect(required(yield* catalog.model.get(Provider.ID.openai, Model.ID.make("gpt-5"))).enabled).toBe(true)
-      expect(
-        required(yield* catalog.model.get(Provider.ID.openai, Model.ID.make("gpt-5-chat-latest"))).enabled,
-      ).toBe(false)
-    }),
-  )
-
  it.effect("filters the OpenAI catalog to codex-eligible models under a ChatGPT connection", () =>
    Effect.gen(function* () {
      const catalog = yield* Catalog.Service
@@ -172,6 +61,7 @@ describe("OpenAIPlugin", () => {
          draft.package = item.package
        })
        catalog.model.update(item.id, Model.ID.make("gpt-5.5"), (model) => {
+          model.limit = { context: 1_050_000, input: 922_000, output: 128_000 }
          model.cost = [
            {
              input: Money.USDPerMillionTokens.make(1),
@@ -189,7 +79,9 @@ describe("OpenAIPlugin", () => {
          model.body = { reasoning: { mode: "pro" } }
        })
        catalog.model.update(item.id, Model.ID.make("gpt-5.6"), () => {})
-        catalog.model.update(item.id, Model.ID.make("gpt-5.6-sol"), () => {})
+        catalog.model.update(item.id, Model.ID.make("gpt-5.6-sol"), (model) => {
+          model.limit = { context: 1_050_000, input: 922_000, output: 128_000 }
+        })
        catalog.model.update(item.id, Model.ID.make("gpt-4.1"), () => {})
      })
      yield* credentials.create({
@@ -205,8 +97,47 @@ describe("OpenAIPlugin", () => {
      })
      yield* addPlugin()

+      const request = yield* (yield* PluginHooks.Service).trigger("session", "request", {
+        sessionID: Session.ID.make("ses_test"),
+        agent: Agent.ID.make("build"),
+        model: Model.Ref.make({ providerID: Provider.ID.openai, id: Model.ID.make("gpt-5.5") }),
+        url: "https://api.openai.com/v1/responses",
+        method: "POST",
+        headers: {},
+        body: "{}",
+      })
+      const custom = yield* (yield* PluginHooks.Service).trigger("session", "request", {
+        sessionID: Session.ID.make("ses_test"),
+        agent: Agent.ID.make("build"),
+        model: Model.Ref.make({ providerID: Provider.ID.make("custom-openai"), id: Model.ID.make("gpt-5.5") }),
+        url: "https://custom.example/v1/responses",
+        method: "POST",
+        headers: {},
+        body: "{}",
+      })
+      const proxy = yield* (yield* PluginHooks.Service).trigger("session", "request", {
+        sessionID: Session.ID.make("ses_test"),
+        agent: Agent.ID.make("build"),
+        model: Model.Ref.make({ providerID: Provider.ID.openai, id: Model.ID.make("gpt-5.5") }),
+        url: "https://proxy.example/v1/responses?region=us",
+        method: "POST",
+        headers: {},
+        body: "{}",
+      })
+
+      const provider = required(yield* catalog.provider.get(Provider.ID.openai))
+      expect(provider.package).toBe("@opencode-ai/ai/providers/openai")
+      expect(provider.settings).toMatchObject({ baseURL: "https://chatgpt.com/backend-api/codex" })
+      expect(provider.headers).toMatchObject({ "chatgpt-account-id": "acct_123" })
+      expect(request.url).toBe("https://chatgpt.com/backend-api/codex/responses")
+      expect(request.headers).toMatchObject({ originator: "opencode", "session-id": "ses_test" })
+      expect(custom.headers).toEqual({})
+      expect(proxy.url).toBe("https://proxy.example/v1/responses?region=us")
+      expect(proxy.headers).toMatchObject({ originator: "opencode", "session-id": "ses_test" })
      const eligible = required(yield* catalog.model.get(Provider.ID.openai, Model.ID.make("gpt-5.5")))
+      expect(eligible.package).toBe("@opencode-ai/ai/providers/openai")
      expect(eligible.cost).toEqual([])
+      expect(eligible.limit).toEqual({ context: 400_000, input: 272_000, output: 128_000 })
      expect(eligible.enabled).toBe(true)
      expect(required(yield* catalog.model.get(Provider.ID.openai, Model.ID.make("gpt-5.5-pro"))).enabled).toBe(
        false,
@@ -215,9 +146,9 @@ describe("OpenAIPlugin", () => {
        false,
      )
      expect(required(yield* catalog.model.get(Provider.ID.openai, Model.ID.make("gpt-5.6"))).enabled).toBe(false)
-      expect(required(yield* catalog.model.get(Provider.ID.openai, Model.ID.make("gpt-5.6-sol"))).enabled).toBe(
-        true,
-      )
+      const gpt56 = required(yield* catalog.model.get(Provider.ID.openai, Model.ID.make("gpt-5.6-sol")))
+      expect(gpt56.enabled).toBe(true)
+      expect(gpt56.limit).toEqual({ context: 500_000, input: 372_000, output: 128_000 })
      expect(required(yield* catalog.model.get(Provider.ID.openai, Model.ID.make("gpt-4.1"))).enabled).toBe(false)
    }),
  )
@@ -234,7 +165,9 @@ describe("OpenAIPlugin", () => {
        catalog.provider.update(item.id, (draft) => {
          draft.package = item.package
        })
-        catalog.model.update(item.id, Model.ID.make("gpt-5.5"), () => {})
+        catalog.model.update(item.id, Model.ID.make("gpt-5.5"), (model) => {
+          model.limit = { context: 1_050_000, input: 922_000, output: 128_000 }
+        })
        catalog.model.update(item.id, Model.ID.make("gpt-4.1"), () => {})
      })
      yield* credentials.create({
@@ -243,29 +176,23 @@ describe("OpenAIPlugin", () => {
      })
      yield* addPlugin()

-      expect(required(yield* catalog.model.get(Provider.ID.openai, Model.ID.make("gpt-5.5"))).enabled).toBe(true)
+      const request = yield* (yield* PluginHooks.Service).trigger("session", "request", {
+        sessionID: Session.ID.make("ses_test"),
+        agent: Agent.ID.make("build"),
+        model: Model.Ref.make({ providerID: Provider.ID.openai, id: Model.ID.make("gpt-5.5") }),
+        url: "https://api.openai.com/v1/responses",
+        method: "POST",
+        headers: {},
+        body: "{}",
+      })
+
+      const model = required(yield* catalog.model.get(Provider.ID.openai, Model.ID.make("gpt-5.5")))
+      expect(model.package).toBe("@opencode-ai/ai/providers/openai")
+      expect(model.enabled).toBe(true)
+      expect(model.limit).toEqual({ context: 1_050_000, input: 922_000, output: 128_000 })
+      expect(request.headers).toEqual({})
      expect(required(yield* catalog.model.get(Provider.ID.openai, Model.ID.make("gpt-4.1"))).enabled).toBe(true)
    }),
  )

-  it.effect("does not disable gpt-5-chat-latest for non-OpenAI providers", () =>
-    Effect.gen(function* () {
-      const catalog = yield* Catalog.Service
-      yield* catalog.transform((catalog) => {
-        const item = Provider.Info.make({
-          ...Provider.Info.empty(Provider.ID.make("custom-openai")),
-          package: Provider.aisdk("test-provider"),
-        })
-        catalog.provider.update(item.id, (draft) => {
-          draft.package = item.package
-        })
-        catalog.model.update(item.id, Model.ID.make("gpt-5-chat-latest"), () => {})
-      })
-      yield* addPlugin()
-      expect(
-        required(yield* catalog.model.get(Provider.ID.make("custom-openai"), Model.ID.make("gpt-5-chat-latest")))
-          .enabled,
-      ).toBe(true)
-    }),
-  )
 })
@@ -71,6 +71,27 @@ function withTmp<A, E, R>(f: (directory: string) => Effect.Effect<A, E, R>) {
 }

 describe("Session.create", () => {
+  it.effect("persists a missing title until one is generated or supplied", () =>
+    Effect.gen(function* () {
+      const session = yield* Session.Service
+      const { db } = yield* Database.Service
+
+      const created = yield* session.create({ location })
+      const row = yield* db.select().from(SessionTable).where(eq(SessionTable.id, created.id)).get().pipe(Effect.orDie)
+      const event = yield* db
+        .select({ data: EventTable.data })
+        .from(EventTable)
+        .where(eq(EventTable.aggregate_id, created.id))
+        .get()
+        .pipe(Effect.orDie)
+
+      expect(created.title).toBeUndefined()
+      expect(row?.title).toBeNull()
+      expect(event?.data).not.toHaveProperty("info.title")
+      expect((yield* session.create({ location, title: "Explicit title" })).title).toBe("Explicit title")
+    }),
+  )
+
  it.effect("creates a fresh projected session when the ID is omitted", () =>
    Effect.gen(function* () {
      const session = yield* Session.Service
@@ -296,6 +317,23 @@ describe("Session.create", () => {
    }),
  )

+  it.effect("keeps a fork untitled when its parent is untitled", () =>
+    Effect.gen(function* () {
+      const session = yield* Session.Service
+      const bus = yield* Bus.Service
+      const { db } = yield* Database.Service
+      const parent = yield* session.create({ location })
+      yield* session.prompt({ sessionID: parent.id, text: "First", resume: false })
+      yield* SessionPending.promote(db, bus, parent.id, "steer")
+
+      const forked = yield* session.fork({ sessionID: parent.id, boundary: { type: "through" } })
+      const row = yield* db.select().from(SessionTable).where(eq(SessionTable.id, forked.id)).get().pipe(Effect.orDie)
+
+      expect(forked.title).toBeUndefined()
+      expect(row?.title).toBeNull()
+    }),
+  )
+
  it.effect("rejects forking an empty session", () =>
    Effect.gen(function* () {
      const session = yield* Session.Service
@@ -796,6 +796,59 @@ const verifyPartialFlushOnInterruption = (kind: FragmentKind) =>
  })

 describe("SessionRunnerLLM", () => {
+  it.effect("retries title generation from the first prompt after execution and title failures", () =>
+    Effect.gen(function* () {
+      const session = yield* setup
+      const agents = yield* Agent.Service
+      const { db } = yield* Database.Service
+      yield* db.update(SessionTable).set({ title: null }).where(eq(SessionTable.id, sessionID)).run().pipe(Effect.orDie)
+      yield* agents.transform((draft) =>
+        draft.update(Agent.ID.make("title"), (agent) => {
+          agent.mode = "primary"
+          agent.hidden = true
+          agent.system = "Generate a title."
+        }),
+      )
+
+      yield* admit(session, "First prompt")
+      yield* TestLLM.push(Stream.fail(invalidRequest()))
+      expect((yield* session.resume(sessionID).pipe(Effect.exit))._tag).toBe("Failure")
+
+      yield* admit(session, "Second prompt")
+      const titleFailed = yield* Deferred.make<void>()
+      yield* TestLLM.push(
+        TestLLM.text("Recovered", "text-recovered"),
+        Stream.make(LLMEvent.providerError({ message: "Title provider unavailable" })).pipe(
+          Stream.ensuring(Deferred.succeed(titleFailed, undefined)),
+        ),
+      )
+      yield* session.resume(sessionID)
+      yield* Deferred.await(titleFailed)
+      yield* Effect.yieldNow
+      expect((yield* session.get(sessionID)).title).toBeUndefined()
+
+      const bus = yield* Bus.Service
+      const renamed = yield* bus.subscribe(SessionEvent.Renamed).pipe(
+        Stream.filter((event) => event.data.sessionID === sessionID),
+        Stream.take(1),
+        Stream.runCollect,
+        Effect.forkScoped({ startImmediately: true }),
+      )
+      yield* admit(session, "Third prompt")
+      yield* TestLLM.push(
+        TestLLM.text("Recovered again", "text-recovered-again"),
+        TestLLM.text("Generated title", "text-title"),
+      )
+      yield* session.resume(sessionID)
+      yield* Fiber.join(renamed)
+
+      expect(requests).toHaveLength(5)
+      expect(requests[2]?.messages).toContainEqual(Message.user("First prompt"))
+      expect(requests[4]?.messages).toContainEqual(Message.user("First prompt"))
+      expect((yield* session.get(sessionID)).title).toBe("Generated title")
+    }),
+  )
+
  it.effect("applies session context hooks without exposing unavailable tools", () =>
    Effect.gen(function* () {
      const session = yield* setup
@@ -20,7 +20,7 @@ import { ProjectTable } from "@opencode-ai/core/project/sql"
 import { App } from "@opencode-ai/core/app"
 import { AbsolutePath } from "@opencode-ai/core/schema"
 import { Money } from "@opencode-ai/schema/money"
-import { Effect, Layer, Stream } from "effect"
+import { Deferred, Effect, Fiber, Layer, Stream } from "effect"
 import { testEffect } from "./lib/effect"

 let requests: LLMRequest[] = []
@@ -39,27 +39,30 @@ const cost = [
    },
  },
 ]
+const successfulTitle = () =>
+  Stream.make(
+    LLMEvent.textDelta({ id: "title", text: "Generated Title\n" }),
+    LLMEvent.stepFinish({
+      index: 0,
+      reason: { normalized: "stop" },
+      usage: {
+        inputTokens: 15,
+        outputTokens: 6,
+        nonCachedInputTokens: 10,
+        cacheReadInputTokens: 3,
+        cacheWriteInputTokens: 2,
+        reasoningTokens: 2,
+      },
+    }),
+    LLMEvent.finish({
+      reason: { normalized: "stop" },
+    }),
+  )
+let titleStream: () => Stream.Stream<LLMEvent> = successfulTitle
 const client = Layer.mock(LLMClient.Service)({
  stream: (request: LLMRequest) => {
    requests.push(request)
-    return Stream.make(
-      LLMEvent.textDelta({ id: "title", text: "Generated Title\n" }),
-      LLMEvent.stepFinish({
-        index: 0,
-        reason: { normalized: "stop" },
-        usage: {
-          inputTokens: 15,
-          outputTokens: 6,
-          nonCachedInputTokens: 10,
-          cacheReadInputTokens: 3,
-          cacheWriteInputTokens: 2,
-          reasoningTokens: 2,
-        },
-      }),
-      LLMEvent.finish({
-        reason: { normalized: "stop" },
-      }),
-    )
+    return titleStream()
  },
  generate: () => Effect.die("unused"),
 })
@@ -89,7 +92,7 @@ const it = testEffect(
  ),
 )

-const insertSession = (id: Session.ID) =>
+const insertSession = (id: Session.ID, title?: string, created?: number) =>
  Effect.gen(function* () {
    const { db } = yield* Database.Service
    yield* db
@@ -105,7 +108,8 @@ const insertSession = (id: Session.ID) =>
        project_id: Project.ID.global,
        slug: id,
        directory: "/project",
-        title: "New session - fake",
+        title,
+        time_created: created,
        version: "test",
      })
      .onConflictDoNothing()
@@ -131,6 +135,7 @@ const prompt = (sessionID: Session.ID, text: string) =>
 it.effect("generates a title from the sole user message and renames the session", () =>
  Effect.gen(function* () {
    requests = []
+    titleStream = successfulTitle
    const agentService = yield* Agent.Service
    yield* agentService.transform((editor) => {
      editor.update(Agent.ID.make("title"), (agent) => {
@@ -144,11 +149,8 @@ it.effect("generates a title from the sole user message and renames the session"
    yield* prompt(sessionID, "Help me debug the failing build")

    const store = yield* SessionStore.Service
-    const session = yield* store
-      .get(sessionID)
-      .pipe(Effect.flatMap((session) => (session ? Effect.succeed(session) : Effect.die("session missing"))))
    const title = yield* SessionTitle.Service
-    yield* title.generateForFirstPrompt(session)
+    yield* title.generateForFirstPrompt(sessionID)

    expect(requests).toHaveLength(1)
    expect(requests[0]?.http?.headers).toEqual({
@@ -167,9 +169,10 @@ it.effect("generates a title from the sole user message and renames the session"
  }),
 )

-it.effect("does not generate once a second user message exists", () =>
+it.effect("generates from the first user message after later messages exist", () =>
  Effect.gen(function* () {
    requests = []
+    titleStream = successfulTitle
    const agentService = yield* Agent.Service
    yield* agentService.transform((editor) => {
      editor.update(Agent.ID.make("title"), (agent) => {
@@ -184,21 +187,46 @@ it.effect("does not generate once a second user message exists", () =>
    yield* prompt(sessionID, "Second message")

    const store = yield* SessionStore.Service
-    const session = yield* store
-      .get(sessionID)
-      .pipe(Effect.flatMap((session) => (session ? Effect.succeed(session) : Effect.die("session missing"))))
    const title = yield* SessionTitle.Service
-    yield* title.generateForFirstPrompt(session)
+    yield* title.generateForFirstPrompt(sessionID)

-    expect(requests).toHaveLength(0)
-    const untouched = yield* store.get(sessionID)
-    expect(untouched?.title).toBe("New session - fake")
+    expect(requests).toHaveLength(1)
+    expect(JSON.stringify(requests[0]?.messages)).toContain("First message")
+    expect(JSON.stringify(requests[0]?.messages)).not.toContain("Second message")
+    expect((yield* store.get(sessionID))?.title).toBe("Generated Title")
+  }),
+)
+
+it.effect("retries a legacy persisted fallback title", () =>
+  Effect.gen(function* () {
+    requests = []
+    titleStream = successfulTitle
+    const agentService = yield* Agent.Service
+    yield* agentService.transform((editor) => {
+      editor.update(Agent.ID.make("title"), (agent) => {
+        agent.mode = "primary"
+        agent.hidden = true
+        agent.system = "You are a title generator."
+      })
+    })
+    const sessionID = Session.ID.make("ses_title_legacy")
+    const created = Date.parse("2026-07-30T18:45:03.662Z")
+    yield* insertSession(sessionID, "New session - 2026-07-30T18:45:03.662Z", created)
+    yield* prompt(sessionID, "Retry the legacy title")
+
+    const title = yield* SessionTitle.Service
+    yield* title.generateForFirstPrompt(sessionID)
+
+    const store = yield* SessionStore.Service
+    expect(requests).toHaveLength(1)
+    expect((yield* store.get(sessionID))?.title).toBe("Generated Title")
  }),
 )

 it.effect("does not generate for a child session", () =>
  Effect.gen(function* () {
    requests = []
+    titleStream = successfulTitle
    const agentService = yield* Agent.Service
    yield* agentService.transform((editor) => {
      editor.update(Agent.ID.make("title"), (agent) => {
@@ -223,7 +251,6 @@ it.effect("does not generate for a child session", () =>
        parent_id: Session.ID.make("ses_title_parent"),
        slug: sessionID,
        directory: "/project",
-        title: "Child session - fake",
        version: "test",
      })
      .onConflictDoNothing()
@@ -231,12 +258,8 @@ it.effect("does not generate for a child session", () =>
      .pipe(Effect.orDie)
    yield* prompt(sessionID, "Do this subtask")

-    const store = yield* SessionStore.Service
-    const session = yield* store
-      .get(sessionID)
-      .pipe(Effect.flatMap((session) => (session ? Effect.succeed(session) : Effect.die("session missing"))))
    const title = yield* SessionTitle.Service
-    yield* title.generateForFirstPrompt(session)
+    yield* title.generateForFirstPrompt(sessionID)

    expect(requests).toHaveLength(0)
  }),
@@ -245,19 +268,100 @@ it.effect("does not generate for a child session", () =>
 it.effect("does not generate when the title agent is removed", () =>
  Effect.gen(function* () {
    requests = []
+    titleStream = successfulTitle
    const sessionID = Session.ID.make("ses_title_no_agent")
    yield* insertSession(sessionID)
    yield* prompt(sessionID, "Help me debug the failing build")

    const store = yield* SessionStore.Service
-    const session = yield* store
-      .get(sessionID)
-      .pipe(Effect.flatMap((session) => (session ? Effect.succeed(session) : Effect.die("session missing"))))
    const title = yield* SessionTitle.Service
-    yield* title.generateForFirstPrompt(session)
+    yield* title.generateForFirstPrompt(sessionID)

    expect(requests).toHaveLength(0)
    const untouched = yield* store.get(sessionID)
-    expect(untouched?.title).toBe("New session - fake")
+    expect(untouched?.title).toBeUndefined()
+  }),
+)
+
+it.effect("does not overwrite an explicit title", () =>
+  Effect.gen(function* () {
+    requests = []
+    titleStream = successfulTitle
+    const sessionID = Session.ID.make("ses_title_explicit")
+    yield* insertSession(sessionID)
+    yield* prompt(sessionID, "Help me debug the failing build")
+    const events = yield* Bus.Service
+    yield* events.publish(SessionEvent.Renamed, { sessionID, title: "New session - 2099-01-01T00:00:00.000Z" })
+
+    const title = yield* SessionTitle.Service
+    yield* title.generateForFirstPrompt(sessionID)
+
+    const store = yield* SessionStore.Service
+    expect(requests).toHaveLength(0)
+    expect((yield* store.get(sessionID))?.title).toBe("New session - 2099-01-01T00:00:00.000Z")
+  }),
+)
+
+it.effect("retries after a failed title request", () =>
+  Effect.gen(function* () {
+    requests = []
+    const agentService = yield* Agent.Service
+    yield* agentService.transform((editor) => {
+      editor.update(Agent.ID.make("title"), (agent) => {
+        agent.mode = "primary"
+        agent.hidden = true
+        agent.system = "You are a title generator."
+      })
+    })
+    const sessionID = Session.ID.make("ses_title_retry")
+    yield* insertSession(sessionID)
+    yield* prompt(sessionID, "Retry this title")
+    const title = yield* SessionTitle.Service
+    titleStream = () => Stream.make(LLMEvent.providerError({ message: "Provider unavailable" }))
+
+    yield* title.generateForFirstPrompt(sessionID)
+    titleStream = successfulTitle
+    yield* title.generateForFirstPrompt(sessionID)
+
+    const store = yield* SessionStore.Service
+    expect(requests).toHaveLength(2)
+    expect((yield* store.get(sessionID))?.title).toBe("Generated Title")
+  }),
+)
+
+it.effect("preserves a manual rename completed while generation is in flight", () =>
+  Effect.gen(function* () {
+    requests = []
+    const agentService = yield* Agent.Service
+    yield* agentService.transform((editor) => {
+      editor.update(Agent.ID.make("title"), (agent) => {
+        agent.mode = "primary"
+        agent.hidden = true
+        agent.system = "You are a title generator."
+      })
+    })
+    const sessionID = Session.ID.make("ses_title_manual_rename")
+    yield* insertSession(sessionID)
+    yield* prompt(sessionID, "Generate this title")
+    const started = yield* Deferred.make<void>()
+    const release = yield* Deferred.make<void>()
+    titleStream = () =>
+      Stream.unwrap(
+        Deferred.succeed(started, undefined).pipe(
+          Effect.andThen(Deferred.await(release)),
+          Effect.as(successfulTitle()),
+        ),
+      )
+    const title = yield* SessionTitle.Service
+    const fiber = yield* title.generateForFirstPrompt(sessionID).pipe(Effect.forkScoped)
+    yield* Deferred.await(started)
+    const events = yield* Bus.Service
+    yield* events.publish(SessionEvent.Renamed, { sessionID, title: "Manual title" })
+    yield* Deferred.succeed(release, undefined)
+    yield* Fiber.join(fiber)
+
+    const store = yield* SessionStore.Service
+    expect(requests).toHaveLength(1)
+    expect((yield* store.get(sessionID))?.title).toBe("Manual title")
  }),
 )
@@ -47,7 +47,7 @@ const executionNode = makeGlobalNode({
      const completed = new Set<Session.ID>()
      const complete = Effect.fn("SubagentTest.complete")(function* (sessionID: Session.ID) {
        if (completed.has(sessionID)) return
-        if ((yield* store.get(sessionID))?.title.includes("fail")) {
+        if ((yield* store.get(sessionID))?.title?.includes("fail")) {
          yield* new SessionRunnerModel.ModelNotSelectedError({ sessionID })
          return
        }
@@ -158,6 +158,11 @@ export default function () {
          const match = createMemo(() => Binary.search(data().session, data().sessionID, (s) => s.id))
          if (!match().found) throw new Error(`Session ${data().sessionID} not found`)
          const info = createMemo(() => data().session[match().index])
+          const title = createMemo(
+            () =>
+              info().title ??
+              `${info().parentID ? "Child" : "New"} session - ${new Date(info().time.created).toISOString()}`,
+          )
          const ogImage = createMemo(() => {
            const models = new Set<string>()
            const messages = data().message[data().sessionID] ?? []
@@ -167,7 +172,7 @@ export default function () {
              }
            }
            const modelIDs = Array.from(models)
-            const encodedTitle = encodeURIComponent(Base64.encode(encodeURIComponent(info().title.substring(0, 700))))
+            const encodedTitle = encodeURIComponent(Base64.encode(encodeURIComponent(title().substring(0, 700))))
            let modelParam: string
            if (modelIDs.length === 1) {
              modelParam = modelIDs[0]
@@ -184,9 +189,7 @@ export default function () {

          return (
            <>
-              <Show when={info().title}>
-                <Title>{info().title} | OpenCode</Title>
-              </Show>
+              <Title>{title()} | OpenCode</Title>
              <Meta name="description" content="opencode - The AI coding agent built for the terminal." />
              <Meta property="og:image" content={ogImage()} />
              <Meta name="twitter:image" content={ogImage()} />
@@ -240,7 +243,7 @@ export default function () {
                              </div>
                            </div>
                          </div>
-                          <div class="text-left text-16-medium text-text-strong">{info().title}</div>
+                          <div class="text-left text-16-medium text-text-strong">{title()}</div>
                        </div>
                      )

@@ -31,9 +31,9 @@
  },
  "peerDependencies": {
    "@opencode-ai/theme": "workspace:*",
-    "@opentui/core": ">=0.4.5",
-    "@opentui/keymap": ">=0.4.5",
-    "@opentui/solid": ">=0.4.5",
+    "@opentui/core": "0.0.0-20260731-669d7f5c",
+    "@opentui/keymap": "0.0.0-20260731-669d7f5c",
+    "@opentui/solid": "0.0.0-20260731-669d7f5c",
    "solid-js": ">=1.9.0"
  },
  "peerDependenciesMeta": {
@@ -1,5 +1,6 @@
 import type { SessionApi } from "@opencode-ai/client/effect/api"
 import type { Message, SystemPart } from "@opencode-ai/ai"
+import type { HttpRequest } from "@opencode-ai/ai/route"
 import type { Agent } from "@opencode-ai/schema/agent"
 import type { Model } from "@opencode-ai/schema/model"
 import type { Session } from "@opencode-ai/schema/session"
@@ -15,8 +16,15 @@ export interface SessionContext {
  tools: Record<string, { description: string; input: JsonSchema.JsonSchema }>
 }

+export interface SessionRequest extends HttpRequest {
+  readonly sessionID: Session.ID
+  readonly agent: Agent.ID
+  readonly model: Model.Ref
+}
+
 export interface SessionHooks {
  readonly context: SessionContext
+  readonly request: SessionRequest
 }

 export type SessionDomain = Pick<
@@ -1,5 +1,6 @@
 import type { SessionApi } from "@opencode-ai/client/promise/api"
 import type { Message, SystemPart } from "@opencode-ai/ai"
+import type { HttpRequest } from "@opencode-ai/ai/route"
 import type { Agent } from "@opencode-ai/schema/agent"
 import type { Model } from "@opencode-ai/schema/model"
 import type { Session } from "@opencode-ai/schema/session"
@@ -15,8 +16,15 @@ export interface SessionContext {
  tools: Record<string, { description: string; input: JsonSchema.JsonSchema }>
 }

+export interface SessionRequest extends HttpRequest {
+  readonly sessionID: Session.ID
+  readonly agent: Agent.ID
+  readonly model: Model.Ref
+}
+
 export interface SessionHooks {
  readonly context: SessionContext
+  readonly request: SessionRequest
 }

 export type SessionDomain = Pick<
@@ -136,9 +136,6 @@ export interface SlotMap {
    readonly sessionID?: string
    readonly mode: "normal" | "shell"
  }
-  readonly "session.composer.top": {
-    readonly sessionID: string
-  }
  readonly "sidebar.content": {
    readonly sessionID: string
  }
@@ -42,7 +42,7 @@ export const Info = Schema.Struct({
    updated: DateTimeUtcFromMillis,
    archived: DateTimeUtcFromMillis.pipe(optional),
  }),
-  title: Schema.String,
+  title: Schema.String.pipe(optional),
  location: Location.Ref,
  subpath: RelativePath.pipe(optional),
  revert: Revert.pipe(optional),
@@ -552,7 +552,7 @@ export const SessionInfo = Schema.Struct({
  cost: optional(Schema.Finite),
  tokens: optional(SessionTokens),
  share: optional(SessionShare),
-  title: Schema.String,
+  title: optional(Schema.String),
  agent: optional(Schema.String),
  model: optional(SessionModel),
  version: Schema.String,
@@ -17,7 +17,7 @@ import { Money } from "../src/money.js"
 import { Skill } from "../src/skill.js"
 import { Shell } from "../src/shell.js"
 import { PersistedRevert } from "../src/session-revert.js"
-import { optional } from "../src/schema.js"
+import { AbsolutePath, optional } from "../src/schema.js"

 describe("contract hygiene", () => {
  test("restricts agent colors to six-digit hex values", () => {
@@ -52,6 +52,18 @@ describe("contract hygiene", () => {
        metadata: undefined,
      }),
    ).toEqual({ text: "completed" })
+
+    expect(
+      Schema.encodeSync(Session.Info)({
+        id: Session.ID.make("ses_untitled"),
+        projectID: Project.ID.make("global"),
+        cost: Money.USD.zero,
+        tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
+        time: { created: DateTime.makeUnsafe(0), updated: DateTime.makeUnsafe(0) },
+        title: undefined,
+        location: { directory: AbsolutePath.make("/project") },
+      }),
+    ).not.toHaveProperty("title")
  })

  test("pending session items omit the internal admission sequence", () => {
@@ -92,7 +92,6 @@
    "@opentui/keymap": "catalog:",
    "@opentui/solid": "catalog:",
    "@solid-primitives/event-bus": "1.1.2",
-    "clipboardy": "4.0.0",
    "diff": "catalog:",
    "effect": "catalog:",
    "fuzzysort": "catalog:",
@@ -92,6 +92,7 @@ import { destroyRenderer } from "./util/renderer"
 import { cliErrorMessage, errorFormat } from "./util/error"
 import { AttentionProvider } from "./context/attention"
 import { StorageProvider } from "./context/storage"
+import { createTuiClipboard, formatClipboardWriteNotification } from "./clipboard"

 registerOpencodeSpinner()

@@ -258,6 +259,13 @@ export const run = Effect.fn("Tui.run")(function* (input: TuiInput) {
          (renderer) => Effect.sync(() => destroyRenderer(renderer)),
        )
      })
+      const clipboard = yield* Effect.acquireRelease(
+        Effect.sync(() => createTuiClipboard(renderer)),
+        (clipboard) =>
+          Effect.tryPromise(() => clipboard.dispose()).pipe(
+            Effect.catch((error) => Effect.sync(() => log("error", "Failed to dispose TUI clipboard", { error }))),
+          ),
+      )
      win32DisableProcessedInput()
      const finalizers = new Set<() => Promise<void>>()
      yield* Effect.addFinalizer(() =>
@@ -293,57 +301,57 @@ export const run = Effect.fn("Tui.run")(function* (input: TuiInput) {
              >
                <EpilogueProvider set={(value) => (exit.epilogue = value)}>
                  <TuiAppProvider value={input.app}>
-                    <ErrorBoundary
-                      fallback={(error, reset) => <ErrorComponent error={error} reset={reset} mode={mode} />}
-                    >
-                      <TuiPathsProvider
-                        value={{
-                          cwd: process.cwd(),
-                          home: global.home,
-                          state: global.state,
-                          worktree: global.data + "/worktree",
-                        }}
+                    <ClipboardProvider value={clipboard}>
+                      <ErrorBoundary
+                        fallback={(error, reset) => <ErrorComponent error={error} reset={reset} mode={mode} />}
                      >
-                        <StorageProvider>
-                          <TuiLifecycleProvider
-                            value={{
-                              add(finalizer) {
-                                finalizers.add(finalizer)
-                                return () => finalizers.delete(finalizer)
-                              },
-                            }}
-                          >
-                            <TuiTerminalEnvironmentProvider
+                        <TuiPathsProvider
+                          value={{
+                            cwd: process.cwd(),
+                            home: global.home,
+                            state: global.state,
+                            worktree: global.data + "/worktree",
+                          }}
+                        >
+                          <StorageProvider>
+                            <TuiLifecycleProvider
                              value={{
-                                platform: process.platform,
-                                multiplexer: process.env.TMUX ? "tmux" : process.env.STY ? "screen" : undefined,
-                                displayServer: process.env.WAYLAND_DISPLAY
-                                  ? "wayland"
-                                  : process.env.DISPLAY
-                                    ? "x11"
-                                    : undefined,
+                                add(finalizer) {
+                                  finalizers.add(finalizer)
+                                  return () => finalizers.delete(finalizer)
+                                },
                              }}
                            >
-                              <TuiStartupProvider
+                              <TuiTerminalEnvironmentProvider
                                value={{
-                                  initialRoute: process.env.OPENCODE_STORY
-                                    ? {
-                                        type: "plugin",
-                                        id: "opencode.storybook",
-                                        name: "storybook",
-                                        // OPENCODE_STORY=1 opens the index; any other value opens that story.
-                                        data:
-                                          process.env.OPENCODE_STORY === "1"
-                                            ? undefined
-                                            : { story: process.env.OPENCODE_STORY },
-                                      }
-                                    : process.env.OPENCODE_ROUTE
-                                      ? JSON.parse(process.env.OPENCODE_ROUTE)
+                                  platform: process.platform,
+                                  multiplexer: process.env.TMUX ? "tmux" : process.env.STY ? "screen" : undefined,
+                                  displayServer: process.env.WAYLAND_DISPLAY
+                                    ? "wayland"
+                                    : process.env.DISPLAY
+                                      ? "x11"
                                      : undefined,
-                                  skipInitialLoading: Boolean(process.env.OPENCODE_FAST_BOOT),
                                }}
                              >
-                                <ClipboardProvider>
+                                <TuiStartupProvider
+                                  value={{
+                                    initialRoute: process.env.OPENCODE_STORY
+                                      ? {
+                                          type: "plugin",
+                                          id: "opencode.storybook",
+                                          name: "storybook",
+                                          // OPENCODE_STORY=1 opens the index; any other value opens that story.
+                                          data:
+                                            process.env.OPENCODE_STORY === "1"
+                                              ? undefined
+                                              : { story: process.env.OPENCODE_STORY },
+                                        }
+                                      : process.env.OPENCODE_ROUTE
+                                        ? JSON.parse(process.env.OPENCODE_ROUTE)
+                                        : undefined,
+                                    skipInitialLoading: Boolean(process.env.OPENCODE_FAST_BOOT),
+                                  }}
+                                >
                                  <ArgsProvider {...input.args}>
                                    <ConfigProvider
                                      config={config}
@@ -408,13 +416,13 @@ export const run = Effect.fn("Tui.run")(function* (input: TuiInput) {
                                      </Keymap.Provider>
                                    </ConfigProvider>
                                  </ArgsProvider>
-                                </ClipboardProvider>
-                              </TuiStartupProvider>
-                            </TuiTerminalEnvironmentProvider>
-                          </TuiLifecycleProvider>
-                        </StorageProvider>
-                      </TuiPathsProvider>
-                    </ErrorBoundary>
+                                </TuiStartupProvider>
+                              </TuiTerminalEnvironmentProvider>
+                            </TuiLifecycleProvider>
+                          </StorageProvider>
+                        </TuiPathsProvider>
+                      </ErrorBoundary>
+                    </ClipboardProvider>
                  </TuiAppProvider>
                </EpilogueProvider>
              </ExitProvider>
@@ -509,8 +517,10 @@ function App(props: { pair?: DialogPairCredentials }) {
    if (!text || text.length === 0) return

    await clipboard
-      .write?.(text)
-      .then(() => toast.show({ message: "Copied to clipboard", variant: "info" }))
+      .write(text)
+      .then((outcome) =>
+        toast.show(formatClipboardWriteNotification(outcome, { message: "Copied to clipboard", variant: "info" })),
+      )
      .catch(toast.error)

    renderer.clearSelection()
@@ -523,7 +533,7 @@ function App(props: { pair?: DialogPairCredentials }) {
    renderer.useMouse = config.data.mouse
  })

-  let active: { id: string; title: string } | undefined
+  let active: { id: string; title?: string } | undefined
  // Update terminal window title based on current route and session
  createEffect(() => {
    const session = route.data.type === "session" ? data.session.get(route.data.sessionID) : undefined
@@ -536,13 +546,13 @@ function App(props: { pair?: DialogPairCredentials }) {
    }

    if (route.data.type === "session") {
-      if (!session || isDefaultTitle(session.title)) {
+      const title = session?.title
+      if (!title || isDefaultTitle(title)) {
        renderer.setTerminalTitle("OpenCode")
        return
      }

-      const title = session.title.length > 40 ? session.title.slice(0, 37) + "..." : session.title
-      renderer.setTerminalTitle(`OC | ${title}`)
+      renderer.setTerminalTitle(`OC | ${title.length > 40 ? title.slice(0, 37) + "..." : title}`)
      return
    }

@@ -646,6 +656,7 @@ function App(props: { pair?: DialogPairCredentials }) {
        run: () => {
          route.navigate({
            type: "home",
+            location: route.data.type === "session" ? data.session.get(route.data.sessionID)?.location : undefined,
          })
          dialog.clear()
        },
@@ -1,124 +1,136 @@
-import { execFile, spawn } from "node:child_process"
-import { readFile, rm } from "node:fs/promises"
-import { platform, release, tmpdir } from "node:os"
-import path from "node:path"
-import { promisify } from "node:util"
+import {
+  createClipboard,
+  createHostClipboard,
+  createRendererClipboardAdapter,
+  decodePasteBytes,
+  type ClipboardService as CoreClipboardService,
+  type ClipboardWriteResult,
+  type RendererClipboardBoundary,
+} from "@opentui/core"
+import type { ClipboardService, ClipboardWriteOutcome } from "./context/clipboard"

-const exec = promisify(execFile)
+const timeoutMs = 1_000
+const maxReadBytes = 8 * 1024 * 1024

-function command(command: string, args: string[] = [], input?: string) {
-  return new Promise<Buffer>((resolve, reject) => {
-    const child = spawn(command, args, { stdio: [input === undefined ? "ignore" : "pipe", "pipe", "ignore"] })
-    const output: Buffer[] = []
-    child.on("error", reject)
-    child.stdout?.on("data", (chunk: Buffer) => output.push(chunk))
-    child.on("close", (code) => {
-      if (code === 0) return resolve(Buffer.concat(output))
-      reject(new Error(`${command} exited with code ${code}`))
-    })
-    if (input !== undefined) child.stdin?.end(input)
-  })
-}
+export type ClipboardNotification = Readonly<{
+  message: string
+  variant: "info" | "success" | "warning"
+}>

-function writeOsc52(text: string) {
-  if (!process.stdout.isTTY) return
-  const sequence = `\x1b]52;c;${Buffer.from(text).toString("base64")}\x07`
-  process.stdout.write(process.env.TMUX || process.env.STY ? `\x1bPtmux;\x1b${sequence}\x1b\\` : sequence)
-}
+export type ClipboardCopyState =
+  | "idle"
+  | "confirmed"
+  | "confirmed-partial"
+  | "attempted"
+  | "attempted-partial"
+  | "failed"

-export async function read() {
-  if (platform() === "darwin") {
-    const file = path.join(tmpdir(), "opencode-clipboard.png")
-    try {
-      await exec("osascript", [
-        "-e",
-        'set imageData to the clipboard as "PNGf"',
-        "-e",
-        `set fileRef to open for access POSIX file "${file}" with write permission`,
-        "-e",
-        "set eof fileRef to 0",
-        "-e",
-        "write imageData to fileRef",
-        "-e",
-        "close access fileRef",
-      ])
-      return { data: (await readFile(file)).toString("base64"), mime: "image/png" }
-    } catch {
-      // Fall through to text clipboard.
-    } finally {
-      await rm(file, { force: true }).catch(() => {})
-    }
-  }
+export type OwnedClipboardService = ClipboardService & Readonly<{ dispose(): Promise<void> }>

-  if (platform() === "win32" || release().includes("WSL")) {
-    const script =
-      "Add-Type -AssemblyName System.Windows.Forms; $img = [System.Windows.Forms.Clipboard]::GetImage(); if ($img) { $ms = New-Object System.IO.MemoryStream; $img.Save($ms, [System.Drawing.Imaging.ImageFormat]::Png); [System.Convert]::ToBase64String($ms.ToArray()) }"
-    const image = await command("powershell.exe", ["-NonInteractive", "-NoProfile", "-command", script]).catch(() =>
-      Buffer.alloc(0),
+export class ClipboardWriteError extends Error {
+  readonly result: ClipboardWriteResult
+
+  constructor(result: ClipboardWriteResult) {
+    super(
+      `Clipboard write failed (host: ${result.host.status}, terminal: ${result.terminal.status})`,
+      result.host.status === "failed" ? { cause: result.host.error } : undefined,
    )
-    if (image.length) return { data: image.toString().trim(), mime: "image/png" }
-  }
-
-  if (platform() === "linux") {
-    const wayland = await command("wl-paste", ["-t", "image/png"]).catch(() => Buffer.alloc(0))
-    if (wayland.length) return { data: wayland.toString("base64"), mime: "image/png" }
-    const x11 = await command("xclip", ["-selection", "clipboard", "-t", "image/png", "-o"]).catch(() =>
-      Buffer.alloc(0),
-    )
-    if (x11.length) return { data: x11.toString("base64"), mime: "image/png" }
-  }
-
-  const { default: clipboardy } = await import("clipboardy")
-  const text = await clipboardy.read().catch(() => undefined)
-  if (text) return { data: text, mime: "text/plain" }
-}
-
-export function copyCommand(
-  os: NodeJS.Platform,
-  wayland: boolean,
-  has: (name: string) => boolean,
-): string[] | undefined {
-  if (os === "darwin" && has("osascript")) return ["osascript"]
-  if (os === "linux" && wayland && has("wl-copy")) return ["wl-copy"]
-  if (os === "linux" && has("xclip")) return ["xclip", "-selection", "clipboard"]
-  if (os === "linux" && has("xsel")) return ["xsel", "--clipboard", "--input"]
-  if (os === "win32" && has("powershell.exe")) {
-    return [
-      "powershell.exe",
-      "-NonInteractive",
-      "-NoProfile",
-      "-Command",
-      "[Console]::InputEncoding = [System.Text.Encoding]::UTF8; Set-Clipboard -Value ([Console]::In.ReadToEnd())",
-    ]
+    this.name = "ClipboardWriteError"
+    this.result = result
  }
 }

-let copyMethod: Promise<(text: string) => Promise<void>> | undefined
+export function createTuiClipboard(renderer: RendererClipboardBoundary): OwnedClipboardService {
+  return createClipboardAdapter(
+    createClipboard({
+      host: createHostClipboard({
+        timeoutMs,
+        maxReadBytes,
+        maxWriteBytes: 8 * 1024 * 1024,
+        maxImagePixels: 64 * 1024 * 1024,
+        maxConversionBytes: 512 * 1024 * 1024,
+        maxConcurrentOperations: 16,
+        maxProviderTransfers: 16,
+        maxWorkUnitsPerDrain: 64,
+      }),
+      terminal: createRendererClipboardAdapter(renderer),
+    }),
+  )
+}

-function getCopyMethod() {
-  return (copyMethod ??= (async () => {
-    const { which } = await import("@opencode-ai/core/util/which")
-    const native = copyCommand(platform(), Boolean(process.env.WAYLAND_DISPLAY), (name) => Boolean(which(name)))
-    if (native?.[0] === "osascript") {
-      return async (text: string) => {
-        const escaped = text.replace(/\\/g, "\\\\").replace(/"/g, '\\"')
-        await command("osascript", ["-e", `set the clipboard to "${escaped}"`]).catch(() => undefined)
+export function createClipboardAdapter(clipboard: CoreClipboardService): OwnedClipboardService {
+  return {
+    async read() {
+      const result = await clipboard.read({
+        preferredTypes: ["image/png", "text/plain"],
+        selection: "clipboard",
+      })
+      if (result.status !== "read") {
+        if (result.status === "empty" || result.status === "unsupported" || result.status === "cancelled") return
+        if (result.status === "failed") throw result.error
+        if (result.status === "timed-out") throw new Error(`Clipboard read timed out after ${timeoutMs}ms`)
+        if (result.status === "limit-exceeded") {
+          throw new RangeError("Clipboard content exceeded configured read or image conversion limits")
+        }
+        throw new Error(`Unexpected clipboard read status: ${result.status}`)
      }
-    }
-    if (native) {
-      return async (text: string) => {
-        await command(native[0], native.slice(1), text).catch(() => undefined)
+
+      if (result.representation.mimeType === "image/png") {
+        return {
+          data: Buffer.from(result.representation.bytes).toString("base64"),
+          mime: result.representation.mimeType,
+        }
      }
-    }
-    return async (text: string) => {
-      const { default: clipboardy } = await import("clipboardy")
-      await clipboardy.write(text).catch(() => undefined)
-    }
-  })())
+      if (result.representation.mimeType === "text/plain") {
+        if (result.representation.bytes.length === 0) return
+        return {
+          data: decodePasteBytes(result.representation.bytes),
+          mime: result.representation.mimeType,
+        }
+      }
+      throw new Error(`Unexpected clipboard MIME type: ${result.representation.mimeType}`)
+    },
+    async write(text) {
+      return classifyClipboardWriteResult(
+        await clipboard.writeText(text, {
+          destination: "all-available",
+          selection: "clipboard",
+        }),
+      )
+    },
+    dispose() {
+      return clipboard.dispose()
+    },
+  }
 }

-export async function write(text: string) {
-  writeOsc52(text)
-  const method = await getCopyMethod()
-  await method(text)
+export function classifyClipboardWriteResult(result: ClipboardWriteResult): ClipboardWriteOutcome {
+  const partial =
+    result.host.status === "failed" ||
+    result.host.status === "timed-out" ||
+    result.host.status === "cancelled" ||
+    result.terminal.status === "local-failure"
+
+  if (result.host.status === "written") return { delivery: "confirmed", partial, result }
+  if (result.terminal.status === "attempted") return { delivery: "attempted", partial, result }
+  throw new ClipboardWriteError(result)
+}
+
+export function formatClipboardWriteNotification(
+  outcome: ClipboardWriteOutcome,
+  confirmed: ClipboardNotification,
+): ClipboardNotification {
+  if (outcome.delivery === "confirmed" && !outcome.partial) return confirmed
+  if (outcome.delivery === "attempted" && !outcome.partial) {
+    return { message: "Sent to terminal clipboard (acceptance unconfirmed)", variant: "info" }
+  }
+  if (outcome.delivery === "confirmed") {
+    return { message: "Copied to host clipboard; terminal clipboard dispatch failed", variant: "warning" }
+  }
+  return { message: "Sent to terminal clipboard; host clipboard write failed", variant: "warning" }
+}
+
+export function clipboardCopyState(outcome: ClipboardWriteOutcome): ClipboardCopyState {
+  if (!outcome.partial) return outcome.delivery
+  return `${outcome.delivery}-partial`
 }
@@ -93,6 +93,15 @@ export const settings: Setting[] = [
    values: ["none", "auto"],
    keywords: ["transcript", "messages"],
  },
+  {
+    title: "Transcript images",
+    category: "Session",
+    path: ["session", "image_preview"],
+    default: false,
+    values: [false, true],
+    labels: ["off", "on"],
+    keywords: ["attachments", "images", "tool output"],
+  },
  {
    title: "Enabled",
    category: "Tabs",
@@ -189,6 +198,15 @@ export const settings: Setting[] = [
    values: ["compact", "full"],
    keywords: ["paste summary", "clipboard", "pasted content"],
  },
+  {
+    title: "Image previews",
+    category: "Input",
+    path: ["prompt", "image_preview"],
+    default: false,
+    values: [false, true],
+    labels: ["off", "on"],
+    keywords: ["attachments", "clipboard", "images", "prompt"],
+  },
  {
    title: "Leader timeout",
    category: "Input",
@@ -9,6 +9,7 @@ import { useClipboard } from "../context/clipboard"
 import { useToast } from "../ui/toast"
 import { describeOS, describeTerminal } from "../util/system"
 import { useTuiApp } from "../context/runtime"
+import { formatClipboardWriteNotification } from "../clipboard"

 export function DialogDebug() {
  const theme = useTheme()
@@ -38,13 +39,22 @@ export function DialogDebug() {
    const text = entries()
      .map((entry) => `${entry.label}: ${entry.value}`)
      .join("\n")
+    setCopied(false)
    void clipboard
-      .write?.(text)
-      .then(() => {
-        setCopied(true)
-        toast.show({ message: "Debug info copied to clipboard", variant: "info" })
+      .write(text)
+      .then((outcome) => {
+        setCopied(outcome.delivery === "confirmed")
+        toast.show(
+          formatClipboardWriteNotification(outcome, {
+            message: "Debug info copied to clipboard",
+            variant: "info",
+          }),
+        )
+      })
+      .catch((error) => {
+        setCopied(false)
+        toast.error(error)
      })
-      .catch(toast.error)
  }

  Keymap.createLayer(() => ({
@@ -0,0 +1,77 @@
+import { TextAttributes } from "@opentui/core"
+import { useTerminalDimensions } from "@opentui/solid"
+import { createEffect, createMemo, createSignal, on } from "solid-js"
+import { Keymap } from "../context/keymap"
+import { useTheme } from "../context/theme"
+import { useDialog } from "../ui/dialog"
+
+type ImagePreviewItem = Readonly<{
+  uri: string
+  mention?: Readonly<{ text: string }>
+}>
+
+export function DialogImagePreview(props: { images: readonly ImagePreviewItem[]; initial: number }) {
+  const dialog = useDialog()
+  const dimensions = useTerminalDimensions()
+  const theme = useTheme("elevated")
+  const [index, setIndex] = createSignal(Math.max(0, Math.min(props.images.length - 1, props.initial)))
+  const [failed, setFailed] = createSignal(false)
+  const current = createMemo(() => props.images[index()])
+  const imageHeight = createMemo(() => Math.max(3, dimensions().height - 8))
+
+  dialog.setSize("xlarge")
+  dialog.setCentered(true)
+
+  function move(direction: number) {
+    if (props.images.length < 2) return
+    setIndex((value) => (value + direction + props.images.length) % props.images.length)
+  }
+
+  createEffect(
+    on(
+      () => current()?.uri,
+      () => setFailed(false),
+    ),
+  )
+
+  Keymap.createLayer(() => ({
+    mode: "modal",
+    commands: [
+      { bind: "left", title: "Previous image", group: "Dialog", run: () => move(-1) },
+      { bind: "right", title: "Next image", group: "Dialog", run: () => move(1) },
+    ],
+  }))
+
+  return (
+    <box id="image-viewer" paddingLeft={2} paddingRight={2} paddingBottom={1} gap={1}>
+      <box flexDirection="row" justifyContent="space-between">
+        <text attributes={TextAttributes.BOLD} fg={theme.text.default}>
+          Image {index() + 1} of {props.images.length}
+        </text>
+        <text fg={theme.text.subdued} onMouseUp={() => dialog.clear()}>
+          esc
+        </text>
+      </box>
+      <image
+        id="image-viewer-image"
+        source={current().uri}
+        fit="fit"
+        protocol="auto"
+        width="100%"
+        height={imageHeight()}
+        onError={() => setFailed(true)}
+      />
+      <box flexDirection="row" justifyContent="space-between">
+        <text fg={theme.text.subdued} onMouseUp={() => move(-1)}>
+          {props.images.length > 1 ? "← previous" : ""}
+        </text>
+        <text fg={failed() ? theme.text.feedback.error.default : theme.text.subdued} wrapMode="none" truncate>
+          {failed() ? "No preview" : (current().mention?.text ?? `Image ${index() + 1}`)}
+        </text>
+        <text fg={theme.text.subdued} onMouseUp={() => move(1)}>
+          {props.images.length > 1 ? "next →" : ""}
+        </text>
+      </box>
+    </box>
+  )
+}
@@ -8,6 +8,7 @@ import type {
 } from "@opencode-ai/client"
 import { createMemo, createSignal, onCleanup, onMount, Show } from "solid-js"
 import { useClipboard } from "../context/clipboard"
+import { formatClipboardWriteNotification } from "../clipboard"
 import { useData } from "../context/data"
 import { useClient } from "../context/client"
 import { Keymap } from "../context/keymap"
@@ -452,8 +453,12 @@ function OAuthAuto(props: {
        run: () => {
          const value = props.attempt.instructions.match(/[A-Z0-9]{4}-[A-Z0-9]{4,5}/)?.[0] ?? props.attempt.url
          clipboard
-            .write?.(value)
-            .then(() => toast.show({ message: "Copied to clipboard", variant: "info" }))
+            .write(value)
+            .then((outcome) =>
+              toast.show(
+                formatClipboardWriteNotification(outcome, { message: "Copied to clipboard", variant: "info" }),
+              ),
+            )
            .catch(toast.error)
        },
      },
@@ -9,6 +9,7 @@ import { useTheme } from "../context/theme"
 import { TextAttributes, type ScrollBoxRenderable } from "@opentui/core"
 import type { McpServer } from "@opencode-ai/client"
 import { useClipboard } from "../context/clipboard"
+import { formatClipboardWriteNotification } from "../clipboard"
 import { useToast } from "../ui/toast"
 import { useKeyboard, useTerminalDimensions } from "@opentui/solid"
 import { useConfig } from "../config"
@@ -146,10 +147,14 @@ function DialogMcpError(props: { server: McpServer; onBack: () => void }) {
  onMount(() => dialog.setSize("large"))

  const copy = () => {
-    if (!clipboard.write) return
    void clipboard
      .write(error())
-      .then(() => setCopied(true))
+      .then((outcome) => {
+        setCopied(outcome.delivery === "confirmed")
+        toast.show(
+          formatClipboardWriteNotification(outcome, { message: "Copied to clipboard", variant: "info" }),
+        )
+      })
      .catch(toast.error)
  }

@@ -16,6 +16,7 @@ import { abbreviateHome } from "../runtime"
 import { useTuiPaths } from "../context/runtime"
 import { truncateFilePath } from "../ui/file-path"
 import { stringWidth } from "../util/string-width"
+import { sessionTitle } from "../util/session"
 import { Spinner } from "./spinner"

 const RECENT_LIMIT = 8
@@ -76,13 +77,13 @@ export function DialogOpen() {
          .slice(0, RECENT_LIMIT)
    const sessionOptions = recent.map((session) => {
      const project = data.project.get(session.projectID)
-      const name = project?.name || path.basename(project?.canonical ?? session.location.directory)
+      const name = project?.canonical === "/" ? undefined : project?.name || path.basename(project?.canonical ?? "")
      const running = data.session.family(session.id).some((id) => data.session.status(id) === "running")
      return {
-        title: session.title,
+        title: sessionTitle(session),
        value: { type: "session", sessionID: session.id } as OpenTarget,
        category: "Sessions",
-        footer: `${Locale.truncate(name, 20)} · ${timeAgo(session.time.updated)}`,
+        footer: `${name ? `${Locale.truncate(name, 20)} · ` : ""}${timeAgo(session.time.updated)}`,
        gutter: running
          ? () => <Spinner />
          : tabs.has(session.id)
@@ -102,13 +103,13 @@ export function DialogOpen() {
      })
      .map((project) => {
        const title = project.name ?? path.basename(project.canonical)
-        const description = abbreviateHome(project.canonical, paths.home)
+        const footer = abbreviateHome(project.canonical, paths.home)
        // Dialog padding, the gutter column, title padding, and the separating space use nine columns.
        const width = Math.min(60, dimensions().width - 2) - 9 - stringWidth(title)
        return {
          title,
-          description: truncateFilePath(description, width),
-          searchText: description,
+          footer: truncateFilePath(footer, width),
+          searchText: footer,
          value: { type: "project", directory: project.canonical } as OpenTarget,
          category: "Projects",
        }
@@ -18,6 +18,7 @@ import { Spinner } from "./spinner"
 import { errorMessage } from "../util/error"
 import { useSessionTabs } from "../context/session-tabs"
 import { useStorage } from "../context/storage"
+import { sessionTitle } from "../util/session"

 export function DialogSessionList() {
  const dialog = useDialog()
@@ -77,7 +78,7 @@ export function DialogSessionList() {
          (session.projectID === current?.project.id && session.location.directory === current.directory),
      )
    if (!query) return sessions
-    return sessions.filter((session) => !session.parentID && session.title.toLowerCase().includes(query))
+    return sessions.filter((session) => !session.parentID && sessionTitle(session).toLowerCase().includes(query))
  })
  const sessions = createMemo(() => {
    const query = filter().trim()
@@ -139,7 +140,7 @@ export function DialogSessionList() {
      const slot = sessionTabs.enabled() ? undefined : slotByID.get(session.id)
      const deleting = toDelete() === session.id
      return {
-        title: deleting ? `Press ${shortcuts.get("session.delete")} again to confirm` : session.title,
+        title: deleting ? `Press ${shortcuts.get("session.delete")} again to confirm` : sessionTitle(session),
        value: session.id,
        category,
        footer,
@@ -6,13 +6,14 @@ import { useClipboard } from "../context/clipboard"
 import { useExit } from "../context/exit"
 import { useTuiApp } from "../context/runtime"
 import { describeOS, describeTerminal } from "../util/system"
+import { clipboardCopyState, type ClipboardCopyState } from "../clipboard"

 export function ErrorComponent(props: { error: Error; reset: () => void; mode?: "dark" | "light" }) {
  const term = useTerminalDimensions()
  const exit = useExit()
  const clipboard = useClipboard()
  const app = useTuiApp()
-  const [copied, setCopied] = createSignal(false)
+  const [copyState, setCopyState] = createSignal<ClipboardCopyState>("idle")

  // Safe fallback palette per mode (mirrors theme/assets/opencode.json) since the
  // theme context may be the thing that crashed.
@@ -28,6 +29,7 @@ export function ErrorComponent(props: { error: Error; reset: () => void; mode?:
        onPrimary: "#ffffff",
        error: "#d1383d",
        success: "#3d9a57",
+        warning: "#c18401",
      }
    : {
        bg: "#0a0a0a",
@@ -39,6 +41,7 @@ export function ErrorComponent(props: { error: Error; reset: () => void; mode?:
        onPrimary: "#0a0a0a",
        error: "#e06c75",
        success: "#7fd88f",
+        warning: "#e5c07b",
      }

  const message = props.error.message || "An unknown error occurred."
@@ -46,11 +49,27 @@ export function ErrorComponent(props: { error: Error; reset: () => void; mode?:
  const issueURL = buildIssueURL(message, stack, app.version)

  const copyReport = () => {
-    void clipboard.write?.(issueURL.toString()).then(() => setCopied(true))
+    void clipboard
+      .write(issueURL.toString())
+      .then((outcome) => setCopyState(clipboardCopyState(outcome)))
+      .catch(() => setCopyState("failed"))
  }

  const actions = [
-    { key: "c", label: () => (copied() ? "✓ Copied" : "Copy report"), copy: true, onUse: copyReport },
+    {
+      key: "c",
+      label: () =>
+        ({
+          idle: "Copy report",
+          confirmed: "Copied",
+          "confirmed-partial": "Copied (terminal failed)",
+          attempted: "Sent",
+          "attempted-partial": "Sent (host failed)",
+          failed: "Copy failed",
+        })[copyState()],
+      copy: true,
+      onUse: copyReport,
+    },
    { key: "r", label: () => "Restart", onUse: props.reset },
    { key: "q", label: () => "Quit", onUse: () => exit() },
  ]
@@ -135,13 +154,18 @@ export function ErrorComponent(props: { error: Error; reset: () => void; mode?:
          <For each={actions}>
            {(action, index) => {
              const isSelected = () => selected() === index()
-              const isCopied = () => action.copy && copied()
+              const copyColor = () => {
+                if (!action.copy) return
+                if (copyState() === "confirmed") return colors.success
+                if (copyState() === "confirmed-partial" || copyState() === "attempted-partial") return colors.warning
+                if (copyState() === "failed") return colors.error
+              }
              return (
                <box flexDirection="column" alignItems="center" flexShrink={0}>
                  <box
                    onMouseDown={() => setSelected(index())}
                    onMouseUp={() => action.onUse()}
-                    backgroundColor={isCopied() ? colors.success : isSelected() ? colors.primary : colors.element}
+                    backgroundColor={copyColor() ?? (isSelected() ? colors.primary : colors.element)}
                    minWidth={15}
                    alignItems="center"
                    paddingLeft={2}
@@ -149,7 +173,7 @@ export function ErrorComponent(props: { error: Error; reset: () => void; mode?:
                  >
                    <text
                      attributes={TextAttributes.BOLD}
-                      fg={isCopied() || isSelected() ? colors.onPrimary : colors.text}
+                      fg={copyColor() || isSelected() ? colors.onPrimary : colors.text}
                    >
                      {action.label()}
                    </text>
@@ -189,9 +213,14 @@ export function ErrorComponent(props: { error: Error; reset: () => void; mode?:
        <Show when={showFooter()}>
          <box flexDirection="column" alignItems="center" flexShrink={0}>
            <text fg={colors.muted}>
-              {copied()
-                ? "Report copied — paste it into a new GitHub issue."
-                : "Copy the report and open a GitHub issue to help us fix this."}
+              {{
+                idle: "Copy the report and open a GitHub issue to help us fix this.",
+                confirmed: "Report copied. Paste it into a new GitHub issue.",
+                "confirmed-partial": "Report copied to host clipboard; terminal dispatch failed.",
+                attempted: "Report sent to terminal clipboard; acceptance is unconfirmed.",
+                "attempted-partial": "Report sent to terminal clipboard; host clipboard write failed.",
+                failed: "Clipboard write failed. Try again or report the crash manually.",
+              }[copyState()]}
            </text>
            <text fg={colors.muted}>OpenCode {app.version}</text>
          </box>
@@ -7,10 +7,9 @@ import {
  decodePasteBytes,
  type KeyEvent,
 } from "@opentui/core"
-import { createEffect, createMemo, onMount, createSignal, onCleanup, on, Show, Switch, Match } from "solid-js"
+import { createEffect, createMemo, onMount, createSignal, onCleanup, on, Show, Switch, Match, For } from "solid-js"
 import { registerOpencodeSpinner } from "../register-spinner"
 import path from "path"
-import { fileURLToPath } from "url"
 import { useLocal } from "../../context/local"
 import { useTheme, useThemes } from "../../context/theme"
 import { tint } from "../../theme/color"
@@ -48,12 +47,19 @@ import { DialogSkill } from "../dialog-skill"
 import { useArgs } from "../../context/args"
 import { useConfig } from "../../config"
 import { usePromptMove } from "./move"
-import { readLocalAttachment } from "./local-attachment"
+import {
+  normalizePastedFilepath,
+  parsePastedFilepaths,
+  readLocalAttachment,
+  MAX_LOCAL_ATTACHMENT_BYTES,
+  type LocalAttachment,
+} from "./local-attachment"
 import { useData } from "../../context/data"
 import { useLocation } from "../../context/location"
 import { Keymap, type KeymapCommand } from "../../context/keymap"
 import { abbreviateHome } from "../../runtime"
 import { PluginSlot } from "../../plugin/context"
+import { DialogImagePreview } from "../dialog-image-preview"

 registerOpencodeSpinner()

@@ -72,17 +78,6 @@ export type PromptProps = {
  }
 }

-function pastedFilepath(value: string, platform: string) {
-  const raw = value.replace(/^['"]+|['"]+$/g, "")
-  if (raw.startsWith("file://")) {
-    try {
-      return fileURLToPath(raw)
-    } catch {}
-  }
-  if (platform === "win32") return raw
-  return raw.replace(/\\(.)/g, "$1")
-}
-
 export type PromptRef = {
  focused: boolean
  current: PromptInfo
@@ -240,7 +235,6 @@ export function Prompt(props: PromptProps) {
              return undefined
            })
            if (!location) return
-            move.setDirectory(location.directory, location.directory !== location.project.directory)
            currentLocation.set(location)
            return
          }
@@ -311,6 +305,114 @@ export function Prompt(props: PromptProps) {
    extmarkToPart: new Map(),
    interrupt: 0,
  })
+  let disposed = false
+  let pasteQueue = Promise.resolve()
+  let pasteEpoch = 0
+  let pasteMutating = false
+  let pasteMutation = 0
+
+  function capturePrompt() {
+    return {
+      epoch: pasteEpoch,
+      sessionID: props.sessionID,
+      mode: store.mode,
+      text: input.plainText,
+      cursor: input.cursorOffset,
+      files: store.prompt.files && unwrap(store.prompt.files),
+      agents: store.prompt.agents && unwrap(store.prompt.agents),
+      pasted: unwrap(store.prompt.pasted),
+    }
+  }
+
+  function promptChanged(before: ReturnType<typeof capturePrompt>) {
+    if (disposed || input.isDestroyed) return true
+    return (
+      pasteEpoch !== before.epoch ||
+      props.sessionID !== before.sessionID ||
+      store.mode !== before.mode ||
+      input.plainText !== before.text ||
+      input.cursorOffset !== before.cursor ||
+      (store.prompt.files && unwrap(store.prompt.files)) !== before.files ||
+      (store.prompt.agents && unwrap(store.prompt.agents)) !== before.agents ||
+      unwrap(store.prompt.pasted) !== before.pasted
+    )
+  }
+
+  function cancelChangedPrompt(before: ReturnType<typeof capturePrompt>) {
+    if (!promptChanged(before)) return false
+    pasteEpoch = Math.max(pasteEpoch, before.epoch + 1)
+    if (!disposed && !input.isDestroyed) {
+      toast.show({ message: "Attachment paste canceled because the prompt changed", variant: "warning" })
+    }
+    return true
+  }
+
+  function enqueuePaste(run: (before: ReturnType<typeof capturePrompt>) => Promise<void>) {
+    const epoch = pasteEpoch
+    pasteQueue = pasteQueue
+      .then(async () => {
+        if (disposed || epoch !== pasteEpoch) return
+        await run(capturePrompt())
+      })
+      .catch((error) => {
+        if (!disposed) toast.error(error)
+      })
+    return pasteQueue
+  }
+
+  function setPromptMode(mode: "normal" | "shell") {
+    if (store.mode === mode) return
+    pasteEpoch++
+    setStore("mode", mode)
+  }
+
+  function applyPaste(run: () => void) {
+    const mutation = ++pasteMutation
+    pasteMutating = true
+    try {
+      run()
+    } finally {
+      queueMicrotask(() => {
+        if (pasteMutation === mutation) pasteMutating = false
+      })
+    }
+  }
+
+  const imageAttachments = createMemo(() =>
+    (store.prompt.files ?? []).filter((file) => typeof file.uri === "string" && file.uri.startsWith("data:image/")),
+  )
+  const imagePreviewHeight = createMemo(() => Math.max(4, Math.min(8, Math.floor(dimensions().height / 4))))
+  const imagePreviewWidth = createMemo(() => imagePreviewHeight() * 2)
+  const imagePreviewAvailableWidth = createMemo(() => Math.min(70, Math.max(0, dimensions().width - 9)))
+  const imagePreviewLimit = createMemo(() =>
+    Math.max(1, Math.min(3, Math.floor((imagePreviewAvailableWidth() - 8) / (imagePreviewWidth() + 1)))),
+  )
+  const visibleImageCount = createMemo(() => Math.min(imagePreviewLimit(), imageAttachments().length))
+  const hiddenImageAttachmentCount = createMemo(() => imageAttachments().length - visibleImageCount())
+  const imagePreviewsVisible = createMemo(
+    () => imageAttachments().length > 0 && imagePreviewAvailableWidth() >= imagePreviewWidth(),
+  )
+  const imageOverflowVisible = createMemo(
+    () => hiddenImageAttachmentCount() > 0 && imagePreviewAvailableWidth() >= imagePreviewWidth() + 9,
+  )
+
+  function openImagePreview(initial: number) {
+    const images = imageAttachments()
+    if (images.length === 0) return
+    dialog.replace(() => <DialogImagePreview images={images} initial={initial} />)
+  }
+
+  function imagePreviewMouseIndex(event: MouseEvent): number | undefined {
+    if (!config.prompt?.image_preview || !imagePreviewsVisible()) return undefined
+    const x = event.x - anchor.x - 3
+    const y = event.y - anchor.y - 1
+    if (x < 0 || y < 0 || y >= imagePreviewHeight()) return undefined
+    const stride = imagePreviewWidth() + 1
+    const index = Math.floor(x / stride)
+    if (index < visibleImageCount() && x % stride < imagePreviewWidth()) return index
+    if (index === visibleImageCount() && imageOverflowVisible() && x % stride < 8) return visibleImageCount()
+    return undefined
+  }

  createEffect(
    on(
@@ -380,22 +482,32 @@ export function Prompt(props: PromptProps) {
        name: "prompt.paste",
        category: "Prompt",
        palette: undefined,
-        run: async (_input: string | undefined, event?: KeyEvent) => {
+        run: (_input: string | undefined, event?: KeyEvent) => {
          event?.preventDefault()
          event?.stopPropagation()
-          const content = await clipboard.read?.()
-          if (content?.mime.startsWith("image/")) {
-            await pasteAttachment({
-              filename: "clipboard",
-              uri: `data:${content.mime};base64,${content.data}`,
-            })
-            return
-          }
-          if (content?.mime === "text/plain") {
-            await pasteInputText(content.data)
-          }
+          return enqueuePaste(async (before) => {
+            const content = await clipboard.read()
+            if (cancelChangedPrompt(before)) return
+            if (content?.mime.startsWith("image/")) {
+              pasteAttachment({
+                filename: "clipboard",
+                uri: `data:${content.mime};base64,${content.data}`,
+              })
+              return
+            }
+            if (content?.mime === "text/plain") {
+              await pasteInputText(content.data, before)
+            }
+          })
        },
      },
+      {
+        title: "View image attachments",
+        name: "prompt.images.view",
+        category: "Prompt",
+        enabled: imageAttachments().length > 0,
+        run: () => openImagePreview(0),
+      },
      {
        title: "Interrupt session",
        name: "session.interrupt",
@@ -407,7 +519,7 @@ export function Prompt(props: PromptProps) {
          if (!input.focused) return
          // TODO: this should be its own command
          if (store.mode === "shell") {
-            setStore("mode", "normal")
+            setPromptMode("normal")
            return
          }
          if (!props.sessionID) return
@@ -528,6 +640,7 @@ export function Prompt(props: PromptProps) {
      "prompt.submit",
      "prompt.editor",
      "prompt.editor_context.clear",
+      "prompt.images.view",
      "prompt.stash",
      "prompt.stash.pop",
      "prompt.stash.list",
@@ -552,12 +665,14 @@ export function Prompt(props: PromptProps) {
      input.blur()
    },
    set(prompt) {
+      pasteEpoch++
      input.setText(prompt.text)
      setStore("prompt", prompt)
      restoreExtmarksFromPrompt(prompt)
      input.gotoBufferEnd()
    },
    reset() {
+      pasteEpoch++
      input.clear()
      input.extmarks.clear()
      setStore("prompt", emptyPrompt())
@@ -581,6 +696,7 @@ export function Prompt(props: PromptProps) {
  })

  onCleanup(() => {
+    disposed = true
    if (store.prompt.text) {
      stashed = { prompt: unwrap(store.prompt), cursor: input.cursorOffset }
    }
@@ -804,7 +920,7 @@ export function Prompt(props: PromptProps) {
          group: "Prompt",
          run: () => {
            setStore("placeholder", randomIndex(shell().length))
-            setStore("mode", "shell")
+            setPromptMode("shell")
          },
        },
      ],
@@ -815,7 +931,7 @@ export function Prompt(props: PromptProps) {
    return {
      target: inputTarget,
      enabled: inputTarget() !== undefined && store.mode === "shell",
-      commands: [{ bind: "escape", title: "Exit shell mode", group: "Prompt", run: () => setStore("mode", "normal") }],
+      commands: [{ bind: "escape", title: "Exit shell mode", group: "Prompt", run: () => setPromptMode("normal") }],
    }
  })

@@ -826,9 +942,7 @@ export function Prompt(props: PromptProps) {
        cursorVersion()
        return inputTarget() !== undefined && store.mode === "shell" && input?.visualCursor.offset === 0
      })(),
-      commands: [
-        { bind: "backspace", title: "Exit shell mode", group: "Prompt", run: () => setStore("mode", "normal") },
-      ],
+      commands: [{ bind: "backspace", title: "Exit shell mode", group: "Prompt", run: () => setPromptMode("normal") }],
    }
  })

@@ -859,7 +973,7 @@ export function Prompt(props: PromptProps) {
            if (!item) return false
            input.setText(item.text)
            setStore("prompt", item)
-            setStore("mode", item.mode ?? "normal")
+            setPromptMode(item.mode ?? "normal")
            restoreExtmarksFromPrompt(item)
            input.cursorOffset = 0
          },
@@ -898,7 +1012,7 @@ export function Prompt(props: PromptProps) {
            if (!item) return false
            input.setText(item.text)
            setStore("prompt", item)
-            setStore("mode", item.mode ?? "normal")
+            setPromptMode(item.mode ?? "normal")
            restoreExtmarksFromPrompt(item)
            input.cursorOffset = input.plainText.length
          },
@@ -963,7 +1077,10 @@ export function Prompt(props: PromptProps) {
      const directory = await move.getDirectory()
      if (move.pending() && !directory) return false
      finishMoveProgress = Boolean(move.progress())
-      const location = data.location.default()
+      // The location context is where the next session is created: seeded by the home
+      // route (launch cwd, inherited session location, or picked project) and updated
+      // by /cd before a session exists.
+      const location = currentLocation.ref ?? data.location.default()

      const created = await client.api.session
        .create({
@@ -1013,7 +1130,7 @@ export function Prompt(props: PromptProps) {
        sessionID,
        command: inputText,
      })
-      setStore("mode", "normal")
+      setPromptMode("normal")
    } else if (
      inputText.startsWith("/") &&
      (data.location.command.list(currentLocation.current) ?? []).some(
@@ -1144,7 +1261,7 @@ export function Prompt(props: PromptProps) {
    const extmarkStart = currentOffset
    const extmarkEnd = extmarkStart + promptOffsetWidth(virtualText)

-    input.insertText(virtualText + " ")
+    applyPaste(() => input.insertText(virtualText + " "))

    const extmarkId = input.extmarks.create({
      start: extmarkStart,
@@ -1166,34 +1283,46 @@ export function Prompt(props: PromptProps) {
    )
  }

-  async function pasteInputText(text: string) {
+  async function pasteInputText(text: string, before: ReturnType<typeof capturePrompt>) {
    const normalizedText = text.replace(/\r\n/g, "\n").replace(/\r/g, "\n")
    const pastedContent = normalizedText.trim()
-    const filepath = pastedFilepath(pastedContent, terminalEnvironment.platform)
+    const filepath = normalizePastedFilepath(pastedContent, terminalEnvironment.platform)
    const isUrl = /^(https?):\/\//.test(filepath)
    if (!isUrl) {
      const attachment = await readLocalAttachment(filepath)
-      const filename = path.basename(filepath)
-      if (attachment?.type === "text") {
-        pasteText(attachment.content, `[SVG: ${filename ?? "image"}]`)
+      if (attachment) {
+        if (cancelChangedPrompt(before)) return
+        pasteLocalAttachment(filepath, attachment)
        return
      }
-      if (attachment?.type === "binary") {
-        await pasteAttachment({
-          filename,
-          uri: `data:${attachment.mime};base64,${Buffer.from(attachment.content).toString("base64")}`,
-        })
-        return
+
+      const filepaths = parsePastedFilepaths(pastedContent, terminalEnvironment.platform)
+      if (filepaths.length > 1) {
+        let remaining = MAX_LOCAL_ATTACHMENT_BYTES
+        const attachments: Array<{ filepath: string; attachment: LocalAttachment }> = []
+        for (const candidate of filepaths) {
+          const next = await readLocalAttachment(candidate, remaining)
+          if (!next) break
+          remaining -= typeof next.content === "string" ? Buffer.byteLength(next.content) : next.content.byteLength
+          attachments.push({ filepath: candidate, attachment: next })
+        }
+        if (attachments.length === filepaths.length) {
+          if (cancelChangedPrompt(before)) return
+          for (const item of attachments) pasteLocalAttachment(item.filepath, item.attachment)
+          return
+        }
      }
    }

+    if (cancelChangedPrompt(before)) return
+
    const lineCount = (pastedContent.match(/\n/g)?.length ?? 0) + 1
    if ((lineCount >= 3 || pastedContent.length > 150) && config.prompt?.paste !== "full") {
      pasteText(pastedContent, `[Pasted ~${lineCount} lines]`)
      return
    }

-    input.insertText(normalizedText)
+    applyPaste(() => input.insertText(normalizedText))

    setTimeout(() => {
      if (!input || input.isDestroyed) return
@@ -1202,17 +1331,32 @@ export function Prompt(props: PromptProps) {
    }, 0)
  }

-  async function pasteAttachment(file: { filename?: string; uri: string }) {
+  function pasteLocalAttachment(filepath: string, attachment: LocalAttachment) {
+    const filename = path.basename(filepath)
+    if (attachment.type === "text") {
+      pasteText(attachment.content, `[SVG: ${filename || "image"}]`)
+      return
+    }
+    pasteAttachment({
+      filename,
+      uri: `data:${attachment.mime};base64,${Buffer.from(attachment.content).toString("base64")}`,
+    })
+  }
+
+  function pasteAttachment(file: { filename?: string; uri: string }) {
    const currentOffset = input.cursorOffset
    const extmarkStart = currentOffset
    const pdf = file.uri.startsWith("data:application/pdf;")
-    const prefix = pdf ? "data:application/pdf;" : "data:image/"
-    const count = store.prompt.files?.filter((attachment) => attachment.uri.startsWith(prefix)).length ?? 0
+    const count = pdf
+      ? (store.prompt.files?.filter(
+          (attachment) => typeof attachment.uri === "string" && attachment.uri.startsWith("data:application/pdf;"),
+        ).length ?? 0)
+      : imageAttachments().length
    const virtualText = pdf ? `[PDF ${count + 1}]` : `[Image ${count + 1}]`
    const extmarkEnd = extmarkStart + virtualText.length
    const textToInsert = virtualText + " "

-    input.insertText(textToInsert)
+    applyPaste(() => input.insertText(textToInsert))

    const extmarkId = input.extmarks.create({
      start: extmarkStart,
@@ -1239,7 +1383,6 @@ export function Prompt(props: PromptProps) {
        draft.extmarkToPart.set(extmarkId, { type: "file", index })
      }),
    )
-    return
  }

  function clearPrompt() {
@@ -1299,7 +1442,12 @@ export function Prompt(props: PromptProps) {
    return `Ask anything... "${list()[store.placeholder % list().length]}"`
  })
  const locationLabel = createMemo(() => {
-    if (!props.sessionID || status() !== "idle") return
+    if (!props.sessionID) {
+      // No session yet: show where the next session will be created.
+      const directory = currentLocation.ref?.directory ?? data.location.default().directory
+      return abbreviateHome(directory, paths.home)
+    }
+    if (status() !== "idle") return
    const directory = data.session.get(props.sessionID)?.location.directory
    return directory ? abbreviateHome(directory, paths.home) : undefined
  })
@@ -1348,7 +1496,76 @@ export function Prompt(props: PromptProps) {
            backgroundColor={promptBg()}
            flexGrow={1}
            width="100%"
+            onMouseDown={(event: MouseEvent) => {
+              if (event.button !== 0 || imagePreviewMouseIndex(event) === undefined) return
+              event.preventDefault()
+            }}
+            onMouseUp={(event: MouseEvent) => {
+              if (event.button !== 0) return
+              const index = imagePreviewMouseIndex(event)
+              if (index === undefined) return
+              event.preventDefault()
+              openImagePreview(index)
+            }}
          >
+            <Show when={config.prompt?.image_preview && imagePreviewsVisible()}>
+              <box
+                width="100%"
+                height={imagePreviewHeight() + 1}
+                flexDirection="row"
+                flexShrink={0}
+                justifyContent="flex-start"
+                gap={1}
+                paddingBottom={1}
+              >
+                <For each={imageAttachments().slice(0, visibleImageCount())}>
+                  {(file, index) => {
+                    const [failed, setFailed] = createSignal(false)
+                    return (
+                      <box
+                        width={imagePreviewWidth()}
+                        height={imagePreviewHeight()}
+                        flexBasis={imagePreviewWidth()}
+                        flexShrink={1}
+                      >
+                        <Show
+                          when={!failed()}
+                          fallback={
+                            <box width="100%" height="100%" alignItems="center" justifyContent="center">
+                              <text fg={theme.text.subdued}>No preview</text>
+                            </box>
+                          }
+                        >
+                          <image
+                            id={`prompt-image-preview-${index()}`}
+                            source={file.uri}
+                            fit="cover"
+                            protocol="auto"
+                            width="100%"
+                            height="100%"
+                            onError={() => setFailed(true)}
+                          />
+                        </Show>
+                      </box>
+                    )
+                  }}
+                </For>
+                <Show when={imageOverflowVisible()}>
+                  <box
+                    width={8}
+                    height={imagePreviewHeight()}
+                    flexBasis={8}
+                    flexShrink={1}
+                    alignItems="center"
+                    justifyContent="center"
+                  >
+                    <text fg={theme.text.subdued} wrapMode="none" truncate>
+                      +{hiddenImageAttachmentCount()} more
+                    </text>
+                  </box>
+                </Show>
+              </box>
+            </Show>
            <textarea
              width="100%"
              placeholder={placeholderText()}
@@ -1358,13 +1575,17 @@ export function Prompt(props: PromptProps) {
              minHeight={1}
              maxHeight={maxHeight()}
              onContentChange={() => {
+                if (!pasteMutating) pasteEpoch++
                const value = input.plainText
                setStore("prompt", "text", value)
                auto()?.onInput(value)
                syncExtmarksWithPromptParts()
                setCursorVersion((value) => value + 1)
              }}
-              onCursorChange={() => setCursorVersion((value) => value + 1)}
+              onCursorChange={() => {
+                if (!pasteMutating) pasteEpoch++
+                setCursorVersion((value) => value + 1)
+              }}
              onKeyDown={(e: { preventDefault(): void }) => {
                if (props.disabled) {
                  e.preventDefault()
@@ -1376,7 +1597,7 @@ export function Prompt(props: PromptProps) {
                // hangul) is flushed to plainText before we read it for submission.
                setTimeout(() => setTimeout(() => submit(), 0), 0)
              }}
-              onPaste={async (event: PasteEvent) => {
+              onPaste={(event: PasteEvent) => {
                if (props.disabled) {
                  event.preventDefault()
                  return
@@ -1386,11 +1607,10 @@ export function Prompt(props: PromptProps) {
                // Windows ConPTY/Terminal often sends CR-only newlines in bracketed paste
                // Replace CRLF first, then any remaining CR
                const normalizedText = decodePasteBytes(event.bytes).replace(/\r\n/g, "\n").replace(/\r/g, "\n")
-                const pastedContent = normalizedText.trim()

                // Windows Terminal <1.25 can surface image-only clipboard as an
                // empty bracketed paste. Windows Terminal 1.25+ does not.
-                if (!pastedContent) {
+                if (event.bytes.byteLength === 0) {
                  keymap.dispatch("prompt.paste")
                  return
                }
@@ -1399,7 +1619,7 @@ export function Prompt(props: PromptProps) {
                // default paste unless we suppress it first and handle insertion ourselves.
                event.preventDefault()

-                await pasteInputText(normalizedText)
+                void enqueuePaste((before) => pasteInputText(normalizedText, before))
              }}
              ref={(r: TextareaRenderable) => {
                input = r
@@ -1,9 +1,15 @@
-import { readFile } from "node:fs/promises"
+import { constants } from "node:fs"
+import { open } from "node:fs/promises"
 import path from "node:path"
+import { fileURLToPath } from "node:url"
+
+// Bound filesystem work per terminal paste; the byte budget also bounds staged data.
+const MAX_PASTED_FILEPATHS = 32
+export const MAX_LOCAL_ATTACHMENT_BYTES = 20 * 1024 * 1024

 export type LocalFiles = Readonly<{
-  readText(path: string): Promise<string>
-  readBytes(path: string): Promise<Uint8Array>
+  readText(path: string, maxBytes: number): Promise<string>
+  readBytes(path: string, maxBytes: number): Promise<Uint8Array>
  mime(path: string): Promise<string>
 }>

@@ -11,14 +17,15 @@ export type LocalAttachment =
  | Readonly<{ type: "text"; mime: "image/svg+xml"; content: string }>
  | Readonly<{ type: "binary"; mime: string; content: Uint8Array }>

-export function readLocalAttachment(file: string) {
+export function readLocalAttachment(file: string, maxBytes = MAX_LOCAL_ATTACHMENT_BYTES) {
  return readLocalAttachmentWith(
    {
-      readText: (value) => readFile(value, "utf8"),
-      readBytes: (value) => readFile(value),
+      readText: async (value, limit) => (await readFileBounded(value, limit)).toString("utf8"),
+      readBytes: readFileBounded,
      mime: async (value) => mimeTypes[path.extname(value).toLowerCase()] ?? "application/octet-stream",
    },
    file,
+    maxBytes,
  )
 }

@@ -33,16 +40,109 @@ const mimeTypes: Record<string, string> = {
  ".webp": "image/webp",
 }

-export async function readLocalAttachmentWith(files: LocalFiles, path: string): Promise<LocalAttachment | undefined> {
+async function readFileBounded(file: string, maxBytes: number) {
+  const handle = await open(file, constants.O_RDONLY | constants.O_NONBLOCK)
+  try {
+    const info = await handle.stat()
+    if (!info.isFile() || info.size > maxBytes) throw new Error("Attachment exceeds the local file limit")
+    const content = Buffer.allocUnsafe(info.size + 1)
+    let offset = 0
+    while (offset < content.byteLength) {
+      const { bytesRead } = await handle.read(content, offset, content.byteLength - offset, offset)
+      if (bytesRead === 0) break
+      offset += bytesRead
+    }
+    if (offset !== info.size) throw new Error("Attachment changed while being read")
+    return content.subarray(0, offset)
+  } finally {
+    await handle.close()
+  }
+}
+
+export function normalizePastedFilepath(value: string, platform: string) {
+  const raw = value.replace(/^['"]+|['"]+$/g, "")
+  const url = decodeFileURL(raw)
+  if (url) return url
+  if (platform === "win32") return raw
+  return raw.replace(/\\(.)/g, "$1")
+}
+
+function decodeFileURL(value: string): string | undefined {
+  if (!value.startsWith("file://")) return undefined
+  try {
+    return fileURLToPath(value)
+  } catch {
+    return undefined
+  }
+}
+
+export function parsePastedFilepaths(value: string, platform: string) {
+  const result: string[] = []
+  let current = ""
+  let quote = ""
+
+  function push() {
+    if (!current) return
+    result.push(decodeFileURL(current) ?? current)
+    current = ""
+  }
+
+  const input = value.includes("file://")
+    ? value
+        .split(/\r?\n/)
+        .filter((line) => !line.trimStart().startsWith("#"))
+        .join("\n")
+    : value
+  for (let index = 0; index < input.length; index++) {
+    const character = input[index]
+    if (quote) {
+      if (character === quote) {
+        quote = ""
+        continue
+      }
+      if (character === "\\" && platform !== "win32" && quote === '"' && index + 1 < input.length) {
+        current += input[++index]
+        continue
+      }
+      current += character
+      continue
+    }
+    if (character === "'" || character === '"') {
+      quote = character
+      continue
+    }
+    if (character === "\\" && platform !== "win32" && index + 1 < input.length) {
+      current += input[++index]
+      continue
+    }
+    if (/\s/.test(character)) {
+      push()
+      if (result.length > MAX_PASTED_FILEPATHS) return []
+      continue
+    }
+    current += character
+  }
+
+  if (quote) return []
+  push()
+  if (result.length > MAX_PASTED_FILEPATHS) return []
+  return result
+}
+
+export async function readLocalAttachmentWith(
+  files: LocalFiles,
+  path: string,
+  maxBytes = MAX_LOCAL_ATTACHMENT_BYTES,
+): Promise<LocalAttachment | undefined> {
  const mime = await files.mime(path).catch(() => undefined)
-  if (!mime) return
+  if (!mime) return undefined
+  if (!mime.startsWith("image/") && mime !== "application/pdf") return undefined
  if (mime === "image/svg+xml") {
-    const content = await files.readText(path).catch(() => undefined)
-    if (!content) return
+    const content = await files.readText(path, maxBytes).catch(() => undefined)
+    if (!content || Buffer.byteLength(content) > maxBytes) return undefined
    return { type: "text", mime, content }
  }
-  if (!mime.startsWith("image/") && mime !== "application/pdf") return
-  const content = await files.readBytes(path).catch(() => undefined)
-  if (!content) return
+  const content = await files.readBytes(path, maxBytes).catch(() => undefined)
+  if (!content || content.byteLength > maxBytes) return undefined
  return { type: "binary", mime, content }
 }
@@ -105,6 +105,9 @@ export const Info = Schema.Struct({
      paste: Schema.optional(Schema.Literals(["compact", "full"])).annotate({
        description: "Display large pastes as compact placeholders or full text",
      }),
+      image_preview: Schema.optional(Schema.Boolean).annotate({
+        description: "Show image attachment previews above the prompt input",
+      }),
    }),
  ).annotate({ description: "Prompt input behavior" }),
  session: Schema.optional(
@@ -119,6 +122,9 @@ export const Info = Schema.Struct({
      grouping: Schema.optional(Schema.Literals(["auto", "none"])).annotate({
        description: "Group related transcript items automatically or render each item separately",
      }),
+      image_preview: Schema.optional(Schema.Boolean).annotate({
+        description: "Show user attachment and tool-result images in the session transcript",
+      }),
      markdown: Schema.optional(Schema.Literals(["source", "rendered"])).annotate({
        description: "Show Markdown syntax markers or conceal them in rendered transcript content",
      }),
@@ -164,6 +164,7 @@ export const Definitions = {

  prompt_submit: keybind("none", "Submit prompt"),
  prompt_editor_context_clear: keybind("none", "Clear editor context"),
+  prompt_images_view: keybind("<leader>i", "View image attachments"),
  prompt_skills: keybind("none", "Open skill selector"),
  prompt_stash: keybind("none", "Stash prompt"),
  prompt_stash_pop: keybind("none", "Pop stashed prompt"),
@@ -364,6 +365,7 @@ export const CommandMap = {
  display_thinking: "session.toggle.thinking",
  prompt_submit: "prompt.submit",
  prompt_editor_context_clear: "prompt.editor_context.clear",
+  prompt_images_view: "prompt.images.view",
  prompt_skills: "prompt.skills",
  prompt_stash: "prompt.stash",
  prompt_stash_pop: "prompt.stash.pop",
@@ -1,18 +1,25 @@
+import type { ClipboardWriteResult } from "@opentui/core"
 import { createContext, type JSX, useContext } from "solid-js"
-import { read, write } from "../clipboard"

 export type ClipboardContent = Readonly<{ data: string; mime: string }>
-export type ClipboardService = Readonly<{
-  read?(): Promise<ClipboardContent | undefined>
-  write?(text: string): Promise<void>
+export type ClipboardWriteOutcome = Readonly<{
+  delivery: "confirmed" | "attempted"
+  partial: boolean
+  result: ClipboardWriteResult
+}>
+export type ClipboardService = Readonly<{
+  read(): Promise<ClipboardContent | undefined>
+  write(text: string): Promise<ClipboardWriteOutcome>
 }>
-const clipboard = { read, write }
-const ClipboardContext = createContext<ClipboardService>(clipboard)

-export function ClipboardProvider(props: { value?: ClipboardService; children: JSX.Element }) {
-  return <ClipboardContext.Provider value={props.value ?? clipboard}>{props.children}</ClipboardContext.Provider>
+const ClipboardContext = createContext<ClipboardService>()
+
+export function ClipboardProvider(props: { value: ClipboardService; children: JSX.Element }) {
+  return <ClipboardContext.Provider value={props.value}>{props.children}</ClipboardContext.Provider>
 }

 export function useClipboard() {
-  return useContext(ClipboardContext)
+  const value = useContext(ClipboardContext)
+  if (!value) throw new Error("useClipboard must be used within a ClipboardProvider")
+  return value
 }
@@ -5,6 +5,8 @@ import { useData } from "./data"

 const context = createContext<{
  readonly current: LocationGetOutput | undefined
+  // The target location as set, available before the server-synced info in `current` arrives.
+  readonly ref: LocationRef | undefined
  set: (location?: LocationRef) => void
 }>()

@@ -37,6 +39,9 @@ export function LocationProvider(props: ParentProps) {
        get current() {
          return current()
        },
+        get ref() {
+          return ref()
+        },
        set,
      }}
    >
@@ -7,6 +7,7 @@ import { useTuiStartup } from "./runtime"
 export type HomeRoute = {
  type: "home"
  prompt?: PromptInfo
+  // Location carried over from the previous session or project picker so a new session lands there.
  location?: LocationRef
 }

@@ -3,6 +3,7 @@ import { isDeepEqual } from "remeda"
 import { createSimpleContext } from "./helper"
 import { useClient } from "./client"
 import { useData } from "./data"
+import { sessionTitle } from "../util/session"
 import { useEvent } from "./event"
 import { useRoute } from "./route"
 import { useConfig } from "../config"
@@ -114,7 +115,8 @@ export const { use: useSessionTabs, provider: SessionTabsProvider } = createSimp
      if (route.data.type !== "session" || route.data.sessionID === "dummy") return
      const sessionID = root(route.data.sessionID)
      history = recordSessionTabHistory(history, sessionID)
-      const title = data.session.get(sessionID)?.title ?? (newTab() ? NEW_SESSION_TAB_TITLE : undefined)
+      const session = data.session.get(sessionID)
+      const title = session?.title ?? (newTab() ? NEW_SESSION_TAB_TITLE : session ? sessionTitle(session) : undefined)
      const tabs = openSessionTab(state().tabs, { sessionID, title })
      if (tabs === state().tabs && !state().unread[sessionID]) return
      update((draft) => {
@@ -127,7 +129,8 @@ export const { use: useSessionTabs, provider: SessionTabsProvider } = createSimp
      if (!enabled()) return
      const next = state().tabs.reduce<SessionTab[]>((tabs, tab) => {
        const sessionID = root(tab.sessionID)
-        return openSessionTab(tabs, { sessionID, title: data.session.get(sessionID)?.title ?? tab.title })
+        const session = data.session.get(sessionID)
+        return openSessionTab(tabs, { sessionID, title: session ? sessionTitle(session) : tab.title })
      }, [])
      const unread = Object.entries(state().unread).reduce<Record<string, SessionTabUnread>>((result, entry) => {
        const sessionID = root(entry[0])
@@ -136,15 +139,8 @@ export const { use: useSessionTabs, provider: SessionTabsProvider } = createSimp
      }, {})
      if (isDeepEqual(next, state().tabs) && isDeepEqual(unread, state().unread)) return
      update((draft) => {
-        draft.tabs = draft.tabs.reduce<SessionTab[]>((tabs, tab) => {
-          const sessionID = root(tab.sessionID)
-          return openSessionTab(tabs, { sessionID, title: data.session.get(sessionID)?.title ?? tab.title })
-        }, [])
-        draft.unread = Object.entries(draft.unread).reduce<Record<string, SessionTabUnread>>((result, entry) => {
-          const sessionID = root(entry[0])
-          result[sessionID] = result[sessionID] === "error" ? "error" : entry[1]
-          return result
-        }, {})
+        draft.tabs = next
+        draft.unread = unread
      })
    })

@@ -4,7 +4,6 @@ import {
  createContext,
  createEffect,
  createMemo,
-  ErrorBoundary,
  For,
  on,
  onCleanup,
@@ -14,12 +13,10 @@ import {
  type ParentProps,
 } from "solid-js"
 import path from "path"
-import { watch } from "fs"
 import { stat } from "fs/promises"
 import { fileURLToPath, pathToFileURL } from "url"
 import type { Context, Dialog, Page, Slot, SlotMap, SlotName, Toast } from "@opencode-ai/plugin/tui/context"
 import { createStore, produce, reconcile as reconcileStore } from "solid-js/store"
-import { isDeepEqual } from "remeda"
 import { useRenderer } from "@opentui/solid"
 import "#runtime-plugin-support"
 import { useConfig } from "../config"
@@ -41,13 +38,14 @@ import { useStorage } from "../context/storage"
 import { useSessionTabs } from "../context/session-tabs"
 import { abbreviateHome } from "../util/path-format"
 import { builtins } from "./builtins"
-import { discoverTuiPlugins, freshSpecifier, localSource, tuiPluginDirectory } from "./discovery"
+import { discoverTuiPlugins } from "./discovery"

 export interface PackageResolver {
  readonly resolve: (spec: string) => Promise<string | undefined>
 }

 type State =
+  | { readonly target: string; readonly status: "loading" }
  | { readonly target: string; readonly id: string; readonly status: "active" | "inactive" }
  | { readonly target: string; readonly status: "unsupported" }
  | { readonly target: string; readonly status: "failed"; readonly error: string }
@@ -63,7 +61,7 @@ type Value = {
  readonly list: () => ReadonlyArray<State>
  readonly registered: () => ReadonlyArray<RegisteredPlugin>
  readonly route: (id: string, name: string) => Page["render"] | undefined
-  readonly slot: <Name extends SlotName>(name: Name) => ReadonlyArray<{ readonly id: string; readonly render: Slot<Name> }>
+  readonly slot: <Name extends SlotName>(name: Name) => ReadonlyArray<Slot<Name>>
  readonly activate: (id: string) => Promise<boolean>
  readonly deactivate: (id: string) => Promise<boolean>
 }
@@ -72,8 +70,6 @@ type Dispose = () => Promise<void>
 type Registration = {
  plugin: Plugin.Definition
  source: RegisteredPlugin["source"]
-  target?: string
-  version: string
  options?: Readonly<Record<string, any>>
  active: boolean
  routes: Record<string, Page>
@@ -81,9 +77,6 @@ type Registration = {
  cleanups: Dispose[]
 }

-// One entry of the desired plugin generation produced by the resolve phase.
-type Desired = Pick<Registration, "plugin" | "source" | "target" | "version" | "options"> & { enabled: boolean }
-
 const PluginContext = createContext<Value>()

 export function PluginProvider(props: ParentProps<{ packages: PackageResolver }>) {
@@ -381,199 +374,85 @@ export function PluginProvider(props: ParentProps<{ packages: PackageResolver }>
    return true
  }

-  // Hot-reload local plugin sources: watch the discovery directory and any
-  // local entrypoints, then rebuild the plugin generation when one changes.
-  // Watches are deduped by path and never torn down individually (a stale
-  // watch costs one fs handle and a no-op reconcile); all die with this
-  // provider. Failed watches leave the set so a later reconcile can retry
-  // once the path exists.
-  const watchers: ReturnType<typeof watch>[] = []
-  const watched = new Set<string>()
-  let disposed = false
-  let pending: ReturnType<typeof setTimeout> | undefined
-  const scheduleReconcile = () => {
-    clearTimeout(pending)
-    pending = setTimeout(() => {
-      loading = loading.catch(() => undefined).then(() => reconcile())
-      // Observe failures immediately: a plugin cleanup that throws would
-      // otherwise surface as an unhandled rejection until the next trigger.
-      void loading.catch(() => undefined)
-    }, 100)
-  }
-  const watchSource = (target: string) => {
-    if (watched.has(target)) return
-    watched.add(target)
-    stat(target)
-      .then((info) => {
-        if (disposed) return
-        // Watch the parent for files: editors that save by rename replace the
-        // inode, which silently kills a direct file watch after the first save.
-        const dir = info.isDirectory() ? target : path.dirname(target)
-        if (dir !== target && watched.has(dir)) return
-        watched.add(dir)
-        const watcher = watch(dir, scheduleReconcile)
-        // A watched directory can disappear out from under us; without a
-        // listener the error event would crash the process. Forget the paths
-        // so a later reconcile can re-arm once they exist again.
-        watcher.on("error", () => {
-          watcher.close()
-          watched.delete(dir)
-          watched.delete(target)
-        })
-        watchers.push(watcher)
+  const reconcile = async (configured = config.data.plugins ?? []) => {
+    await Promise.all(
+      Object.entries(store.registrations)
+        .filter(([, registration]) => registration.active)
+        .map(([id]) => deactivate(id)),
+    )
+    const entries = [...(await discoverTuiPlugins(paths.cwd)), ...configured]
+    batch(() => {
+      setStore("registrations", reconcileStore({}))
+      setStore("states", [])
+    })
+
+    for (const plugin of builtins) {
+      setStore("registrations", plugin.id, {
+        plugin,
+        source: "builtin",
+        active: false,
+        routes: {},
+        slots: {},
+        cleanups: [],
      })
-      .catch(() => watched.delete(target))
-  }
-  onCleanup(() => {
-    disposed = true
-    clearTimeout(pending)
-    for (const watcher of watchers) watcher.close()
-  })
+      await activate(plugin.id)
+    }

-  // Rebuild the plugin generation as resolve → compare → swap, mirroring the
-  // core plugin registry: fold the ordered entries into a desired end state
-  // (importing only new or changed sources, before anything running is
-  // touched), no-op when the generation is unchanged, and restart only the
-  // plugins that differ. Membership or order changes rebuild the whole
-  // generation to preserve slot-order semantics.
-  // Package resolution failures would otherwise retry a full npm install on
-  // every watch event; remember them until the configuration changes.
-  const npmFailures = new Map<string, string>()
-  const reconcile = async (configured?: NonNullable<typeof config.data.plugins>) => {
-    if (configured) npmFailures.clear()
-    const entries = [...(await discoverTuiPlugins(paths.cwd)), ...(configured ?? config.data.plugins ?? [])]
-    watchSource(tuiPluginDirectory(paths.cwd))
-
-    // Resolve: fold entries into one desired generation. A source that fails
-    // to import keeps its running previous version and only reports failure.
-    const desired = new Map<string, Desired>()
-    for (const plugin of builtins) desired.set(plugin.id, { plugin, source: "builtin", version: "builtin", enabled: true })
-    const failures: State[] = []
    for (const entry of entries) {
      const target = typeof entry === "string" ? entry : entry.package
      if (target.startsWith("-")) {
-        for (const item of desired.values()) if (matches(target.slice(1), item.plugin.id)) item.enabled = false
+        for (const id of Object.keys(store.registrations).filter((id) => matches(target.slice(1), id)))
+          await deactivate(id)
        continue
      }

-      const selected = [...desired.values()].filter((item) => matches(target, item.plugin.id))
+      const selected = Object.keys(store.registrations).filter((id) => matches(target, id))
      if (selected.length || target === "*" || target.endsWith(".*") || target.startsWith("opencode.")) {
-        for (const item of selected) item.enabled = true
+        for (const id of selected) await activate(id)
        continue
      }

      const options = typeof entry === "string" ? undefined : entry.options
-      // Watch even when the resolve below fails so fixing a broken plugin reloads it.
-      const local = localSource(target, directory)
-      if (local) watchSource(fileURLToPath(local))
-      const previous = Object.values(store.registrations).find((registration) => registration.target === target)
-      const memo = local ? undefined : npmFailures.get(target)
-      const resolved = memo
-        ? { status: "failed" as const, error: memo }
-        : await resolvePlugin(target, local, options, previous, props.packages).catch((error) => ({
-            status: "failed" as const,
-            error: error instanceof Error ? error.message : String(error),
-          }))
-      if (resolved.status === "unsupported") {
-        failures.push({ target, status: "unsupported" })
-        continue
-      }
-      if (resolved.status === "failed") {
-        if (!local && !previous) npmFailures.set(target, resolved.error)
-        failures.push({
-          target,
-          status: "failed",
-          error: previous ? `${resolved.error} (previous version still active)` : resolved.error,
-        })
-        if (previous)
-          desired.set(previous.plugin.id, {
-            plugin: previous.plugin,
-            source: "external",
-            target,
-            version: previous.version,
-            options: previous.options,
-            enabled: true,
-          })
-        continue
-      }
-      desired.set(resolved.plugin.id, {
-        plugin: resolved.plugin,
-        source: "external",
-        target,
-        version: resolved.version,
-        options,
-        enabled: true,
+      setStore("states", (items) => [...items, { target, status: "loading" }])
+      const plugin = await loadPlugin(target, directory, props.packages).catch((error) => {
+        setStore("states", (items) =>
+          items.map((state) =>
+            state.target === target
+              ? { target, status: "failed", error: error instanceof Error ? error.message : String(error) }
+              : state,
+          ),
+        )
+        return undefined
      })
-    }
-
-    // Compare: unchanged plugins are never touched, and a fully unchanged
-    // generation is a no-op, so spurious watch events cost nothing.
-    const currentIds = Object.keys(store.registrations)
-    const desiredIds = [...desired.keys()]
-    const structural = currentIds.length !== desiredIds.length || currentIds.some((id, index) => desiredIds[index] !== id)
-    if (structural) {
-      await Promise.all(
-        Object.entries(store.registrations)
-          .filter(([, registration]) => registration.active)
-          .map(([id]) => deactivate(id).catch(() => undefined)),
-      )
-      setStore("registrations", reconcileStore({}))
-    }
-    const changed = structural
-      ? desiredIds
-      : desiredIds.filter((id) => {
-          const registration = store.registrations[id]!
-          const item = desired.get(id)!
-          return (
-            registration.version !== item.version ||
-            !sameOptions(registration.options, item.options) ||
-            registration.active !== item.enabled
-          )
-        })
-
-    // Swap: cleanup failures are logged into states, never propagated, so one
-    // broken plugin cannot take the rest of the generation down.
-    const errors = new Map<string, string>()
-    for (const id of changed) {
-      const item = desired.get(id)!
-      const registration = store.registrations[id]
-      if (!registration || registration.version !== item.version || !sameOptions(registration.options, item.options)) {
-        if (registration) await deactivate(id).catch(() => undefined)
-        // In-place replacement keeps the registration's key position, which
-        // slot ordering (mode "replace" takes the last one) depends on.
-        setStore("registrations", id, toRegistration(item))
-      }
-      if (!item.enabled) {
-        await deactivate(id).catch(() => undefined)
+      if (!plugin) {
+        setStore("states", (items) =>
+          items.map((state) =>
+            state.target === target && state.status !== "failed" ? { target, status: "unsupported" } : state,
+          ),
+        )
        continue
      }
-      const error = await activate(id).then(
+
+      setStore("registrations", plugin.id, {
+        plugin,
+        source: "external",
+        options,
+        active: false,
+        routes: {},
+        slots: {},
+        cleanups: [],
+      })
+      const error = await activate(plugin.id).then(
        () => undefined,
        (error) => (error instanceof Error ? error.message : String(error)),
      )
-      if (error) errors.set(id, error)
+      setStore("states", (items) => [
+        ...items.filter((state) => state.target !== target && (!("id" in state) || state.id !== plugin.id)),
+        error
+          ? { target, status: "failed", error }
+          : { target, id: plugin.id, status: "active" },
+      ])
    }
-
-    const states: State[] = [
-      ...[...desired.values()].flatMap((item): State[] => {
-        if (item.target === undefined) return []
-        // A failed reload keeps this item running; the failure entry covers it.
-        if (failures.some((failure) => failure.target === item.target)) return []
-        const error = errors.get(item.plugin.id)
-        if (error) return [{ target: item.target, status: "failed", error }]
-        const status = store.registrations[item.plugin.id]?.active ? "active" : "inactive"
-        return [{ target: item.target, id: item.plugin.id, status }]
-      }),
-      ...failures,
-    ]
-    // Surface newly failing plugins; repeated reconciles stay silent.
-    for (const state of states)
-      if (
-        state.status === "failed" &&
-        !store.states.some((prev) => prev.status === "failed" && prev.target === state.target && prev.error === state.error)
-      )
-        toast.show({ variant: "error", title: "Plugin", message: `${state.target}: ${state.error}` })
-    setStore("states", reconcileStore(states))
  }
  let loading = Promise.resolve()
  createEffect(
@@ -599,7 +478,7 @@ export function PluginProvider(props: ParentProps<{ packages: PackageResolver }>
          Promise.all(
            Object.entries(store.registrations)
              .filter(([, registration]) => registration.active)
-              .map(([id]) => deactivate(id).catch(() => undefined)),
+              .map(([id]) => deactivate(id)),
          ),
        )
        .then(() => setStore("registrations", reconcileStore({})))
@@ -621,8 +500,8 @@ export function PluginProvider(props: ParentProps<{ packages: PackageResolver }>
          Object.entries(store.registrations).map(([id, plugin]) => ({ id, source: plugin.source, active: plugin.active })),
        route: (id, name) => store.registrations[id]?.routes[name]?.render,
        slot: (name) =>
-          Object.entries(store.registrations).flatMap(([id, registration]) =>
-            registration.active && registration.slots[name] ? [{ id, render: registration.slots[name] }] : [],
+          Object.values(store.registrations).flatMap((registration) =>
+            registration.active && registration.slots[name] ? [registration.slots[name]] : [],
          ),
        activate,
        deactivate,
@@ -652,45 +531,17 @@ function matches(selector: string, id: string) {
  return selector === "*" || selector === id || (selector.endsWith(".*") && id.startsWith(selector.slice(0, -1)))
 }

-async function resolvePlugin(
-  spec: string,
-  local: URL | undefined,
-  options: Readonly<Record<string, any>> | undefined,
-  previous: Registration | undefined,
-  packages: PackageResolver,
-) {
-  // Package entrypoints never change within a session, so a loaded previous
-  // version needs no re-resolution (which could otherwise hit npm).
-  if (!local && previous && sameOptions(previous.options, options))
-    return { status: "unchanged" as const, plugin: previous.plugin, version: previous.version }
+async function loadPlugin(spec: string, directory: string, packages: PackageResolver) {
+  const local = spec.startsWith("file://")
+    ? new URL(spec)
+    : spec.startsWith("./") || spec.startsWith("../") || path.isAbsolute(spec)
+      ? pathToFileURL(path.resolve(directory, spec))
+      : undefined
  const entrypoint = local ? await resolveLocal(local) : await packages.resolve(spec)
-  if (!entrypoint) return { status: "unsupported" as const }
-  // The cache-busted specifier doubles as the version: unique per entrypoint
-  // and mtime, so equal versions mean an identical module.
-  const version = local ? freshSpecifier(entrypoint, (await stat(new URL(entrypoint))).mtimeMs) : entrypoint
-  if (previous && previous.version === version && sameOptions(previous.options, options))
-    return { status: "unchanged" as const, plugin: previous.plugin, version }
-  const mod: { readonly default?: unknown } = await import(version)
+  if (!entrypoint) return
+  const mod: { readonly default?: unknown } = await import(entrypoint)
  if (!isPlugin(mod.default)) throw new Error(`Invalid V2 TUI plugin module: ${spec}`)
-  return { status: "loaded" as const, plugin: mod.default, version }
-}
-
-function toRegistration(item: Desired): Registration {
-  return {
-    plugin: item.plugin,
-    source: item.source,
-    target: item.target,
-    version: item.version,
-    options: item.options,
-    active: false,
-    routes: {},
-    slots: {},
-    cleanups: [],
-  }
-}
-
-function sameOptions(a: Registration["options"], b: Registration["options"]) {
-  return isDeepEqual(a ?? null, b ?? null)
+  return mod.default
 }

 async function resolveLocal(url: URL) {
@@ -726,43 +577,16 @@ export function usePlugin() {
  return value
 }

-// Contain render-time plugin crashes: a throwing slot or route must not take
-// down the app or the other plugins. The crash surfaces as one error toast.
-function PluginBoundary(props: ParentProps<{ id: string; where: string }>) {
-  const toast = useToast()
-  return (
-    <ErrorBoundary
-      fallback={(error) => {
-        createEffect(() =>
-          toast.show({
-            variant: "error",
-            title: "Plugin",
-            message: `${props.id} crashed in ${props.where}: ${error instanceof Error ? error.message : String(error)}`,
-          }),
-        )
-        return null
-      }}
-    >
-      {props.children}
-    </ErrorBoundary>
-  )
-}
-
 export function PluginRoute(props: { readonly fallback: (id: string, name: string) => JSX.Element }) {
  const plugins = usePlugin()
  const route = useRoute()
-  const id = createMemo(() => (route.data.type === "plugin" ? route.data.id : ""))
  const content = createMemo(() => {
    if (route.data.type !== "plugin") return
    const render = plugins.route(route.data.id, route.data.name)
    if (!render) return props.fallback(route.data.id, route.data.name)
    return render({ data: route.data.data })
  })
-  return (
-    <PluginBoundary id={id()} where="route">
-      {content()}
-    </PluginBoundary>
-  )
+  return <>{content()}</>
 }

 export function PluginSlot<Name extends SlotName>(props: {
@@ -776,13 +600,5 @@ export function PluginSlot<Name extends SlotName>(props: {
    if (props.mode === "replace") return items.slice(-1)
    return items
  })
-  return (
-    <For each={renderers()}>
-      {(item) => (
-        <PluginBoundary id={item.id} where={`slot ${props.name}`}>
-          {item.render(props.input)}
-        </PluginBoundary>
-      )}
-    </For>
-  )
+  return <For each={renderers()}>{(render) => render(props.input)}</For>
 }
@@ -1,15 +1,10 @@
 import { readdir } from "node:fs/promises"
 import path from "node:path"
-import { fileURLToPath, pathToFileURL } from "node:url"

 const extensions = new Set([".cjs", ".cts", ".js", ".jsx", ".mjs", ".mts", ".ts", ".tsx"])

-export function tuiPluginDirectory(cwd: string) {
-  return path.join(cwd, ".opencode", "plugins", "tui")
-}
-
 export async function discoverTuiPlugins(cwd: string) {
-  const directory = tuiPluginDirectory(cwd)
+  const directory = path.join(cwd, ".opencode", "plugins", "tui")
  const entries = await readdir(directory, { withFileTypes: true }).catch((error: unknown) => {
    if (error && typeof error === "object" && Reflect.get(error, "code") === "ENOENT") return []
    return Promise.reject(error)
@@ -19,19 +14,3 @@ export async function discoverTuiPlugins(cwd: string) {
    .map((entry) => path.join(directory, entry.name))
    .sort()
 }
-
-export function localSource(spec: string, directory: string) {
-  if (spec.startsWith("file://")) return new URL(spec)
-  if (spec.startsWith("./") || spec.startsWith("../") || path.isAbsolute(spec))
-    return pathToFileURL(path.resolve(directory, spec))
-  return undefined
-}
-
-// Key local plugin imports by mtime so edited sources re-import fresh instead
-// of hitting the ESM cache. Bun ignores query params when caching file:// URL
-// imports, so bust with a plain path there; Node keys its cache on the full
-// URL. Mirrors the core plugin supervisor's loader.
-export function freshSpecifier(entrypoint: string, mtime: number) {
-  if (typeof Bun !== "undefined") return `${fileURLToPath(entrypoint).replaceAll("\\", "/")}?mtime=${mtime}`
-  return `${entrypoint}?mtime=${mtime}`
-}
@@ -1,5 +1,5 @@
 import { Prompt, type PromptRef } from "../component/prompt"
-import { createEffect, createMemo, createSignal, onMount, Show } from "solid-js"
+import { createEffect, createMemo, createSignal, onMount, Show, untrack } from "solid-js"
 import { Logo } from "../component/logo"
 import { useArgs } from "../context/args"
 import { useRouteData } from "../context/route"
@@ -31,7 +31,13 @@ export function Home() {
  const forms = createMemo(() => data.session.form.list("global", currentLocation()) ?? [])
  let sent = false

-  createEffect(() => location.set(currentLocation()))
+  // Track only the route location and (when absent) the default location; location.set
+  // reads other signals internally and tracking them would re-assert the route location
+  // after the user overrides it with /cd.
+  createEffect(() => {
+    const target = currentLocation()
+    untrack(() => location.set(target))
+  })

  onMount(() => {
    editor.clearSelection()
@@ -8,6 +8,7 @@ import { useTheme } from "../../../context/theme"
 import { Locale } from "../../../util/locale"
 import { Keymap } from "../../../context/keymap"
 import { useComposerTab } from "./index"
+import { sessionTitle } from "../../../util/session"

 interface SubagentEntry {
  sessionID: string
@@ -38,13 +39,14 @@ export function SubagentsTab(props: { sessionID: string }) {
    if (current.parentID) {
      const siblings = data.session.list().filter((s) => s.parentID === current.parentID)
      for (const sibling of siblings) {
-        const agentMatch = sibling.title.match(/@(\w+) subagent/)
+        const title = sessionTitle(sibling)
+        const agentMatch = title.match(/@(\w+) subagent/)
        const agent = sibling.agent
          ? Locale.titlecase(sibling.agent)
          : agentMatch
            ? Locale.titlecase(agentMatch[1])
            : "Subagent"
-        const name = agentMatch ? sibling.title.replace(agentMatch[0], "").trim() || sibling.title : sibling.title
+        const name = agentMatch ? title.replace(agentMatch[0], "").trim() || title : title
        result.push({
          sessionID: sibling.id,
          agent,
@@ -56,13 +58,14 @@ export function SubagentsTab(props: { sessionID: string }) {
    } else {
      const children = data.session.list().filter((s) => s.parentID === props.sessionID)
      for (const child of children) {
-        const agentMatch = child.title.match(/@(\w+) subagent/)
+        const title = sessionTitle(child)
+        const agentMatch = title.match(/@(\w+) subagent/)
        const agent = child.agent
          ? Locale.titlecase(child.agent)
          : agentMatch
            ? Locale.titlecase(agentMatch[1])
            : "Subagent"
-        const name = agentMatch ? child.title.replace(agentMatch[0], "").trim() || child.title : child.title
+        const name = agentMatch ? title.replace(agentMatch[0], "").trim() || title : title
        result.push({
          sessionID: child.id,
          agent,
@@ -8,6 +8,7 @@ import { errorMessage } from "../../util/error"
 import { DialogFork } from "./dialog-fork"
 import type { PromptInfo } from "../../prompt/history"
 import { projectedPromptInput } from "../../prompt/codec"
+import { formatClipboardWriteNotification } from "../../clipboard"

 export function DialogMessage(props: {
  messageID: string
@@ -66,8 +67,19 @@ export function DialogMessage(props: {
                  : "text" in value
                    ? value.text
                    : ""
-            await clipboard.write?.(text)
-            dialog.clear()
+            if (!text) {
+              toast.show({ message: "No text content found in message", variant: "error" })
+              return
+            }
+            try {
+              const outcome = await clipboard.write(text)
+              toast.show(
+                formatClipboardWriteNotification(outcome, { message: "Copied to clipboard", variant: "info" }),
+              )
+              dialog.clear()
+            } catch (error) {
+              toast.error(error)
+            }
          },
        },
        {
@@ -8,6 +8,7 @@ import type { FormField, FormValue } from "@opencode-ai/client"
 import type { FormWithLocation } from "../../context/data"
 import { useClient } from "../../context/client"
 import { useClipboard } from "../../context/clipboard"
+import { formatClipboardWriteNotification } from "../../clipboard"
 import { SplitBorder } from "../../ui/border"
 import { useToast } from "../../ui/toast"
 import { Keymap } from "../../context/keymap"
@@ -364,12 +365,14 @@ export function FormPrompt(props: { form: FormWithLocation }) {

  function copyExternal() {
    const current = externalField()
-    if (!current || !clipboard.write) return
+    if (!current) return
    void clipboard
      .write(current.url)
-      .then(() => {
+      .then((outcome) => {
        setStore("externalReady", { ...store.externalReady, [current.key]: true })
-        toast.show({ message: "Copied URL to clipboard", variant: "info" })
+        toast.show(
+          formatClipboardWriteNotification(outcome, { message: "Copied URL to clipboard", variant: "info" }),
+        )
      })
      .catch(toast.error)
  }
@@ -992,7 +995,7 @@ export function FormPrompt(props: { form: FormWithLocation }) {
          >
            enter <span style={{ fg: theme.text.subdued }}>{actionLabel()}</span>
          </text>
-          <Show when={externalField() && clipboard.write}>
+          <Show when={externalField()}>
            <text fg={theme.text.default} onMouseUp={copyExternal}>
              c <span style={{ fg: theme.text.subdued }}>copy</span>
            </text>
@@ -23,7 +23,7 @@ import { SplitBorder } from "../../ui/border"
 import { useTuiPaths, useTuiTerminalEnvironment } from "../../context/runtime"
 import { Spinner, SPINNER_FRAMES } from "../../component/spinner"
 import { ThemeContextProvider, useTheme, useThemes } from "../../context/theme"
-import { BoxRenderable, ScrollBoxRenderable, addDefaultParsers, TextAttributes, RGBA } from "@opentui/core"
+import { BoxRenderable, ScrollBoxRenderable, addDefaultParsers, TextAttributes, RGBA, MouseEvent } from "@opentui/core"
 import { Prompt, type PromptRef } from "../../component/prompt"
 import type {
  ModelInfo,
@@ -53,6 +53,7 @@ import { openEditor } from "../../editor"
 import { useDialog } from "../../ui/dialog"
 import { DialogConfirm } from "../../ui/dialog-confirm"
 import { DialogSessionRename } from "../../component/dialog-session-rename"
+import { DialogImagePreview } from "../../component/dialog-image-preview"
 import { DialogMessage } from "./dialog-message"
 import { DialogFork } from "./dialog-fork"
 import { DialogTimeline } from "./dialog-timeline"
@@ -74,13 +75,13 @@ import { DialogExportResult } from "../../ui/dialog-export-result"
 import { sessionEpilogue } from "../../util/presentation"
 import { useConfig } from "../../config"
 import { useClipboard } from "../../context/clipboard"
+import { formatClipboardWriteNotification } from "../../clipboard"
 import { nextThinkingMode, reasoningSummary, type ThinkingMode } from "../../context/thinking"
 import { getScrollAcceleration } from "../../util/scroll"
 import { collapseToolOutput } from "../../util/collapse-tool-output"
 import { Keymap, type KeymapCommand } from "../../context/keymap"
 import { usePathFormatter } from "../../context/path-format"
 import { useLocation } from "../../context/location"
-import { PluginSlot } from "../../plugin/context"
 import {
  cacheReuseDrop,
  createSessionRows,
@@ -94,6 +95,7 @@ import { switchLabel } from "../../util/model"
 import { findMessageBoundary, messageNavigationSlack } from "./message-navigation"
 import { stringWidth } from "../../util/string-width"
 import { useArgs } from "../../context/args"
+import { sessionTitle } from "../../util/session"

 addDefaultParsers(parsers.parsers)

@@ -106,6 +108,7 @@ const NAVIGATION_SLACK_ID = "session-navigation-slack"
 const TRANSCRIPT_TAIL_ROWS = 40
 const TRANSCRIPT_BACKFILL_CHUNK = 60
 const TRANSCRIPT_BACKFILL_DELAY = 120
+const SESSION_IMAGE_LIMIT = 6

 const context = createContext<{
  width: number
@@ -115,6 +118,7 @@ const context = createContext<{
  markdownMode: () => "source" | "rendered"
  groupExploration: () => boolean
  diffWrapMode: () => "word" | "none"
+  imageKeys: () => ReadonlySet<string>
  models: () => ModelInfo[]
  config: ReturnType<typeof useConfig>["data"]
 }>()
@@ -144,6 +148,9 @@ export function Session() {
  const promptRef = usePromptRef()
  const session = createMemo(() => data.session.get(route.sessionID))
  const messages = () => data.session.message.list(route.sessionID)
+  const imageKeys = createMemo(() =>
+    config.session?.image_preview ? sessionImageKeys(messages(), session()?.revert?.messageID) : new Set<string>(),
+  )
  const location = createMemo(() => session()?.location)
  const currentLocation = useLocation()

@@ -796,8 +803,15 @@ export function Session() {
        }

        clipboard
-          .write?.(text)
-          .then(() => toast.show({ message: "Message copied to clipboard!", variant: "success" }))
+          .write(text)
+          .then((outcome) =>
+            toast.show(
+              formatClipboardWriteNotification(outcome, {
+                message: "Message copied to clipboard!",
+                variant: "success",
+              }),
+            ),
+          )
          .catch(() => toast.show({ message: "Failed to copy to clipboard", variant: "error" }))
        dialog.clear()
      },
@@ -814,8 +828,13 @@ export function Session() {
          const sessionData = session()
          if (!sessionData) return
          const transcript = formatSessionTranscript(sessionData, messages(), showThinking())
-          await clipboard.write?.(transcript)
-          toast.show({ message: "Session transcript copied to clipboard!", variant: "success" })
+          const outcome = await clipboard.write(transcript)
+          toast.show(
+            formatClipboardWriteNotification(outcome, {
+              message: "Session transcript copied to clipboard!",
+              variant: "success",
+            }),
+          )
        } catch {
          toast.show({ message: "Failed to copy session transcript", variant: "error" })
        }
@@ -857,9 +876,11 @@ export function Session() {
                })()

          if (options.action === "copy") {
-            await clipboard.write?.(content)
+            const outcome = await clipboard.write(content)
            dialog.clear()
-            toast.show({ message: "Copied to clipboard", variant: "success" })
+            toast.show(
+              formatClipboardWriteNotification(outcome, { message: "Copied to clipboard", variant: "success" }),
+            )
            return
          }

@@ -980,6 +1001,7 @@ export function Session() {
        markdownMode,
        groupExploration,
        diffWrapMode,
+        imageKeys,
        models,
        config,
      }}
@@ -1030,7 +1052,6 @@ export function Session() {
              </Show>
            </scrollbox>
            <box flexShrink={0}>
-              <PluginSlot name="session.composer.top" input={{ sessionID: route.sessionID }} mode="all" />
              <Composer
                sessionID={route.sessionID}
                open={composer.open || (!!session()?.parentID && forms().length === 0)}
@@ -1370,7 +1391,7 @@ function SessionPartView(props: { partRef: PartRef; message: (messageID: string)
            />
          </Match>
          <Match when={item().type === "tool"}>
-            <ToolPart part={item() as SessionMessageAssistantTool} />
+            <ToolPartWithImages messageID={props.partRef.messageID} part={item() as SessionMessageAssistantTool} />
          </Match>
        </Switch>
      )}
@@ -1508,6 +1529,7 @@ function SessionGroupView(props: {
 }) {
  const theme = useTheme()
  const ctx = use()
+  const dialog = useDialog()
  const renderer = useRenderer()
  const [expanded, setExpanded] = createSignal(false)
  const [hover, setHover] = createSignal(false)
@@ -1517,13 +1539,13 @@ function SessionGroupView(props: {
      if (message?.type !== "assistant") return []
      const part = resolvePart(message, ref.partID)
      if (part?.type !== "tool") return []
-      return [part]
+      return [{ messageID: ref.messageID, part }]
    })
  const grouped = createMemo(() => parts(props.refs))
  const pending = createMemo(() => parts(props.pending))
  const label = createMemo(() => {
-    const counts = grouped().reduce<Record<string, number>>((result, part) => {
-      const tool = toolDisplay(part.name)
+    const counts = grouped().reduce<Record<string, number>>((result, item) => {
+      const tool = toolDisplay(item.part.name)
      const name = tool === "grep" || tool === "glob" ? "search" : tool
      result[name] = (result[name] ?? 0) + 1
      return result
@@ -1537,7 +1559,11 @@ function SessionGroupView(props: {
    <Show when={grouped().length > 0 || pending().length > 0}>
      <Show
        when={ctx.groupExploration()}
-        fallback={<For each={[...grouped(), ...pending()]}>{(part) => <ToolPart part={part} />}</For>}
+        fallback={
+          <For each={[...grouped(), ...pending()]}>
+            {(item) => <ToolPartWithImages messageID={item.messageID} part={item.part} />}
+          </For>
+        }
      >
        <Show when={grouped().length > 0}>
          <InlineToolRow
@@ -1557,9 +1583,18 @@ function SessionGroupView(props: {
          </InlineToolRow>
        </Show>
        <Show when={expanded() && grouped().length > 0}>
-          <For each={grouped()}>{(part) => <ToolPart part={part} />}</For>
+          <For each={grouped()}>{(item) => <ToolPart part={item.part} />}</For>
        </Show>
-        <For each={pending()}>{(part) => <ToolPart part={part} />}</For>
+        <ToolImages
+          parts={grouped()}
+          visible={ctx.imageKeys()}
+          onOpen={(images, index) =>
+            dialog.replace(() => <DialogImagePreview images={images} initial={index} />)
+          }
+        />
+        <For each={pending()}>
+          {(item) => <ToolPartWithImages messageID={item.messageID} part={item.part} />}
+        </For>
      </Show>
    </Show>
  )
@@ -1865,6 +1900,7 @@ function UserMessage(props: { message: SessionMessageUser }) {
  const data = useData()
  const local = useLocal()
  const files = createMemo(() => props.message.files ?? [])
+  const images = createMemo(() => sessionMessageImages(props.message))
  const themes = useThemes()
  const theme = useTheme("elevated")
  const mode = themes.mode
@@ -1883,28 +1919,31 @@ function UserMessage(props: { message: SessionMessageUser }) {
        border={["left"]}
        borderColor={queued() ? theme.border.default : color()}
        customBorderChars={SplitBorder.customBorderChars}
+        backgroundColor={hover() ? theme.raise(theme.background.default) : theme.background.default}
+        onMouseOver={() => setHover(true)}
+        onMouseOut={() => setHover(false)}
+        onMouseUp={() => {
+          if (renderer.getSelection()?.getSelectedText()) return
+          dialog.replace(() => (
+            <DialogMessage
+              messageID={props.message.id}
+              sessionID={ctx.sessionID}
+              setPrompt={(value) => promptRef.current?.set(value)}
+            />
+          ))
+        }}
      >
+        <SessionImages
+          images={images()}
+          visible={ctx.imageKeys()}
+          onOpen={(images, index) =>
+            dialog.replace(() => <DialogImagePreview images={images} initial={index} />)
+          }
+        />
        <box
-          onMouseOver={() => {
-            setHover(true)
-          }}
-          onMouseOut={() => {
-            setHover(false)
-          }}
-          onMouseUp={() => {
-            if (renderer.getSelection()?.getSelectedText()) return
-            dialog.replace(() => (
-              <DialogMessage
-                messageID={props.message.id}
-                sessionID={ctx.sessionID}
-                setPrompt={(value) => promptRef.current?.set(value)}
-              />
-            ))
-          }}
          paddingTop={1}
          paddingBottom={1}
          paddingLeft={2}
-          backgroundColor={hover() ? theme.raise(theme.background.default) : theme.background.default}
          flexShrink={0}
        >
          <text fg={theme.text.default}>{props.message.text}</text>
@@ -2329,6 +2368,130 @@ function ToolPart(props: { part: SessionMessageAssistantTool }) {
  )
 }

+function ToolPartWithImages(props: { messageID: string; part: SessionMessageAssistantTool }) {
+  const ctx = use()
+  const dialog = useDialog()
+  return (
+    <>
+      <ToolPart part={props.part} />
+      <ToolImages
+        parts={[props]}
+        visible={ctx.imageKeys()}
+        onOpen={(images, index) => dialog.replace(() => <DialogImagePreview images={images} initial={index} />)}
+      />
+    </>
+  )
+}
+
+export function ToolImages(props: {
+  parts: readonly { messageID: string; part: SessionMessageAssistantTool }[]
+  visible: ReadonlySet<string>
+  onOpen?: (images: readonly { key: string; uri: string }[], index: number) => void
+}) {
+  const images = createMemo(() => props.parts.flatMap((item) => inlineToolImages(item.messageID, item.part)))
+
+  return <SessionImages images={images()} visible={props.visible} onOpen={props.onOpen} />
+}
+
+export function SessionImages(props: {
+  images: readonly { key: string; uri: string }[]
+  visible: ReadonlySet<string>
+  onOpen?: (images: readonly { key: string; uri: string }[], index: number) => void
+}) {
+  const dimensions = useTerminalDimensions()
+  const images = createMemo(() => props.images.filter((image) => props.visible.has(image.key)))
+  const height = createMemo(() => Math.max(4, Math.min(8, Math.floor(dimensions().height / 4))))
+  const width = createMemo(() => height() * 2)
+  const limit = createMemo(() =>
+    Math.max(0, Math.min(3, Math.floor((Math.max(0, dimensions().width - 6) + 1) / (width() + 1)))),
+  )
+  const count = createMemo(() => Math.min(limit(), images().length))
+
+  return (
+    <Show when={count() > 0}>
+      <box
+        flexDirection="row"
+        flexShrink={0}
+        paddingTop={1}
+        paddingLeft={2}
+        paddingRight={2}
+        paddingBottom={1}
+        gap={1}
+      >
+        <For each={images().slice(0, count())}>
+          {(image, index) => {
+            const [failed, setFailed] = createSignal(false)
+            return (
+              <box
+                width={width()}
+                height={height()}
+                flexBasis={width()}
+                flexShrink={0}
+                alignItems="center"
+                justifyContent="center"
+                onMouseUp={(event: MouseEvent) => {
+                  if (event.button !== 0) return
+                  event.stopPropagation()
+                  props.onOpen?.(images(), index())
+                }}
+              >
+                <Show when={!failed()} fallback={<text>No preview</text>}>
+                  <image
+                    id={`session-image-${image.key}`}
+                    source={image.uri}
+                    fit="cover"
+                    protocol="auto"
+                    width="100%"
+                    height="100%"
+                    onError={() => setFailed(true)}
+                  />
+                </Show>
+              </box>
+            )
+          }}
+        </For>
+        <Show when={images().length > count()}>
+          <box width={8} height={height()} flexShrink={1} alignItems="center" justifyContent="center">
+            <text wrapMode="none" truncate>
+              +{images().length - count()} more
+            </text>
+          </box>
+        </Show>
+      </box>
+    </Show>
+  )
+}
+
+export function sessionImageKeys(messages: readonly SessionMessageInfo[], revertBoundary?: string) {
+  return new Set(
+    messages
+      .filter((message) => !revertBoundary || message.id < revertBoundary)
+      .flatMap(sessionMessageImages)
+      .map((image) => image.key)
+      .slice(-SESSION_IMAGE_LIMIT),
+  )
+}
+
+export function sessionMessageImages(message: SessionMessageInfo) {
+  if (message.type === "user") {
+    return (message.files ?? []).flatMap((file, index) =>
+      file.mime.startsWith("image/")
+        ? [{ key: `${message.id}:file:${index}`, uri: `data:${file.mime};base64,${file.data}` }]
+        : [],
+    )
+  }
+  if (message.type !== "assistant") return []
+  return message.content.flatMap((part) => (part.type === "tool" ? inlineToolImages(message.id, part) : []))
+}
+
+function inlineToolImages(messageID: string, part: SessionMessageAssistantTool) {
+  return toolDisplayContent(part.state).flatMap((content, index) =>
+    content.type === "file" && content.mime.startsWith("image/") && content.uri.startsWith("data:image/")
+      ? [{ key: `${messageID}:${part.id}:${index}`, uri: content.uri }]
+      : [],
+  )
+}
+
 type ToolProps = {
  input: Record<string, unknown>
  metadata: Record<string, unknown>
@@ -3336,7 +3499,7 @@ function formatSessionTranscript(session: SessionInfo, messages: SessionMessageI
    })
    return [`## Assistant\n\n${content.join("\n\n")}`]
  })
-  return `# ${session.title}\n\n**Session ID:** ${session.id}\n**Created:** ${new Date(session.time.created).toLocaleString()}\n**Updated:** ${new Date(session.time.updated).toLocaleString()}\n\n---\n\n${body.join("\n\n---\n\n")}\n`
+  return `# ${sessionTitle(session)}\n\n**Session ID:** ${session.id}\n**Created:** ${new Date(session.time.created).toLocaleString()}\n**Updated:** ${new Date(session.time.updated).toLocaleString()}\n\n---\n\n${body.join("\n\n---\n\n")}\n`
 }

 export function parseApplyPatchFiles(value: unknown) {
@@ -3,6 +3,7 @@ import { createMemo, Show } from "solid-js"
 import { useTheme } from "../../context/theme"
 import { useConfig } from "../../config"
 import { PluginSlot } from "../../plugin/context"
+import { sessionTitle } from "../../util/session"

 import { getScrollAcceleration } from "../../util/scroll"

@@ -38,7 +39,7 @@ export function Sidebar(props: { sessionID: string; overlay?: boolean }) {
          <box flexShrink={0} gap={1} paddingRight={1}>
            <box paddingRight={1}>
              <text fg={theme.text.default}>
-                <b>{session()!.title}</b>
+                <b>{sessionTitle(session()!)}</b>
              </text>
              <Show when={session()!.location.workspaceID}>
                <text fg={theme.text.subdued}>{session()!.location.workspaceID}</text>
@@ -240,7 +240,7 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
    on(
      () => props.options,
      () => {
-        if (!props.preserveSelection) {
+        if (!props.preserveSelection && props.current === undefined) {
          const count = flat().length
          if (count === 0) return
          const next = reconcileSelection(store.selected, count)
@@ -276,7 +276,7 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
          setStore("selected", index)
          selection = option
          if (!moved) return
-          if (!props.preserveSelection || store.filter.length > 0) return
+          if ((!props.preserveSelection && props.current === undefined) || store.filter.length > 0) return
          scrollAfterLayout(false, option.value)
          return
        }
@@ -7,6 +7,7 @@ import { createStore } from "solid-js/store"
 import { useToast } from "./toast"
 import { useClipboard } from "../context/clipboard"
 import { useConfig } from "../config"
+import { formatClipboardWriteNotification } from "../clipboard"

 export function Dialog(
  props: ParentProps<{
@@ -202,9 +203,10 @@ export function DialogProvider(props: ParentProps) {

  function copySelection() {
    const text = renderer.getSelection()?.getSelectedText()
-    if (!text || !clipboard.write) return false
+    if (!text) return false
    void clipboard.write(text).then(
-      () => toast.show({ message: "Copied to clipboard", variant: "info" }),
+      (outcome) =>
+        toast.show(formatClipboardWriteNotification(outcome, { message: "Copied to clipboard", variant: "info" })),
      (error) => toast.error(error),
    )
    renderer.clearSelection()
@@ -1,4 +1,5 @@
 import type { ClipboardService } from "../context/clipboard"
+import { formatClipboardWriteNotification } from "../clipboard"

 type Toast = {
  show: (input: { message: string; variant: "info" | "success" | "warning" | "error" }) => void
@@ -35,8 +36,10 @@ export function copy(renderer: Renderer, toast: Toast, clipboard: ClipboardServi
    focus?.getClipboardText && selection.selectedRenderables.includes(focus) ? focus.getClipboardText(text) : text

  clipboard
-    ?.write?.(clipboardText)
-    .then(() => toast.show({ message: "Copied to clipboard", variant: "info" }))
+    .write(clipboardText)
+    .then((outcome) =>
+      toast.show(formatClipboardWriteNotification(outcome, { message: "Copied to clipboard", variant: "info" })),
+    )
    .catch(toast.error)

  renderer.clearSelection()
@@ -1,8 +1,16 @@
-import type { ModelInfo, SessionMessageAssistant, SessionMessageInfo } from "@opencode-ai/client"
+import type { ModelInfo, SessionInfo, SessionMessageAssistant, SessionMessageInfo } from "@opencode-ai/client"
 import { Locale } from "./locale"

-export function isDefaultTitle(title: string) {
-  return /^(New session - |Child session - )\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/.test(title)
+export function isDefaultTitle(title?: string) {
+  return (
+    title === undefined || /^(New session - |Child session - )\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/.test(title)
+  )
+}
+
+export function sessionTitle(session: Pick<SessionInfo, "parentID" | "time" | "title">) {
+  return (
+    session.title ?? `${session.parentID ? "Child" : "New"} session - ${new Date(session.time.created).toISOString()}`
+  )
 }

 export function lastAssistantWithUsage(messages: ReadonlyArray<SessionMessageInfo>, boundary?: string) {
@@ -1,14 +1,89 @@
 import { expect, mock, test } from "bun:test"
 import { createTestRenderer } from "@opentui/core/testing"
+import type {
+  ClipboardOptions,
+  ClipboardService,
+  HostClipboardOptions,
+  HostClipboardService,
+  RendererClipboardBoundary,
+} from "@opentui/core"
 import { Effect, FileSystem } from "effect"
 import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { Global } from "@opencode-ai/util/global"
 import { createEventStream, createFetch, directory, json } from "./fixture/tui-client"

+const openTui = { ...(await import("@opentui/core")) }
+
+function restoreOpenTui() {
+  mock.restore()
+  mock.module("@opentui/core", () => openTui)
+}
+
+async function mockOpenTuiClipboard(
+  renderer: RendererClipboardBoundary,
+  options: {
+    dispose?: () => Promise<void>
+    constructionError?: Error
+  } = {},
+) {
+  const calls = {
+    host: [] as (HostClipboardOptions | undefined)[],
+    adapter: [] as RendererClipboardBoundary[],
+    service: [] as ClipboardOptions[],
+    dispose: 0,
+    hostDispose: 0,
+    hostWrite: 0,
+  }
+  const host: HostClipboardService = {
+    maxWriteBytes: 8 * 1024 * 1024,
+    async read() {
+      return { status: "empty" }
+    },
+    async writeText() {
+      calls.hostWrite++
+      return { status: "written" }
+    },
+    async clear() {
+      return { status: "cleared" }
+    },
+    async dispose() {
+      calls.hostDispose++
+      await options.dispose?.()
+    },
+  }
+
+  mock.module("@opentui/core", () => ({
+    ...openTui,
+    createCliRenderer: async () => renderer,
+    createHostClipboard: (input?: HostClipboardOptions) => {
+      if (options.constructionError) throw options.constructionError
+      calls.host.push(input)
+      return host
+    },
+    createRendererClipboardAdapter: (input: RendererClipboardBoundary) => {
+      calls.adapter.push(input)
+      return openTui.createRendererClipboardAdapter(input)
+    },
+    createClipboard: (input: ClipboardOptions) => {
+      calls.service.push(input)
+      const service = openTui.createClipboard(input)
+      return {
+        read: service.read,
+        writeText: service.writeText,
+        clear: service.clear,
+        async dispose() {
+          calls.dispose++
+          await service.dispose()
+        },
+      } satisfies ClipboardService
+    },
+  }))
+  return calls
+}
+
 test("SIGHUP clears title and disposes scoped resources once", async () => {
  const setup = await createTestRenderer({ width: 80, height: 24, useThread: false })
-  const core = await import("@opentui/core")
-  mock.module("@opentui/core", () => ({ ...core, createCliRenderer: async () => setup.renderer }))
+  const clipboard = await mockOpenTuiClipboard(setup.renderer)
  const titles: string[] = []
  let started!: () => void
  const ready = new Promise<void>((resolve) => {
@@ -42,18 +117,46 @@ test("SIGHUP clears title and disposes scoped resources once", async () => {

    expect(setup.renderer.isDestroyed).toBe(true)
    expect(titles.at(-1)).toBe("")
+    expect(clipboard.host).toEqual([
+      {
+        timeoutMs: 1_000,
+        maxReadBytes: 8 * 1024 * 1024,
+        maxWriteBytes: 8 * 1024 * 1024,
+        maxImagePixels: 64 * 1024 * 1024,
+        maxConversionBytes: 512 * 1024 * 1024,
+        maxConcurrentOperations: 16,
+        maxProviderTransfers: 16,
+        maxWorkUnitsPerDrain: 64,
+      },
+    ])
+    expect(clipboard.adapter).toEqual([setup.renderer])
+    expect(clipboard.service).toHaveLength(1)
+    expect(clipboard.dispose).toBe(1)
+    expect(clipboard.hostDispose).toBe(1)
    expect(process.listeners("SIGHUP").every((listener) => listeners.has(listener))).toBe(true)
  } finally {
    if (!setup.renderer.isDestroyed) setup.renderer.destroy()
    await server.stop()
-    mock.restore()
+    restoreOpenTui()
  }
 })

 test("session lifecycle updates the terminal title and prints the epilogue after cleanup", async () => {
  const setup = await createTestRenderer({ width: 80, height: 24, useThread: false })
-  const core = await import("@opentui/core")
-  mock.module("@opentui/core", () => ({ ...core, createCliRenderer: async () => setup.renderer }))
+  let releaseDispose!: () => void
+  let startDispose!: () => void
+  const disposeStarted = new Promise<void>((resolve) => {
+    startDispose = resolve
+  })
+  const disposeReady = new Promise<void>((resolve) => {
+    releaseDispose = resolve
+  })
+  const clipboard = await mockOpenTuiClipboard(setup.renderer, {
+    dispose: async () => {
+      startDispose()
+      await disposeReady
+    },
+  })
  let initialTitle!: () => void
  const initialTitleSet = new Promise<void>((resolve) => {
    initialTitle = resolve
@@ -124,17 +227,164 @@ test("session lifecycle updates the terminal title and prints the epilogue after
      data: { sessionID: "dummy", title: "Renamed session" },
    })
    await renamedTitleSet
-    setup.renderer.destroy()
+    let settled = false
+    void task.then(
+      () => (settled = true),
+      () => (settled = true),
+    )
+    events.emit({
+      id: "evt_exit",
+      created: 2,
+      type: "tui.command.execute",
+      data: { command: "app.exit" },
+    })
+    await disposeStarted
+    expect(settled).toBe(false)
+    expect(stdout).toBe("")
+    releaseDispose()
    await task

-    expect(stdout).toContain("Renamed session")
    expect(stdout).toContain("opencode2 -s dummy")
    expect(promptRequests).toBe(0)
+    expect(clipboard.dispose).toBe(1)
+    expect(clipboard.hostDispose).toBe(1)
  } finally {
+    releaseDispose()
    process.stdout.write = originalWrite
    if (!setup.renderer.isDestroyed) setup.renderer.destroy()
    await server.stop()
-    mock.restore()
+    restoreOpenTui()
+  }
+})
+
+test("direct renderer destruction disposes the clipboard once", async () => {
+  const setup = await createTestRenderer({ width: 80, height: 24, useThread: false })
+  const clipboard = await mockOpenTuiClipboard(setup.renderer)
+  let started!: () => void
+  const ready = new Promise<void>((resolve) => {
+    started = resolve
+  })
+  const setTitle = setup.renderer.setTerminalTitle.bind(setup.renderer)
+  setup.renderer.setTerminalTitle = (title) => {
+    if (title === "OpenCode") started()
+    setTitle(title)
+  }
+  const events = createEventStream()
+  const calls = createFetch(undefined, events)
+  const server = Bun.serve({ port: 0, fetch: (request) => calls.fetch(request) })
+
+  try {
+    const { run } = await import("../src/app")
+    const task = Effect.runPromise(
+      run({
+        app: { name: "test", version: "test", channel: "test" },
+        server: { endpoint: { url: server.url.toString() } },
+        config: { get: async () => ({}), update: async () => ({}) },
+        packages: { resolve: async () => undefined },
+        args: {},
+        log: () => {},
+      }).pipe(Effect.provide(AppNodeBuilder.build(Global.node)), Effect.provide(FileSystem.layerNoop({}))),
+    )
+    await ready
+    const staleCopy = setup.renderer.console.onCopySelection
+    setup.renderer.destroy()
+    await task
+
+    expect(clipboard.dispose).toBe(1)
+    expect(clipboard.hostDispose).toBe(1)
+    await staleCopy?.("stale")
+    expect(clipboard.hostWrite).toBe(0)
+  } finally {
+    if (!setup.renderer.isDestroyed) setup.renderer.destroy()
+    await server.stop()
+    restoreOpenTui()
+  }
+})
+
+test("clipboard construction failure releases the renderer", async () => {
+  const setup = await createTestRenderer({ width: 80, height: 24, useThread: false })
+  const failure = new Error("clipboard construction failed")
+  await mockOpenTuiClipboard(setup.renderer, { constructionError: failure })
+  const events = createEventStream()
+  const calls = createFetch(undefined, events)
+  const server = Bun.serve({ port: 0, fetch: (request) => calls.fetch(request) })
+
+  try {
+    const { run } = await import("../src/app")
+    await expect(
+      Effect.runPromise(
+        run({
+          app: { name: "test", version: "test", channel: "test" },
+          server: { endpoint: { url: server.url.toString() } },
+          config: { get: async () => ({}), update: async () => ({}) },
+          packages: { resolve: async () => undefined },
+          args: {},
+          log: () => {},
+        }).pipe(Effect.provide(AppNodeBuilder.build(Global.node)), Effect.provide(FileSystem.layerNoop({}))),
+      ),
+    ).rejects.toThrow("clipboard construction failed")
+    expect(setup.renderer.isDestroyed).toBe(true)
+  } finally {
+    if (!setup.renderer.isDestroyed) setup.renderer.destroy()
+    await server.stop()
+    restoreOpenTui()
+  }
+})
+
+test("clipboard disposal failure is logged without failing remaining cleanup", async () => {
+  const setup = await createTestRenderer({ width: 80, height: 24, useThread: false })
+  const clipboard = await mockOpenTuiClipboard(setup.renderer, {
+    dispose: async () => {
+      throw new Error("clipboard disposal failed")
+    },
+  })
+  let started!: () => void
+  const ready = new Promise<void>((resolve) => {
+    started = resolve
+  })
+  const titles: string[] = []
+  const setTitle = setup.renderer.setTerminalTitle.bind(setup.renderer)
+  setup.renderer.setTerminalTitle = (title) => {
+    titles.push(title)
+    if (title === "OpenCode") started()
+    setTitle(title)
+  }
+  const events = createEventStream()
+  const calls = createFetch(undefined, events)
+  const server = Bun.serve({ port: 0, fetch: (request) => calls.fetch(request) })
+  const logs: unknown[] = []
+
+  try {
+    const { run } = await import("../src/app")
+    const task = Effect.runPromise(
+      run({
+        app: { name: "test", version: "test", channel: "test" },
+        server: { endpoint: { url: server.url.toString() } },
+        config: { get: async () => ({}), update: async () => ({}) },
+        packages: { resolve: async () => undefined },
+        args: {},
+        log: (_level, message) => void logs.push(message),
+      }).pipe(
+        Effect.provide(AppNodeBuilder.build(Global.node)),
+        Effect.provide(FileSystem.layerNoop({})),
+      ),
+    )
+    await ready
+    setup.renderer.destroy()
+    await task
+
+    expect(clipboard.dispose).toBe(1)
+    expect(clipboard.hostDispose).toBe(1)
+    expect(titles.at(-1)).toBe("")
+    expect(
+      logs.some((message) =>
+        (Array.isArray(message) ? message : [message]).some((value) => value === "Failed to dispose TUI clipboard"),
+      ),
+    ).toBe(true)
+  } finally {
+    if (!setup.renderer.isDestroyed) setup.renderer.destroy()
+    await server.stop()
+    restoreOpenTui()
  }
 })

@@ -5,6 +5,7 @@ import { expect, test } from "bun:test"
 import { onMount } from "solid-js"
 import { ConfigProvider, resolve, type Info, type Interface } from "../../../src/config"
 import { CommandPaletteDialog } from "../../../src/component/command-palette"
+import { settingID, settings } from "../../../src/component/dialog-config"
 import { Keymap } from "../../../src/context/keymap"
 import { ThemeProvider } from "../../../src/context/theme"
 import { DialogProvider, useDialog } from "../../../src/ui/dialog"
@@ -13,6 +14,10 @@ import { TestTuiContexts } from "../../fixture/tui-environment"

 test("searches settings globally and opens the matching setting", async () => {
  let current: Info = {}
+  expect(settings.find((setting) => settingID(setting) === "session.image_preview")).toMatchObject({
+    title: "Transcript images",
+    default: false,
+  })
  const service: Interface = {
    get: async () => current,
    update: async (update) => {
@@ -74,11 +79,11 @@ test("searches settings globally and opens the matching setting", async () => {
    await app.waitFor(() => app.renderer.currentFocusedEditor instanceof InputRenderable)

    app.mockInput.pressArrow("down")
-    for (const key of "sounds") app.mockInput.pressKey(key)
+    for (const key of "image preview") app.mockInput.pressKey(key)
    app.mockInput.pressEnter()
-    await app.waitForFrame((frame) => frame.includes("Settings") && frame.includes("Sounds"))
+    await app.waitForFrame((frame) => frame.includes("Settings") && frame.includes("Image previews"))
    app.mockInput.pressEnter()
-    await app.waitFor(() => current.attention?.sound === false)
+    await app.waitFor(() => current.prompt?.image_preview === true)
  } finally {
    app.renderer.destroy()
  }
@@ -79,7 +79,7 @@ async function renderSelect(
  return app
 }

-async function mountSelect(root: string, initial: DialogSelectOption<string>[]) {
+async function mountSelect(root: string, initial: DialogSelectOption<string>[], current?: string) {
  const state = path.join(root, "state")
  await mkdir(state, { recursive: true })
  const config = createTuiResolvedConfig()
@@ -114,6 +114,7 @@ async function mountSelect(root: string, initial: DialogSelectOption<string>[])
          <DialogSelect
            title="Mutable options"
            options={options()}
+            current={current}
            onMove={(option) => moved.push(option.value)}
            onSelect={(option) => selected.push(option.value)}
          />
@@ -309,3 +310,20 @@ test("keeps the cursor index while options are temporarily empty", async () => {
    select.app.renderer.destroy()
  }
 })
+
+test("keeps the current option selected when options reorder", async () => {
+  await using tmp = await tmpdir()
+  const options = ["first", "current", "third"].map((value) => ({ title: value, value }))
+  const select = await mountSelect(tmp.path, options, "current")
+
+  try {
+    select.replaceOptions([options[1], options[2], options[0]])
+    await select.app.waitForFrame((frame) => frame.indexOf("current") < frame.indexOf("third"))
+    select.app.mockInput.pressEnter()
+    await select.app.waitFor(() => select.selected.length === 1)
+
+    expect(select.selected).toEqual(["current"])
+  } finally {
+    select.app.renderer.destroy()
+  }
+})
@@ -60,9 +60,19 @@ async function mountForm(root: string, width = 80) {
      >
        <ClipboardProvider
          value={{
+            async read() {
+              return undefined
+            },
            write(text) {
              copied.push(text)
-              return Promise.resolve()
+              return Promise.resolve({
+                delivery: "confirmed" as const,
+                partial: false,
+                result: {
+                  host: { status: "written" as const },
+                  terminal: { status: "not-attempted" as const, capability: "unknown" as const },
+                },
+              })
            },
          }}
        >
@@ -0,0 +1,147 @@
+import { afterEach, expect, test } from "bun:test"
+import { ImageRenderable } from "@opentui/core"
+import { MouseButtons } from "@opentui/core/testing"
+import { testRender } from "@opentui/solid"
+import type { SessionMessageAssistant, SessionMessageAssistantTool, SessionMessageUser } from "@opencode-ai/client"
+import { sessionImageKeys, sessionMessageImages, SessionImages, ToolImages } from "../../../src/routes/session"
+
+const PNG_1X1_BASE64 =
+  "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR4AWP4z8DwHwAFAAH/e+m+7wAAAABJRU5ErkJggg=="
+const image = { type: "file" as const, uri: `data:image/png;base64,${PNG_1X1_BASE64}`, mime: "image/png" }
+let setup: Awaited<ReturnType<typeof testRender>> | undefined
+
+afterEach(() => {
+  setup?.renderer.destroy()
+  setup = undefined
+})
+
+test("renders bounded inline images from completed tool content", async () => {
+  let opened = -1
+  setup = await testRender(
+    () => toolImages([image, image, image, image, image, image, image], (_, index) => (opened = index)),
+    {
+      width: 80,
+      height: 70,
+    },
+  )
+  await setup.renderOnce()
+
+  const first = setup.renderer.root.findDescendantById("session-image-message-1:call-1:1")
+  const second = setup.renderer.root.findDescendantById("session-image-message-1:call-1:2")
+  if (!(first instanceof ImageRenderable)) throw new Error("Tool image did not render")
+  if (!(second instanceof ImageRenderable)) throw new Error("Second tool image did not render")
+  await first.loadPromise
+
+  expect(first.fit).toBe("cover")
+  expect(first.protocol).toBe("auto")
+  expect(first.width).toBe(16)
+  expect(first.height).toBe(8)
+  expect(second.y).toBe(first.y)
+  expect(second.x).toBe(first.x + first.width + 1)
+  expect(setup.renderer.root.findDescendantById("session-image-message-1:call-1:3")).toBeInstanceOf(ImageRenderable)
+  expect(setup.renderer.root.findDescendantById("session-image-message-1:call-1:0")).toBeUndefined()
+  expect(setup.renderer.root.findDescendantById("session-image-message-1:call-1:4")).toBeUndefined()
+  expect(setup.captureCharFrame()).toContain("+3 more")
+
+  await setup.mockMouse.click(first.x, first.y, MouseButtons.LEFT)
+  expect(opened).toBe(0)
+})
+
+test("does not expose external image tool content to the renderer", () => {
+  expect(
+    sessionMessageImages(
+      assistant("message-1", [
+        tool([
+          { type: "file", uri: "https://example.test/image.png", mime: "image/png" },
+          { type: "file", uri: "file:///tmp/image.png", mime: "image/png" },
+          { type: "file", uri: "data:text/plain;base64,SGVsbG8=", mime: "text/plain" },
+        ]),
+      ]),
+    ),
+  ).toEqual([])
+})
+
+test("does not render session images without the opt-in setting", async () => {
+  const part = tool([image])
+  setup = await testRender(() => <ToolImages parts={[{ messageID: "message-1", part }]} visible={new Set()} />, {
+    width: 80,
+    height: 24,
+  })
+  await setup.renderOnce()
+
+  expect(setup.renderer.root.findDescendantById("session-image-message-1:call-1:0")).toBeUndefined()
+})
+
+test("renders images submitted in user prompts", async () => {
+  const message: SessionMessageUser = {
+    type: "user",
+    id: "message-user",
+    text: "What is in this image?",
+    files: [{ data: PNG_1X1_BASE64, mime: "image/png", source: { type: "inline" }, name: "prompt.png" }],
+    time: { created: 1 },
+  }
+  setup = await testRender(
+    () => <SessionImages images={sessionMessageImages(message)} visible={sessionImageKeys([message])} />,
+    { width: 80, height: 24 },
+  )
+  await setup.renderOnce()
+
+  const preview = setup.renderer.root.findDescendantById("session-image-message-user:file:0")
+  if (!(preview instanceof ImageRenderable)) throw new Error("User image did not render")
+  await preview.loadPromise
+
+  expect(preview.fit).toBe("cover")
+})
+
+test("does not reserve image slots for reverted messages", () => {
+  const visible = assistant("message-1", [tool([image])])
+  const reverted = assistant("message-2", [tool([image, image, image, image, image, image])])
+
+  expect([...sessionImageKeys([visible, reverted], reverted.id)]).toEqual(["message-1:call-1:0"])
+})
+
+test("falls back when inline image content is malformed", async () => {
+  setup = await testRender(
+    () => toolImages([{ type: "file", uri: "data:image/png;base64,aW52YWxpZA==", mime: "image/png" }]),
+    { width: 80, height: 24 },
+  )
+  await setup.renderOnce()
+
+  const preview = setup.renderer.root.findDescendantById("session-image-message-1:call-1:0")
+  if (!(preview instanceof ImageRenderable)) throw new Error("Tool image did not render")
+  await preview.loadPromise
+
+  expect(await setup.waitForFrame((frame) => frame.includes("No preview"))).toContain("No preview")
+})
+
+function toolImages(
+  content: Extract<SessionMessageAssistantTool["state"], { status: "completed" }>["content"],
+  onOpen?: (images: readonly { key: string; uri: string }[], index: number) => void,
+) {
+  const part = tool(content)
+  const message = assistant("message-1", [part])
+  return <ToolImages parts={[{ messageID: message.id, part }]} visible={sessionImageKeys([message])} onOpen={onOpen} />
+}
+
+function assistant(id: string, content: SessionMessageAssistant["content"]): SessionMessageAssistant {
+  return {
+    type: "assistant",
+    id,
+    agent: "build",
+    model: { id: "model", providerID: "provider" },
+    content,
+    time: { created: 1 },
+  }
+}
+
+function tool(
+  content: Extract<SessionMessageAssistantTool["state"], { status: "completed" }>["content"],
+): SessionMessageAssistantTool {
+  return {
+    type: "tool",
+    id: "call-1",
+    name: "image",
+    state: { status: "completed", input: {}, content },
+    time: { created: 0, completed: 1 },
+  }
+}
@@ -1,19 +1,271 @@
 import { expect, test } from "bun:test"
-import { copyCommand } from "../src/clipboard"
+import {
+  createClipboard,
+  type ClipboardReadOptions,
+  type ClipboardReadResult,
+  type ClipboardService as CoreClipboardService,
+  type ClipboardWriteOptions,
+  type ClipboardWriteResult,
+  type HostClipboardService,
+} from "@opentui/core"
+import {
+  ClipboardWriteError,
+  classifyClipboardWriteResult,
+  createClipboardAdapter,
+  formatClipboardWriteNotification,
+} from "../src/clipboard"

-test("prefers Wayland clipboard when available", () => {
-  expect(copyCommand("linux", true, (name) => name === "wl-copy")).toEqual(["wl-copy"])
+type OpenTuiFixture = {
+  read?: ClipboardReadResult
+  remote?: boolean
+  onCoreRead?: (options: ClipboardReadOptions) => void
+  onCoreWrite?: (text: string, options: ClipboardWriteOptions) => void
+  onHostWrite?: () => void
+  onTerminalWrite?: () => void
+}
+
+function openTuiClipboard(options: OpenTuiFixture = {}) {
+  const host: HostClipboardService = {
+    maxWriteBytes: 8 * 1024 * 1024,
+    async read() {
+      return options.read ?? { status: "empty" }
+    },
+    async writeText() {
+      options.onHostWrite?.()
+      return { status: "written" }
+    },
+    async clear() {
+      return { status: "cleared" }
+    },
+    async dispose() {},
+  }
+  const clipboard = createClipboard({
+    host,
+    terminal: {
+      remote: options.remote ?? false,
+      writeText() {
+        options.onTerminalWrite?.()
+        return { status: "attempted", capability: "supported" }
+      },
+      clear() {
+        return { status: "attempted", capability: "supported" }
+      },
+    },
+  })
+  return {
+    read(input) {
+      options.onCoreRead?.(input)
+      return clipboard.read(input)
+    },
+    writeText(text, input) {
+      options.onCoreWrite?.(text, input)
+      return clipboard.writeText(text, input)
+    },
+    clear: clipboard.clear,
+    dispose: clipboard.dispose,
+  } satisfies CoreClipboardService
+}
+
+function writeResult(
+  host: ClipboardWriteResult["host"]["status"],
+  terminal: ClipboardWriteResult["terminal"]["status"],
+  error = new Error("host failed"),
+): ClipboardWriteResult {
+  return {
+    host: host === "failed" ? { status: host, error } : { status: host },
+    terminal: { status: terminal, capability: "supported" },
+  }
+}
+
+function writeError(result: ClipboardWriteResult) {
+  try {
+    classifyClipboardWriteResult(result)
+  } catch (error) {
+    if (error instanceof ClipboardWriteError) return error
+    throw error
+  }
+  throw new Error("Expected clipboard classification to fail")
+}
+
+test("requests the standard clipboard with image-first preferences and adapts PNG bytes", async () => {
+  const requests: ClipboardReadOptions[] = []
+  const bytes = new Uint8Array([0, 1, 2, 255])
+  const clipboard = createClipboardAdapter(
+    openTuiClipboard({
+      read: { status: "read", representation: { mimeType: "image/png", bytes } },
+      onCoreRead: (input) => requests.push(input),
+    }),
+  )
+
+  expect(await clipboard.read()).toEqual({ data: "AAEC/w==", mime: "image/png" })
+  expect(bytes).toEqual(new Uint8Array([0, 1, 2, 255]))
+  expect(requests).toEqual([{ preferredTypes: ["image/png", "text/plain"], selection: "clipboard" }])
 })

-test("uses osascript on macOS", () => {
-  expect(copyCommand("darwin", false, (name) => name === "osascript")).toEqual(["osascript"])
+test("decodes text through OpenTUI without normalizing its contents", async () => {
+  const text = "line 1\r\n\t\u001b[31m世界"
+  const bytes = new TextEncoder().encode(text)
+  const clipboard = createClipboardAdapter(
+    openTuiClipboard({ read: { status: "read", representation: { mimeType: "text/plain", bytes } } }),
+  )
+
+  expect(await clipboard.read()).toEqual({ data: text, mime: "text/plain" })
 })

-test("falls back through X11 clipboard commands", () => {
-  expect(copyCommand("linux", true, (name) => name === "xclip")).toEqual(["xclip", "-selection", "clipboard"])
-  expect(copyCommand("linux", false, (name) => name === "xsel")).toEqual(["xsel", "--clipboard", "--input"])
+test("maps empty host results and zero-byte text to no content", async () => {
+  await Promise.all(
+    (["empty", "unsupported", "cancelled"] as const).map(async (status) => {
+      expect(await createClipboardAdapter(openTuiClipboard({ read: { status } })).read()).toBeUndefined()
+    }),
+  )
+  expect(
+    await createClipboardAdapter(
+      openTuiClipboard({
+        read: { status: "read", representation: { mimeType: "text/plain", bytes: new Uint8Array() } },
+      }),
+    ).read(),
+  ).toBeUndefined()
 })

-test("returns undefined when native clipboard is unavailable", () => {
-  expect(copyCommand("linux", false, () => false)).toBeUndefined()
+test("preserves backend read failures and synthesizes operational errors", async () => {
+  const failure = new Error("read failed")
+  const failed = createClipboardAdapter(openTuiClipboard({ read: { status: "failed", error: failure } }))
+  expect(await failed.read().then(undefined, (error) => error)).toBe(failure)
+
+  const timedOut = createClipboardAdapter(openTuiClipboard({ read: { status: "timed-out" } }))
+  await expect(timedOut.read()).rejects.toThrow("Clipboard read timed out after 1000ms")
+
+  const limited = createClipboardAdapter(openTuiClipboard({ read: { status: "limit-exceeded" } }))
+  const limitError = await limited.read().then(undefined, (error) => error)
+  expect(limitError).toBeInstanceOf(RangeError)
+  if (!(limitError instanceof RangeError)) throw limitError
+  expect(limitError.message).toBe("Clipboard content exceeded configured read or image conversion limits")
+
+  const unexpected = createClipboardAdapter(
+    openTuiClipboard({
+      read: { status: "read", representation: { mimeType: "text/html", bytes: new Uint8Array([1]) } },
+    }),
+  )
+  await expect(unexpected.read()).rejects.toThrow("Unexpected clipboard MIME type: text/html")
+})
+
+test("uses OpenTUI all-available composition for local writes", async () => {
+  let hostWrites = 0
+  let terminalWrites = 0
+  const writes: [string, ClipboardWriteOptions][] = []
+  const clipboard = createClipboardAdapter(
+    openTuiClipboard({
+      onHostWrite: () => hostWrites++,
+      onTerminalWrite: () => terminalWrites++,
+      onCoreWrite: (text, options) => writes.push([text, options]),
+    }),
+  )
+
+  expect(await clipboard.write("hello")).toMatchObject({ delivery: "confirmed", partial: false })
+  expect(hostWrites).toBe(1)
+  expect(terminalWrites).toBe(1)
+  expect(writes).toEqual([["hello", { destination: "all-available", selection: "clipboard" }]])
+})
+
+test("does not authorize a process-host write for remote renderers", async () => {
+  let hostWrites = 0
+  let terminalWrites = 0
+  const clipboard = createClipboardAdapter(
+    openTuiClipboard({
+      remote: true,
+      onHostWrite: () => hostWrites++,
+      onTerminalWrite: () => terminalWrites++,
+    }),
+  )
+
+  expect(await clipboard.write("hello")).toMatchObject({
+    delivery: "attempted",
+    partial: false,
+    result: { host: { status: "not-attempted" }, terminal: { status: "attempted" } },
+  })
+  expect(hostWrites).toBe(0)
+  expect(terminalWrites).toBe(1)
+})
+
+test("classifies confirmed, attempted, and partial delivery", () => {
+  const scenarios = [
+    { result: writeResult("written", "attempted"), delivery: "confirmed", partial: false },
+    { result: writeResult("written", "not-attempted"), delivery: "confirmed", partial: false },
+    { result: writeResult("unsupported", "attempted"), delivery: "attempted", partial: false },
+    { result: writeResult("failed", "attempted"), delivery: "attempted", partial: true },
+    { result: writeResult("timed-out", "attempted"), delivery: "attempted", partial: true },
+    { result: writeResult("cancelled", "attempted"), delivery: "attempted", partial: true },
+    { result: writeResult("written", "local-failure"), delivery: "confirmed", partial: true },
+  ] as const
+
+  scenarios.forEach((scenario) => {
+    expect(classifyClipboardWriteResult(scenario.result)).toMatchObject({
+      delivery: scenario.delivery,
+      partial: scenario.partial,
+      result: scenario.result,
+    })
+  })
+})
+
+test("rejects every unavailable total-failure combination", () => {
+  const hosts = ["failed", "unsupported", "cancelled", "timed-out", "not-attempted"] as const
+  const terminals = ["local-failure", "not-attempted"] as const
+
+  hosts.flatMap((host) => terminals.map((terminal) => [host, terminal] as const)).forEach(([host, terminal]) => {
+    const failure = new Error("native write failed")
+    const result = writeResult(host, terminal, failure)
+    const error = writeError(result)
+    expect(error.message).toBe(`Clipboard write failed (host: ${host}, terminal: ${terminal})`)
+    expect(error.result).toBe(result)
+    expect(error.cause).toBe(host === "failed" ? failure : undefined)
+  })
+})
+
+test("formats truthful notifications for every delivered outcome", () => {
+  const confirmed = { message: "Copied value", variant: "success" as const }
+  expect(
+    formatClipboardWriteNotification(
+      { delivery: "confirmed", partial: false, result: writeResult("written", "attempted") },
+      confirmed,
+    ),
+  ).toBe(confirmed)
+  expect(
+    formatClipboardWriteNotification(
+      { delivery: "attempted", partial: false, result: writeResult("unsupported", "attempted") },
+      confirmed,
+    ),
+  ).toEqual({ message: "Sent to terminal clipboard (acceptance unconfirmed)", variant: "info" })
+  expect(
+    formatClipboardWriteNotification(
+      { delivery: "confirmed", partial: true, result: writeResult("written", "local-failure") },
+      confirmed,
+    ),
+  ).toEqual({ message: "Copied to host clipboard; terminal clipboard dispatch failed", variant: "warning" })
+  expect(
+    formatClipboardWriteNotification(
+      { delivery: "attempted", partial: true, result: writeResult("failed", "attempted") },
+      confirmed,
+    ),
+  ).toEqual({ message: "Sent to terminal clipboard; host clipboard write failed", variant: "warning" })
+})
+
+test("retains OpenTUI text validation and the configured 8 MiB UTF-8 bound", async () => {
+  let hostWrites = 0
+  let terminalWrites = 0
+  const clipboard = createClipboardAdapter(
+    openTuiClipboard({
+      onHostWrite: () => hostWrites++,
+      onTerminalWrite: () => terminalWrites++,
+    }),
+  )
+
+  const boundary = "é".repeat(4 * 1024 * 1024)
+  await expect(clipboard.write(boundary)).resolves.toMatchObject({ delivery: "confirmed" })
+  await expect(clipboard.write("")).rejects.toThrow("writeText requires non-empty text")
+  await expect(clipboard.write("before\0after")).rejects.toThrow("writeText does not support NUL characters")
+  await expect(clipboard.write(boundary + "a")).rejects.toThrow(
+    "writeText exceeds the configured 8388608 byte limit",
+  )
+  expect(hostWrites).toBe(1)
+  expect(terminalWrites).toBe(1)
 })
@@ -0,0 +1,131 @@
+import { expect, test } from "bun:test"
+import { testRender } from "@opentui/solid"
+import { ErrorComponent } from "../../src/component/error-component"
+import { ClipboardProvider, type ClipboardService, type ClipboardWriteOutcome } from "../../src/context/clipboard"
+import { ExitProvider } from "../../src/context/exit"
+import { TuiAppProvider } from "../../src/context/runtime"
+
+const outcomes = [
+  {
+    label: "Copied",
+    absent: "Copied (terminal failed)",
+    outcome: {
+      delivery: "confirmed",
+      partial: false,
+      result: {
+        host: { status: "written" },
+        terminal: { status: "attempted", capability: "supported" },
+      },
+    },
+  },
+  {
+    label: "Copied (terminal failed)",
+    absent: undefined,
+    outcome: {
+      delivery: "confirmed",
+      partial: true,
+      result: {
+        host: { status: "written" },
+        terminal: { status: "local-failure", capability: "supported" },
+      },
+    },
+  },
+  {
+    label: "Sent",
+    absent: "Sent (host failed)",
+    outcome: {
+      delivery: "attempted",
+      partial: false,
+      result: {
+        host: { status: "unsupported" },
+        terminal: { status: "attempted", capability: "supported" },
+      },
+    },
+  },
+  {
+    label: "Sent (host failed)",
+    absent: undefined,
+    outcome: {
+      delivery: "attempted",
+      partial: true,
+      result: {
+        host: { status: "failed", error: new Error("host failed") },
+        terminal: { status: "attempted", capability: "supported" },
+      },
+    },
+  },
+] as const satisfies readonly { label: string; absent: string | undefined; outcome: ClipboardWriteOutcome }[]
+
+function clipboard(write: () => Promise<ClipboardWriteOutcome>): ClipboardService {
+  return {
+    async read() {
+      return undefined
+    },
+    write,
+  }
+}
+
+async function waitForFrame(
+  app: { renderOnce(): Promise<void>; captureCharFrame(): string },
+  match: (frame: string) => boolean,
+) {
+  for (let attempts = 0; attempts < 20; attempts++) {
+    await app.renderOnce()
+    const frame = app.captureCharFrame()
+    if (match(frame)) return frame
+    await Bun.sleep(1)
+  }
+  throw new Error("Timed out waiting for clipboard state")
+}
+
+test("crash report distinguishes every delivered clipboard state", async () => {
+  for (const scenario of outcomes) {
+    const app = await testRender(
+      () => (
+        <TuiAppProvider value={{ name: "test", version: "test", channel: "test" }}>
+          <ExitProvider exit={() => {}}>
+            <ClipboardProvider value={clipboard(async () => scenario.outcome)}>
+              <ErrorComponent error={new Error("boom")} reset={() => {}} />
+            </ClipboardProvider>
+          </ExitProvider>
+        </TuiAppProvider>
+      ),
+      { width: 100, height: 24 },
+    )
+    try {
+      await app.renderOnce()
+      expect(app.captureCharFrame()).toContain("Copy report")
+      app.mockInput.pressKey("c")
+      const frame = await waitForFrame(app, (frame) => frame.includes(scenario.label))
+      if (scenario.absent) expect(frame).not.toContain(scenario.absent)
+    } finally {
+      app.renderer.destroy()
+    }
+  }
+})
+
+test("crash report catches clipboard rejection", async () => {
+  const app = await testRender(
+    () => (
+      <TuiAppProvider value={{ name: "test", version: "test", channel: "test" }}>
+        <ExitProvider exit={() => {}}>
+          <ClipboardProvider
+            value={clipboard(async () => {
+              throw new Error("copy failed")
+            })}
+          >
+            <ErrorComponent error={new Error("boom")} reset={() => {}} />
+          </ClipboardProvider>
+        </ExitProvider>
+      </TuiAppProvider>
+    ),
+    { width: 100, height: 24 },
+  )
+  try {
+    await app.renderOnce()
+    app.mockInput.pressKey("c")
+    expect(await waitForFrame(app, (frame) => frame.includes("Copy failed"))).toContain("Copy failed")
+  } finally {
+    app.renderer.destroy()
+  }
+})
@@ -14,11 +14,14 @@ test("validates mini replay settings", () => {
  expect(() => decode({ mini: { replay_limit: 1.5 } })).toThrow()
 })

-test("validates the session tabs setting", () => {
+test("validates boolean settings", () => {
  const decode = Schema.decodeUnknownSync(Info)

  expect(decode({ tabs: { enabled: true } })).toEqual({ tabs: { enabled: true } })
  expect(() => decode({ tabs: { enabled: "on" } })).toThrow()
+  expect(decode({ prompt: { image_preview: true } })).toEqual({ prompt: { image_preview: true } })
+  expect(() => decode({ prompt: { image_preview: "on" } })).toThrow()
+  expect(decode({ session: { image_preview: true } })).toEqual({ session: { image_preview: true } })
 })

 test("resolves nested config and keybind defaults", () => {
@@ -86,6 +86,14 @@ test("resolves a session move keybind", () => {
  expect(config.keybinds.get("session.move")).toMatchObject([{ key: "ctrl+o" }])
 })

+test("resolves the image viewer keybind", () => {
+  const defaults = resolve({}, { terminalSuspend: true })
+  const overridden = resolve({ keybinds: { prompt_images_view: "ctrl+shift+i" } }, { terminalSuspend: true })
+
+  expect(defaults.keybinds.get("prompt.images.view")).toMatchObject([{ key: "<leader>i" }])
+  expect(overridden.keybinds.get("prompt.images.view")).toMatchObject([{ key: "ctrl+shift+i" }])
+})
+
 test("resolves message navigation defaults", () => {
  const config = resolve({}, { terminalSuspend: true })

@@ -0,0 +1,50 @@
+import { expect, test } from "bun:test"
+import { testRender } from "@opentui/solid"
+import { ErrorBoundary, type JSX } from "solid-js"
+import { ClipboardProvider, type ClipboardService, useClipboard } from "../../src/context/clipboard"
+
+const clipboard: ClipboardService = {
+  async read() {
+    return { data: "text", mime: "text/plain" }
+  },
+  async write() {
+    return {
+      delivery: "confirmed",
+      partial: false,
+      result: {
+        host: { status: "written" },
+        terminal: { status: "not-attempted", capability: "unknown" },
+      },
+    }
+  },
+}
+
+test("requires explicit provider injection", () => {
+  expect(() => useClipboard()).toThrow("useClipboard must be used within a ClipboardProvider")
+})
+
+test("keeps clipboard access available to an error boundary fallback", async () => {
+  let value: ClipboardService | undefined
+  function Crash(): JSX.Element {
+    throw new Error("crash")
+  }
+  function Fallback() {
+    value = useClipboard()
+    return <text>fallback</text>
+  }
+
+  const app = await testRender(() => (
+    <ClipboardProvider value={clipboard}>
+      <ErrorBoundary fallback={() => <Fallback />}>
+        <Crash />
+      </ErrorBoundary>
+    </ClipboardProvider>
+  ))
+  try {
+    await app.renderOnce()
+    expect(app.captureCharFrame()).toContain("fallback")
+    expect(value).toBe(clipboard)
+  } finally {
+    app.renderer.destroy()
+  }
+})
@@ -7,6 +7,23 @@ import {
 } from "../../src/context/runtime"
 import type { ParentProps } from "solid-js"
 import { LogProvider, type LogSink } from "../../src/context/log"
+import { ClipboardProvider, type ClipboardService } from "../../src/context/clipboard"
+
+const clipboard: ClipboardService = {
+  async read() {
+    return undefined
+  },
+  async write() {
+    return {
+      delivery: "confirmed",
+      partial: false,
+      result: {
+        host: { status: "written" },
+        terminal: { status: "not-attempted", capability: "unknown" },
+      },
+    }
+  },
+}

 export function TestTuiContexts(
  props: ParentProps<{
@@ -14,6 +31,7 @@ export function TestTuiContexts(
    directory?: string
    paths?: Partial<TuiPaths>
    log?: LogSink
+    clipboard?: ClipboardService
  }>,
 ) {
  return (
@@ -28,7 +46,9 @@ export function TestTuiContexts(
        }}
      >
        <TuiTerminalEnvironmentProvider value={{ platform: "linux" }}>
-          <TuiStartupProvider value={{ skipInitialLoading: false }}>{props.children}</TuiStartupProvider>
+          <TuiStartupProvider value={{ skipInitialLoading: false }}>
+            <ClipboardProvider value={props.clipboard ?? clipboard}>{props.children}</ClipboardProvider>
+          </TuiStartupProvider>
        </TuiTerminalEnvironmentProvider>
      </TuiPathsProvider>
    </LogProvider>
@@ -1,157 +0,0 @@
-import { expect, mock, test } from "bun:test"
-import { createTestRenderer } from "@opentui/core/testing"
-import { Effect, FileSystem } from "effect"
-import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
-import { Global } from "@opencode-ai/util/global"
-import { mkdir, readFile, writeFile } from "node:fs/promises"
-import path from "node:path"
-import { createEventStream, createFetch } from "./fixture/tui-client"
-import { tmpdir } from "./fixture/fixture"
-
-function lifecycleSource(marker: string, id: string, version: string) {
-  return `
-import { appendFile } from "node:fs/promises"
-export default {
-  id: ${JSON.stringify(id)},
-  setup: async () => {
-    await appendFile(${JSON.stringify(marker)}, "${version}:setup\\n")
-    return () => appendFile(${JSON.stringify(marker)}, "${version}:cleanup\\n")
-  },
-}
-`
-}
-
-async function until(read: () => Promise<string>, expected: (value: string | undefined) => boolean) {
-  let value: string | undefined
-  for (let attempt = 0; attempt < 200; attempt++) {
-    value = await read().catch(() => undefined)
-    if (expected(value)) return value
-    await new Promise((resolve) => setTimeout(resolve, 50))
-  }
-  return value
-}
-
-async function bootApp(directory: string) {
-  const setup = await createTestRenderer({ width: 80, height: 24, useThread: false })
-  const core = await import("@opentui/core")
-  mock.module("@opentui/core", () => ({ ...core, createCliRenderer: async () => setup.renderer }))
-  const events = createEventStream()
-  const calls = createFetch(undefined, events)
-  const server = Bun.serve({ port: 0, fetch: (request) => calls.fetch(request) })
-  const cwd = process.cwd()
-  process.chdir(directory)
-  const { run } = await import("../src/app")
-  const task = Effect.runPromise(
-    run({
-      app: { name: "test", version: "test", channel: "test" },
-      server: { endpoint: { url: server.url.toString() } },
-      config: { get: async () => ({}), update: async () => ({}) },
-      packages: { resolve: async () => undefined },
-      args: {},
-      log: () => {},
-    }).pipe(Effect.provide(AppNodeBuilder.build(Global.node)), Effect.provide(FileSystem.layerNoop({}))),
-  )
-  return {
-    task,
-    async [Symbol.asyncDispose]() {
-      process.chdir(cwd)
-      if (!setup.renderer.isDestroyed) setup.renderer.destroy()
-      await server.stop()
-      mock.restore()
-    },
-  }
-}
-
-test("editing a discovered TUI plugin hot-reloads its fresh module", async () => {
-  await using tmp = await tmpdir()
-  const directory = path.join(tmp.path, ".opencode", "plugins", "tui")
-  await mkdir(directory, { recursive: true })
-  const marker = path.join(tmp.path, "marker.txt")
-  const source = path.join(directory, "hot.ts")
-  await writeFile(source, lifecycleSource(marker, "test.hot", "v1"))
-
-  await using app = await bootApp(tmp.path)
-  const read = () => readFile(marker, "utf8")
-  expect(await until(read, (value) => value === "v1:setup\n")).toBe("v1:setup\n")
-
-  await writeFile(source, lifecycleSource(marker, "test.hot", "v2"))
-  expect(await until(read, (value) => value?.includes("v2:setup") ?? false)).toBe("v1:setup\nv1:cleanup\nv2:setup\n")
-
-  process.emit("SIGHUP")
-  await app.task
-})
-
-test("a plugin whose slot render throws does not take down the TUI", async () => {
-  await using tmp = await tmpdir()
-  const directory = path.join(tmp.path, ".opencode", "plugins", "tui")
-  await mkdir(directory, { recursive: true })
-  const markerA = path.join(tmp.path, "a.txt")
-  const markerCrash = path.join(tmp.path, "crash.txt")
-  const sourceA = path.join(directory, "a.ts")
-  await writeFile(sourceA, lifecycleSource(markerA, "test.a", "a1"))
-  await writeFile(
-    path.join(directory, "crash.ts"),
-    `
-import { appendFile } from "node:fs/promises"
-export default {
-  id: "test.crash",
-  setup: async (context: any) => {
-    context.ui.slot("home.footer", () => {
-      throw new Error("boom")
-    })
-    await appendFile(${JSON.stringify(markerCrash)}, "setup\\n")
-  },
-}
-`,
-  )
-
-  await using app = await bootApp(tmp.path)
-  const readA = () => readFile(markerA, "utf8")
-  await until(readA, (value) => value === "a1:setup\n")
-  await until(() => readFile(markerCrash, "utf8"), (value) => value === "setup\n")
-
-  // The app survives the crashing slot: hot reload still works for others.
-  await writeFile(sourceA, lifecycleSource(markerA, "test.a", "a2"))
-  expect(await until(readA, (value) => value?.includes("a2:setup") ?? false)).toBe("a1:setup\na1:cleanup\na2:setup\n")
-
-  process.emit("SIGHUP")
-  await app.task
-})
-
-test("editing one plugin leaves others untouched and a broken save keeps the last good version", async () => {
-  await using tmp = await tmpdir()
-  const directory = path.join(tmp.path, ".opencode", "plugins", "tui")
-  await mkdir(directory, { recursive: true })
-  const markerA = path.join(tmp.path, "a.txt")
-  const markerB = path.join(tmp.path, "b.txt")
-  const sourceB = path.join(directory, "b.ts")
-  await writeFile(path.join(directory, "a.ts"), lifecycleSource(markerA, "test.a", "a1"))
-  await writeFile(sourceB, lifecycleSource(markerB, "test.b", "b1"))
-
-  await using app = await bootApp(tmp.path)
-  const readA = () => readFile(markerA, "utf8")
-  const readB = () => readFile(markerB, "utf8")
-  await until(readA, (value) => value === "a1:setup\n")
-  await until(readB, (value) => value === "b1:setup\n")
-
-  // Editing B restarts only B: A sees no cleanup and no second setup.
-  await writeFile(sourceB, lifecycleSource(markerB, "test.b", "b2"))
-  expect(await until(readB, (value) => value?.includes("b2:setup") ?? false)).toBe("b1:setup\nb1:cleanup\nb2:setup\n")
-  expect(await readA()).toBe("a1:setup\n")
-
-  // A broken save keeps the last good version running: b2 is never cleaned up.
-  await writeFile(sourceB, "export default {")
-  await new Promise((resolve) => setTimeout(resolve, 800))
-  expect(await readB()).toBe("b1:setup\nb1:cleanup\nb2:setup\n")
-  expect(await readA()).toBe("a1:setup\n")
-
-  // Fixing the file replaces the kept version.
-  await writeFile(sourceB, lifecycleSource(markerB, "test.b", "b3"))
-  expect(await until(readB, (value) => value?.includes("b3:setup") ?? false)).toBe(
-    "b1:setup\nb1:cleanup\nb2:setup\nb2:cleanup\nb3:setup\n",
-  )
-  expect(await readA()).toBe("a1:setup\n")
-
-  process.emit("SIGHUP")
-  await app.task
-})
@@ -1,30 +0,0 @@
-import { writeFile } from "node:fs/promises"
-import path from "node:path"
-import { pathToFileURL } from "node:url"
-import { expect, test } from "bun:test"
-import { freshSpecifier, localSource } from "../src/plugin/discovery"
-import { tmpdir } from "./fixture/fixture"
-
-test("localSource resolves file URLs and local paths but not package specs", () => {
-  const base = process.cwd()
-  const absolute = path.resolve(base, "abs", "plugin.ts")
-  expect(localSource("file:///tmp/plugin.ts", base)?.href).toBe("file:///tmp/plugin.ts")
-  expect(localSource("./plugin.ts", base)?.href).toBe(pathToFileURL(path.join(base, "plugin.ts")).href)
-  expect(localSource("../plugin.ts", path.join(base, "nested"))?.href).toBe(
-    pathToFileURL(path.join(base, "plugin.ts")).href,
-  )
-  expect(localSource(absolute, base)?.href).toBe(pathToFileURL(absolute).href)
-  expect(localSource("some-package", base)).toBeUndefined()
-  expect(localSource("@scope/some-package", base)).toBeUndefined()
-})
-
-test("freshSpecifier re-imports a plugin source after it changes", async () => {
-  await using tmp = await tmpdir()
-  const file = path.join(tmp.path, "plugin.ts")
-  await writeFile(file, "export default 1")
-  const first: { readonly default?: unknown } = await import(freshSpecifier(pathToFileURL(file).href, 1))
-  await writeFile(file, "export default 2")
-  const second: { readonly default?: unknown } = await import(freshSpecifier(pathToFileURL(file).href, 2))
-  expect(first.default).toBe(1)
-  expect(second.default).toBe(2)
-})
@@ -0,0 +1,534 @@
+import { afterAll, expect, mock, test } from "bun:test"
+import { mkdtemp, rm, writeFile } from "node:fs/promises"
+import { tmpdir } from "node:os"
+import path from "node:path"
+import { ImageRenderable, TextareaRenderable, type ClipboardReadResult, type HostClipboardService } from "@opentui/core"
+import { createTestRenderer, MouseButtons } from "@opentui/core/testing"
+import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
+import { Global } from "@opencode-ai/util/global"
+import { Effect, FileSystem } from "effect"
+import { createComponent } from "solid-js"
+import { Prompt, type PromptRef } from "../../src/component/prompt"
+import { parsePromptInfo } from "../../src/prompt/history"
+import { createEventStream, createFetch } from "../fixture/tui-client"
+
+const openTui = { ...(await import("@opentui/core")) }
+const PNG_1X1_BASE64 =
+  "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR4AWP4z8DwHwAFAAH/e+m+7wAAAABJRU5ErkJggg=="
+const PNG_1X1 = Buffer.from(PNG_1X1_BASE64, "base64")
+const readPngClipboard = async (): Promise<ClipboardReadResult> => ({
+  status: "read",
+  representation: { mimeType: "image/png", bytes: PNG_1X1 },
+})
+let activeSetup: Awaited<ReturnType<typeof createTestRenderer>> | undefined
+let activeHost: HostClipboardService | undefined
+let activePromptRef: PromptRef | undefined
+
+await mock.module("@opentui/core", () => ({
+  ...openTui,
+  createCliRenderer: async () => {
+    if (!activeSetup) throw new Error("Prompt renderer is not mounted")
+    return activeSetup.renderer
+  },
+  createHostClipboard: () => {
+    if (!activeHost) throw new Error("Prompt clipboard is not mounted")
+    return activeHost
+  },
+}))
+await mock.module("../../src/routes/home", () => ({
+  Home: () =>
+    createComponent(Prompt, {
+      ref: (value) => (activePromptRef = value),
+      showPlaceholder: false,
+    }),
+}))
+const { run } = await import("../../src/app")
+
+afterAll(() => mock.restore())
+
+async function mountPrompt(read: () => Promise<ClipboardReadResult>, imagePreview = false, width = 80) {
+  const setup = await createTestRenderer({ width, height: 24, useThread: false })
+  let reads = 0
+  let ready!: () => void
+  const mounted = new Promise<void>((resolve) => (ready = resolve))
+  const setTitle = setup.renderer.setTerminalTitle.bind(setup.renderer)
+  setup.renderer.setTerminalTitle = (title) => {
+    if (title === "OpenCode") ready()
+    setTitle(title)
+  }
+
+  const host: HostClipboardService = {
+    maxWriteBytes: 8 * 1024 * 1024,
+    async read() {
+      reads++
+      return read()
+    },
+    async writeText() {
+      return { status: "written" }
+    },
+    async clear() {
+      return { status: "cleared" }
+    },
+    async dispose() {},
+  }
+  activeSetup = setup
+  activeHost = host
+  activePromptRef = undefined
+
+  const events = createEventStream()
+  const calls = createFetch(undefined, events)
+  let preloaded!: () => void
+  const preload = new Promise<void>((resolve) => (preloaded = resolve))
+  const server = Bun.serve({
+    port: 0,
+    fetch: async (request) => {
+      const response = await calls.fetch(request)
+      const url = new URL(request.url)
+      if (url.pathname === "/api/session/active") preloaded()
+      return response
+    },
+  })
+  let task: Promise<unknown> | undefined
+  try {
+    task = Effect.runPromise(
+      run({
+        app: { name: "test", version: "test", channel: "test" },
+        server: { endpoint: { url: server.url.toString() } },
+        config: {
+          get: async () => ({ prompt: { paste: "full" as const, image_preview: imagePreview } }),
+          update: async () => ({}),
+        },
+        packages: { resolve: async () => undefined },
+        args: {},
+        log: () => {},
+      }).pipe(Effect.provide(AppNodeBuilder.build(Global.node)), Effect.provide(FileSystem.layerNoop({}))),
+    )
+    await mounted
+    await setup.waitFor(() => activePromptRef?.focused === true)
+    await preload
+    await Bun.sleep(0)
+  } catch (error) {
+    setup.renderer.destroy()
+    await task?.catch(() => undefined)
+    await server.stop()
+    activeSetup = undefined
+    activeHost = undefined
+    activePromptRef = undefined
+    throw error
+  }
+
+  return {
+    setup,
+    get input() {
+      const input = setup.renderer.currentFocusedEditor
+      if (!(input instanceof TextareaRenderable)) throw new Error("Prompt textarea is not focused")
+      return input
+    },
+    get reads() {
+      return reads
+    },
+    get prompt() {
+      if (!activePromptRef) throw new Error("Prompt ref is not mounted")
+      return activePromptRef
+    },
+    async dispose() {
+      activePromptRef?.reset()
+      setup.renderer.destroy()
+      await task
+      await server.stop()
+      activeSetup = undefined
+      activeHost = undefined
+      activePromptRef = undefined
+    },
+  }
+}
+
+async function pasteImages(prompt: Awaited<ReturnType<typeof mountPrompt>>, count: number) {
+  for (let index = 0; index < count; index++) {
+    prompt.setup.renderer.keyInput.processPaste(new Uint8Array())
+    await prompt.setup.waitFor(() => prompt.reads === index + 1)
+  }
+}
+
+test("distinguishes whitespace-only terminal paste from empty clipboard fallback", async () => {
+  const prompt = await mountPrompt(async () => ({ status: "empty" }))
+  try {
+    await prompt.setup.mockInput.pasteBracketedText(" \t\n")
+    await prompt.setup.waitFor(() => prompt.input.plainText === " \t\n")
+    expect(prompt.reads).toBe(0)
+
+    prompt.setup.renderer.keyInput.processPaste(new Uint8Array())
+    await prompt.setup.waitFor(() => prompt.reads === 1)
+
+    expect(prompt.input.plainText).toBe(" \t\n")
+    expect(prompt.reads).toBe(1)
+  } finally {
+    await prompt.dispose()
+  }
+})
+
+test("normalizes host clipboard text once before inserting it", async () => {
+  const bytes = new TextEncoder().encode("first\r\nsecond\rthird")
+  const prompt = await mountPrompt(async () => ({ status: "read", representation: { mimeType: "text/plain", bytes } }))
+  try {
+    prompt.setup.renderer.keyInput.processPaste(new Uint8Array())
+    await prompt.setup.waitFor(() => prompt.input.plainText === "first\nsecond\nthird")
+
+    expect(prompt.input.plainText).toBe("first\nsecond\nthird")
+    expect(prompt.reads).toBe(1)
+  } finally {
+    await prompt.dispose()
+  }
+})
+
+test("serializes overlapping local image pastes", async () => {
+  const directory = await mkdtemp(path.join(tmpdir(), "opencode-overlap-"))
+  const file = path.join(directory, "image.png")
+  await writeFile(file, PNG_1X1)
+  const prompt = await mountPrompt(async () => ({ status: "empty" }))
+  try {
+    await Promise.all([
+      prompt.setup.mockInput.pasteBracketedText(`'${file}'`),
+      prompt.setup.mockInput.pasteBracketedText(`'${file}'`),
+    ])
+    await prompt.setup.waitFor(() => prompt.prompt.current.files?.length === 2)
+
+    expect(prompt.input.plainText).toBe("[Image 1] [Image 2] ")
+  } finally {
+    await prompt.dispose()
+    await rm(directory, { recursive: true, force: true })
+  }
+})
+
+test("continues queued paste work after a clipboard failure", async () => {
+  const directory = await mkdtemp(path.join(tmpdir(), "opencode-recovery-"))
+  const file = path.join(directory, "image.png")
+  await writeFile(file, PNG_1X1)
+  const result = Promise.withResolvers<ClipboardReadResult>()
+  const prompt = await mountPrompt(() => result.promise)
+  try {
+    prompt.setup.renderer.keyInput.processPaste(new Uint8Array())
+    await prompt.setup.waitFor(() => prompt.reads === 1)
+    await prompt.setup.mockInput.pasteBracketedText(`'${file}'`)
+    result.reject(new Error("clipboard failed"))
+    await prompt.setup.waitFor(() => prompt.prompt.current.files?.length === 1)
+
+    expect(prompt.input.plainText).toBe("[Image 1] ")
+  } finally {
+    await prompt.dispose()
+    await rm(directory, { recursive: true, force: true })
+  }
+})
+
+test("cancels delayed and queued pastes after a reversible prompt change", async () => {
+  const result = Promise.withResolvers<ClipboardReadResult>()
+  const prompt = await mountPrompt(() => result.promise)
+  try {
+    prompt.setup.renderer.keyInput.processPaste(new Uint8Array())
+    await prompt.setup.waitFor(() => prompt.reads === 1)
+    await prompt.setup.mockInput.pasteBracketedText("queued")
+    prompt.setup.mockInput.pressKey("x")
+    await prompt.setup.waitFor(() => prompt.input.plainText === "x")
+    prompt.setup.mockInput.pressBackspace()
+    await prompt.setup.waitFor(() => prompt.input.plainText === "")
+    prompt.prompt.set({ text: "temporary", files: [], agents: [], pasted: [] })
+    prompt.prompt.reset()
+    await prompt.setup.renderOnce()
+    await prompt.setup.mockInput.pasteBracketedText("new")
+
+    result.resolve({
+      status: "read",
+      representation: { mimeType: "text/plain", bytes: new TextEncoder().encode("/missing-one.png /missing-two.png") },
+    })
+    await prompt.setup.waitForFrame((frame) => frame.includes("Attachment paste canceled"))
+
+    await prompt.setup.waitFor(() => prompt.input.plainText === "new")
+    expect(prompt.prompt.current.files).toEqual([])
+  } finally {
+    await prompt.dispose()
+  }
+})
+
+test("does not insert a delayed image after entering shell mode", async () => {
+  const result = Promise.withResolvers<ClipboardReadResult>()
+  const prompt = await mountPrompt(() => result.promise)
+  try {
+    prompt.setup.renderer.keyInput.processPaste(new Uint8Array())
+    await prompt.setup.waitFor(() => prompt.reads === 1)
+    prompt.setup.mockInput.pressKey("!")
+    await prompt.setup.waitForFrame((frame) => frame.includes("Shell"))
+    prompt.setup.mockInput.pressBackspace()
+    await prompt.setup.waitForFrame((frame) => !frame.includes("Shell"))
+
+    result.resolve(await readPngClipboard())
+    await prompt.setup.waitForFrame((frame) => frame.includes("Attachment paste canceled"))
+
+    expect(prompt.input.plainText).toBe("")
+    expect(prompt.prompt.current.files).toEqual([])
+  } finally {
+    await prompt.dispose()
+  }
+})
+
+test("ignores a clipboard read that completes after prompt teardown", async () => {
+  const result = Promise.withResolvers<ClipboardReadResult>()
+  const prompt = await mountPrompt(() => result.promise)
+
+  prompt.setup.renderer.keyInput.processPaste(new Uint8Array())
+  await prompt.setup.waitFor(() => prompt.reads === 1)
+  prompt.setup.renderer.destroy()
+  result.resolve(await readPngClipboard())
+  await Bun.sleep(0)
+  await prompt.dispose()
+})
+
+test("creates one image mention from PNG clipboard bytes", async () => {
+  const prompt = await mountPrompt(readPngClipboard)
+  try {
+    prompt.setup.renderer.keyInput.processPaste(new Uint8Array())
+    await prompt.setup.waitFor(() => prompt.input.plainText === "[Image 1] ")
+
+    expect(prompt.input.plainText).toBe("[Image 1] ")
+    expect(prompt.input.extmarks.getVirtual()).toHaveLength(1)
+    expect(prompt.prompt.current.files).toEqual([
+      {
+        uri: `data:image/png;base64,${PNG_1X1_BASE64}`,
+        name: "clipboard",
+        mention: { start: 0, end: 9, text: "[Image 1]" },
+      },
+    ])
+    expect(prompt.setup.renderer.root.findDescendantById("prompt-image-preview-0")).toBeUndefined()
+    expect(prompt.reads).toBe(1)
+  } finally {
+    await prompt.dispose()
+  }
+})
+
+test("renders at most three left-aligned cropped thumbnails", async () => {
+  const prompt = await mountPrompt(readPngClipboard, true)
+  try {
+    await pasteImages(prompt, 4)
+
+    const first = prompt.setup.renderer.root.findDescendantById("prompt-image-preview-0")
+    if (!(first instanceof ImageRenderable)) throw new Error("Image preview did not render")
+    await first.loadPromise
+    expect(first.fit).toBe("cover")
+    expect(prompt.setup.renderer.root.findDescendantById("prompt-image-preview-1")).toBeInstanceOf(ImageRenderable)
+    expect(prompt.setup.renderer.root.findDescendantById("prompt-image-preview-2")).toBeInstanceOf(ImageRenderable)
+    expect(prompt.setup.renderer.root.findDescendantById("prompt-image-preview-3")).toBeUndefined()
+    const frame = await prompt.setup.waitForFrame((frame) => frame.includes("+1 more"))
+    expect(frame).toMatch(/^┃  █/m)
+    expect(frame.match(/\[Image 1\]/g)).toHaveLength(1)
+    expect(frame.match(/\[Image 2\]/g)).toHaveLength(1)
+    expect(frame.match(/\[Image 3\]/g)).toHaveLength(1)
+
+    await prompt.setup.mockMouse.click(49, 1, MouseButtons.LEFT)
+    await prompt.setup.waitForFrame((frame) => frame.includes("Image 4 of 4"))
+    prompt.setup.mockInput.pressCtrlC()
+    await prompt.setup.waitForFrame((frame) => !frame.includes("Image 4 of 4"))
+    await prompt.setup.mockMouse.click(50, 1, MouseButtons.LEFT)
+    await prompt.setup.renderOnce()
+    expect(prompt.setup.captureCharFrame()).not.toContain("Image 4 of 4")
+  } finally {
+    await prompt.dispose()
+  }
+})
+
+test("opens image attachments by keyboard, mouse, and command palette", async () => {
+  const prompt = await mountPrompt(readPngClipboard, true)
+  try {
+    await pasteImages(prompt, 2)
+
+    const thumbnail = prompt.setup.renderer.root.findDescendantById("prompt-image-preview-1")
+    if (!(thumbnail instanceof ImageRenderable)) throw new Error("Second image thumbnail did not render")
+
+    prompt.setup.mockInput.pressKey("x", { ctrl: true })
+    prompt.setup.mockInput.pressKey("i")
+    await prompt.setup.waitForFrame((frame) => frame.includes("Image 1 of 2"))
+    prompt.setup.mockInput.pressCtrlC()
+    await prompt.setup.waitForFrame((frame) => !frame.includes("Image 1 of 2"))
+
+    await prompt.setup.mockMouse.click(14, 1, MouseButtons.LEFT)
+
+    await prompt.setup.waitForFrame((frame) => frame.includes("Image 1 of 2"))
+    prompt.setup.mockInput.pressCtrlC()
+    await prompt.setup.waitForFrame((frame) => !frame.includes("Image 1 of 2"))
+
+    await prompt.setup.mockMouse.click(15, 1, MouseButtons.LEFT)
+    await prompt.setup.renderOnce()
+    expect(prompt.setup.captureCharFrame()).not.toContain("Image 2 of 2")
+    await prompt.setup.mockMouse.click(29, 1, MouseButtons.LEFT)
+    await prompt.setup.renderOnce()
+    expect(prompt.setup.captureCharFrame()).not.toContain("Image 2 of 2")
+
+    await prompt.setup.mockMouse.click(16, 1, MouseButtons.LEFT)
+
+    await prompt.setup.waitForFrame((frame) => frame.includes("Image 2 of 2"))
+    const large = prompt.setup.renderer.root.findDescendantById("image-viewer-image")
+    if (!(large instanceof ImageRenderable)) throw new Error("Large image preview did not render")
+    expect(large.fit).toBe("fit")
+    expect(large.height).toBeGreaterThan(thumbnail.height)
+
+    prompt.setup.mockInput.pressArrow("left")
+    await prompt.setup.waitForFrame((frame) => frame.includes("Image 1 of 2"))
+    prompt.setup.mockInput.pressCtrlC()
+    await prompt.setup.waitForFrame((frame) => !frame.includes("Image 1 of 2"))
+    expect(large.isDestroyed).toBe(true)
+    await prompt.setup.waitFor(() => prompt.setup.renderer.currentFocusedEditor === prompt.input)
+
+    prompt.setup.mockInput.pressKey("p", { ctrl: true })
+    await prompt.setup.waitForFrame((frame) => frame.includes("Commands"))
+    for (const key of "view image attachments") prompt.setup.mockInput.pressKey(key)
+    const palette = await prompt.setup.waitForFrame((frame) => frame.includes("View image attachments"))
+    expect(palette).toContain("ctrl+x i")
+    prompt.setup.mockInput.pressEnter()
+    await prompt.setup.waitForFrame((frame) => frame.includes("Image 1 of 2"))
+  } finally {
+    await prompt.dispose()
+  }
+})
+
+test("attaches multiple images from one terminal drop", async () => {
+  const directory = await mkdtemp(path.join(tmpdir(), "opencode-drop-"))
+  const first = path.join(directory, "one image.png")
+  const second = path.join(directory, "two image.png")
+  await Promise.all([writeFile(first, PNG_1X1), writeFile(second, PNG_1X1)])
+  const prompt = await mountPrompt(async () => ({ status: "empty" }), true)
+  try {
+    await prompt.setup.mockInput.pasteBracketedText(`'${first}' '${second}'`)
+    await prompt.setup.waitFor(() => prompt.prompt.current.files?.length === 2)
+
+    expect(prompt.input.plainText).toBe("[Image 1] [Image 2] ")
+    expect(prompt.prompt.current.files?.map((file) => file.name)).toEqual(["one image.png", "two image.png"])
+  } finally {
+    await prompt.dispose()
+    await rm(directory, { recursive: true, force: true })
+  }
+})
+
+test("reduces the preview count to fit a narrow terminal", async () => {
+  const prompt = await mountPrompt(readPngClipboard, true, 32)
+  try {
+    await pasteImages(prompt, 4)
+
+    expect(prompt.setup.renderer.root.findDescendantById("prompt-image-preview-0")).toBeInstanceOf(ImageRenderable)
+    expect(prompt.setup.renderer.root.findDescendantById("prompt-image-preview-1")).toBeUndefined()
+    await prompt.setup.waitForFrame((frame) => frame.includes("+3 more"))
+  } finally {
+    await prompt.dispose()
+  }
+})
+
+test("does not click a hidden overflow control", async () => {
+  const prompt = await mountPrompt(readPngClipboard, true, 22)
+  try {
+    await pasteImages(prompt, 2)
+    await prompt.setup.mockMouse.click(16, 1, MouseButtons.LEFT)
+    await prompt.setup.renderOnce()
+
+    expect(prompt.setup.captureCharFrame()).not.toContain("Image 2 of 2")
+  } finally {
+    await prompt.dispose()
+  }
+})
+
+test("hides thumbnails when their minimum width does not fit", async () => {
+  const prompt = await mountPrompt(readPngClipboard, true, 16)
+  try {
+    await pasteImages(prompt, 1)
+    expect(prompt.setup.renderer.root.findDescendantById("prompt-image-preview-0")).toBeUndefined()
+
+    await prompt.setup.mockMouse.click(12, 1, MouseButtons.LEFT)
+    await prompt.setup.renderOnce()
+    expect(prompt.setup.captureCharFrame()).not.toContain("Image 1 of 1")
+  } finally {
+    await prompt.dispose()
+  }
+})
+
+test("removes an image preview when its mention is deleted", async () => {
+  const prompt = await mountPrompt(readPngClipboard, true)
+  try {
+    prompt.setup.renderer.keyInput.processPaste(new Uint8Array())
+    await prompt.setup.waitFor(
+      () => prompt.setup.renderer.root.findDescendantById("prompt-image-preview-0") instanceof ImageRenderable,
+    )
+    const preview = prompt.setup.renderer.root.findDescendantById("prompt-image-preview-0")
+    if (!(preview instanceof ImageRenderable)) throw new Error("Image preview did not render")
+    await preview.loadPromise
+    const image = preview.image
+    expect(image).not.toBeNull()
+
+    prompt.input.cursorOffset = prompt.input.plainText.length
+    prompt.setup.mockInput.pressBackspace()
+    prompt.setup.mockInput.pressBackspace()
+    await prompt.setup.waitFor(() => prompt.prompt.current.files?.length === 0)
+
+    expect(prompt.input.plainText).toBe("")
+    expect(prompt.setup.renderer.root.findDescendantById("prompt-image-preview-0")).toBeUndefined()
+    expect(() => image!.info()).toThrow("NativeImage is disposed")
+  } finally {
+    await prompt.dispose()
+  }
+})
+
+test("keeps an attachment when its opt-in preview cannot be decoded", async () => {
+  const bytes = new Uint8Array([137, 80, 78, 71])
+  const prompt = await mountPrompt(
+    async () => ({ status: "read", representation: { mimeType: "image/png", bytes } }),
+    true,
+  )
+  try {
+    prompt.setup.renderer.keyInput.processPaste(new Uint8Array())
+    await prompt.setup.waitForFrame((frame) => frame.includes("No preview"))
+
+    expect(prompt.input.plainText).toBe("[Image 1] ")
+    expect(prompt.prompt.current.files).toEqual([
+      {
+        uri: "data:image/png;base64,iVBORw==",
+        name: "clipboard",
+        mention: { start: 0, end: 9, text: "[Image 1]" },
+      },
+    ])
+  } finally {
+    await prompt.dispose()
+  }
+})
+
+test("ignores malformed attachment URIs restored into the prompt", async () => {
+  const prompt = await mountPrompt(readPngClipboard, true)
+  try {
+    const restored = parsePromptInfo({
+      text: "[Image 1] ",
+      files: [{ uri: 42 }],
+      agents: [],
+      pasted: [],
+    })
+    if (!restored) throw new Error("Malformed prompt fixture was not restored")
+    prompt.prompt.set(restored)
+    await prompt.setup.renderOnce()
+
+    expect(prompt.prompt.current.text).toBe("[Image 1] ")
+    expect(prompt.setup.renderer.root.findDescendantById("prompt-image-preview-0")).toBeUndefined()
+
+    prompt.setup.renderer.keyInput.processPaste(new Uint8Array())
+    await prompt.setup.waitFor(() => prompt.reads === 1 && prompt.prompt.current.files?.length === 1)
+    expect(prompt.prompt.current.files?.[0]?.uri).toBe(`data:image/png;base64,${PNG_1X1_BASE64}`)
+  } finally {
+    await prompt.dispose()
+  }
+})
+
+test("shows clipboard read failures without changing prompt state", async () => {
+  const prompt = await mountPrompt(async () => ({ status: "failed", error: new Error("clipboard read failed") }))
+  try {
+    prompt.setup.renderer.keyInput.processPaste(new Uint8Array())
+    await prompt.setup.waitForFrame((frame) => frame.includes("clipboard read failed"))
+
+    expect(prompt.input.plainText).toBe("")
+    expect(prompt.input.extmarks.getAll()).toHaveLength(0)
+    expect(prompt.reads).toBe(1)
+  } finally {
+    await prompt.dispose()
+  }
+})
@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test"
-import { readLocalAttachmentWith } from "../../src/component/prompt/local-attachment"
+import { parsePastedFilepaths, readLocalAttachmentWith } from "../../src/component/prompt/local-attachment"
 import type { LocalFiles } from "../../src/component/prompt/local-attachment"

 function files(input: { mime: string; text?: string; bytes?: Uint8Array }): LocalFiles {
@@ -11,6 +11,36 @@ function files(input: { mime: string; text?: string; bytes?: Uint8Array }): Loca
 }

 describe("prompt local attachments", () => {
+  test("parses multi-file drops from POSIX, URI-list, and Windows terminals", () => {
+    expect(parsePastedFilepaths("'/tmp/one image.png' /tmp/two\\ image.webp", "linux")).toEqual([
+      "/tmp/one image.png",
+      "/tmp/two image.webp",
+    ])
+    expect(parsePastedFilepaths("file:///tmp/one%20image.png\r\nfile:///tmp/two.webp", "linux")).toEqual([
+      "/tmp/one image.png",
+      "/tmp/two.webp",
+    ])
+    expect(parsePastedFilepaths("# dropped files\nfile:///tmp/one.png\nfile:///tmp/two.webp", "linux")).toEqual([
+      "/tmp/one.png",
+      "/tmp/two.webp",
+    ])
+    expect(parsePastedFilepaths("/tmp/one\\\\image.png /tmp/two.webp", "linux")).toEqual([
+      "/tmp/one\\image.png",
+      "/tmp/two.webp",
+    ])
+    expect(parsePastedFilepaths('"C:\\one image.png" "C:\\two.webp"', "win32")).toEqual([
+      "C:\\one image.png",
+      "C:\\two.webp",
+    ])
+  })
+
+  test("rejects unbounded and malformed multi-file drops", () => {
+    expect(parsePastedFilepaths("'/tmp/one.png /tmp/two.png", "linux")).toEqual([])
+    expect(
+      parsePastedFilepaths(Array.from({ length: 33 }, (_, index) => `/tmp/${index}.png`).join(" "), "linux"),
+    ).toEqual([])
+  })
+
  test("reads SVG attachments as text", async () => {
    expect(await readLocalAttachmentWith(files({ mime: "image/svg+xml", text: "<svg />" }), "/tmp/image.svg")).toEqual({
      type: "text",
@@ -39,5 +69,8 @@ describe("prompt local attachments", () => {
        "/tmp/missing.png",
      ),
    ).toBeUndefined()
+    expect(
+      await readLocalAttachmentWith(files({ mime: "image/png", bytes: new Uint8Array(2) }), "/tmp/large.png", 1),
+    ).toBeUndefined()
  })
 })
@@ -0,0 +1,104 @@
+import { expect, test } from "bun:test"
+import type { ClipboardService } from "../../src/context/clipboard"
+import { Selection } from "../../src/util/selection"
+
+test("copies semantic selection text, reports attempted partial delivery, and clears immediately", async () => {
+  const notifications: { message: string; variant: "info" | "success" | "warning" | "error" }[] = []
+  const errors: unknown[] = []
+  const writes: string[] = []
+  const events: string[] = []
+  let notify!: () => void
+  const notified = new Promise<void>((resolve) => {
+    notify = resolve
+  })
+  const focus = {
+    hasSelection: () => true,
+    getClipboardText: (text: string) => text.replace("[Pasted ~2 lines]", "first\nsecond"),
+  }
+  const renderer = {
+    getSelection: () => ({
+      getSelectedText: () => "before [Pasted ~2 lines] after",
+      selectedRenderables: [focus],
+    }),
+    clearSelection: () => events.push("clear"),
+    currentFocusedRenderable: focus,
+  }
+  const clipboard: ClipboardService = {
+    async read() {
+      return undefined
+    },
+    async write(text) {
+      events.push("write")
+      writes.push(text)
+      return {
+        delivery: "attempted",
+        partial: true,
+        result: {
+          host: { status: "failed", error: new Error("host failed") },
+          terminal: { status: "attempted", capability: "supported" },
+        },
+      }
+    },
+  }
+
+  expect(
+    Selection.copy(
+      renderer,
+      {
+        show: (notification) => {
+          notifications.push(notification)
+          notify()
+        },
+        error: (error) => errors.push(error),
+      },
+      clipboard,
+    ),
+  ).toBe(true)
+  expect(writes).toEqual(["before first\nsecond after"])
+  expect(events).toEqual(["write", "clear"])
+  await notified
+  expect(notifications).toEqual([
+    { message: "Sent to terminal clipboard; host clipboard write failed", variant: "warning" },
+  ])
+  expect(errors).toEqual([])
+})
+
+test("reports total selection-copy failure without delaying selection clearing", async () => {
+  const failure = new Error("copy failed")
+  const errors: unknown[] = []
+  const notifications: unknown[] = []
+  let clears = 0
+  let report!: () => void
+  const reported = new Promise<void>((resolve) => {
+    report = resolve
+  })
+  const clipboard: ClipboardService = {
+    async read() {
+      return undefined
+    },
+    async write() {
+      throw failure
+    },
+  }
+
+  expect(
+    Selection.copy(
+      {
+        getSelection: () => ({ getSelectedText: () => "text", selectedRenderables: [] }),
+        clearSelection: () => void clears++,
+      },
+      {
+        show: (notification) => notifications.push(notification),
+        error: (error) => {
+          errors.push(error)
+          report()
+        },
+      },
+      clipboard,
+    ),
+  ).toBe(true)
+  expect(clears).toBe(1)
+  await reported
+  expect(notifications).toEqual([])
+  expect(errors).toEqual([failure])
+})
@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test"
 import type { SessionMessageInfo } from "@opencode-ai/client"
-import { isDefaultTitle, lastAssistantWithUsage } from "../../src/util/session"
+import { isDefaultTitle, lastAssistantWithUsage, sessionTitle } from "../../src/util/session"

 const assistant = (id: string, input: number): SessionMessageInfo => ({
  id,
@@ -14,11 +14,21 @@ const assistant = (id: string, input: number): SessionMessageInfo => ({

 describe("util.session", () => {
  test("recognizes generated parent and child titles", () => {
+    expect(isDefaultTitle(undefined)).toBeTrue()
    expect(isDefaultTitle("New session - 2026-06-06T12:34:56.789Z")).toBeTrue()
    expect(isDefaultTitle("Child session - 2026-06-06T12:34:56.789Z")).toBeTrue()
    expect(isDefaultTitle("New session - custom")).toBeFalse()
  })

+  test("derives display-only titles for untitled sessions", () => {
+    expect(sessionTitle({ title: undefined, time: { created: 0, updated: 0 } })).toBe(
+      "New session - 1970-01-01T00:00:00.000Z",
+    )
+    expect(sessionTitle({ title: undefined, parentID: "ses_parent", time: { created: 0, updated: 0 } })).toBe(
+      "Child session - 1970-01-01T00:00:00.000Z",
+    )
+  })
+
  test("tracks usage across undo and redo boundaries", () => {
    const messages = [assistant("msg_z", 10), assistant("msg_a", 30)]
Author	SHA1	Message	Date
Simon Klee	dba970201c	tui: open transcript images on click Make inline transcript images clickable and show the full preview. Use bounded thumbnails so image attachments remain usable without crowding the session view.	2026-07-31 11:07:44 +02:00
Simon Klee	597b552234	fix(tui): gate transcript image previews	2026-07-31 11:07:44 +02:00
Simon Klee	4022f24d90	feat(tui): render session tool images	2026-07-31 11:07:44 +02:00
Simon Klee	fe169838a7	test(tui): simplify prompt preload fixture	2026-07-31 11:07:44 +02:00
Simon Klee	50d4f21f7e	test(tui): update prompt fixture preload	2026-07-31 11:07:44 +02:00
Simon Klee	beaf406057	tui: bind leader+i to image viewer Default <leader>i opens the prompt image attachment viewer from the keyboard. Drop thumbnail captions so previews stay compact and fill their allotted height.	2026-07-31 11:07:44 +02:00
Simon Klee	8bed8911e9	tui: serialize clipboard and paste queue Concurrent clipboard and terminal pastes raced the prompt, so later work could clobber earlier attachments or touch a destroyed input. Queue pastes FIFO, drop stale work after prompt mutations, and keep hit testing aligned with thumbnail geometry so overflow stays usable.	2026-07-31 11:07:44 +02:00
Simon Klee	9445a8f72a	tui: bound and guard attachment pastes Local drops could read unbounded files and still insert after the prompt changed during async I/O. Cap staged bytes, share the budget across multi-file drops, and cancel if the prompt moves first.	2026-07-31 11:07:44 +02:00
Simon Klee	5f97574183	tui: add image preview and multi-drop Thumbnails only showed a few crops with no way to inspect them, and terminal drops could attach only one path. Open a navigable full preview on click or from the command palette, and accept multi-file drops so dragged image sets attach in one paste.	2026-07-31 11:07:44 +02:00
Simon Klee	d50b43b6a7	tui: add opt-in prompt image previews	2026-07-31 11:07:44 +02:00
Simon Klee	480e5c675f	chore(tui): upgrade integrated OpenTUI snapshot	2026-07-31 11:07:38 +02:00
Simon Klee	c159add010	chore(tui): upgrade integrated OpenTUI snapshot	2026-07-31 07:17:36 +02:00
Simon Klee	9db2df59b0	tui: preserve clipboard paste semantics	2026-07-31 07:17:35 +02:00
Simon Klee	bd304078ed	chore(tui): upgrade OpenTUI snapshot	2026-07-31 07:17:35 +02:00
Simon Klee	3722e2bd0c	tui: report clipboard copy delivery status	2026-07-31 07:17:35 +02:00
Simon Klee	3fe90886d9	tui: use OpenTUI clipboard service	2026-07-31 07:17:35 +02:00
Aiden Cline	ff2b184af1	feat(ai): support Gemini thinking levels (#39796 )	2026-07-30 23:38:00 -05:00
Aiden Cline	671e164f8d	refactor(core): contain Codex in OpenAI plugin (#39734 )	2026-07-30 21:43:38 -05:00
Aiden Cline	5b4ebf3e9d	fix(core): map xAI native options (#39787 )	2026-07-30 21:42:53 -05:00
Aiden Cline	98229d466d	feat(plugin): add session request hook (#39764 )	2026-07-30 21:11:22 -05:00
Kit Langton	5c7e2b5042	fix(tui): clarify open menu project labels (#39780 )	2026-07-30 21:34:29 -04:00
Kit Langton	0a6a5d3e80	fix(session): retry failed title generation (#39748 )	2026-07-30 21:26:44 -04:00
Kit Langton	eb95bd27fe	feat(session): make generated titles optional (#39747 )	2026-07-30 21:24:34 -04:00
Kit Langton	865f512a44	fix(tui): preserve current selection across list updates (#39774 )	2026-07-31 00:48:51 +00:00
Kit Langton	a460f02f67	feat(tui): inherit session directory when creating a new session (#39753 )	2026-07-30 20:31:38 -04:00