agentel 0.2.4 → 0.2.5

package/README.md

@@ -41,7 +41,7 @@ ref for repeatable installs:
 ```sh
 npm install -g brianlzhou/agentlog
 # or
-npm install -g brianlzhou/agentlog#v0.2.4
+npm install -g brianlzhou/agentlog#v0.2.5
 agentlog init
 ```
 
@@ -234,7 +234,7 @@ still run `agentlog import --source all` for a one-time catch-up,
 `agentlog watcher login enable` later. The default
 watcher choices are Codex CLI, Codex Desktop, Claude Code CLI, Claude Code
 Desktop, Claude Workspace, Gemini CLI, Antigravity, Devin CLI, Cursor, Cline,
-OpenCode, and Aider. New configs still support
+OpenCode CLI, OpenCode Desktop, OpenCode Web, and Aider. New configs still support
 `imports.autoDiscoverSources=true`, but init records the chosen watcher list
 exactly by setting `imports.autoDiscoverSources=false`.
 Cursor raw SQLite recovery is intentionally left to explicit imports such as
@@ -493,7 +493,7 @@ Default init sources:
   to same-project workspace sessions, duplicate prefix pruning, and newer
   `~/.cursor/projects/<project>/agent-transcripts` files
 - Cline task folders from VS Code/JetBrains globalStorage, including checkpoint diffs when present
-- OpenCode JSON session/message/part storage under `~/.local/share/opencode`
+- OpenCode CLI/core SQLite and project JSON storage under `~/.local/share/opencode`, plus OpenCode Desktop app storage and Web sessions when present
 - Aider repo-local `.aider.chat.history.md` transcripts, with `.aider.llm.history`
   model/usage enrichment, `.aider.input.history` backups, and matching auto-commit diffs
 
