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 15:34:02 -04:00 · 2026-07-31 18:38:42 +02:00 · 2026-07-31 18:38:21 +02:00 · 2026-07-31 18:37:47 +02:00 · 2026-07-31 18:36:52 +02:00 · 2026-07-31 18:36:52 +02:00
57 changed files with 2791 additions and 958 deletions
@@ -621,9 +621,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-8e554196",
+        "@opentui/keymap": "0.0.0-20260731-8e554196",
+        "@opentui/solid": "0.0.0-20260731-8e554196",
        "solid-js": ">=1.9.0",
      },
      "optionalPeers": [
@@ -914,7 +914,6 @@
        "@opentui/keymap": "catalog:",
        "@opentui/solid": "catalog:",
        "@solid-primitives/event-bus": "1.1.2",
-        "clipboardy": "4.0.0",
        "diff": "catalog:",
        "effect": "catalog:",
        "fuzzysort": "catalog:",
@@ -1101,9 +1100,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-8e554196",
+    "@opentui/keymap": "0.0.0-20260731-8e554196",
+    "@opentui/solid": "0.0.0-20260731-8e554196",
    "@types/bun": "catalog:",
    "@types/node": "catalog:",
    "effect": "catalog:",
@@ -1121,9 +1120,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-8e554196",
+    "@opentui/keymap": "0.0.0-20260731-8e554196",
+    "@opentui/solid": "0.0.0-20260731-8e554196",
    "@pierre/diffs": "1.2.10",
    "@playwright/test": "1.59.1",
    "@sentry/solid": "10.36.0",
@@ -2162,27 +2161,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-8e554196", "", { "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-8e554196", "@opentui/core-darwin-x64": "0.0.0-20260731-8e554196", "@opentui/core-linux-arm64": "0.0.0-20260731-8e554196", "@opentui/core-linux-arm64-musl": "0.0.0-20260731-8e554196", "@opentui/core-linux-x64": "0.0.0-20260731-8e554196", "@opentui/core-linux-x64-musl": "0.0.0-20260731-8e554196", "@opentui/core-win32-arm64": "0.0.0-20260731-8e554196", "@opentui/core-win32-x64": "0.0.0-20260731-8e554196" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-xXX9wN3NkXwrzNw6yfnbpRkoA5AAhgO8N8p1SNwdXdMxJajyMi5oXB8As/xHkubawEJmPRGF/0LFcRjz0p6riA=="],

-    "@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-8e554196", "", { "os": "darwin", "cpu": "arm64" }, "sha512-9+Yeyh1rXHjYP0TY+1rmmYZ3gn89to16jVO11Yn9M9ggiC8htHSOT/tg2RWwXhl2Jm4nSpIk9wKF3TdKtU6BFQ=="],

-    "@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-8e554196", "", { "os": "darwin", "cpu": "x64" }, "sha512-DQ9fseLrrygk4WC9FI/8/tx/wVy+6yU8TbhP37wn80HZsuSNvzIwsmifEFwL3fe4l+odkEJ6YCyr8UvRswdbQw=="],

-    "@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-8e554196", "", { "os": "linux", "cpu": "arm64" }, "sha512-uS7Ej6HdNPB7YGbXtf3JFfjG9dTWEi/YuD+ejGIxLho/zNQUdhnfT9SsrPOIeDWqT0uO5BjXFffcUKD7fG+GdA=="],

-    "@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-8e554196", "", { "os": "linux", "cpu": "arm64" }, "sha512-b/q4Etu8AK0+0oHcmE4XkpfZCFWIYht7C5bIDeYCa6yQNCVMZeemDx4WEHH7DQDSsev208l01ly+CB0MlhnnOw=="],

-    "@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-8e554196", "", { "os": "linux", "cpu": "x64" }, "sha512-YB1WokWhHdFm7ytBZkSHyMIuUdLbXeguz9fdt8N1TkI1FMWeVPRANVhk7XrH9zlI/IRqLLvTKUgWKyhbYGuP7A=="],

-    "@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-8e554196", "", { "os": "linux", "cpu": "x64" }, "sha512-U84Pu0yD3Iuhwmj1SJQMQID69J+v8fykYb/H3acrmKKmCWBf9XBQ0PXP4T2X/GeyXCZdI+I+3rUtlsa/QIyqDg=="],

-    "@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-8e554196", "", { "os": "win32", "cpu": "arm64" }, "sha512-Kw9jMghKVArQ13bohhgvvkrvEFLWwtAMLrrZLNH1WUH+j5QF4mpnGb+p1K/S/6Gri44HZBANB2gKDCtk0b3g8A=="],

-    "@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-8e554196", "", { "os": "win32", "cpu": "x64" }, "sha512-qNbF9a+Om1XmYt6xpKrZmKftYovX+QFwpH3ORT2AfguESkSfzj/fqLivOm0lEZDuDTnXQvM/pwqJOk/UNwCMug=="],

-    "@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-8e554196", "", { "dependencies": { "@opentui/core": "0.0.0-20260731-8e554196" }, "peerDependencies": { "@opentui/react": "0.0.0-20260731-8e554196", "@opentui/solid": "0.0.0-20260731-8e554196", "react": ">=19.2.0", "solid-js": "1.9.12" }, "optionalPeers": ["@opentui/react", "@opentui/solid", "react", "solid-js"] }, "sha512-lOD/FqN5y/ydobbzlD9llBK3/mfckfZcK7RRoBuelyxtWCvyASVrj93j1DdiQp4T8hh5Gy0gocZ94egxaVHrNA=="],

-    "@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-8e554196", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.0.0-20260731-8e554196", "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-xk3FYM5+wASJ6vdHpTKjgt9gVghLKujzfAGszbdpXOMmmVYwxN/BcV/JtmGwORg4EW2Xk+zQqziI4fmeAaz57g=="],

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

@@ -3530,7 +3529,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=="],

@@ -3610,8 +3609,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=="],
@@ -4028,7 +4025,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=="],

@@ -4310,7 +4307,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=="],

@@ -4454,8 +4451,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=="],
@@ -4794,7 +4789,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=="],

@@ -4914,7 +4909,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=="],

@@ -4940,7 +4935,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=="],

@@ -5540,7 +5535,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=="],

@@ -5572,8 +5567,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=="],
@@ -6514,8 +6507,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=="],
@@ -6698,9 +6689,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=="],

@@ -6774,8 +6767,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=="],
@@ -7550,20 +7541,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=="],
@@ -8618,8 +8595,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-8e554196",
+      "@opentui/keymap": "0.0.0-20260731-8e554196",
+      "@opentui/solid": "0.0.0-20260731-8e554196",
      "@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-8e554196",
+    "@opentui/keymap": "0.0.0-20260731-8e554196",
+    "@opentui/solid": "0.0.0-20260731-8e554196",
    "@types/bun": "catalog:",
    "@types/node": "catalog:",
    "effect": "catalog:"
