spiracha 2.1.0 → 2.2.0

package/src/lib/conversation-data/opencode-adapter.ts

@@ -1,3 +1,4 @@
+import { mapWithConcurrency } from '../concurrency';
 import {
     deleteOpenCodeSession,
     listOpenCodeSessionsForGroup,
@@ -15,9 +16,11 @@ import { getFinalOpenCodeAssistantTextPartIds, getOpenCodeTextPartPhase } from '
 import { cleanInlineTitle } from '../shared';
 import { runWithTranscriptLoadLimit } from '../transcript-load-limiter';
 import {
+    createConversationUiPath,
     createDeepLinks,
     createTextMessage,
     finalizeMessages,
+    isWithinUpdatedWindow,
     normalizeAssistantPhase,
     normalizeRole,
 } from './adapter-helpers';
@@ -33,6 +36,8 @@ import type {
     ListConversationsForPathOptions,
 } from './types';
 
+const OPENCODE_CONVERSATION_HYDRATION_CONCURRENCY = 4;
+
 const getDbPath = (options: { locations?: { opencodeDbPath?: string } }) =>
     options.locations?.opencodeDbPath ?? resolveOpenCodeDbPath();
 
@@ -41,7 +46,10 @@ const textPartToMessages = (
     finalTextPartIds: Set<string>,
     order: number,
 ): ConversationMessage[] => {
-    const split = splitOpenCodeThinkTaggedText(part.text ?? '');
+    const split =
+        part.role === 'assistant'
+            ? splitOpenCodeThinkTaggedText(part.text ?? '')
+            : { reasoningBlocks: [], visibleText: part.text ?? '' };
     return [
         ...createTextMessage({
             createdAtMs: part.createdAtMs,
@@ -83,15 +91,27 @@ const partToMessages = (
     }
 
     if (part.type === 'tool') {
-        return createTextMessage({
-            createdAtMs: part.createdAtMs,
-            id: part.partId,
-            metadata: { callId: part.callId, status: part.status, toolName: part.toolName },
-            order,
-            phase: part.outputText ? 'tool_output' : 'tool_call',
-            role: 'tool',
-            text: part.outputText ?? part.argumentsText ?? part.title ?? part.toolName,
-        });
+        const metadata = { callId: part.callId, status: part.status, toolName: part.toolName };
+        return [
+            ...createTextMessage({
+                createdAtMs: part.createdAtMs,
+                id: `${part.partId}:tool_call`,
+                metadata,
+                order,
+                phase: 'tool_call',
+                role: 'tool',
+                text: [part.toolName, part.argumentsText ?? part.title].filter(Boolean).join('\n'),
+            }),
+            ...createTextMessage({
+                createdAtMs: part.createdAtMs,
+                id: `${part.partId}:tool_output`,
+                metadata,
+                order,
+                phase: 'tool_output',
+                role: 'tool',
+                text: part.outputText,
+            }),
+        ];
     }
 
     return [];
@@ -126,7 +146,11 @@ const buildConversation = async (
 
     return {
         createdAtMs: session.createdAtMs,
-        deepLinks: createDeepLinks('opencode', session.sessionId, `/opencode-sessions/${session.sessionId}`),
+        deepLinks: createDeepLinks(
+            'opencode',
+            session.sessionId,
+            createConversationUiPath('opencode-sessions', session.sessionId),
+        ),
         id: session.sessionId,
         matches,
         messageCount: options.includeMessages ? allMessages.length : session.messageCount,
@@ -156,10 +180,14 @@ const listOpenCodeConversationsForPath = async (options: ListConversationsForPat
         if (!match) {
             continue;
         }
-        const sessions = await listOpenCodeSessionsForGroup(group.key, dbPath);
-        for (const session of sessions) {
-            conversations.push(await buildConversation(session, dbPath, [match], options));
-        }
+        const sessions = (await listOpenCodeSessionsForGroup(group.key, dbPath)).filter((session) =>
+            isWithinUpdatedWindow(session.lastUpdatedAtMs, options),
+        );
+        conversations.push(
+            ...(await mapWithConcurrency(sessions, OPENCODE_CONVERSATION_HYDRATION_CONCURRENCY, (session) =>
+                buildConversation(session, dbPath, [match], options),
+            )),
+        );
     }
 
     return conversations;

package/src/lib/conversation-data/path-match.ts

@@ -1,20 +1,8 @@
 import { realpath } from 'node:fs/promises';
-import os from 'node:os';
 import path from 'node:path';
+import { expandHome } from '../shared';
 import type { ConversationPathMatch } from './types';
 
-const expandHome = (value: string) => {
-    if (value === '~') {
-        return os.homedir();
-    }
-
-    if (value.startsWith('~/') || value.startsWith('~\\')) {
-        return path.join(os.homedir(), value.slice(2));
-    }
-
-    return value;
-};
-
 const trimTrailingSeparators = (value: string) => {
     const trimmed = value.replace(/[\\/]+$/u, '');
     return trimmed || value;

package/src/lib/conversation-data/qoder-adapter.ts

@@ -16,9 +16,11 @@ import { getFinalQoderAssistantMessageEntryIds, getQoderMessagePhase } from '../
 import { cleanInlineTitle } from '../shared';
 import { runWithTranscriptLoadLimit } from '../transcript-load-limiter';
 import {
+    createConversationUiPath,
     createDeepLinks,
     createTextMessage,
     finalizeMessages,
+    isWithinUpdatedWindow,
     normalizeAssistantPhase,
     normalizeRole,
     toDateMs,
@@ -36,6 +38,11 @@ import type {
 
 const QODER_CONVERSATION_HYDRATION_CONCURRENCY = 4;
 
+const getPartString = (part: QoderTranscriptPart, key: string): string | null => {
+    const value = part.raw[key];
+    return typeof value === 'string' && value.trim() ? value : null;
+};
+
 const getQoderLocations = (options: {
     locations?: {
         qoderAcpSocketPath?: string;
@@ -50,20 +57,6 @@ const getQoderLocations = (options: {
     workspaceStorageDir: options.locations?.qoderWorkspaceStorageDir ?? resolveQoderWorkspaceStorageDir(),
 });
 
-const isWithinUpdatedWindow = (
-    session: QoderSessionSummary,
-    options: Pick<ListConversationsForPathOptions, 'updatedAfterMs' | 'updatedBeforeMs'>,
-): boolean => {
-    const updatedAtMs = session.lastActiveAtMs ?? 0;
-    if (options.updatedAfterMs !== undefined && updatedAtMs < options.updatedAfterMs) {
-        return false;
-    }
-    if (options.updatedBeforeMs !== undefined && updatedAtMs > options.updatedBeforeMs) {
-        return false;
-    }
-    return true;
-};
-
 const partToMessages = (
     entry: QoderTranscriptEntry,
     part: QoderTranscriptPart,
@@ -74,7 +67,11 @@ const partToMessages = (
         return createTextMessage({
             createdAtMs: toDateMs(entry.timestamp),
             id: `${entry.entryId}:${partIndex}`,
-            metadata: { requestId: entry.requestId },
+            metadata: {
+                requestId: entry.requestId,
+                toolCallId: getPartString(part, 'toolCallId') ?? entry.entryId,
+                toolName: getPartString(part, 'toolName'),
+            },
             order: partIndex,
             phase: 'tool_call',
             role: 'tool',
@@ -86,7 +83,11 @@ const partToMessages = (
         return createTextMessage({
             createdAtMs: toDateMs(entry.timestamp),
             id: `${entry.entryId}:${partIndex}`,
-            metadata: { requestId: entry.requestId },
+            metadata: {
+                requestId: entry.requestId,
+                toolCallId: getPartString(part, 'toolCallId'),
+                toolName: getPartString(part, 'toolName'),
+            },
             order: partIndex,
             phase: 'tool_output',
             role: 'tool',
@@ -155,7 +156,11 @@ const buildConversation = async (
 
     return {
         createdAtMs: session.createdAtMs,
-        deepLinks: createDeepLinks('qoder', session.sessionId, `/qoder-sessions/${session.sessionId}`),
+        deepLinks: createDeepLinks(
+            'qoder',
+            session.sessionId,
+            createConversationUiPath('qoder-sessions', session.sessionId),
+        ),
         id: session.sessionId,
         matches,
         messageCount: options.includeMessages ? allMessages.length : session.messageCount,
@@ -201,7 +206,7 @@ const listQoderConversationsForPath = async (options: ListConversationsForPathOp
             locations.workspaceStorageDir,
         );
         for (const session of sessions) {
-            if (!isWithinUpdatedWindow(session, options)) {
+            if (!isWithinUpdatedWindow(session.lastActiveAtMs, options)) {
                 continue;
             }
 

package/src/lib/conversation-zip-export.ts

@@ -2,7 +2,8 @@ import { randomUUID } from 'node:crypto';
 import { mkdtemp, rm } from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
-import { resolveUniqueExportFileBaseName, sanitizeExportFileName, zipExportDirectory } from './ui-export-archive';
+import { resolveUniqueExportFileBaseName, sanitizeExportFileName } from './ui-export-archive';
+import { zipExportDirectory } from './ui-export-zip';
 
 type ConversationMarkdownZipEntry = {
     fallbackBaseName: string;
@@ -15,6 +16,22 @@ type ConversationMarkdownZipOptions = {
     fileBaseName: string;
 };
 
+const EXPORT_BASE_NAME_BYTE_LIMIT = 120;
+
+const truncateUtf8 = (value: string, maxBytes: number) => {
+    let bytes = 0;
+    let result = '';
+    for (const character of value) {
+        const characterBytes = Buffer.byteLength(character);
+        if (bytes + characterBytes > maxBytes) {
+            break;
+        }
+        bytes += characterBytes;
+        result += character;
+    }
+    return result;
+};
+
 export type ConversationMarkdownZip = {
     blob: Blob;
     fileName: string;
@@ -22,7 +39,8 @@ export type ConversationMarkdownZip = {
 };
 
 const toSafeFileBaseName = (value: string | null, fallback: string) => {
-    return sanitizeExportFileName(value?.trim() || '') || sanitizeExportFileName(fallback) || 'conversation';
+    const sanitized = sanitizeExportFileName(value?.trim() || '') || sanitizeExportFileName(fallback) || 'conversation';
+    return truncateUtf8(sanitized, EXPORT_BASE_NAME_BYTE_LIMIT) || 'conversation';
 };
 
 export const createConversationMarkdownZip = async ({

package/src/lib/cursor-db.ts

@@ -1,5 +1,6 @@
 import { constants, Database } from 'bun:sqlite';
 import { createHash } from 'node:crypto';
+import { existsSync } from 'node:fs';
 import { readdir, stat } from 'node:fs/promises';
 import path from 'node:path';
 import {
@@ -19,7 +20,8 @@ import {
     getCursorWorkspaceStorageDir,
     resolveCursorUserDir,
 } from './cursor-exporter-types';
-import { asNumber, asObject, asString, type JsonValue } from './shared';
+import { buildCursorBubbleKeyLikePattern, isSafeCursorComposerId } from './cursor-id';
+import { asNumber, asObject, asString, type JsonValue, pathExists, toFileUri } from './shared';
 
 type ComposerEntry = Record<string, JsonValue> & {
     composerId?: string;
@@ -34,7 +36,7 @@ export const CURSOR_READONLY_DB_OPEN_FLAGS = constants.SQLITE_OPEN_READONLY | co
 // the constructor never sees it). immutable=1 reads the main database file directly, which works
 // whether or not Cursor is running and whether or not the WAL sidecars are present. The explicit URI
 // flag keeps this portable across SQLite builds where URI filename parsing is not enabled globally.
-export const getCursorReadonlyDbUri = (dbPath: string): string => {
+export const getCursorReadonlyDbUri = (dbPath: string, immutable = true): string => {
     const normalizedPath = dbPath.replace(/\\/gu, '/');
     const absolutePath = normalizedPath.startsWith('/') ? normalizedPath : `/${normalizedPath}`;
     const encodedPath = absolutePath
@@ -42,20 +44,12 @@ export const getCursorReadonlyDbUri = (dbPath: string): string => {
         .map((segment) => (/^[A-Za-z]:$/u.test(segment) ? segment : encodeURIComponent(segment)))
         .join('/');
 
-    return `file://${encodedPath}?immutable=1`;
+    return `file://${encodedPath}?${immutable ? 'immutable=1' : 'mode=ro'}`;
 };
 
 export const openCursorReadonlyDb = (dbPath: string): Database => {
-    return new Database(getCursorReadonlyDbUri(dbPath), CURSOR_READONLY_DB_OPEN_FLAGS);
-};
-
-const pathExists = async (target: string): Promise<boolean> => {
-    try {
-        await stat(target);
-        return true;
-    } catch {
-        return false;
-    }
+    const hasWalSidecars = existsSync(`${dbPath}-wal`) || existsSync(`${dbPath}-shm`);
+    return new Database(getCursorReadonlyDbUri(dbPath, !hasWalSidecars), CURSOR_READONLY_DB_OPEN_FLAGS);
 };
 
 const isMissingOrUnreadableCursorStoreError = (error: unknown): boolean => {
@@ -95,7 +89,12 @@ export const decodeCursorUri = (uri: string): string => {
     }
 
     if (uri.startsWith('file://')) {
-        return decodeURIComponent(uri.slice('file://'.length));
+        const rawPath = uri.slice('file://'.length);
+        try {
+            return decodeURIComponent(rawPath);
+        } catch {
+            return rawPath;
+        }
     }
 
     return uri;
@@ -440,8 +439,10 @@ export const findCursorWorkspaceGroups = (groups: CursorWorkspaceGroup[], query:
 
 const countBubbles = (db: Database, composerId: string): { count: number; bytes: number } => {
     const row = db
-        .query('SELECT COUNT(*) AS count, COALESCE(SUM(length(value)), 0) AS bytes FROM cursorDiskKV WHERE key LIKE ?')
-        .get(`bubbleId:${composerId}:%`) as { count: number; bytes: number };
+        .query(
+            `SELECT COUNT(*) AS count, COALESCE(SUM(length(value)), 0) AS bytes FROM cursorDiskKV WHERE key LIKE ? ESCAPE '\\'`,
+        )
+        .get(buildCursorBubbleKeyLikePattern(composerId)) as { count: number; bytes: number };
     return { bytes: row.bytes, count: row.count };
 };
 
@@ -449,6 +450,10 @@ export const findCursorTranscriptDirs = async (
     composerId: string,
     userDir = resolveCursorUserDir(),
 ): Promise<string[]> => {
+    if (!isSafeCursorComposerId(composerId)) {
+        return [];
+    }
+
     const projectsDir = getCursorProjectsDir(userDir);
     if (!(await pathExists(projectsDir))) {
         return [];
@@ -463,7 +468,13 @@ export const findCursorTranscriptDirs = async (
     }
 
     for (const projectDir of projectDirs) {
-        const transcriptDir = path.join(projectsDir, projectDir, 'agent-transcripts', composerId);
+        const agentTranscriptsDir = path.resolve(projectsDir, projectDir, 'agent-transcripts');
+        const transcriptDir = path.resolve(agentTranscriptsDir, composerId);
+        const relativePath = path.relative(agentTranscriptsDir, transcriptDir);
+        if (!relativePath || relativePath.startsWith(`..${path.sep}`) || path.isAbsolute(relativePath)) {
+            continue;
+        }
+
         if (await pathExists(transcriptDir)) {
             matches.push(transcriptDir);
         }
@@ -648,8 +659,8 @@ const readCursorFileHistoryProjectActivity = async (userDir: string): Promise<Ma
 
 const inferFolderFromBubbles = (db: Database, composerId: string): string | null => {
     const rows = db
-        .query('SELECT value FROM cursorDiskKV WHERE key LIKE ? LIMIT 80')
-        .all(`bubbleId:${composerId}:%`) as Array<{ value: string }>;
+        .query(`SELECT value FROM cursorDiskKV WHERE key LIKE ? ESCAPE '\\' LIMIT 80`)
+        .all(buildCursorBubbleKeyLikePattern(composerId)) as Array<{ value: string }>;
     const paths: string[] = [];
 
     for (const { value } of rows) {
@@ -973,7 +984,7 @@ const buildBucketlessGroup = (key: string, threadCount: number, lastActiveMs: nu
         lastActiveMs,
         needsRecovery: false,
         threadCount,
-        uri: folder ? `file://${folder}` : '',
+        uri: folder ? toFileUri(folder) : '',
     };
 };
 
@@ -1475,8 +1486,8 @@ export const readCursorThreadTranscriptWithAgentFiles = async (
 
 const readAllBubbleIds = (db: Database, composerId: string): string[] => {
     const prefix = `bubbleId:${composerId}:`;
-    const rows = db.query('SELECT key FROM cursorDiskKV WHERE key LIKE ? ORDER BY key ASC').all(`${prefix}%`) as Array<{
-        key: string;
-    }>;
+    const rows = db
+        .query(`SELECT key FROM cursorDiskKV WHERE key LIKE ? ESCAPE '\\' ORDER BY key ASC`)
+        .all(buildCursorBubbleKeyLikePattern(composerId)) as Array<{ key: string }>;
     return rows.map((row) => row.key.slice(prefix.length));
 };

package/src/lib/cursor-id.ts

@@ -0,0 +1,17 @@
+const SAFE_CURSOR_COMPOSER_ID_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._:-]{0,255}$/u;
+
+export const isSafeCursorComposerId = (value: string): boolean => {
+    return SAFE_CURSOR_COMPOSER_ID_PATTERN.test(value) && !value.includes('..');
+};
+
+export const assertSafeCursorComposerId = (value: string): void => {
+    if (!isSafeCursorComposerId(value)) {
+        throw new Error(`Invalid Cursor composer id: ${value}`);
+    }
+};
+
+const escapeSqlLikeValue = (value: string): string => value.replace(/[\\%_]/gu, '\\$&');
+
+export const buildCursorBubbleKeyLikePattern = (composerId: string): string => {
+    return `bubbleId:${escapeSqlLikeValue(composerId)}:%`;
+};