diff --git a/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx b/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
index 3029eafcc..8cf81f1d5 100644
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
@@ -124,9 +124,10 @@ export function Autocomplete(props: {
             (item): AutocompleteOption => ({
               display: Locale.truncateMiddle(item, width),
               onSelect: () => {
+                const mime = Bun.file(item).type || "text/plain"
                 insertPart(item, {
                   type: "file",
-                  mime: "text/plain",
+                  mime,
                   filename: item,
                   url: `file://${process.cwd()}/${item}`,
                   source: {
diff --git a/packages/opencode/src/session/message-v2.ts b/packages/opencode/src/session/message-v2.ts
index 690873567..b35618c1e 100644
--- a/packages/opencode/src/session/message-v2.ts
+++ b/packages/opencode/src/session/message-v2.ts
@@ -638,7 +638,11 @@ export namespace MessageV2 {
                 state: "output-available",
                 toolCallId: part.callID,
                 input: part.state.input,
-                output: part.state.time.compacted ? "[Old tool result content cleared]" : part.state.output,
+                output: part.state.attachments?.length
+                  ? "[Image content moved to user message]"
+                  : part.state.time.compacted
+                    ? "[Old tool result content cleared]"
+                    : part.state.output,
                 callProviderMetadata: part.metadata,
               })
             }