agentel 0.2.3 → 0.2.5

package/src/parser-versions.js

@@ -21,6 +21,11 @@ const PARSER_VERSION_SUFFIXES = {
   "devin-cli-history": 0,
   "gemini-cli-history": 0,
   "cline-task-history": 0,
+  "opencode-cli-history": 0,
+  "opencode-cli-sqlite-history": 0,
+  "opencode-desktop-history": 0,
+  "opencode-desktop-sqlite-history": 0,
+  "opencode-web-sqlite-history": 0,
   "opencode-history": 0,
   "opencode-sqlite-history": 0,
   "aider-chat-history": 0,

package/src/search.js

@@ -17,6 +17,8 @@ const SQLITE_BUILD_BATCH_SIZE = 100;
 const RIPGREP_SEARCH_TIMEOUT_MS = 8000;
 const RIPGREP_BATCH_FILE_COUNT = 200;
 const MARKDOWN_MATCHES_PER_FILE = 3;
+const FTS_SEARCH_BATCH_SIZE = 250;
+const FTS_MAX_SCAN_ROWS = 5000;
 const _indexCache = {
   path: "",
   mtimeMs: 0,
@@ -671,33 +673,29 @@ function searchFtsSessions(query, queryTokens, context, env = process.env) {
   if (!ftsIndexAvailable(env, { noStaleCheck: Boolean(context.options.noRebuild || context.options.allowStaleFts) })) return null;
   const matchQuery = ftsMatchQuery(query);
   if (!matchQuery) return [];
-  const candidateLimit = Math.max(context.limit * 8, 80);
-  const rows = sqliteJson(
-    ftsPath,
-    [
-      "SELECT",
-      "  d.doc_id, d.session_id, d.provider, d.source_type, d.repo_canonical, d.repo_display,",
-      "  d.scope_canonical, d.cwd, d.title, d.started_at, d.occurred_at, d.role,",
-      "  d.event_id, d.event_kind, d.message_index, d.path, d.matched_text,",
-      "  snippet(docs_fts, 0, '', '', '...', 32) AS excerpt,",
-      "  bm25(docs_fts) AS rank",
-      "FROM docs_fts",
-      "JOIN docs d ON d.rowid = docs_fts.rowid",
-      `WHERE docs_fts MATCH ${sqliteString(matchQuery)}`,
-      "ORDER BY rank ASC, d.occurred_at DESC, d.started_at DESC",
-      `LIMIT ${candidateLimit};`
-    ].join("\n")
-  );
-  if (!rows) return null;
   const bySession = new Map();
-  for (const row of rows) {
-    const doc = ftsRowToDoc(row);
-    if (!matchesSessionFilter(doc, { ...context.filter, includeWebChats: context.includeWebChats, since: context.since })) continue;
-    if (!context.options.repo && context.repo && doc.repoCanonical === context.repo) {
-      row.rank = Number(row.rank || 0) - 0.05;
+  const batchSize = Math.max(context.limit * 20, FTS_SEARCH_BATCH_SIZE);
+  const maxScanRows = Math.max(batchSize, Math.min(FTS_MAX_SCAN_ROWS, context.limit * 500));
+  let offset = 0;
+  while (offset < maxScanRows && bySession.size < context.limit) {
+    const rows = ftsSearchRows(ftsPath, matchQuery, {
+      limit: Math.min(batchSize, maxScanRows - offset),
+      offset,
+      context
+    });
+    if (!rows) return null;
+    if (!rows.length) break;
+    offset += rows.length;
+    for (const row of rows) {
+      const doc = ftsRowToDoc(row);
+      if (!matchesSessionFilter(doc, { ...context.filter, includeWebChats: context.includeWebChats, since: context.since })) continue;
+      if (!context.options.repo && context.repo && doc.repoCanonical === context.repo) {
+        row.rank = Number(row.rank || 0) - 0.05;
+      }
+      if (!bySession.has(doc.sessionId)) bySession.set(doc.sessionId, { doc, row });
+      if (bySession.size >= context.limit) break;
     }
-    if (!bySession.has(doc.sessionId)) bySession.set(doc.sessionId, { doc, row });
-    if (bySession.size >= context.limit) break;
+    if (rows.length < batchSize) break;
   }
   return [...bySession.values()].slice(0, context.limit).map(({ doc, row }) => ({
     session_id: doc.sessionId,
@@ -720,6 +718,34 @@ function searchFtsSessions(query, queryTokens, context, env = process.env) {
   }));
 }
 
+function ftsSearchRows(ftsPath, matchQuery, options) {
+  const clauses = [`docs_fts MATCH ${sqliteString(matchQuery)}`];
+  const filter = options.context?.filter || {};
+  if (filter.provider) clauses.push(`d.provider = ${sqliteString(filter.provider)}`);
+  const sourceTypes = filter.sourceTypes?.length ? filter.sourceTypes : filter.sourceType ? [filter.sourceType] : [];
+  if (sourceTypes.length) clauses.push(`d.source_type IN (${sourceTypes.map(sqliteString).join(", ")})`);
+  if (options.context?.since) {
+    const since = sqliteString(options.context.since.toISOString());
+    clauses.push(`(d.started_at >= ${since} OR (d.started_at = '' AND d.occurred_at >= ${since}))`);
+  }
+  return sqliteJson(
+    ftsPath,
+    [
+      "SELECT",
+      "  d.doc_id, d.session_id, d.provider, d.source_type, d.repo_canonical, d.repo_display,",
+      "  d.scope_canonical, d.cwd, d.title, d.started_at, d.occurred_at, d.role,",
+      "  d.event_id, d.event_kind, d.message_index, d.path, d.matched_text,",
+      "  snippet(docs_fts, 0, '', '', '...', 32) AS excerpt,",
+      "  bm25(docs_fts) AS rank",
+      "FROM docs_fts",
+      "JOIN docs d ON d.rowid = docs_fts.rowid",
+      `WHERE ${clauses.join(" AND ")}`,
+      "ORDER BY rank ASC, d.occurred_at DESC, d.started_at DESC",
+      `LIMIT ${Math.max(1, Number(options.limit) || FTS_SEARCH_BATCH_SIZE)} OFFSET ${Math.max(0, Number(options.offset) || 0)};`
+    ].join("\n")
+  );
+}
+
 function ftsRowToDoc(row) {
   return {
     id: row.doc_id || "",
@@ -1079,7 +1105,10 @@ function normalizeProviderFilter(value) {
     codex_desktop: { provider: "codex", sourceType: "codex-desktop-history", sourceTypes: ["codex-desktop-history"] },
     cursor: { provider: "cursor" },
     cline: { provider: "cline", sourceType: "cline-task-history", sourceTypes: ["cline-task-history"] },
-    opencode: { provider: "opencode", sourceTypes: ["opencode-history", "opencode-sqlite-history"] },
+    opencode: { provider: "opencode", sourceTypes: ["opencode-cli-history", "opencode-cli-sqlite-history", "opencode-desktop-history", "opencode-desktop-sqlite-history", "opencode-web-sqlite-history", "opencode-history", "opencode-sqlite-history"] },
+    opencode_cli: { provider: "opencode", sourceType: "opencode-cli-history", sourceTypes: ["opencode-cli-history", "opencode-cli-sqlite-history"] },
+    opencode_desktop: { provider: "opencode", sourceType: "opencode-desktop-history", sourceTypes: ["opencode-desktop-history", "opencode-desktop-sqlite-history"] },
+    opencode_web: { provider: "opencode", sourceType: "opencode-web-sqlite-history", sourceTypes: ["opencode-web-sqlite-history"] },
     aider: { provider: "aider", sourceType: "aider-chat-history", sourceTypes: ["aider-chat-history"] },
     devin: { provider: "devin" },
     devin_cli: { provider: "devin", sourceType: "devin-cli-history", sourceTypes: ["devin-cli-history"] },

package/src/sources.js

@@ -37,7 +37,9 @@ const SOURCE_GROUPS = [
     sources: [
       { source: "cursor", provider: "cursor", label: "Cursor" },
       { source: "cline", provider: "cline", sourceType: "cline-task-history", label: "Cline" },
-      { source: "opencode", provider: "opencode", sourceType: "opencode-history", label: "OpenCode" },
+      { source: "opencode-cli", provider: "opencode", sourceType: "opencode-cli-history", label: "OpenCode CLI" },
+      { source: "opencode-desktop", provider: "opencode", sourceType: "opencode-desktop-history", label: "OpenCode Desktop" },
+      { source: "opencode-web", provider: "opencode", sourceType: "opencode-web-sqlite-history", label: "OpenCode Web" },
       { source: "aider", provider: "aider", sourceType: "aider-chat-history", label: "Aider" }
     ]
   }
@@ -61,7 +63,9 @@ const IMPORT_SOURCE_ORDER = [
   "devin-cli",
   "cursor",
   "cline",
-  "opencode",
+  "opencode-cli",
+  "opencode-desktop",
+  "opencode-web",
   "aider"
 ];
 
@@ -72,7 +76,7 @@ function enabledImportSources(sources) {
 }
 
 function sourceLabel(source) {
-  return HISTORY_PROVIDER_OPTIONS.find((item) => item.source === source)?.label || source;
+  return HISTORY_PROVIDER_OPTIONS.find((item) => item.source === source)?.label || { opencode: "OpenCode" }[source] || source;
 }
 
 module.exports = {