@@ -118,7 +118,6 @@ export type SessionListOperation<E = never> = (input?: Endpoint5_0Input) => Effe

 export type Endpoint5_1Input = {
  readonly id?: Session.ID | undefined
-  readonly title?: string | undefined
  readonly agent?: Agent.ID | undefined
  readonly model?: Model.Ref | undefined
  readonly location?: Location.Ref | undefined
@@ -299,13 +299,7 @@ const Endpoint5_0 = (raw: RawClient["server.session"]) => (input?: Endpoint5_0In
 const Endpoint5_1 = (raw: RawClient["server.session"]) => (input?: Endpoint5_1Input) =>
  preserveEffect<Endpoint5_1Output>()(
    raw["session.create"]({
-      payload: {
-        id: input?.["id"],
-        title: input?.["title"],
-        agent: input?.["agent"],
-        model: input?.["model"],
-        location: input?.["location"],
-      },
+      payload: { id: input?.["id"], agent: input?.["agent"], model: input?.["model"], location: input?.["location"] },
    }).pipe(
      Effect.mapError(mapClientError),
      Effect.map((value) => value.data),
@@ -462,7 +462,6 @@ export function make(options: ClientOptions) {
            path: `/api/session`,
            body: {
              id: input?.["id"],
-              title: input?.["title"],
              agent: input?.["agent"],
              model: input?.["model"],
              location: input?.["location"],
@@ -2662,35 +2662,24 @@ export type SessionListOutput = SessionsResponse
 export type SessionCreateInput = {
  readonly id?: {
    readonly id?: string | null
-    readonly title?: string | null
    readonly agent?: string | null
    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
    readonly location?: { readonly directory: string; readonly workspaceID?: string } | null
  }["id"]
-  readonly title?: {
-    readonly id?: string | null
-    readonly title?: string | null
-    readonly agent?: string | null
-    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
-    readonly location?: { readonly directory: string; readonly workspaceID?: string } | null
-  }["title"]
  readonly agent?: {
    readonly id?: string | null
-    readonly title?: string | null
    readonly agent?: string | null
    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
    readonly location?: { readonly directory: string; readonly workspaceID?: string } | null
  }["agent"]
  readonly model?: {
    readonly id?: string | null
-    readonly title?: string | null
    readonly agent?: string | null
    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
    readonly location?: { readonly directory: string; readonly workspaceID?: string } | null
  }["model"]
  readonly location?: {
    readonly id?: string | null
-    readonly title?: string | null
    readonly agent?: string | null
    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
    readonly location?: { readonly directory: string; readonly workspaceID?: string } | null
@@ -4,8 +4,6 @@ import { Plugin } from "@opencode-ai/plugin/effect"
 import type { IntegrationMethodRegistration } from "@opencode-ai/plugin/effect/integration"
 import type { CredentialOAuth } from "@opencode-ai/sdk/v2/types"
 import { EventManifest } from "@opencode-ai/schema/event-manifest"
-import { SessionMessagesCursor } from "@opencode-ai/schema/session-messages-cursor"
-import { SessionsQuery } from "@opencode-ai/schema/sessions-query"
 import { App } from "../app"
 import { Effect, Schema, Stream } from "effect"
 import { Agent } from "../agent"
@@ -343,54 +341,17 @@ export const make = Effect.fn("PluginHost.make")(function* (plugin: import("../p
      create: (input) =>
        runtime.session.create({
          id: input?.id,
-          title: input?.title,
          agent: input?.agent,
          model: input?.model,
          location:
            input?.location ?? Location.Ref.make({ directory: location.directory, workspaceID: location.workspaceID }),
        }),
      get: (input) => runtime.session.get(input.sessionID),
-      list: (input) =>
-        Effect.gen(function* () {
-          const query =
-            input?.cursor !== undefined
-              ? yield* SessionsQuery.Cursor.parse(input.cursor).pipe(
-                  Effect.mapError(() => new Error("Invalid cursor")),
-                )
-              : (input ?? {})
-          const page = yield* runtime.session.list({
-            ...query,
-            workspaceID: query.workspace,
-            limit: input?.limit ?? SessionsQuery.DefaultLimit,
-          })
-          return { data: page.data, cursor: SessionsQuery.Cursor.page(query, page.data) }
-        }),
-      messages: (input) =>
-        Effect.gen(function* () {
-          if (input.cursor !== undefined && input.order !== undefined)
-            return yield* Effect.fail(new Error("Cursor cannot be combined with order"))
-          const decoded =
-            input.cursor !== undefined
-              ? yield* SessionMessagesCursor.parse(input.cursor).pipe(
-                  Effect.mapError(() => new Error("Invalid cursor")),
-                )
-              : undefined
-          const order = decoded?.order ?? input.order ?? "desc"
-          const data = yield* runtime.session.messages({
-            sessionID: input.sessionID,
-            limit: input.limit ?? SessionMessagesCursor.DefaultLimit,
-            order,
-            cursor: decoded ? { id: decoded.id, direction: decoded.direction } : undefined,
-          })
-          return { data, cursor: SessionMessagesCursor.page(data, order) }
-        }),
      prompt: runtime.session.prompt,
      generate: (input) => runtime.session.generate(input).pipe(Effect.map((text) => ({ text }))),
      command: runtime.session.command,
-      rename: runtime.session.rename,
      synthetic: runtime.session.synthetic,
      interrupt: (input) => runtime.session.interrupt(input.sessionID),
-      wait: (input) => runtime.session.wait(input.sessionID),
    },
  } satisfies Plugin.Context
 })
@@ -11,18 +11,7 @@ import { Session } from "../session"
 export interface Interface {
  readonly session: Pick<
    Session.Interface,
-    | "get"
-    | "create"
-    | "list"
-    | "messages"
-    | "prompt"
-    | "generate"
-    | "command"
-    | "rename"
-    | "resume"
-    | "interrupt"
-    | "synthetic"
-    | "wait"
+    "get" | "create" | "messages" | "prompt" | "generate" | "command" | "resume" | "interrupt" | "synthetic"
  >
  readonly job: Pick<Job.Interface, "start" | "wait" | "block" | "background" | "cancel">
  readonly location: {
@@ -59,16 +48,13 @@ export const layerWithCell = (cell: Cell) =>
      session: {
        get: (sessionID) => require(cell, (runtime) => runtime.session.get(sessionID)),
        create: (input) => require(cell, (runtime) => runtime.session.create(input)),
-        list: (input) => require(cell, (runtime) => runtime.session.list(input)),
        messages: (input) => require(cell, (runtime) => runtime.session.messages(input)),
        prompt: (input) => require(cell, (runtime) => runtime.session.prompt(input)),
        generate: (input) => require(cell, (runtime) => runtime.session.generate(input)),
        command: (input) => require(cell, (runtime) => runtime.session.command(input)),
-        rename: (input) => require(cell, (runtime) => runtime.session.rename(input)),
        resume: (sessionID) => require(cell, (runtime) => runtime.session.resume(sessionID)),
        interrupt: (sessionID) => require(cell, (runtime) => runtime.session.interrupt(sessionID)),
        synthetic: (input) => require(cell, (runtime) => runtime.session.synthetic(input)),
-        wait: (sessionID) => require(cell, (runtime) => runtime.session.wait(sessionID)),
      },
      job: {
        start: (input) => require(cell, (runtime) => runtime.job.start(input)),
@@ -103,15 +103,11 @@ export function host(overrides: Overrides = {}): Plugin.Context {
      hook: overrides.session?.hook ?? (() => Effect.die("unused session.hook")),
      create: overrides.session?.create ?? (() => Effect.die("unused session.create")),
      get: overrides.session?.get ?? (() => Effect.die("unused session.get")),
-      list: overrides.session?.list ?? (() => Effect.die("unused session.list")),
-      messages: overrides.session?.messages ?? (() => Effect.die("unused session.messages")),
      prompt: overrides.session?.prompt ?? (() => Effect.die("unused session.prompt")),
      generate: overrides.session?.generate ?? (() => Effect.die("unused session.generate")),
      command: overrides.session?.command ?? (() => Effect.die("unused session.command")),
-      rename: overrides.session?.rename ?? (() => Effect.die("unused session.rename")),
      synthetic: overrides.session?.synthetic ?? (() => Effect.die("unused session.synthetic")),
      interrupt: overrides.session?.interrupt ?? (() => Effect.die("unused session.interrupt")),
-      wait: overrides.session?.wait ?? (() => Effect.die("unused session.wait")),
    },
  }
 }
@@ -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-8e554196",
+    "@opentui/keymap": "0.0.0-20260731-8e554196",
+    "@opentui/solid": "0.0.0-20260731-8e554196",
    "solid-js": ">=1.9.0"
  },
  "peerDependenciesMeta": {
@@ -1,4 +1,4 @@
-import type { MessageApi, SessionApi } from "@opencode-ai/client/effect/api"
+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"
@@ -29,9 +29,7 @@ export interface SessionHooks {

 export type SessionDomain = Pick<
  SessionApi<unknown>,
-  "create" | "get" | "list" | "prompt" | "generate" | "command" | "synthetic" | "interrupt" | "rename" | "wait"
+  "create" | "get" | "prompt" | "generate" | "command" | "synthetic" | "interrupt"
 > & {
  readonly hook: Hooks<SessionHooks>
-  /** Read a session's projected message history, paginated like the HTTP message list endpoint. */
-  readonly messages: MessageApi<unknown>["list"]
 }
@@ -4,8 +4,7 @@ import { PromptInput } from "@opencode-ai/schema/prompt-input"
 import { Session } from "@opencode-ai/schema/session"
 import { InstructionEntry } from "@opencode-ai/schema/instruction-entry"
 import { Project } from "@opencode-ai/schema/project"
-import { AbsolutePath, PositiveInt, RelativePath } from "@opencode-ai/schema/schema"
-import { SessionsQuery } from "@opencode-ai/schema/sessions-query"
+import { AbsolutePath, PositiveInt, RelativePath, statics } from "@opencode-ai/schema/schema"
 import { Event } from "@opencode-ai/schema/event"
 import { Workspace } from "@opencode-ai/schema/workspace"
 import { Context, Effect, Encoding, Result, Schema, SchemaGetter, Struct } from "effect"
@@ -30,6 +29,76 @@ import { Location } from "@opencode-ai/schema/location"
 import { SessionEvent } from "@opencode-ai/schema/session-event"
 import { EventLog } from "@opencode-ai/schema/event-log"

+const ParentIDFilter = Schema.Union([
+  Session.ID,
+  Schema.Null.pipe(
+    Schema.encodeTo(Schema.Literal("null"), {
+      decode: SchemaGetter.transform(() => null),
+      encode: SchemaGetter.transform(() => "null" as const),
+    }),
+  ),
+]).annotate({
+  description: "Filter by parent session. Use null to return only root sessions.",
+})
+
+const SessionsQueryFields = {
+  workspace: Workspace.ID.pipe(Schema.optional),
+  limit: Schema.NumberFromString.pipe(Schema.decodeTo(PositiveInt), Schema.optional).annotate({
+    description: "Maximum number of sessions to return. Defaults to the newest 50 sessions.",
+  }),
+  order: Schema.optional(Schema.Union([Schema.Literal("asc"), Schema.Literal("desc")])).annotate({
+    description: "Session order for the first page. Use desc for newest first or asc for oldest first.",
+  }),
+  search: Schema.optional(Schema.String),
+  parentID: ParentIDFilter.pipe(Schema.optional),
+}
+
+const SessionsDirectoryQuery = Schema.Struct({
+  ...SessionsQueryFields,
+  directory: AbsolutePath,
+})
+
+const SessionsProjectQuery = Schema.Struct({
+  ...SessionsQueryFields,
+  project: Project.ID,
+  subpath: RelativePath.pipe(Schema.optional),
+})
+
+const SessionsAllQuery = Schema.Struct(SessionsQueryFields)
+
+const withCursor = <Fields extends Schema.Struct.Fields>(schema: Schema.Struct<Fields>) =>
+  schema.mapFields((fields) => ({
+    ...Struct.omit(fields, ["limit"]),
+    anchor: Session.ListAnchor,
+  }))
+
+const SessionsCursorInput = Schema.Union([
+  withCursor(SessionsDirectoryQuery),
+  withCursor(SessionsProjectQuery),
+  withCursor(SessionsAllQuery),
+])
+const SessionsCursorJson = Schema.fromJsonString(SessionsCursorInput)
+const encodeSessionsCursor = Schema.encodeSync(SessionsCursorJson)
+const decodeSessionsCursor = Schema.decodeUnknownEffect(SessionsCursorJson)
+const invalidCursor = "Invalid cursor" as const
+
+export const SessionsCursor = Schema.String.pipe(
+  Schema.brand("SessionsCursor"),
+  statics((schema) => {
+    const make = schema.make.bind(schema)
+    return {
+      make: (input: typeof SessionsCursorInput.Type) => make(Encoding.encodeBase64Url(encodeSessionsCursor(input))),
+      parse: (input: string) =>
+        Effect.suspend(() => {
+          const result = Encoding.decodeBase64UrlString(input)
+          return Result.isFailure(result)
+            ? Effect.fail(invalidCursor)
+            : decodeSessionsCursor(result.success).pipe(Effect.mapError(() => invalidCursor))
+        }),
+    }
+  }),
+)
+export type SessionsCursor = typeof SessionsCursor.Type

 const SessionActive = Schema.Struct({
  type: Schema.Literal("running"),
@@ -42,17 +111,28 @@ const BooleanFromString = Schema.Literals(["true", "false"]).pipe(
  }),
 )

+const SessionsQueryCursor = SessionsCursor.annotate({
+  description: "Opaque pagination cursor returned as cursor.previous or cursor.next in the previous response.",
+})
+
+export const SessionsQuery = Schema.Struct({
+  ...SessionsQueryFields,
+  directory: AbsolutePath.pipe(Schema.optional),
+  project: Project.ID.pipe(Schema.optional),
+  subpath: RelativePath.pipe(Schema.optional),
+  cursor: SessionsQueryCursor.pipe(Schema.optional),
+}).annotate({ identifier: "SessionsQuery" })

 export const makeSessionGroup = <I extends HttpApiMiddleware.AnyId, S>(sessionLocationMiddleware: Context.Key<I, S>) =>
  HttpApiGroup.make("server.session")
    .add(
      HttpApiEndpoint.get("session.list", "/api/session", {
-        query: SessionsQuery.Query,
+        query: SessionsQuery,
        success: Schema.Struct({
          data: Schema.Array(Session.Info),
          cursor: Schema.Struct({
-            previous: SessionsQuery.Cursor.pipe(Schema.optional),
-            next: SessionsQuery.Cursor.pipe(Schema.optional),
+            previous: SessionsCursor.pipe(Schema.optional),
+            next: SessionsCursor.pipe(Schema.optional),
          }),
        }).annotate({ identifier: "SessionsResponse" }),
        error: [InvalidCursorError, InvalidRequestError],
@@ -69,7 +149,6 @@ export const makeSessionGroup = <I extends HttpApiMiddleware.AnyId, S>(sessionLo
      HttpApiEndpoint.post("session.create", "/api/session", {
        payload: Schema.Struct({
          id: Session.ID.pipe(Schema.optional),
-          title: Schema.String.pipe(Schema.optional),
          agent: Agent.ID.pipe(Schema.optional),
          model: Model.Ref.pipe(Schema.optional),
          location: Location.Ref.pipe(Schema.optional),
@@ -0,0 +1,18 @@
+import { describe, expect, test } from "bun:test"
+import { Effect } from "effect"
+import { SessionsCursor } from "../src/groups/session.js"
+import { Session } from "@opencode-ai/schema/session"
+
+describe("SessionsCursor", () => {
+  test("round trips without Node globals", async () => {
+    const input = {
+      workspace: undefined,
+      search: "protocol",
+      order: "desc" as const,
+      anchor: { id: Session.ID.make("ses_test"), time: 1, direction: "next" as const },
+    }
+    const cursor = SessionsCursor.make(input)
+
+    expect(await Effect.runPromise(SessionsCursor.parse(cursor))).toEqual(input)
+  })
+})
@@ -1,48 +0,0 @@
-export * as SessionMessagesCursor from "./session-messages-cursor.js"
-
-import { Effect, Encoding, Result, Schema } from "effect"
-import { SessionMessage } from "./session-message.js"
-
-/**
- * Shared session message pagination cursor. Lives in schema so the protocol
- * message handler and the core plugin host paginate identically. The encoded
- * cursor carries the page order, so a cursor cannot be combined with an
- * explicit order.
- */
-
-export const DefaultLimit = 50
-
-export const Order = Schema.Literals(["asc", "desc"])
-export type Order = typeof Order.Type
-
-const Payload = Schema.Struct({
-  id: SessionMessage.ID,
-  order: Order,
-  direction: Schema.Literals(["previous", "next"]),
-})
-export type Payload = typeof Payload.Type
-
-const PayloadJson = Schema.fromJsonString(Payload)
-const encodePayload = Schema.encodeSync(PayloadJson)
-const decodePayload = Schema.decodeUnknownEffect(PayloadJson)
-const invalidCursor = "Invalid cursor" as const
-
-export const make = (input: Payload) => Encoding.encodeBase64Url(encodePayload(input))
-
-export const parse = (input: string) =>
-  Effect.suspend(() => {
-    const result = Encoding.decodeBase64UrlString(input)
-    return Result.isFailure(result)
-      ? Effect.fail(invalidCursor)
-      : decodePayload(result.success).pipe(Effect.mapError(() => invalidCursor))
-  })
-
-/** previous/next cursors for one returned page of messages. */
-export const page = (data: ReadonlyArray<SessionMessage.Info>, order: Order) => {
-  const first = data[0]
-  const last = data.at(-1)
-  return {
-    previous: first ? make({ id: first.id, order, direction: "previous" }) : undefined,
-    next: last ? make({ id: last.id, order, direction: "next" }) : undefined,
-  }
-}
@@ -1,125 +0,0 @@
-export * as SessionsQuery from "./sessions-query.js"
-
-import { DateTime, Effect, Encoding, Result, Schema, SchemaGetter, Struct } from "effect"
-import { Project } from "./project.js"
-import { AbsolutePath, PositiveInt, RelativePath, statics } from "./schema.js"
-import { Session } from "./session.js"
-import { Workspace } from "./workspace.js"
-
-/**
- * Shared session list query and cursor codec. Lives in schema so both the
- * protocol session group and the core plugin host paginate identically.
- */
-
-export const DefaultLimit = 50
-
-const ParentIDFilter = Schema.Union([
-  Session.ID,
-  Schema.Null.pipe(
-    Schema.encodeTo(Schema.Literal("null"), {
-      decode: SchemaGetter.transform(() => null),
-      encode: SchemaGetter.transform(() => "null" as const),
-    }),
-  ),
-]).annotate({
-  description: "Filter by parent session. Use null to return only root sessions.",
-})
-
-export const Fields = {
-  workspace: Workspace.ID.pipe(Schema.optional),
-  limit: Schema.NumberFromString.pipe(Schema.decodeTo(PositiveInt), Schema.optional).annotate({
-    description: "Maximum number of sessions to return. Defaults to the newest 50 sessions.",
-  }),
-  order: Schema.optional(Schema.Union([Schema.Literal("asc"), Schema.Literal("desc")])).annotate({
-    description: "Session order for the first page. Use desc for newest first or asc for oldest first.",
-  }),
-  search: Schema.optional(Schema.String),
-  parentID: ParentIDFilter.pipe(Schema.optional),
-}
-
-const DirectoryQuery = Schema.Struct({
-  ...Fields,
-  directory: AbsolutePath,
-})
-
-const ProjectQuery = Schema.Struct({
-  ...Fields,
-  project: Project.ID,
-  subpath: RelativePath.pipe(Schema.optional),
-})
-
-const AllQuery = Schema.Struct(Fields)
-
-const withAnchor = <Fields extends Schema.Struct.Fields>(schema: Schema.Struct<Fields>) =>
-  schema.mapFields((fields) => ({
-    ...Struct.omit(fields, ["limit"]),
-    anchor: Session.ListAnchor,
-  }))
-
-const CursorInput = Schema.Union([withAnchor(DirectoryQuery), withAnchor(ProjectQuery), withAnchor(AllQuery)])
-const CursorJson = Schema.fromJsonString(CursorInput)
-const encodeCursor = Schema.encodeSync(CursorJson)
-const decodeCursor = Schema.decodeUnknownEffect(CursorJson)
-const invalidCursor = "Invalid cursor" as const
-
-type PageQuery = Omit<typeof Query.Type, "limit" | "cursor">
-
-export const Cursor = Schema.String.pipe(
-  Schema.brand("SessionsCursor"),
-  statics((schema) => {
-    const make = schema.make.bind(schema)
-    const makeCursor = (input: typeof CursorInput.Type) => make(Encoding.encodeBase64Url(encodeCursor(input)))
-    return {
-      make: makeCursor,
-      parse: (input: string) =>
-        Effect.suspend(() => {
-          const result = Encoding.decodeBase64UrlString(input)
-          return Result.isFailure(result)
-            ? Effect.fail(invalidCursor)
-            : decodeCursor(result.success).pipe(Effect.mapError(() => invalidCursor))
-        }),
-      /**
-       * previous/next cursors for one returned page, re-anchoring the
-       * originating query at the page's first and last items.
-       */
-      page: (query: PageQuery, data: ReadonlyArray<Session.Info>) => {
-        const first = data[0]
-        const last = data.at(-1)
-        return {
-          previous: first
-            ? makeCursor({
-                ...query,
-                anchor: {
-                  id: first.id,
-                  time: DateTime.toEpochMillis(first.time.updated),
-                  direction: "previous",
-                },
-              })
-            : undefined,
-          next: last
-            ? makeCursor({
-                ...query,
-                anchor: {
-                  id: last.id,
-                  time: DateTime.toEpochMillis(last.time.updated),
-                  direction: "next",
-                },
-              })
-            : undefined,
-        }
-      },
-    }
-  }),
-)
-export type Cursor = typeof Cursor.Type
-
-export const Query = Schema.Struct({
-  ...Fields,
-  directory: AbsolutePath.pipe(Schema.optional),
-  project: Project.ID.pipe(Schema.optional),
-  subpath: RelativePath.pipe(Schema.optional),
-  cursor: Cursor.annotate({
-    description: "Opaque pagination cursor returned as cursor.previous or cursor.next in the previous response.",
-  }).pipe(Schema.optional),
-}).annotate({ identifier: "SessionsQuery" })
-export type Query = typeof Query.Type
@@ -1,33 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { Effect } from "effect"
-import { SessionsQuery } from "../src/sessions-query.js"
-import { SessionMessagesCursor } from "../src/session-messages-cursor.js"
-import { SessionMessage } from "../src/session-message.js"
-import { Session } from "../src/session.js"
-
-describe("SessionsQuery.Cursor", () => {
-  test("round trips without Node globals", async () => {
-    const input = {
-      workspace: undefined,
-      search: "protocol",
-      order: "desc" as const,
-      anchor: { id: Session.ID.make("ses_test"), time: 1, direction: "next" as const },
-    }
-    const cursor = SessionsQuery.Cursor.make(input)
-
-    expect(await Effect.runPromise(SessionsQuery.Cursor.parse(cursor))).toEqual(input)
-  })
-})
-
-describe("SessionMessagesCursor", () => {
-  test("round trips", async () => {
-    const input = {
-      id: SessionMessage.ID.make("msg_test"),
-      order: "desc" as const,
-      direction: "next" as const,
-    }
-    const cursor = SessionMessagesCursor.make(input)
-
-    expect(await Effect.runPromise(SessionMessagesCursor.parse(cursor))).toEqual(input)
-  })
-})
@@ -1,10 +1,29 @@
+import { SessionMessage } from "@opencode-ai/core/session/message"
 import { Session } from "@opencode-ai/core/session"
-import { SessionMessagesCursor } from "@opencode-ai/schema/session-messages-cursor"
-import { Effect } from "effect"
+import { Effect, Schema } from "effect"
 import { HttpApiBuilder } from "effect/unstable/httpapi"
 import { Api } from "../api"
 import { InvalidCursorError, SessionNotFoundError, UnknownError } from "@opencode-ai/protocol/errors"

+const DefaultMessagesLimit = 50
+
+const Cursor = Schema.Struct({
+  id: SessionMessage.ID,
+  order: Schema.Union([Schema.Literal("asc"), Schema.Literal("desc")]),
+  direction: Schema.Union([Schema.Literal("previous"), Schema.Literal("next")]),
+})
+
+const decodeCursor = Schema.decodeUnknownSync(Cursor)
+
+const cursor = {
+  encode(message: SessionMessage.Info, order: "asc" | "desc", direction: "previous" | "next") {
+    return Buffer.from(JSON.stringify({ id: message.id, order, direction })).toString("base64url")
+  },
+  decode(input: string) {
+    return decodeCursor(JSON.parse(Buffer.from(input, "base64url").toString("utf8")))
+  },
+}
+
 export const MessageHandler = HttpApiBuilder.group(Api, "server.message", (handlers) =>
  Effect.gen(function* () {
    const session = yield* Session.Service
@@ -14,16 +33,15 @@ export const MessageHandler = HttpApiBuilder.group(Api, "server.message", (handl
      Effect.fn(function* (ctx) {
        if (ctx.query.cursor && ctx.query.order !== undefined)
          return yield* new InvalidCursorError({ message: "Cursor cannot be combined with order" })
-        const decoded = ctx.query.cursor
-          ? yield* SessionMessagesCursor.parse(ctx.query.cursor).pipe(
-              Effect.mapError(() => new InvalidCursorError({ message: "Invalid cursor" })),
-            )
-          : undefined
+        const decoded = yield* Effect.try({
+          try: () => (ctx.query.cursor ? cursor.decode(ctx.query.cursor) : undefined),
+          catch: () => new InvalidCursorError({ message: "Invalid cursor" }),
+        })
        const order = decoded?.order ?? ctx.query.order ?? "desc"
        const messages = yield* session
          .messages({
            sessionID: ctx.params.sessionID,
-            limit: ctx.query.limit ?? SessionMessagesCursor.DefaultLimit,
+            limit: ctx.query.limit ?? DefaultMessagesLimit,
            order,
            cursor: decoded ? { id: decoded.id, direction: decoded.direction } : undefined,
          })
@@ -48,9 +66,14 @@ export const MessageHandler = HttpApiBuilder.group(Api, "server.message", (handl
              )
            }),
          )
+        const first = messages[0]
+        const last = messages.at(-1)
        return {
          data: messages,
-          cursor: SessionMessagesCursor.page(messages, order),
+          cursor: {
+            previous: first ? cursor.encode(first, order, "previous") : undefined,
+            next: last ? cursor.encode(last, order, "next") : undefined,
+          },
        }
      }),
    )
@@ -3,7 +3,7 @@ import { InstructionEntry } from "@opencode-ai/core/session/instruction-entry"
 import { DateTime, Effect, Stream } from "effect"
 import { HttpApiBuilder, HttpApiSchema } from "effect/unstable/httpapi"
 import { Api } from "../api"
-import { SessionsQuery } from "@opencode-ai/schema/sessions-query"
+import { SessionsCursor } from "@opencode-ai/protocol/groups/session"
 import {
  ConflictError,
  CommandEvaluationError,
@@ -19,6 +19,8 @@ import {
 } from "@opencode-ai/protocol/errors"
 import { AbsolutePath } from "@opencode-ai/core/schema"

+const DefaultSessionsLimit = 50
+
 export const SessionHandler = HttpApiBuilder.group(Api, "server.session", (handlers) =>
  Effect.gen(function* () {
    const session = yield* Session.Service
@@ -29,18 +31,42 @@ export const SessionHandler = HttpApiBuilder.group(Api, "server.session", (handl
        Effect.fn(function* (ctx) {
          const query =
            ctx.query.cursor !== undefined
-              ? yield* SessionsQuery.Cursor.parse(ctx.query.cursor).pipe(
+              ? yield* SessionsCursor.parse(ctx.query.cursor).pipe(
                  Effect.mapError(() => new InvalidCursorError({ message: "Invalid cursor" })),
                )
              : ctx.query
          const page = yield* session.list({
            ...query,
            workspaceID: query.workspace,
-            limit: ctx.query.limit ?? SessionsQuery.DefaultLimit,
+            limit: ctx.query.limit ?? DefaultSessionsLimit,
          })
+          const sessions = page.data
+          const first = sessions[0]
+          const last = sessions.at(-1)
          return {
-            data: page.data,
-            cursor: SessionsQuery.Cursor.page(query, page.data),
+            data: sessions,
+            cursor: {
+              previous: first
+                ? SessionsCursor.make({
+                    ...query,
+                    anchor: {
+                      id: first.id,
+                      time: DateTime.toEpochMillis(first.time.updated),
+                      direction: "previous",
+                    },
+                  })
+                : undefined,
+              next: last
+                ? SessionsCursor.make({
+                    ...query,
+                    anchor: {
+                      id: last.id,
+                      time: DateTime.toEpochMillis(last.time.updated),
+                      direction: "next",
+                    },
+                  })
+                : undefined,
+            },
          }
        }),
      )
@@ -51,7 +77,6 @@ export const SessionHandler = HttpApiBuilder.group(Api, "server.session", (handl
            data: yield* session
              .create({
                id: ctx.payload.id,
-                title: ctx.payload.title,
                agent: ctx.payload.agent,
                model: ctx.payload.model,
                location: ctx.payload.location ?? { directory: AbsolutePath.make(process.cwd()) },
@@ -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()
@@ -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)
  }

@@ -37,8 +37,8 @@ export function DialogOpen() {
  const dimensions = useTerminalDimensions()
  const shortcuts = Keymap.useShortcuts()
  const [filter, setFilter] = createSignal("")
-  const [selectionMoved, setSelectionMoved] = createSignal(false)

+  data.project.invalidate()
  void data.project.sync().catch(() => {})

  // One background fetch fills in recent sessions from other projects; the menu renders
@@ -52,12 +52,8 @@ export function DialogOpen() {
    { initialValue: [] },
  )

-  const openTabs = createMemo(
-    () => new Set(sessionTabs.enabled() ? sessionTabs.tabs().map((tab) => tab.sessionID) : []),
-  )
-  const currentSessionID = createMemo(() =>
-    route.data.type === "session" ? data.session.root(route.data.sessionID) : undefined,
-  )
+  const openTabs = createMemo(() => new Set(sessionTabs.tabs().map((tab) => tab.sessionID)))
+  const currentSessionID = createMemo(() => (route.data.type === "session" ? route.data.sessionID : undefined))
  const sessions = createMemo(() => {
    const seen = new Set<string>()
    return [...data.session.list(), ...fetched()]
@@ -73,7 +69,7 @@ export function DialogOpen() {
    const tabs = openTabs()
    // With an empty query the menu shows what is not already one keystroke away: open tabs are
    // visible in the strip, so recents exclude them. Typing widens the pool to every session so
-    // matching a loaded tab by name still switches to it.
+    // matching a tab by name still switches to it.
    const recent = filter().trim()
      ? sessions()
      : sessions()
@@ -82,9 +78,7 @@ export function DialogOpen() {
    const sessionOptions = recent.map((session) => {
      const project = data.project.get(session.projectID)
      const name = project?.canonical === "/" ? undefined : project?.name || path.basename(project?.canonical ?? "")
-      const running =
-        data.session.status(session.id) === "running" ||
-        data.session.family(session.id).some((id) => data.session.status(id) === "running")
+      const running = data.session.family(session.id).some((id) => data.session.status(id) === "running")
      return {
        title: withTimestampedFallback(session),
        value: { type: "session", sessionID: session.id } as OpenTarget,
@@ -104,7 +98,7 @@ export function DialogOpen() {
    const projectOptions = data.project
      .list()
      .filter((project) => {
-        if (project.canonical === "/" || seen.has(project.canonical)) return false
+        if (project.canonical === "/" || project.id === current?.id || seen.has(project.canonical)) return false
        seen.add(project.canonical)
        return true
      })
@@ -119,10 +113,6 @@ export function DialogOpen() {
          searchText: footer,
          value: { type: "project", directory: project.canonical } as OpenTarget,
          category: "Projects",
-          gutter:
-            project.canonical === current?.canonical
-              ? () => <text fg={theme.text.formfield.selected}>●</text>
-              : undefined,
        }
      })

@@ -138,8 +128,6 @@ export function DialogOpen() {
      options={options()}
      current={currentSessionID() ? ({ type: "session", sessionID: currentSessionID()! } as OpenTarget) : undefined}
      focusCurrent={false}
-      preserveSelection={selectionMoved()}
-      onMove={() => setSelectionMoved(true)}
      onFilter={setFilter}
      noMatchView={
        <box paddingLeft={4} paddingRight={4}>
@@ -89,8 +89,7 @@ export function DialogSessionList() {
  const sessions = createMemo(() => {
    const query = filter().trim()
    const local = localSessions()
-    if (query !== search().trim()) return searchResults.latest?.sessions ?? local
-    if (searchResults.loading) return searchResults.latest?.sessions ?? []
+    if (query !== search().trim() || searchResults.loading) return searchResults.latest?.sessions ?? local
    const result = searchResults()
    if (result?.query !== query || result.allProjects !== allProjects() || result.error) return local
    return result.sessions
@@ -155,13 +154,11 @@ export function DialogSessionList() {
        footer,
        bg: deleting ? theme.background.action.destructive.focused : undefined,
        fg: deleting ? theme.text.action.destructive.focused : undefined,
-        gutter:
-          data.session.status(session.id) === "running" ||
-          data.session.family(session.id).some((id) => data.session.status(id) === "running")
-            ? () => <Spinner />
-            : slot === undefined
-              ? undefined
-              : () => <text fg={theme.hue.accent[mode() === "light" ? 800 : 200]}>{slot}</text>,
+        gutter: data.session.family(session.id).some((id) => data.session.status(id) === "running")
+          ? () => <Spinner />
+          : slot === undefined
+            ? undefined
+            : () => <text fg={theme.hue.accent[mode() === "light" ? 800 : 200]}>{slot}</text>,
      }
    }

@@ -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
@@ -310,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(
@@ -379,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",
@@ -406,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
@@ -527,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",
@@ -551,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())
@@ -580,6 +696,7 @@ export function Prompt(props: PromptProps) {
  })

  onCleanup(() => {
+    disposed = true
    if (store.prompt.text) {
      stashed = { prompt: unwrap(store.prompt), cursor: input.cursorOffset }
    }
@@ -803,7 +920,7 @@ export function Prompt(props: PromptProps) {
          group: "Prompt",
          run: () => {
            setStore("placeholder", randomIndex(shell().length))
-            setStore("mode", "shell")
+            setPromptMode("shell")
          },
        },
      ],
@@ -814,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") }],
    }
  })

@@ -825,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") }],
    }
  })

@@ -858,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
          },
@@ -897,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
          },
@@ -1015,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(
@@ -1146,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,
@@ -1168,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
@@ -1204,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,
@@ -1241,7 +1383,6 @@ export function Prompt(props: PromptProps) {
        draft.extmarkToPart.set(extmarkId, { type: "file", index })
      }),
    )
-    return
  }

  function clearPrompt() {
@@ -1355,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()}
@@ -1365,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()
@@ -1383,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
@@ -1393,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
                }
@@ -1406,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
 }
@@ -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,
@@ -52,6 +52,7 @@ import { useEditorContext } from "../../context/editor"
 import { openEditor } from "../../editor"
 import { useDialog } from "../../ui/dialog"
 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"
@@ -73,6 +74,7 @@ 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"
@@ -105,6 +107,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
@@ -114,6 +117,7 @@ const context = createContext<{
  markdownMode: () => "source" | "rendered"
  groupExploration: () => boolean
  diffWrapMode: () => "word" | "none"
+  imageKeys: () => ReadonlySet<string>
  models: () => ModelInfo[]
  config: ReturnType<typeof useConfig>["data"]
 }>()
@@ -143,6 +147,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 currentLocation = useLocation()
  const location = createMemo(() => session()?.location ?? currentLocation.ref)

@@ -769,8 +776,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()
      },
@@ -787,8 +801,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" })
        }
@@ -830,9 +849,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
          }

@@ -953,6 +974,7 @@ export function Session() {
        markdownMode,
        groupExploration,
        diffWrapMode,
+        imageKeys,
        models,
        config,
      }}
@@ -1116,11 +1138,7 @@ function SessionRowView(props: SessionRowViewProps) {
        </Match>
        <Match when={props.row.type === "turn-usage" ? props.row : undefined}>
          {(row) => (
-            <TurnTokenUsage
-              messageIDs={row().messageIDs}
-              previousCache={row().previousCache}
-              message={props.message}
-            />
+            <TurnTokenUsage messageIDs={row().messageIDs} previousCache={row().previousCache} message={props.message} />
          )}
        </Match>
      </Switch>
@@ -1227,21 +1245,10 @@ function TurnTokenToolCalls(props: { tools: SessionMessageAssistantTool[] }) {
        <For each={props.tools}>
          {(tool) => (
            <box flexDirection="row">
-              <text
-                width={nameWidth()}
-                flexShrink={0}
-                fg={theme.text.subdued}
-                attributes={TextAttributes.BOLD}
-              >
+              <text width={nameWidth()} flexShrink={0} fg={theme.text.subdued} attributes={TextAttributes.BOLD}>
                {tool.name}
              </text>
-              <text
-                fg={theme.text.subdued}
-                attributes={TextAttributes.DIM}
-                wrapMode="word"
-                flexGrow={1}
-                minWidth={0}
-              >
+              <text fg={theme.text.subdued} attributes={TextAttributes.DIM} wrapMode="word" flexGrow={1} minWidth={0}>
                {turnTokenToolSummary(tool)}
              </text>
            </box>
@@ -1258,9 +1265,7 @@ function turnTokenToolSummary(tool: SessionMessageAssistantTool) {
  const primaryKey = ["command", "id", "pattern", "url", "query", "path", "description", "code"].find(
    (key) => key in data,
  )
-  const input = Object.entries(data).filter(([, value]) =>
-    ["string", "number", "boolean"].includes(typeof value),
-  )
+  const input = Object.entries(data).filter(([, value]) => ["string", "number", "boolean"].includes(typeof value))
  const primary = input.find(([key]) => key === primaryKey)?.[1]
  const details = input.filter(([key]) => key !== primaryKey).map(([key, value]) => `${key}: ${String(value)}`)
  return [primary === undefined ? "" : String(primary), ...details].filter(Boolean).join("  ")
@@ -1342,7 +1347,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>
      )}
@@ -1480,6 +1485,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)
@@ -1489,13 +1495,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
@@ -1509,7 +1515,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
@@ -1529,9 +1539,14 @@ 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>
  )
@@ -1665,8 +1680,7 @@ function CompactionMessage(props: { message: Extract<SessionMessageInfo, { type:
  const text = () =>
    props.message.status === "failed" ? (cancelled() ? "" : props.message.error.message) : props.message.summary
  const content = createMemo(() => text().trim())
-  const color = () =>
-    status() === "failed" && !cancelled() ? theme.text.feedback.error.default : theme.text.subdued
+  const color = () => (status() === "failed" && !cancelled() ? theme.text.feedback.error.default : theme.text.subdued)
  return (
    <box>
      <box flexDirection="row" alignItems="center">
@@ -1837,6 +1851,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
@@ -1855,30 +1870,26 @@ 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)}
+            />
+          ))
+        }}
      >
-        <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}
-        >
+        <SessionImages
+          images={images()}
+          visible={ctx.imageKeys()}
+          onOpen={(images, index) => dialog.replace(() => <DialogImagePreview images={images} initial={index} />)}
+        />
+        <box paddingTop={1} paddingBottom={1} paddingLeft={2} flexShrink={0}>
          <text fg={theme.text.default}>{props.message.text}</text>
          <Show when={files().length}>
            <box flexDirection="row" paddingTop={1} gap={1} flexWrap="wrap">
@@ -2301,6 +2312,122 @@ 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>
@@ -2346,10 +2473,7 @@ function GenericTool(props: ToolProps) {
            {(value) => (
              <box gap={1}>
                <text>
-                  <span style={{ bg: theme.raise(theme.background.default), fg: theme.text.subdued }}>
-                    {" "}
-                    Output{" "}
-                  </span>
+                  <span style={{ bg: theme.raise(theme.background.default), fg: theme.text.subdued }}> Output </span>
                </text>
                <box paddingLeft={1}>
                  <text fg={theme.text.default} wrapMode="word">
@@ -2601,9 +2725,7 @@ function BlockToolContent(props: BlockToolProps & { borderColor: RGBA }) {
              <Show
                when={props.spinner}
                fallback={
-                  <text fg={permission() ? theme.text.feedback.warning.default : theme.text.subdued}>
-                    {title()}
-                  </text>
+                  <text fg={permission() ? theme.text.feedback.warning.default : theme.text.subdued}>{title()}</text>
                }
              >
                <Spinner color={permission() ? theme.text.feedback.warning.default : theme.text.subdued}>
@@ -245,7 +245,7 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
    on(
      () => props.options,
      () => {
-        if (!props.preserveSelection && (props.current === undefined || props.focusCurrent === false)) {
+        if (!props.preserveSelection && props.current === undefined) {
          const count = flat().length
          if (count === 0) return
          const next = reconcileSelection(store.selected, count)
@@ -281,11 +281,7 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
          setStore("selected", index)
          selection = option
          if (!moved) return
-          if (
-            (!props.preserveSelection && (props.current === undefined || props.focusCurrent === false)) ||
-            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 type DialogSize = "medium" | "large" | "xlarge"

@@ -204,9 +205,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,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()
  }
@@ -106,18 +106,11 @@ test("does not preload session summaries into the data context", async () => {
  }
 })

-test("proactively syncs project metadata newest first", async () => {
+test("proactively syncs project metadata", async () => {
  const events = createEventStream()
  const calls = createFetch((url) => {
    if (url.pathname !== "/api/project") return
    return json([
-      {
-        id: "proj_old",
-        canonical: "/old/project",
-        name: "Old project",
-        time: { created: 1, updated: 1 },
-        sandboxes: [],
-      },
      {
        id: "proj_test",
        canonical: worktree,
@@ -156,13 +149,6 @@ test("proactively syncs project metadata newest first", async () => {
        time: { created: 1, updated: 2 },
        sandboxes: [],
      },
-      {
-        id: "proj_old",
-        canonical: "/old/project",
-        name: "Old project",
-        time: { created: 1, updated: 1 },
-        sandboxes: [],
-      },
    ])
  } finally {
    app.renderer.destroy()
@@ -18,14 +18,16 @@ import { StorageProvider } from "../../../src/context/storage"
 import { ThemeProvider } from "../../../src/context/theme"
 import { DialogProvider, useDialog } from "../../../src/ui/dialog"
 import { ToastProvider } from "../../../src/ui/toast"
-import { createApi, createEventStream, createFetch, json, type FetchHandler } from "../../fixture/tui-client"
+import { createApi, createEventStream, createFetch, json } from "../../fixture/tui-client"
 import { TestTuiContexts } from "../../fixture/tui-environment"
 import { createTuiResolvedConfig } from "../../fixture/tui-runtime"

 test("selecting an unhydrated session preserves its location", async () => {
+  const state = mkdtempSync(path.join(tmpdir(), "opencode-dialog-open-"))
+  const events = createEventStream()
  const remote = { directory: "/tmp/opencode/remote", workspaceID: "ws_remote" }
-  const fixture = await renderOpen((url) => {
-    if (url.pathname !== "/api/session") return undefined
+  const calls = createFetch((url) => {
+    if (url.pathname !== "/api/session") return
    return json({
      data: [
        {
@@ -40,129 +42,7 @@ test("selecting an unhydrated session preserves its location", async () => {
      ],
      cursor: {},
    })
-  })
-
-  try {
-    await fixture.app.waitForFrame((frame) => frame.includes("Remote session"))
-    expect(fixture.data.session.get("ses_remote")).toBeUndefined()
-
-    fixture.app.mockInput.pressEnter()
-    await fixture.app.waitFor(() => fixture.route.data.type === "session")
-
-    expect(fixture.route.data).toEqual({ type: "session", sessionID: "ses_remote" })
-    expect(fixture.location.ref).toEqual(remote)
-  } finally {
-    fixture.dispose()
-  }
-})
-
-test("shows the current project and opens its root", async () => {
-  const root = "/tmp/opencode/project"
-  const subfolder = `${root}/packages/tui`
-  const fixture = await renderOpen(
-    (url) => {
-      if (url.pathname === "/api/project")
-        return json([
-          {
-            id: "proj_current",
-            canonical: root,
-            name: "OpenCode",
-            time: { created: 1, updated: 2 },
-            sandboxes: [],
-          },
-        ])
-      if (url.pathname === "/api/location")
-        return json({
-          directory: subfolder,
-          project: { id: "proj_current", directory: root, canonical: root },
-        })
-      return undefined
-    },
-    async ({ data, location }) => {
-      await data.location.sync({ directory: subfolder })
-      location.set({ directory: subfolder })
-    },
-  )
-
-  try {
-    const frame = await fixture.app.waitForFrame((value) => value.includes("OpenCode") && value.includes("●"))
-    expect(frame).toContain(root)
-
-    fixture.app.mockInput.pressEnter()
-    await fixture.app.waitFor(() => fixture.route.data.type === "home")
-
-    expect(fixture.route.data).toEqual({ type: "home", location: { directory: root } })
-    expect(fixture.location.ref).toEqual({ directory: root })
-  } finally {
-    fixture.dispose()
-  }
-})
-
-test("preserves a moved project when sessions arrive", async () => {
-  let resolveSessions!: (response: Response) => void
-  const sessions = new Promise<Response>((resolve) => (resolveSessions = resolve))
-  const fixture = await renderOpen((url) => {
-    if (url.pathname === "/api/session") return sessions
-    if (url.pathname === "/api/project")
-      return json([
-        {
-          id: "proj_first",
-          canonical: "/tmp/opencode/first",
-          name: "First project",
-          time: { created: 1, updated: 2 },
-          sandboxes: [],
-        },
-        {
-          id: "proj_second",
-          canonical: "/tmp/opencode/second",
-          name: "Second project",
-          time: { created: 1, updated: 1 },
-          sandboxes: [],
-        },
-      ])
-    return undefined
-  })
-
-  try {
-    await fixture.app.waitForFrame((frame) => frame.includes("Second project"))
-    fixture.app.mockInput.pressArrow("down")
-
-    resolveSessions(
-      json({
-        data: [
-          {
-            id: "ses_recent",
-            projectID: "proj_first",
-            cost: 0,
-            tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
-            time: { created: 2, updated: 3 },
-            title: "Recent session",
-            location: { directory: "/tmp/opencode/first" },
-          },
-        ],
-        cursor: {},
-      }),
-    )
-    await fixture.app.waitForFrame((frame) => frame.includes("Recent session"))
-    fixture.app.mockInput.pressEnter()
-    await fixture.app.waitFor(() => fixture.route.data.type === "home")
-
-    expect(fixture.route.data).toEqual({ type: "home", location: { directory: "/tmp/opencode/second" } })
-  } finally {
-    fixture.dispose()
-  }
-})
-
-async function renderOpen(
-  handler: FetchHandler,
-  beforeOpen?: (contexts: {
-    data: ReturnType<typeof useData>
-    location: ReturnType<typeof useLocation>
-  }) => void | Promise<void>,
-) {
-  const state = mkdtempSync(path.join(tmpdir(), "opencode-dialog-open-"))
-  const events = createEventStream()
-  const calls = createFetch(handler, events)
+  }, events)
  let route!: ReturnType<typeof useRoute>
  let location!: ReturnType<typeof useLocation>
  let data!: ReturnType<typeof useData>
@@ -172,9 +52,7 @@ async function renderOpen(
    route = useRoute()
    location = useLocation()
    data = useData()
-    onMount(
-      () => void Promise.resolve(beforeOpen?.({ data, location })).then(() => dialog.replace(() => <DialogOpen />)),
-    )
+    onMount(() => dialog.replace(() => <DialogOpen />))
    return null
  }

@@ -212,20 +90,17 @@ async function renderOpen(
  )
  app.renderer.start()

-  return {
-    app,
-    get route() {
-      return route
-    },
-    get location() {
-      return location
-    },
-    get data() {
-      return data
-    },
-    dispose() {
-      app.renderer.destroy()
-      rmSync(state, { recursive: true, force: true })
-    },
+  try {
+    await app.waitForFrame((frame) => frame.includes("Remote session"))
+    expect(data.session.get("ses_remote")).toBeUndefined()
+
+    app.mockInput.pressEnter()
+    await app.waitFor(() => route.data.type === "session")
+
+    expect(route.data).toEqual({ type: "session", sessionID: "ses_remote" })
+    expect(location.ref).toEqual(remote)
+  } finally {
+    app.renderer.destroy()
+    rmSync(state, { recursive: true, force: true })
  }
-}
+})
@@ -82,12 +82,7 @@ async function renderSelect(
  return app
 }

-async function mountSelect(
-  root: string,
-  initial: DialogSelectOption<string>[],
-  current?: string,
-  focusCurrent?: boolean,
-) {
+async function mountSelect(root: string, initial: DialogSelectOption<string>[], current?: string) {
  const state = path.join(root, "state")
  await mkdir(state, { recursive: true })
  const config = createTuiResolvedConfig()
@@ -123,7 +118,6 @@ async function mountSelect(
            title="Mutable options"
            options={options()}
            current={current}
-            focusCurrent={focusCurrent}
            onMove={(option) => moved.push(option.value)}
            onSelect={(option) => selected.push(option.value)}
          />
@@ -358,24 +352,3 @@ test("keeps the current option selected when options reorder", async () => {
    select.app.renderer.destroy()
  }
 })
-
-test("keeps the first row selected when current is only a marker", async () => {
-  await using tmp = await tmpdir()
-  const project = { title: "project", value: "project" }
-  const select = await mountSelect(tmp.path, [project], "current", false)
-
-  try {
-    select.replaceOptions([
-      { title: "recent session", value: "recent" },
-      project,
-      { title: "current session", value: "current" },
-    ])
-    await select.app.waitForFrame((frame) => frame.includes("recent session"))
-    select.app.mockInput.pressEnter()
-    await select.app.waitFor(() => select.selected.length === 1)
-
-    expect(select.selected).toEqual(["recent"])
-  } 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>
@@ -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])
+})
@@ -177,7 +177,7 @@ and plugin options.
 | `ctx.integration`      | `list`, `get`, `connect`, `attempt`, `transform`, `reload`, and connection lookup/resolution |
 | `ctx.plugin`           | `list` currently active plugin IDs                                                           |
 | `ctx.reference`        | `list`, `transform`, `reload`                                                                |
-| `ctx.session`          | `create`, `get`, `list`, `messages`, `prompt`, `command`, `rename`, `synthetic`, `interrupt`, `wait`, and `hook` |
+| `ctx.session`          | `create`, `get`, `prompt`, `command`, `synthetic`, `interrupt`, and `hook`                   |
 | `ctx.skill`            | `list`, `transform`, `reload`                                                                |
 | `ctx.tool`             | `transform` and `hook`                                                                       |
 | `ctx.aisdk`            | `hook`                                                                                       |
Author	SHA1	Message	Date
Simon Klee	b7545549b0	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 18:38:42 +02:00
Simon Klee	ca4fd58932	fix(tui): gate transcript image previews	2026-07-31 18:38:21 +02:00
Simon Klee	27a88ae13a	feat(tui): render session tool images	2026-07-31 18:37:47 +02:00
Simon Klee	6cfec0bb4a	test(tui): simplify prompt preload fixture	2026-07-31 18:36:52 +02:00
Simon Klee	8ce951ce3e	test(tui): update prompt fixture preload	2026-07-31 18:36:52 +02:00
Simon Klee	0e5ece3696	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 18:36:52 +02:00
Simon Klee	ec1be284bc	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 18:36:52 +02:00
Simon Klee	5add8493de	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 18:36:52 +02:00
Simon Klee	eef5554b8d	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 18:36:52 +02:00
Simon Klee	2a1da12589	tui: add opt-in prompt image previews	2026-07-31 18:36:52 +02:00
Simon Klee	f3bb96ef8a	chore(tui): upgrade integrated OpenTUI snapshot	2026-07-31 18:36:45 +02:00
Simon Klee	8f9cc9cdf0	chore(tui): upgrade integrated OpenTUI snapshot	2026-07-31 18:36:23 +02:00
Simon Klee	8fa9eb08d5	chore(tui): upgrade integrated OpenTUI snapshot	2026-07-31 18:36:23 +02:00
Simon Klee	7f916c68d0	tui: preserve clipboard paste semantics	2026-07-31 18:36:23 +02:00
Simon Klee	94f8a38869	chore(tui): upgrade OpenTUI snapshot	2026-07-31 18:36:23 +02:00
Simon Klee	c1aa9940e1	tui: report clipboard copy delivery status	2026-07-31 18:36:23 +02:00
Simon Klee	da6c867884	tui: use OpenTUI clipboard service	2026-07-31 18:36:23 +02:00