there is no session delete, so fallback to sqlite

Entire-Checkpoint: 03bc551af447

Author: Soph

cmd/entire/cli/agent/opencode/cli_commands.go

@@ -5,35 +5,12 @@ import (
 	"errors"
 	"fmt"
 	"os/exec"
-	"strings"
 	"time"
 )
 
 // openCodeCommandTimeout is the maximum time to wait for opencode CLI commands.
 const openCodeCommandTimeout = 30 * time.Second
 
-// runOpenCodeSessionDelete runs `opencode session delete <sessionID>` to remove
-// a session from OpenCode's database. Treats "Session not found" as success
-// (nothing to delete).
-func runOpenCodeSessionDelete(sessionID string) error {
-	ctx, cancel := context.WithTimeout(context.Background(), openCodeCommandTimeout)
-	defer cancel()
-
-	cmd := exec.CommandContext(ctx, "opencode", "session", "delete", sessionID)
-	output, err := cmd.CombinedOutput()
-	if err != nil {
-		if ctx.Err() == context.DeadlineExceeded {
-			return fmt.Errorf("opencode session delete timed out after %s", openCodeCommandTimeout)
-		}
-		// Treat "Session not found" as success — nothing to delete.
-		if strings.Contains(string(output), "Session not found") {
-			return nil
-		}
-		return fmt.Errorf("opencode session delete failed: %w (output: %s)", err, string(output))
-	}
-	return nil
-}
-
 // runOpenCodeExport runs `opencode export <sessionID>` to export a session
 // from OpenCode's database. Returns the JSON export data as bytes.
 func runOpenCodeExport(sessionID string) ([]byte, error) {

cmd/entire/cli/agent/opencode/opencode.go

@@ -246,12 +246,15 @@ func (a *OpenCodeAgent) WriteSession(session *agent.AgentSession) error {
 // For rewind (session already exists), the session is deleted first so the
 // reimport replaces it with the checkpoint-state messages.
 func (a *OpenCodeAgent) importSessionIntoOpenCode(sessionID string, exportData []byte) error {
-	// Delete the session first so reimport replaces it cleanly.
+	// Delete existing messages first so reimport replaces them cleanly.
 	// opencode import uses ON CONFLICT DO NOTHING, so existing messages
 	// would be skipped without this step (breaking rewind).
-	// runOpenCodeSessionDelete treats "not found" as success.
-	if err := runOpenCodeSessionDelete(sessionID); err != nil {
-		return fmt.Errorf("failed to delete existing session: %w", err)
+	// Uses direct SQLite delete since OpenCode CLI has no session delete command.
+	if err := deleteMessagesFromSQLite(sessionID); err != nil {
+		// Non-fatal: DB might not exist yet (first session), or sqlite3 not installed.
+		// Import will still work for new sessions; only rewind of existing sessions
+		// would have stale messages.
+		fmt.Fprintf(os.Stderr, "warning: could not clear existing messages: %v\n", err)
 	}
 
 	// Write export JSON to a temp file for opencode import

cmd/entire/cli/agent/opencode/sqlite.go

@@ -0,0 +1,78 @@
+package opencode
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"time"
+)
+
+// getOpenCodeDBPath returns the path to OpenCode's SQLite database.
+// OpenCode always uses ~/.local/share/opencode/opencode.db (XDG default)
+// regardless of platform — it does NOT use ~/Library/Application Support on macOS.
+//
+// XDG_DATA_HOME overrides the default on all platforms.
+func getOpenCodeDBPath() (string, error) {
+	dataDir := os.Getenv("XDG_DATA_HOME")
+	if dataDir == "" {
+		home, err := os.UserHomeDir()
+		if err != nil {
+			return "", fmt.Errorf("failed to get home directory: %w", err)
+		}
+		dataDir = filepath.Join(home, ".local", "share")
+	}
+	return filepath.Join(dataDir, "opencode", "opencode.db"), nil
+}
+
+// runSQLiteQuery executes a SQL query against OpenCode's SQLite database.
+// Returns the combined stdout/stderr output.
+func runSQLiteQuery(query string, timeout time.Duration) ([]byte, error) {
+	dbPath, err := getOpenCodeDBPath()
+	if err != nil {
+		return nil, fmt.Errorf("failed to get OpenCode DB path: %w", err)
+	}
+	if _, err := os.Stat(dbPath); os.IsNotExist(err) {
+		return nil, fmt.Errorf("OpenCode database not found: %w", err)
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
+	defer cancel()
+
+	//nolint:gosec // G204: query is constructed from sanitized inputs (escapeSQLiteString)
+	cmd := exec.CommandContext(ctx, "sqlite3", dbPath, query)
+	output, err := cmd.CombinedOutput()
+	if err != nil {
+		return output, fmt.Errorf("sqlite3 query failed: %w", err)
+	}
+	return output, nil
+}
+
+// deleteMessagesFromSQLite removes all messages (and cascading parts) for a session.
+// This is used before reimporting a session during rewind so that `opencode import`
+// can insert the checkpoint-state messages (import uses ON CONFLICT DO NOTHING).
+func deleteMessagesFromSQLite(sessionID string) error {
+	// Enable foreign keys so CASCADE deletes work (parts are deleted with messages).
+	query := fmt.Sprintf(
+		"PRAGMA foreign_keys = ON; DELETE FROM message WHERE session_id = '%s';",
+		escapeSQLiteString(sessionID),
+	)
+	if output, err := runSQLiteQuery(query, 5*time.Second); err != nil {
+		return fmt.Errorf("failed to delete messages from OpenCode DB: %w (output: %s)", err, string(output))
+	}
+	return nil
+}
+
+// escapeSQLiteString escapes single quotes in a string for safe use in SQLite queries.
+func escapeSQLiteString(s string) string {
+	result := make([]byte, 0, len(s))
+	for i := range len(s) {
+		if s[i] == '\'' {
+			result = append(result, '\'', '\'')
+		} else {
+			result = append(result, s[i])
+		}
+	}
+	return string(result)
+}