opencode-manager 0.4.0 → 0.4.1

package/README.md

@@ -8,15 +8,27 @@ Terminal UI for inspecting, filtering, and pruning OpenCode metadata stored on d
 ## Screenshots
 
 <p align="center">
-  <img src="home-screen.png" alt="OpenCode Metadata Manager home screen showing projects and sessions" width="85%" />
+  <img src="oc-manager.png" alt="OpenCode Metadata Manager home screen showing projects and sessions" width="85%" />
   <br />
   <em>Main workspace with Projects (left) and Sessions (right) panels.</em>
 </p>
 
 <p align="center">
-  <img src="help-screen.png" alt="OpenCode Metadata Manager help overlay" width="85%" />
+  <img src="oc-manager-home.png" alt="OpenCode Metadata Manager home screen alternate view" width="85%" />
   <br />
-  <em>Contextual help overlay with key bindings and tips.</em>
+  <em>Alternate home view with project/session context.</em>
+</p>
+
+<p align="center">
+  <img src="oc-manager-search.png" alt="OpenCode Metadata Manager search view" width="85%" />
+  <br />
+  <em>Fuzzy search across sessions with ranked results.</em>
+</p>
+
+<p align="center">
+  <img src="oc-manager-cli.png" alt="OpenCode Metadata Manager CLI output" width="85%" />
+  <br />
+  <em>Scriptable CLI output for listing projects and sessions.</em>
 </p>
 
 ## Features
@@ -32,6 +44,7 @@ Terminal UI for inspecting, filtering, and pruning OpenCode metadata stored on d
 - Rich help overlay with live key hints (`?` or `H`).
 - Zero-install via `bunx` so even CI shells can run it without cloning.
 - **Token counting**: View token usage per session, per project, and globally.
+- **Experimental SQLite backend**: Faster queries for large stores via `--experimental-sqlite`.
 
 ## Token Counting
 
@@ -117,6 +130,43 @@ The CLI provides scriptable access to all management operations. Use subcommands
 | `-q, --quiet` | `false` | Suppress non-essential output |
 | `-c, --clipboard` | `false` | Copy output to clipboard |
 | `--backup-dir <path>` | — | Directory for backup copies before deletion |
+| `--experimental-sqlite` | `false` | Use SQLite database instead of JSONL files (experimental) |
+| `--db <path>` | `~/.local/share/opencode/opencode.db` | Path to SQLite database (implies `--experimental-sqlite`) |
+| `--sqlite-strict` | `false` | Fail on any SQLite warning or malformed data |
+| `--force-write` | `false` | Wait for SQLite write locks to clear before failing |
+
+#### Experimental SQLite Support
+
+OpenCode can store metadata in SQLite databases. The CLI supports this mode with `--experimental-sqlite` or by pointing directly at a database with `--db <path>`.
+
+Key behaviors:
+- Read operations open SQLite in readonly mode by default.
+- Write operations may fail if OpenCode has the database locked. Use `--force-write` to wait for the lock to clear.
+- When malformed rows are encountered, the CLI logs a warning and returns partial results. Use `--sqlite-strict` to fail fast.
+
+When to use SQLite vs JSONL:
+- Use SQLite when your OpenCode installation no longer writes JSONL files or when you want faster list/search operations on large stores.
+- Use JSONL when you need maximal compatibility with older OpenCode versions or when you want to avoid SQLite locking.
+
+Known limitations and differences:
+- Schema changes in OpenCode may break compatibility. The CLI validates required tables/columns and warns if the schema is incomplete.
+- SQLite records use virtual file paths (e.g., `sqlite:project:proj_123`) instead of JSON file paths.
+- Results may differ slightly from JSONL when extra SQLite-only rows exist.
+
+Examples:
+```bash
+# List projects using the default SQLite database
+opencode-manager projects list --experimental-sqlite
+
+# List sessions using an explicit SQLite database path
+opencode-manager sessions list --db ~/.local/share/opencode/opencode.db
+
+# Fail fast on malformed SQLite data
+opencode-manager projects list --db ~/.local/share/opencode/opencode.db --sqlite-strict
+
+# Wait for locks before destructive operations
+opencode-manager projects delete --id proj_missing --db ~/.local/share/opencode/opencode.db --yes --force-write
+```
 
 #### Commands Overview
 
