Merge main; fix captureStdout conflict; fall back to EXPUNGE without UIDPLUS

Merge origin/main to pick up search_test.go. Remove duplicate
captureStdout from sync_test.go and adapt callers to the deferred-
capture signature from search_test.go.

DeleteMessage now checks UIDPLUS capability before using UID EXPUNGE
and falls back to plain EXPUNGE on servers that lack the extension.
TrashMessage already had a fallback via go-imap/v2's Move() method.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: wesm

cmd/msgvault/cmd/sync_test.go

@@ -1,7 +1,6 @@
 package cmd
 
 import (
-	"io"
 	"log/slog"
 	"os"
 	"path/filepath"
@@ -25,25 +24,6 @@ const fakeClientSecrets = `{
   }
 }`
 
-// captureStdout runs fn while capturing os.Stdout output.
-func captureStdout(t *testing.T, fn func()) string {
-	t.Helper()
-	r, w, err := os.Pipe()
-	if err != nil {
-		t.Fatalf("create pipe: %v", err)
-	}
-	orig := os.Stdout
-	os.Stdout = w
-
-	fn()
-
-	_ = w.Close()
-	os.Stdout = orig
-	out, _ := io.ReadAll(r)
-	_ = r.Close()
-	return string(out)
-}
-
 // TestSyncCmd_DuplicateIdentifierRoutesCorrectly verifies that when
 // Gmail and IMAP sources share the same identifier, the single-arg
 // sync path resolves both and routes each to the correct backend.
@@ -123,10 +103,9 @@ func TestSyncCmd_DuplicateIdentifierRoutesCorrectly(t *testing.T) {
 
 	// Capture stdout: the sync command prints per-source errors
 	// to stdout while the returned error is just the count.
-	var execErr error
-	output := captureStdout(t, func() {
-		execErr = root.Execute()
-	})
+	getOutput := captureStdout(t)
+	execErr := root.Execute()
+	output := getOutput()
 
 	if execErr == nil {
 		t.Fatal("expected error (no credentials/token)")
@@ -349,10 +328,9 @@ func TestSyncFullCmd_OAuthSkipDoesNotBlockIMAP(t *testing.T) {
 	root.SetArgs([]string{"sync-full"})
 
 	// Capture stdout to check skip messages.
-	var execErr error
-	output := captureStdout(t, func() {
-		execErr = root.Execute()
-	})
+	getOutput := captureStdout(t)
+	execErr := root.Execute()
+	output := getOutput()
 
 	// IMAP source should be attempted (and fail due to missing
 	// config), but the command should NOT abort entirely because
@@ -461,10 +439,9 @@ func TestSyncCmd_BrokenOAuthDoesNotBlockIMAP(t *testing.T) {
 			root.AddCommand(testCmd)
 			root.SetArgs([]string{tc.name})
 
-			var execErr error
-			output := captureStdout(t, func() {
-				execErr = root.Execute()
-			})
+			getOutput := captureStdout(t)
+			execErr := root.Execute()
+			output := getOutput()
 
 			if execErr == nil {
 				t.Fatal("expected error")

internal/imap/client.go

@@ -849,7 +849,8 @@ func (c *Client) TrashMessage(ctx context.Context, messageID string) error {
 	})
 }
 
-// DeleteMessage permanently deletes a message using UID STORE \Deleted + UID EXPUNGE.
+// DeleteMessage permanently deletes a message using UID STORE \Deleted
+// followed by UID EXPUNGE (UIDPLUS) or plain EXPUNGE as a fallback.
 func (c *Client) DeleteMessage(ctx context.Context, messageID string) error {
 	mailbox, uid, err := parseCompositeID(messageID)
 	if err != nil {
@@ -868,8 +869,14 @@ func (c *Client) DeleteMessage(ctx context.Context, messageID string) error {
 		}, nil).Close(); err != nil {
 			return fmt.Errorf("UID STORE \\Deleted: %w", err)
 		}
-		if err := conn.UIDExpunge(uidSet).Close(); err != nil {
-			return fmt.Errorf("UID EXPUNGE: %w", err)
+		if conn.Caps().Has(imap.CapUIDPlus) {
+			if err := conn.UIDExpunge(uidSet).Close(); err != nil {
+				return fmt.Errorf("UID EXPUNGE: %w", err)
+			}
+		} else {
+			if err := conn.Expunge().Close(); err != nil {
+				return fmt.Errorf("EXPUNGE: %w", err)
+			}
 		}
 		return nil
 	})