@@ -528,7 +528,7 @@ The same choices can be run directly:
 
 ```sh
 agentlog import --source all --since all
-agentlog import --sources codex-cli,codex-desktop,claude,claude-code-desktop,claude-workspace,gemini-cli,antigravity,devin-cli,cursor,cline,opencode,aider --since all
+agentlog import --sources codex-cli,codex-desktop,claude,claude-code-desktop,claude-workspace,gemini-cli,antigravity,devin-cli,cursor,cline,opencode-cli,opencode-desktop,opencode-web,aider --since all
 agentlog import --source codex-desktop --since 90d
 agentlog import --source codex-cli --since 30d
 agentlog import chatgpt ~/Downloads/chatgpt-export.zip --username you@example.com

package/docs/code-reference.md

@@ -790,13 +790,13 @@ Cline helpers:
 
 OpenCode helpers:
 
-- `openCodeDatabaseFiles(env)`: resolves normalized OpenCode `opencode.db`
+- `openCodeDatabaseFiles(env, options)`: resolves normalized OpenCode `opencode.db`
   files from data-root defaults and database override env vars.
-- `openCodeStorageRoots(env)`: resolves global and project-scoped OpenCode
+- `openCodeStorageRoots(env, options)`: resolves global and project-scoped OpenCode
   `storage` directories, plus override env vars.
 - `readOpenCodeSqliteSessionsFromDb(dbPath)`: reads the `session`, `message`,
   `part`, and `project` tables from `opencode.db` and emits
-  `opencode-sqlite-history` sessions.
+  desktop or explicitly configured SQLite sessions.
 - `openCodeSessionFiles(root)`: finds session JSON files.
 - `openCodeMessageSessionIds(root)`: finds message-only OpenCode session
   directories when session metadata is missing.

package/docs/history-source-handling.md

@@ -183,30 +183,35 @@ package-prefixed scheme.
 
 | Source type | Version |
 | --- | --- |
-| `codex-cli-history` | `0.2.4.0` |
-| `codex-desktop-history` | `0.2.4.0` |
-| `cli-history` | `0.2.4.0` |
-| `claude-sdk-history` | `0.2.4.0` |
-| `claude-code-desktop-metadata` | `0.2.4.0` |
-| `claude-workspace-desktop` | `0.2.4.0` |
-| `cursor-workspace-sqlite` | `0.2.4.0` |
-| `cursor-global-sqlite` | `0.2.4.0` |
-| `cursor-raw-sqlite-salvage` | `0.2.4.0` |
-| `cursor-agent-transcripts` | `0.2.4.0` |
-| `devin-cli-history` | `0.2.4.0` |
-| `gemini-cli-history` | `0.2.4.0` |
-| `cline-task-history` | `0.2.4.0` |
-| `opencode-history` | `0.2.4.0` |
-| `opencode-sqlite-history` | `0.2.4.0` |
-| `aider-chat-history` | `0.2.4.0` |
-| `antigravity-history` | `0.2.4.0` |
-| `antigravity-trajectory-summary` | `0.2.4.0` |
-| `windsurf-trajectory-export` | `0.2.4.0` |
-| `web-chat-export` | `0.2.4.0` |
-| `chatgpt-export` | `0.2.4.0` |
-| `claude-web-export` | `0.2.4.0` |
-| `claude-web-memory` | `0.2.4.0` |
-| `import` | `0.2.4.0` |
+| `codex-cli-history` | `0.2.5.0` |
+| `codex-desktop-history` | `0.2.5.0` |
+| `cli-history` | `0.2.5.0` |
+| `claude-sdk-history` | `0.2.5.0` |
+| `claude-code-desktop-metadata` | `0.2.5.0` |
+| `claude-workspace-desktop` | `0.2.5.0` |
+| `cursor-workspace-sqlite` | `0.2.5.0` |
+| `cursor-global-sqlite` | `0.2.5.0` |
+| `cursor-raw-sqlite-salvage` | `0.2.5.0` |
+| `cursor-agent-transcripts` | `0.2.5.0` |
+| `devin-cli-history` | `0.2.5.0` |
+| `gemini-cli-history` | `0.2.5.0` |
+| `cline-task-history` | `0.2.5.0` |
+| `opencode-cli-history` | `0.2.5.0` |
+| `opencode-cli-sqlite-history` | `0.2.5.0` |
+| `opencode-desktop-history` | `0.2.5.0` |
+| `opencode-desktop-sqlite-history` | `0.2.5.0` |
+| `opencode-web-sqlite-history` | `0.2.5.0` |
+| `opencode-history` | `0.2.5.0` |
+| `opencode-sqlite-history` | `0.2.5.0` |
+| `aider-chat-history` | `0.2.5.0` |
+| `antigravity-history` | `0.2.5.0` |
+| `antigravity-trajectory-summary` | `0.2.5.0` |
+| `windsurf-trajectory-export` | `0.2.5.0` |
+| `web-chat-export` | `0.2.5.0` |
+| `chatgpt-export` | `0.2.5.0` |
+| `claude-web-export` | `0.2.5.0` |
+| `claude-web-memory` | `0.2.5.0` |
+| `import` | `0.2.5.0` |
 
 `cursor-sqlite-history` and `antigravity-brain` are compatibility aliases for
 older labels. Fingerprints include the parser version prefix, so changing the
@@ -249,12 +254,13 @@ The setup UI, import defaults, and history source filters use this grouped order
    Claude.ai, Claude SDK jobs
 3. Google: Gemini CLI, Antigravity
 4. Cognition: Devin CLI
-5. Other: Cursor, Cline, OpenCode, Aider
+5. Other: Cursor, Cline, OpenCode CLI, OpenCode Desktop, OpenCode Web, Aider
 
 `agentlog import --source all` uses the default import order from
 `src/sources.js`: `codex-cli`, `codex-desktop`, `claude`,
 `claude-code-desktop`, `claude-workspace`, `gemini-cli`, `antigravity`,
-`devin-cli`, `cursor`, `cline`, `opencode`, `aider`. Claude SDK jobs are
+`devin-cli`, `cursor`, `cline`, `opencode-cli`, `opencode-desktop`,
+`opencode-web`, `aider`. Claude SDK jobs are
 intentionally opt-in. Windsurf local cache scanning is disabled for now because
 current Cascade transcripts are encrypted binary stores, but downloaded
 trajectory Markdown exports are importable with an explicit path.
@@ -421,9 +427,32 @@ message roles, text content, timestamps, assistant thinking summaries,
 token usage. Tool calls and results are normalized into the shared
 `metadata.toolCalls[]`, `metadata.toolResult`, and `metadata.usage` shapes.
 Bash or shell tool calls that invoke `apply_patch` are reclassified as edit
-calls and retain the patch text under `arguments.diff`. Repo attribution is
-computed from the parsed `cwd`; if no cwd is present the session is archived
-under an uncategorized provider scope.
+calls and retain the patch text under `arguments.diff`.
+
+When the Claude desktop app has a matching
+`~/Library/Application Support/Claude/claude-code-sessions/**/local_*.json`
+record with `cliSessionId`, the CLI importer uses that sidecar's generated
+`title` and `originCwd` while preserving both the transcript and sidecar in raw
+archive storage. This is the source of Claude's readable auto names such as
+"Fix cursor import paths handling"; the transcript JSONL itself may only contain
+the user prompt ("Can you fix these?"). Without a sidecar title, the importer
+falls back to the first real user prompt. Repo attribution uses sidecar
+`originCwd` when available, otherwise the parsed `cwd`; Claude-created
+`.claude/worktrees/<name>` directories are attributed to their parent project
+when that project still exists, even if the temporary worktree has been deleted.
+The original worktree path remains stored as `cwd`. If no cwd is present the
+session is archived under an uncategorized provider scope.
+
+A sanitized subset of sidecar metadata is also copied into
+`metadata.sessionSummary.claudeCodeSidecar`: the app/CLI session ids, title
+source, cwd/origin cwd, worktree path/name, branch names, created/last-activity
+timestamps, model/effort, permission modes, completed turn count, archive state,
+enabled MCP tool count, MCP server names, and sidecar source path. The sidecar
+`model` also contributes to normalized `models[]` through `sessionSummary`
+model usage. Full MCP configuration remains available only through raw
+preservation rather than promoted metadata. After this parser behavior changes,
+run `agentlog update --yes --since all` or `agentlog import claude --since all`
+to rebuild existing local Claude Code archives.
 
 ## Claude SDK Jobs
 
@@ -834,18 +863,25 @@ original checkpoint files remain in raw backups.
 
 ## OpenCode
 
-- Import selector: `opencode`
+- Import selectors: `opencode-cli`, `opencode-desktop`, `opencode-web`, or `opencode` for all three
 - Provider: `opencode`
 - Source types:
-  - `opencode-sqlite-history` for the normalized `opencode.db` store
-  - `opencode-history` for the JSON `storage/` layout
-- Primary data root: `~/.local/share/opencode`
-- Alternate macOS data root: `~/Library/Application Support/opencode`
-- Additional desktop roots:
+  - `opencode-cli-history` for CLI JSON `storage/` sessions
+  - `opencode-cli-sqlite-history` for the CLI/core normalized `~/.local/share/opencode/opencode.db` store
+  - `opencode-desktop-history` for desktop/app JSON `storage/` sessions
+  - `opencode-desktop-sqlite-history` for the desktop/app normalized `opencode.db` store
+  - `opencode-web-sqlite-history` for web sessions in the shared normalized SQLite store
+  - `opencode-history` and `opencode-sqlite-history` for older or explicitly configured archives
+- CLI data root: `~/.local/share/opencode`
+- Desktop/app data roots:
+  - `~/Library/Application Support/ai.opencode.desktop`
+  - `~/Library/Application Support/opencode`
   - `~/.local/share/ai.opencode.app`
   - `~/Library/Application Support/ai.opencode.app`
 - SQLite database:
-  - `opencode.db`
+  - CLI/core root: `~/.local/share/opencode/opencode.db`
+  - desktop/app roots: `opencode.db`
+  - explicit overrides only: `AGENTLOG_OPENCODE_DB`, `AGENTLOG_OPENCODE_DATABASE`, `OPENCODE_DB`, or `AGENTLOG_OPENCODE_DATA_DIR`
 - Storage roots:
   - `~/.local/share/opencode/storage`
   - `~/.local/share/opencode/project/<project-slug>/storage`
@@ -862,8 +898,17 @@ original checkpoint files remain in raw backups.
   - `AGENTLOG_OPENCODE_STORAGE_DIR` or `AGENTLOG_OPENCODE_STORAGE_ROOTS`
     points directly at one or more `storage` directories.
 
-agentlog first reads OpenCode's normalized SQLite store when `opencode.db` is
-present. The `session`, `message`, `part`, and `project` tables provide session
+agentlog reads OpenCode's normalized SQLite store from the shared core
+`~/.local/share/opencode/opencode.db` root, desktop/app roots, or when a
+database is explicitly configured. The shared core database can contain sessions
+created by Desktop, CLI, and Web clients, so agentlog classifies each SQLite
+session row individually. Desktop sessions are identified by session ids in
+OpenCode Desktop sidecar state such as `ai.opencode.desktop/*.dat`; sub-sessions
+inherit Desktop classification from a Desktop parent. CLI sessions are
+identified by session-level `agent` or `model` metadata. Remaining non-`local`
+shared core rows are labeled as Web sessions. Rows without reliable client
+evidence stay on the legacy `opencode-sqlite-history` source type. The
+`session`, `message`, `part`, and `project` tables provide session
 metadata, working directory, user/assistant messages, reasoning text, tool
 calls, tool outputs, model/provider ids, cost, and token usage. Because the
 database is a multi-session source, raw preservation stores it as a shared raw
@@ -879,7 +924,11 @@ If a session metadata file is missing but `storage/message/<session-id>/` and
 session from those message and part files.
 
 When both SQLite and JSON records exist for the same OpenCode session id,
-agentlog prefers `opencode-sqlite-history` and merges the raw source file list.
+agentlog prefers SQLite source types such as `opencode-cli-sqlite-history`
+and merges the raw source file list.
+After this source handling change, run `agentlog import --source opencode
+--since all` or `agentlog update --yes --since all` to rebuild existing local
+OpenCode archives with the corrected CLI/Desktop/Web split.
 
 When `session_diff/<session-id>.json` is present, agentlog adds a supplementary
 edit tool call with the diff payload. Unified diff text is rendered inline in

package/docs/release.md

@@ -30,7 +30,6 @@ npm run smoke:pack
 - selected docs
 - `README.md`
 - `LICENSE`
-- `agentlog-spec.md`
 - `package.json`
 
 It should not include local settings, test fixtures, `.git`, `.claude`, logs,
@@ -65,5 +64,5 @@ After tagging and pushing the release, sanity-check both public install forms:
 
 ```sh
 npm install -g agentel
-npm install -g brianlzhou/agentlog#v0.2.4
+npm install -g brianlzhou/agentlog#v0.2.5
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentel",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "Local-first archive and recall layer for agent coding sessions.",
   "type": "commonjs",
   "license": "MIT",

package/src/cli.js

@@ -2544,7 +2544,7 @@ function resumeCommandForSession(session) {
   if (provider === "devin" && sourceType === "devin-cli-history") {
     return `devin -r ${shellArg(sessionId.replace(/^devin-/, ""))}`;
   }
-  if (provider === "opencode" && ["opencode-history", "opencode-sqlite-history"].includes(sourceType)) {
+  if (provider === "opencode" && ["opencode-cli-history", "opencode-cli-sqlite-history", "opencode-desktop-history", "opencode-desktop-sqlite-history", "opencode-web-sqlite-history", "opencode-history", "opencode-sqlite-history"].includes(sourceType)) {
     return `opencode --session ${shellArg(sessionId.replace(/^opencode-/, ""))}`;
   }
   if (provider === "gemini_cli" && sourceType === "gemini-cli-history") {
@@ -3188,6 +3188,7 @@ function statsCompanyFromProvider(provider) {
   if (["claude_code", "claude_desktop", "claude_sdk", "claude_web"].includes(value)) return "anthropic";
   if (["gemini_cli", "antigravity"].includes(value)) return "google";
   if (value === "devin" || value === "windsurf") return "cognition";
+  if (value === "cursor") return "cursor";
   return "unknown";
 }
 
@@ -3201,7 +3202,7 @@ function statsCompanyFromModel(model) {
   if (text.includes("devin") || text.includes("cognition")) return "cognition";
   if (text.includes("windsurf") || text.includes("swe-")) return "cognition";
   if (text.includes("antigravity")) return "google";
-  if (text.startsWith("composer-") || text.startsWith("cursor-") || text === "auto") return "cursor";
+  if (text.startsWith("composer-") || text.startsWith("cursor-") || text === "auto" || text === "default") return "cursor";
   return "";
 }
 
@@ -3519,7 +3520,7 @@ const RECALL_TARGET_SOURCE_MAP = {
   devin: ["devin-cli"],
   cursor: ["cursor"],
   cline: ["cline"],
-  opencode: ["opencode"],
+  opencode: ["opencode-cli", "opencode-desktop", "opencode-web"],
   aider: ["aider"]
 };
 
@@ -3600,6 +3601,9 @@ function normalizeRecallTarget(target) {
     "gemini-cli": "gemini",
     "devin-cli": "devin",
     "open-code": "opencode",
+    "opencode-cli": "opencode",
+    "opencode-desktop": "opencode",
+    "opencode-web": "opencode",
     open_code: "opencode",
     clinecli: "cline",
     "cline-cli": "cline",
@@ -5158,12 +5162,28 @@ function importSourceOptions(discovered) {
       defaultSelected: Boolean(discovered.cline?.sessions)
     },
     {
-      source: "opencode",
-      label: "OpenCode",
-      count: discovered.opencode?.sessions || 0,
-      summary: sourceSummary(discovered.opencode),
-      description: "OpenCode JSON session, message, part, and session_diff storage from ~/.local/share/opencode.",
-      defaultSelected: Boolean(discovered.opencode?.sessions)
+      source: "opencode-cli",
+      label: "OpenCode CLI",
+      count: discovered.opencodeCli?.sessions || 0,
+      summary: sourceSummary(discovered.opencodeCli),
+      description: "OpenCode CLI/core SQLite database plus project JSON session, message, part, and session_diff storage from ~/.local/share/opencode.",
+      defaultSelected: Boolean(discovered.opencodeCli?.sessions)
+    },
+    {
+      source: "opencode-desktop",
+      label: "OpenCode Desktop",
+      count: discovered.opencodeDesktop?.sessions || 0,
+      summary: sourceSummary(discovered.opencodeDesktop),
+      description: "OpenCode Desktop app-specific SQLite database and app storage.",
+      defaultSelected: Boolean(discovered.opencodeDesktop?.sessions)
+    },
+    {
+      source: "opencode-web",
+      label: "OpenCode Web",
+      count: discovered.opencodeWeb?.sessions || 0,
+      summary: sourceSummary(discovered.opencodeWeb),
+      description: "OpenCode web sessions from the shared OpenCode SQLite store.",
+      defaultSelected: Boolean(discovered.opencodeWeb?.sessions)
     },
     {
       source: "aider",
@@ -5741,7 +5761,9 @@ mark.search-match.search-match-current{background:#fde047;color:#422006;box-shad
 	              <button class="select-option" type="button" data-value="devin-cli">Devin CLI</button>
 	              <button class="select-option" type="button" data-value="cursor">Cursor</button>
 	              <button class="select-option" type="button" data-value="cline">Cline</button>
-	              <button class="select-option" type="button" data-value="opencode">OpenCode</button>
+	              <button class="select-option" type="button" data-value="opencode-cli">OpenCode CLI</button>
+	              <button class="select-option" type="button" data-value="opencode-desktop">OpenCode Desktop</button>
+	              <button class="select-option" type="button" data-value="opencode-web">OpenCode Web</button>
 	              <button class="select-option" type="button" data-value="aider">Aider</button>
             </div>
           </div>
@@ -6017,7 +6039,7 @@ function brandKeyForSourceValue(value) {
   if (key === 'devin-cli') return 'devin';
   if (key === 'cursor') return 'cursor';
   if (key === 'cline') return 'cline';
-  if (key === 'opencode') return 'opencode';
+  if (['opencode-cli', 'opencode-desktop', 'opencode-web'].includes(key)) return 'opencode';
   return '';
 }
 
@@ -6268,6 +6290,21 @@ function providerLabel(provider) {
   return labels[provider] || provider || 'unknown';
 }
 
+function sourceTypeLabel(provider, sourceType) {
+  const labels = {
+    'opencode-cli-history': 'OpenCode CLI',
+    'opencode-cli-sqlite-history': 'OpenCode CLI',
+    'opencode-desktop-history': 'OpenCode Desktop',
+    'opencode-desktop-sqlite-history': 'OpenCode Desktop',
+    'opencode-web-sqlite-history': 'OpenCode Web',
+    'opencode-history': 'OpenCode',
+    'opencode-sqlite-history': 'OpenCode'
+  };
+  if (labels[sourceType]) return labels[sourceType];
+  const providerText = providerLabel(provider);
+  return sourceType ? providerText + ' / ' + sourceType : providerText;
+}
+
 const PROVIDER_COLORS = {
   codex:           '#2563EB',
   chatgpt:         '#10A37F',
@@ -6296,6 +6333,7 @@ const COMPANY_LABELS = {
   google: 'Google',
   cognition: 'Cognition',
   windsurf: 'Cognition',
+  cursor: 'Cursor',
   stealth: 'Stealth',
   unknown: 'Unknown'
 };
@@ -6306,6 +6344,7 @@ const COMPANY_COLORS = {
   google: PROVIDER_COLORS.gemini_cli,
   cognition: PROVIDER_COLORS.devin,
   windsurf: PROVIDER_COLORS.devin,
+  cursor: PROVIDER_COLORS.cursor,
   stealth: PROVIDER_COLORS.unknown,
   unknown: PROVIDER_COLORS.unknown
 };
@@ -6788,7 +6827,7 @@ function sessionNode(item, includeExcerpt) {
   button.type = 'button';
   button.dataset.id = item.session_id || '';
   const title = item.title || '(untitled session)';
-  const source = providerLabel(item.provider) + (item.source_type ? ' / ' + item.source_type : '');
+  const source = sourceTypeLabel(item.provider, item.source_type);
   const scope = item.repo_display || item.repo || item.scope || 'unknown repo';
   const folderPath = searchResultFolderPath(item);
   const folderLabel = folderPath || scope;
@@ -7024,7 +7063,7 @@ function renderSession(payload) {
   }
   if (sessionMetaRight) {
     const innerParts = [];
-    if (payload.source_type) innerParts.push('<span class="meta-source">' + esc(payload.source_type) + '</span>');
+    if (payload.source_type) innerParts.push('<span class="meta-source">' + esc(sourceTypeLabel(payload.provider, payload.source_type)) + '</span>');
     const repoRaw = payload.repo_display || payload.repo || payload.scope || '';
     if (repoRaw) {
       if (innerParts.length) innerParts.push('<span class="meta-dot" aria-hidden="true">\u00b7</span>');
@@ -8276,7 +8315,7 @@ function sessionDetailsText(payload) {
     'Title: ' + (payload.title || '(untitled session)'),
     'Thread ID: ' + (payload.session_id || ''),
     'Provider: ' + [providerLabel(payload.provider), payload.provider].filter(Boolean).join(' / '),
-    payload.source_type ? 'Source type: ' + payload.source_type : '',
+    payload.source_type ? 'Source: ' + sourceTypeLabel(payload.provider, payload.source_type) + ' (' + payload.source_type + ')' : '',
     payload.repo_display || payload.repo || payload.scope ? 'Repo or path: ' + (payload.repo_display || payload.repo || payload.scope) : '',
     payload.cwd ? 'Working directory: ' + payload.cwd : '',
     payload.started_at ? 'Started: ' + payload.started_at : '',
@@ -10282,7 +10321,10 @@ Import sources:
   devin-cli             Devin for Terminal sessions from ~/.local/share/devin/cli/sessions.db
   cursor                Cursor SQLite history plus newer agent-transcripts folders
   cline                 Cline task folders from VS Code/JetBrains globalStorage
-  opencode              OpenCode JSON session/message/part storage
+  opencode-cli          OpenCode CLI/core SQLite database plus project JSON session/message/part storage
+  opencode-desktop      OpenCode Desktop app-specific SQLite database and app storage
+  opencode-web          OpenCode web sessions from the shared OpenCode SQLite store
+  opencode              OpenCode CLI, Desktop, and Web aggregate
   aider                 Aider repo-local markdown chat history
   all                   configured default local sources
 
@@ -10304,7 +10346,7 @@ Examples:
   agentlog import --source cline --since all
   agentlog import --source opencode --since all
   agentlog import --source aider --since all
-  agentlog import --sources codex-cli,codex-desktop,claude,claude-code-desktop,claude-workspace,gemini-cli,antigravity,devin-cli,cursor,cline,opencode,aider --since all
+  agentlog import --sources codex-cli,codex-desktop,claude,claude-code-desktop,claude-workspace,gemini-cli,antigravity,devin-cli,cursor,cline,opencode-cli,opencode-desktop,opencode-web,aider --since all
   agentlog import --source all --since all --dry-run
   agentlog import --source cursor --since all --explain-skips
   agentlog import --source cursor --since all --explain-skips --json

package/src/config.js

@@ -81,7 +81,10 @@ function effectiveImportSources(config) {
   const imports = config?.imports || {};
   const configured = enabledImportSources(Array.isArray(imports.sources) ? imports.sources : []);
   if (imports.autoDiscoverSources === false) return configured.length ? configured : undefined;
-  return enabledImportSources([...new Set([...configured, ...IMPORT_SOURCE_ORDER])]);
+  const defaultSources = configured.includes("opencode")
+    ? IMPORT_SOURCE_ORDER.filter((source) => !["opencode-cli", "opencode-desktop", "opencode-web"].includes(source))
+    : IMPORT_SOURCE_ORDER;
+  return enabledImportSources([...new Set([...configured, ...defaultSources])]);
 }
 
 function saveConfig(config, env = process.env) {

package/src/doctor.js

@@ -68,7 +68,9 @@ function sourceCoverage(discovery, cfg) {
     coverageRow("devin-cli", "Devin CLI", discovery.devinCli, configured),
     coverageRow("cursor", "Cursor", discovery.cursor, configured),
     coverageRow("cline", "Cline", discovery.cline, configured),
-    coverageRow("opencode", "OpenCode", discovery.opencode, configured),
+    coverageRow("opencode-cli", "OpenCode CLI", discovery.opencodeCli, configured),
+    coverageRow("opencode-desktop", "OpenCode Desktop", discovery.opencodeDesktop, configured),
+    coverageRow("opencode-web", "OpenCode Web", discovery.opencodeWeb, configured),
     coverageRow("aider", "Aider", discovery.aider, configured)
   ];
   return rows.map((row) => ({
@@ -81,7 +83,10 @@ function coverageRow(source, label, result = {}, configured) {
   return {
     source,
     label,
-    configured: configured.has(source) || (source === "claude-code-desktop" && configured.has("claude-desktop")) || (source === "claude-workspace" && configured.has("claude-desktop")),
+    configured: configured.has(source)
+      || (source === "claude-code-desktop" && configured.has("claude-desktop"))
+      || (source === "claude-workspace" && configured.has("claude-desktop"))
+      || (source.startsWith("opencode-") && configured.has("opencode")),
     sessions: result?.sessions || 0,
     oldest: result?.oldest || "",
     details: result?.details || {},
@@ -200,7 +205,13 @@ function parserUpdateCommand(sourceType) {
     "devin-cli-history": "devin-cli",
     "gemini-cli-history": "gemini-cli",
     "cline-task-history": "cline",
+    "opencode-cli-history": "opencode-cli",
+    "opencode-cli-sqlite-history": "opencode-cli",
+    "opencode-desktop-history": "opencode-desktop",
+    "opencode-desktop-sqlite-history": "opencode-desktop",
+    "opencode-web-sqlite-history": "opencode-web",
     "opencode-history": "opencode",
+    "opencode-sqlite-history": "opencode",
     "aider-chat-history": "aider",
     "antigravity-history": "antigravity"
   }[canonicalSourceType(sourceType)];

package/src/importers/providers.js

@@ -76,11 +76,35 @@ const PROVIDER_ADAPTERS = [
   {
     source: "opencode",
     provider: "opencode",
-    sourceType: "opencode-history",
+    sourceType: "opencode-cli-history",
     label: "OpenCode",
     run: ({ helpers, since, options, env }) =>
       helpers.importStructuredProvider("opencode", helpers.readOpenCodeSessions(env, { ...options, since }), since, options, env)
   },
+  {
+    source: "opencode-cli",
+    provider: "opencode",
+    sourceType: "opencode-cli-history",
+    label: "OpenCode CLI",
+    run: ({ helpers, since, options, env }) =>
+      helpers.importStructuredProvider("opencode", helpers.readOpenCodeSessions(env, { ...options, since, openCodeKind: "cli" }), since, options, env)
+  },
+  {
+    source: "opencode-desktop",
+    provider: "opencode",
+    sourceType: "opencode-desktop-history",
+    label: "OpenCode Desktop",
+    run: ({ helpers, since, options, env }) =>
+      helpers.importStructuredProvider("opencode", helpers.readOpenCodeSessions(env, { ...options, since, openCodeKind: "desktop" }), since, options, env)
+  },
+  {
+    source: "opencode-web",
+    provider: "opencode",
+    sourceType: "opencode-web-sqlite-history",
+    label: "OpenCode Web",
+    run: ({ helpers, since, options, env }) =>
+      helpers.importStructuredProvider("opencode", helpers.readOpenCodeSessions(env, { ...options, since, openCodeKind: "web" }), since, options, env)
+  },
   {
     source: "aider",
     provider: "aider",