@@ -424,13 +474,24 @@ Delete commands (`projects delete`, `sessions delete`) remove **metadata files o
 ### Project Structure
 ```
 src/
-  bin/opencode-manager.ts   # Bun-native CLI shim exposed as the bin entry
+  bin/opencode-manager.ts       # Bun-native CLI shim exposed as the bin entry
+  cli/
+    index.ts                    # Commander program with global options
+    commands/                   # Subcommand implementations (projects, sessions, chat, tokens)
+    resolvers.ts                # ID prefix resolution helpers
+  lib/
+    opencode-data.ts            # JSONL file-based data access
+    opencode-data-sqlite.ts     # SQLite backend (experimental)
+    opencode-data-provider.ts   # Unified DataProvider abstraction
   tui/
-    app.tsx                 # Main TUI implementation (panels, search, help)
-    index.tsx               # TUI entrypoint with launchTUI(), parseArgs(), bootstrap()
-manage_opencode_projects.py # Legacy Python launcher for backwards compatibility
-opencode-gen.sh             # Spec snapshot helper script
-PROJECT-SUMMARY.md          # Extended design notes & roadmap
+    app.tsx                     # Main TUI implementation (panels, search, help)
+    index.tsx                   # TUI entrypoint with launchTUI(), parseArgs(), bootstrap()
+tests/
+  fixtures/                     # Test data (JSONL and SQLite fixtures)
+  lib/                          # Unit tests for data modules
+  cli/                          # CLI integration tests
+manage_opencode_projects.py     # Legacy Python launcher for backwards compatibility
+PROJECT-SUMMARY.md              # Extended design notes & roadmap
 ```
 
 ## Packaging & Publish

package/bun.lock

@@ -12,6 +12,7 @@
         "react": "^19.0.0",
       },
       "devDependencies": {
+        "@types/bun": "^1.3.6",
         "@types/node": "^22.8.5",
         "@types/react": "^19.0.0",
         "typescript": "^5.6.3",
@@ -95,6 +96,8 @@
 
     "@tokenizer/token": ["@tokenizer/token@0.3.0", "", {}, "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A=="],
 
+    "@types/bun": ["@types/bun@1.3.6", "", { "dependencies": { "bun-types": "1.3.6" } }, "sha512-uWCv6FO/8LcpREhenN1d1b6fcspAB+cefwD7uti8C8VffIv0Um08TKMn98FynpTiU38+y2dUO55T11NgDt8VAA=="],
+
     "@types/node": ["@types/node@22.19.0", "", { "dependencies": { "undici-types": "~6.21.0" } }, "sha512-xpr/lmLPQEj+TUnHmR+Ab91/glhJvsqcjB+yY0Ix9GO70H6Lb4FHH5GeqdOE5btAx7eIMwuHkp4H2MSkLcqWbA=="],
 
     "@types/react": ["@types/react@19.2.2", "", { "dependencies": { "csstype": "^3.0.2" } }, "sha512-6mDvHUFSjyT2B2yeNx2nUgMxh9LtOWvkhIU3uePn2I2oyNymUAX1NIsdgviM4CH+JSrp2D2hsMvJOkxY+0wNRA=="],
@@ -115,6 +118,8 @@
 
     "bun-ffi-structs": ["bun-ffi-structs@0.1.2", "", { "peerDependencies": { "typescript": "^5" } }, "sha512-Lh1oQAYHDcnesJauieA4UNkWGXY9hYck7OA5IaRwE3Bp6K2F2pJSNYqq+hIy7P3uOvo3km3oxS8304g5gDMl/w=="],
 
+    "bun-types": ["bun-types@1.3.6", "", { "dependencies": { "@types/node": "*" } }, "sha512-OlFwHcnNV99r//9v5IIOgQ9Uk37gZqrNMCcqEaExdkVq3Avwqok1bJFmvGMCkCE0FqzdY8VMOZpfpR3lwI+CsQ=="],
+
     "bun-webgpu": ["bun-webgpu@0.1.4", "", { "dependencies": { "@webgpu/types": "^0.1.60" }, "optionalDependencies": { "bun-webgpu-darwin-arm64": "^0.1.4", "bun-webgpu-darwin-x64": "^0.1.4", "bun-webgpu-linux-x64": "^0.1.4", "bun-webgpu-win32-x64": "^0.1.4" } }, "sha512-Kw+HoXl1PMWJTh9wvh63SSRofTA8vYBFCw0XEP1V1fFdQEDhI8Sgf73sdndE/oDpN/7CMx0Yv/q8FCvO39ROMQ=="],
 
     "bun-webgpu-darwin-arm64": ["bun-webgpu-darwin-arm64@0.1.4", "", { "os": "darwin", "cpu": "arm64" }, "sha512-eDgLN9teKTfmvrCqgwwmWNsNszxYs7IZdCqk0S1DCarvMhr4wcajoSBlA/nQA0/owwLduPTS8xxCnQp4/N/gDg=="],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-manager",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Terminal UI for inspecting OpenCode metadata stores.",
   "type": "module",
   "license": "MIT",
@@ -51,6 +51,7 @@
     "react": "^19.0.0"
   },
   "devDependencies": {
+    "@types/bun": "^1.3.6",
     "@types/node": "^22.8.5",
     "@types/react": "^19.0.0",
     "typescript": "^5.6.3"

package/src/cli/commands/chat.ts

@@ -7,13 +7,8 @@
 
 import { Command, type OptionValues } from "commander"
 import { parseGlobalOptions, type GlobalOptions } from "../index"
-import {
-  loadSessionChatIndex,
-  loadSessionRecords,
-  hydrateChatMessageParts,
-  searchSessionsChat,
-  type ChatMessage,
-} from "../../lib/opencode-data"
+import { type ChatMessage, type ChatSearchResult } from "../../lib/opencode-data"
+import { createProviderFromGlobalOptions } from "../../lib/opencode-data-provider"
 import { copyToClipboard } from "../../lib/clipboard"
 import { resolveSessionId } from "../resolvers"
 import { withErrorHandling, UsageError, NotFoundError } from "../errors"
@@ -141,6 +136,16 @@ export function registerChatCommands(parent: Command): void {
         searchOpts
       )
     })
