fix(tui): preserve clipboard fallback
- commit
- 3ece2da72227929210f848aca1129233c4e292b1
- author
- brice · · 2026-08-04 09:54 UTC
- parent
- 3959425
- signature
- GPG Verified
CD88F9E564E0102646FB6077A1A07C7C7C3E349D· arch-gpg Verified for the committer email
2 files · +2 -11
M packages/agent/modes/interactive.go +1 -8
| @@ -2767,14 +2767,7 @@ func (i *Interactive) handleKey(ctx context.Context, k tui.Key) (done bool) { | |||
| 2767 | 2767 | } | |
| 2768 | 2768 | ||
| 2769 | 2769 | func (i *Interactive) pasteClipboard(ctx context.Context) { | |
| 2770 | - | image, ok, err := tui.ReadClipboardImage(ctx) | |
| 2771 | - | if err != nil { | |
| 2772 | - | i.mu.Lock() | |
| 2773 | - | i.statusErr = "clipboard paste failed: " + err.Error() | |
| 2774 | - | i.statusOK = "" | |
| 2775 | - | i.mu.Unlock() | |
| 2776 | - | return | |
| 2777 | - | } | |
| 2770 | + | image, ok, _ := tui.ReadClipboardImage(ctx) | |
| 2778 | 2771 | if ok { | |
| 2779 | 2772 | i.mu.Lock() | |
| 2780 | 2773 | marker := fmt.Sprintf("[clipboard image #%d]", len(i.clipboardImages)+1) | |
| @@ -2767,14 +2767,7 @@ func (i *Interactive) handleKey(ctx context.Context, k tui.Key) (done bool) { | |||||
| 2767 | } | 2767 | } | ||
| 2768 | 2768 | ||||
| 2769 | func (i *Interactive) pasteClipboard(ctx context.Context) { | 2769 | func (i *Interactive) pasteClipboard(ctx context.Context) { | ||
| 2770 | - | image, ok, err := tui.ReadClipboardImage(ctx) | 2770 | + | image, ok, _ := tui.ReadClipboardImage(ctx) |
| 2771 | - | if err != nil { | |||
| 2772 | - | i.mu.Lock() | |||
| 2773 | - | i.statusErr = "clipboard paste failed: " + err.Error() | |||
| 2774 | - | i.statusOK = "" | |||
| 2775 | - | i.mu.Unlock() | |||
| 2776 | - | return | |||
| 2777 | - | } | |||
| 2778 | if ok { | 2771 | if ok { | ||
| 2779 | i.mu.Lock() | 2772 | i.mu.Lock() | ||
| 2780 | marker := fmt.Sprintf("[clipboard image #%d]", len(i.clipboardImages)+1) | 2773 | marker := fmt.Sprintf("[clipboard image #%d]", len(i.clipboardImages)+1) | ||
M packages/tui/clipboard_darwin.go +1 -3
| @@ -63,9 +63,7 @@ func ReadClipboardImage(ctx context.Context) (ClipboardImage, bool, error) { | |||
| 63 | 63 | if !ok { | |
| 64 | 64 | return ClipboardImage{}, false, nil | |
| 65 | 65 | } | |
| 66 | - | if err := removeClipboardImageFile(path); err != nil { | |
| 67 | - | return ClipboardImage{}, false, err | |
| 68 | - | } | |
| 66 | + | _ = removeClipboardImageFile(path) | |
| 69 | 67 | return ClipboardImage{MimeType: "image/png", Data: data}, true, nil | |
| 70 | 68 | } | |
| 71 | 69 | ||
| @@ -63,9 +63,7 @@ func ReadClipboardImage(ctx context.Context) (ClipboardImage, bool, error) { | |||||
| 63 | if !ok { | 63 | if !ok { | ||
| 64 | return ClipboardImage{}, false, nil | 64 | return ClipboardImage{}, false, nil | ||
| 65 | } | 65 | } | ||
| 66 | - | if err := removeClipboardImageFile(path); err != nil { | 66 | + | _ = removeClipboardImageFile(path) |
| 67 | - | return ClipboardImage{}, false, err | |||
| 68 | - | } | |||
| 69 | return ClipboardImage{MimeType: "image/png", Data: data}, true, nil | 67 | return ClipboardImage{MimeType: "image/png", Data: data}, true, nil | ||
| 70 | } | 68 | } | ||
| 71 | 69 | ||||