+
+  chat.addHelpText(
+    "after",
+    [
+      "",
+      "Examples:",
+      "  opencode-manager chat list --session <id> --experimental-sqlite",
+      "  opencode-manager chat list --session <id> --db ~/.local/share/opencode/opencode.db",
+    ].join("\n")
+  )
 }
 
 /**
@@ -153,19 +158,23 @@ async function handleChatList(
   globalOpts: GlobalOptions,
   listOpts: ChatListOptions
 ): Promise<void> {
-  // Resolve session ID (with prefix matching)
+  // Create provider from global options (JSONL or SQLite)
+  const provider = createProviderFromGlobalOptions(globalOpts)
+
+  // Resolve session ID (with prefix matching) using the provider
   const { session } = await resolveSessionId(listOpts.session, {
     root: globalOpts.root,
     allowPrefix: true,
+    provider,
   })
 
   // Load message index for the session
-  let messages = await loadSessionChatIndex(session.sessionId, globalOpts.root)
+  let messages = await provider.loadSessionChatIndex(session.sessionId)
 
   // Hydrate parts if requested
   if (listOpts.includeParts) {
     messages = await Promise.all(
-      messages.map((msg) => hydrateChatMessageParts(msg, globalOpts.root))
+      messages.map((msg: ChatMessage) => provider.hydrateChatMessageParts(msg))
     )
   }
 
@@ -175,7 +184,7 @@ async function handleChatList(
   }
 
   // Add 1-based index for display
-  const indexedMessages: IndexedChatMessage[] = messages.map((msg, i) => ({
+  const indexedMessages: IndexedChatMessage[] = messages.map((msg: ChatMessage, i: number) => ({
     ...msg,
     index: i + 1,
   }))
@@ -207,14 +216,18 @@ async function handleChatShow(
     )
   }
 
-  // Resolve session ID (with prefix matching)
+  // Create provider from global options (JSONL or SQLite)
+  const provider = createProviderFromGlobalOptions(globalOpts)
+
+  // Resolve session ID (with prefix matching) using the provider
   const { session } = await resolveSessionId(showOpts.session, {
     root: globalOpts.root,
     allowPrefix: true,
+    provider,
   })
 
   // Load all messages for the session
-  const messages = await loadSessionChatIndex(session.sessionId, globalOpts.root)
+  const messages = await provider.loadSessionChatIndex(session.sessionId)
 
   if (messages.length === 0) {
     throw new NotFoundError(
@@ -228,17 +241,17 @@ async function handleChatShow(
   if (showOpts.message) {
     // Find by message ID (exact or prefix match)
     const messageId = showOpts.message
-    message = messages.find((m) => m.messageId === messageId)
+    message = messages.find((m: ChatMessage) => m.messageId === messageId)
     if (!message) {
       // Try prefix matching
-      const prefixMatches = messages.filter((m) =>
+      const prefixMatches = messages.filter((m: ChatMessage) =>
         m.messageId.startsWith(messageId)
       )
       if (prefixMatches.length === 1) {
         message = prefixMatches[0]
       } else if (prefixMatches.length > 1) {
         throw new NotFoundError(
-          `Ambiguous message ID prefix "${messageId}" matches ${prefixMatches.length} messages: ${prefixMatches.map((m) => m.messageId).join(", ")}`,
+          `Ambiguous message ID prefix "${messageId}" matches ${prefixMatches.length} messages: ${prefixMatches.map((m: ChatMessage) => m.messageId).join(", ")}`,
           "message"
         )
       } else {
@@ -261,12 +274,12 @@ async function handleChatShow(
   }
 
   // Hydrate message parts to get full content
-  const hydratedMessage = await hydrateChatMessageParts(message, globalOpts.root)
+  const hydratedMessage = await provider.hydrateChatMessageParts(message)
 
   // Copy to clipboard if requested
   if (showOpts.clipboard) {
     const content = hydratedMessage.parts
-      ?.map((p) => p.text)
+      ?.map((p: { text: string }) => p.text)
       .join("\n\n") ?? hydratedMessage.previewText
     try {
       await copyToClipboard(content)
@@ -296,22 +309,23 @@ async function handleChatSearch(
   globalOpts: GlobalOptions,
   searchOpts: ChatSearchOptions
 ): Promise<void> {
+  // Create provider from global options (JSONL or SQLite)
+  const provider = createProviderFromGlobalOptions(globalOpts)
+
   // Load sessions to search
-  const sessions = await loadSessionRecords({
-    root: globalOpts.root,
+  const sessions = await provider.loadSessionRecords({
     projectId: searchOpts.project,
   })
 
   // Search across sessions using the limit from global options
-  const results = await searchSessionsChat(
+  const results = await provider.searchSessionsChat(
     sessions,
     searchOpts.query,
-    globalOpts.root,
     { maxResults: globalOpts.limit }
   )
 
   // Add 1-based index for display
-  const indexedResults: IndexedChatSearchResult[] = results.map((result, i) => ({
+  const indexedResults: IndexedChatSearchResult[] = results.map((result: ChatSearchResult, i: number) => ({
     ...result,
     index: i + 1,
   }))

package/src/cli/commands/projects.ts

@@ -7,11 +7,10 @@
 import { Command, type OptionValues } from "commander"
 import { parseGlobalOptions, type GlobalOptions } from "../index"
 import {
-  loadProjectRecords,
   filterProjectsByState,
-  deleteProjectMetadata,
   type ProjectRecord,
 } from "../../lib/opencode-data"
+import { createProviderFromGlobalOptions } from "../../lib/opencode-data-provider"
 import {
   getOutputOptions,
   printProjectsOutput,
@@ -107,6 +106,16 @@ export function registerProjectsCommands(parent: Command): void {
         deleteOpts
       )
     })
+
+  projects.addHelpText(
+    "after",
+    [
+      "",
+      "Examples:",
+      "  opencode-manager projects list --experimental-sqlite",
+      "  opencode-manager projects list --db ~/.local/share/opencode/opencode.db",
+    ].join("\n")
+  )
 }
 
 /**
@@ -116,8 +125,11 @@ async function handleProjectsList(
   globalOpts: GlobalOptions,
   listOpts: ProjectsListOptions
 ): Promise<void> {
+  // Create data provider based on global options (JSONL or SQLite backend)
+  const provider = createProviderFromGlobalOptions(globalOpts)
+
   // Load project records from the data layer
-  let projects = await loadProjectRecords({ root: globalOpts.root })
+  let projects = await provider.loadProjectRecords()
 
   // Apply missing-only filter if requested
   if (listOpts.missingOnly) {
@@ -160,10 +172,14 @@ async function handleProjectsDelete(
 ): Promise<void> {
   const outputOpts = getOutputOptions(globalOpts)
 
-  // Resolve project ID to a project record
+  // Create data provider based on global options (JSONL or SQLite backend)
+  const provider = createProviderFromGlobalOptions(globalOpts)
+
+  // Resolve project ID to a project record (use provider for backend-agnostic resolution)
   const { project } = await resolveProjectId(deleteOpts.id, {
     root: globalOpts.root,
     allowPrefix: true,
+    provider,
   })
 
   const pathsToDelete = [project.filePath]
@@ -178,8 +194,8 @@ async function handleProjectsDelete(
   // Require confirmation for destructive operation
   requireConfirmation(deleteOpts.yes, "Project deletion")
 
-  // Backup files if requested
-  if (deleteOpts.backupDir) {
+  // Backup files if requested (only applies to JSONL backend - SQLite has no files to backup)
+  if (deleteOpts.backupDir && provider.backend === "jsonl") {
     const backupResult = await copyToBackupDir(pathsToDelete, {
       backupDir: deleteOpts.backupDir,
       prefix: "project",
@@ -201,13 +217,13 @@ async function handleProjectsDelete(
     }
   }
 
-  // Perform the deletion
-  const deleteResult = await deleteProjectMetadata([project], { dryRun: false })
+  // Perform the deletion using the provider (handles both JSONL and SQLite)
+  const deleteResult = await provider.deleteProjectMetadata([project], { dryRun: false })
 
   if (deleteResult.failed.length > 0) {
     throw new FileOperationError(
       `Failed to delete ${deleteResult.failed.length} file(s): ${deleteResult.failed
-        .map((f) => `${f.path}: ${f.error}`)
+        .map((f: { path: string; error?: string }) => `${f.path}: ${f.error || "unknown error"}`)
         .join(", ")}`,
       "delete"
     )

package/src/cli/commands/sessions.ts

@@ -8,14 +8,10 @@
 import { Command, type OptionValues } from "commander"
 import { parseGlobalOptions, type GlobalOptions } from "../index"
 import {
-  loadSessionRecords,
-  loadProjectRecords,
-  deleteSessionMetadata,
-  updateSessionTitle,
-  moveSession,
   copySession,
   type SessionRecord,
 } from "../../lib/opencode-data"
+import { createProviderFromGlobalOptions } from "../../lib/opencode-data-provider"
 import {
   getOutputOptions,
   printSessionsOutput,
@@ -195,6 +191,16 @@ export function registerSessionsCommands(parent: Command): void {
         copyOpts
       )
     })
+
+  sessions.addHelpText(
+    "after",
+    [
+      "",
+      "Examples:",
+      "  opencode-manager sessions list --experimental-sqlite",
+      "  opencode-manager sessions list --db ~/.local/share/opencode/opencode.db",
+    ].join("\n")
+  )
 }
 
 /**
@@ -217,10 +223,12 @@ async function handleSessionsList(
   globalOpts: GlobalOptions,
   listOpts: SessionsListOptions
 ): Promise<void> {
+  // Create data provider based on global options (JSONL or SQLite backend)
+  const provider = createProviderFromGlobalOptions(globalOpts)
+
   // Load session records from the data layer
   // If a project filter is provided, pass it to the loader
-  let sessions = await loadSessionRecords({
-    root: globalOpts.root,
+  let sessions = await provider.loadSessionRecords({
     projectId: listOpts.project,
   })
 
@@ -277,7 +285,7 @@ async function handleSessionsList(
  * Handle the sessions delete command.
  *
  * This command deletes a session's metadata file from the OpenCode storage.
- * It does NOT delete associated chat message files (yet).
+ * For SQLite backend, it deletes session, messages, and parts in a transaction.
  *
  * Exit codes:
  * - 0: Success (or dry-run completed)
@@ -291,10 +299,14 @@ async function handleSessionsDelete(
 ): Promise<void> {
   const outputOpts = getOutputOptions(globalOpts)
 
-  // Resolve session ID to a session record
+  // Create data provider based on global options (JSONL or SQLite backend)
+  const provider = createProviderFromGlobalOptions(globalOpts)
+
+  // Resolve session ID to a session record (use provider for backend-agnostic resolution)
   const { session } = await resolveSessionId(deleteOpts.session, {
     root: globalOpts.root,
     allowPrefix: true,
+    provider,
   })
 
   const pathsToDelete = [session.filePath]
@@ -309,8 +321,8 @@ async function handleSessionsDelete(
   // Require confirmation for destructive operation
   requireConfirmation(deleteOpts.yes, "Session deletion")
 
-  // Backup files if requested
-  if (deleteOpts.backupDir) {
+  // Backup files if requested (only applies to JSONL backend - SQLite has no files to backup)
+  if (deleteOpts.backupDir && provider.backend === "jsonl") {
     const backupResult = await copyToBackupDir(pathsToDelete, {
       backupDir: deleteOpts.backupDir,
       prefix: "session",
@@ -332,13 +344,13 @@ async function handleSessionsDelete(
     }
   }
 
-  // Perform the deletion
-  const deleteResult = await deleteSessionMetadata([session], { dryRun: false })
+  // Perform the deletion using the provider (handles both JSONL and SQLite)
+  const deleteResult = await provider.deleteSessionMetadata([session], { dryRun: false })
 
   if (deleteResult.failed.length > 0) {
     throw new FileOperationError(
       `Failed to delete ${deleteResult.failed.length} file(s): ${deleteResult.failed
-        .map((f) => `${f.path}: ${f.error}`)
+        .map((f) => `${f.path}: ${f.error || "unknown error"}`)
         .join(", ")}`,
       "delete"
     )
@@ -356,6 +368,7 @@ async function handleSessionsDelete(
  * Handle the sessions rename command.
  *
  * This command updates a session's title in its metadata file.
+ * For SQLite backend, it updates the title in the database.
  *
  * Exit codes:
  * - 0: Success
@@ -374,14 +387,18 @@ async function handleSessionsRename(
     throw new UsageError("Title cannot be empty")
   }
 
-  // Resolve session ID to a session record
+  // Create data provider based on global options (JSONL or SQLite backend)
+  const provider = createProviderFromGlobalOptions(globalOpts)
+
+  // Resolve session ID to a session record (use provider for backend-agnostic resolution)
   const { session } = await resolveSessionId(renameOpts.session, {
     root: globalOpts.root,
     allowPrefix: true,
+    provider,
   })
 
-  // Update the session title
-  await updateSessionTitle(session.filePath, newTitle)
+  // Update the session title using the provider
+  await provider.updateSessionTitle(session, newTitle)
 
   // Output success
   printSuccessOutput(
@@ -395,7 +412,8 @@ async function handleSessionsRename(
  * Handle the sessions move command.
  *
  * This command moves a session to a different project.
- * The session file is moved to the target project's session directory.
+ * For JSONL backend, the session file is moved to the target project's session directory.
+ * For SQLite backend, the project_id column is updated in the database.
  *
  * Exit codes:
  * - 0: Success
@@ -408,39 +426,46 @@ async function handleSessionsMove(
 ): Promise<void> {
   const outputOpts = getOutputOptions(globalOpts)
 
-  // Resolve session ID to a session record
+  // Create data provider based on global options (JSONL or SQLite backend)
+  const provider = createProviderFromGlobalOptions(globalOpts)
+
+  // Resolve session ID to a session record (use provider for backend-agnostic resolution)
   const { session } = await resolveSessionId(moveOpts.session, {
     root: globalOpts.root,
     allowPrefix: true,
+    provider,
   })
 
   // Validate target project exists
   // Use prefix matching for convenience, but require exactly one match
-  await resolveProjectId(moveOpts.to, {
+  // For SQLite, we don't enforce target project existence (consistent with JSONL behavior)
+  // but we still try to resolve it for prefix matching
+  const { project: targetProject } = await resolveProjectId(moveOpts.to, {
     root: globalOpts.root,
     allowPrefix: true,
+    provider,
   })
 
   // Check if session is already in the target project
-  if (session.projectId === moveOpts.to) {
+  if (session.projectId === targetProject.projectId) {
     printSuccessOutput(
-      `Session ${session.sessionId} is already in project ${moveOpts.to}`,
-      { sessionId: session.sessionId, projectId: moveOpts.to, moved: false },
+      `Session ${session.sessionId} is already in project ${targetProject.projectId}`,
+      { sessionId: session.sessionId, projectId: targetProject.projectId, moved: false },
       outputOpts.format
     )
     return
   }
 
-  // Move the session
-  const newRecord = await moveSession(session, moveOpts.to, globalOpts.root)
+  // Move the session using the provider
+  const newRecord = await provider.moveSession(session, targetProject.projectId)
 
   // Output success
   printSuccessOutput(
-    `Moved session ${session.sessionId} to project ${moveOpts.to}`,
+    `Moved session ${session.sessionId} to project ${targetProject.projectId}`,
     {
       sessionId: session.sessionId,
       fromProject: session.projectId,
-      toProject: moveOpts.to,
+      toProject: targetProject.projectId,
       newPath: newRecord.filePath,
     },
     outputOpts.format