@echomem/mcp 1.4.44 → 1.4.46

package/dist/migrate.js

@@ -1,9 +1,11 @@
 /**
  * `echomem-mcp migrate` — one-shot bulk back-fill of the user's EXISTING local coding-agent history
- * (Codex + Claude Code) into their Echo cloud. The onboarding "see it instantly know my work" moment.
+ * (Codex + Claude Code + local Claude Desktop Cowork) into their Echo cloud. The onboarding
+ * "see it instantly know my work" moment.
  *
  * Why this lives in the bridge (client-side): the session logs exist ONLY on the user's machine
- * (~/.codex/sessions, ~/.claude/projects). The bridge discovers each session, assembles it into a
+ * (~/.codex/sessions, ~/.claude/projects, Claude Desktop local-agent-mode-sessions). The bridge
+ * discovers each session, assembles it into a
  * text-turn-only `## ` transcript, and feeds it to the shared durable import queue
  * through MCP-owned policy entrypoints. POST /api/extension/mcp/historical-import-sessions
  * creates one import_jobs row per session, then the bridge POSTs each transcript to
@@ -27,8 +29,8 @@ import axios from "axios";
 import { KeyStore, echoConfigDir } from "./keystore.js";
 import { fetchEncryptionConfig } from "./encryption.js";
 import { discoverCodexSessionFiles } from "./codex-session-files.js";
-import { resolveClaudeProjectsDir } from "./local-data-paths.js";
-import { eachJsonLine, walkLocalFiles } from "./local-jsonl.js";
+import { resolveClaudeCoworkSessionsDir, resolveClaudeProjectsDir } from "./local-data-paths.js";
+import { walk, eachLine } from "./report.js";
 const API_BASE = (process.env.ECHO_API_BASE_URL || "https://echo-mem-chrome.vercel.app").replace(/\/$/, "");
 const RATE_MAX = 28; // stay under the import-jobs /run limit of 30 / 60s
 const RATE_WINDOW_MS = 60_000;
@@ -56,8 +58,7 @@ export function assembleCodex(file) {
     let firstTs = null;
     let title = "";
     const turns = [];
-    eachJsonLine(file, (value) => {
-        const o = value;
+    eachLine(file, (o) => {
         if (o && o.type === "session_meta") {
             sessionId = (o.payload && typeof o.payload.id === "string" && o.payload.id) || sessionId;
             cwd = (o.payload && typeof o.payload.cwd === "string" && o.payload.cwd) || cwd;
@@ -103,14 +104,13 @@ export function assembleCodex(file) {
     };
 }
 /** Claude Code <uuid>.jsonl → one session. User/assistant text turns are sent; tool calls/results/thinking stay local. */
-export function assembleClaude(file) {
+export function assembleClaude(file, opts = {}) {
     let sessionId = null;
     let cwd = null;
     let firstTs = null;
     let title = "";
     const turns = [];
-    eachJsonLine(file, (value) => {
-        const o = value;
+    eachLine(file, (o) => {
         if (!cwd && typeof o.cwd === "string")
             cwd = o.cwd;
         if (!sessionId && typeof o.sessionId === "string")
@@ -159,10 +159,12 @@ export function assembleClaude(file) {
     if (!turns.length)
         return null;
     const stat = statSafe(file);
+    const source = opts.source ?? "claude-code";
+    const conversationId = opts.conversationId ?? sessionId ?? sha16(file);
     return {
         filePath: file,
-        source: "claude-code",
-        conversationKey: `claude-code:${sessionId || sha16(file)}`,
+        source,
+        conversationKey: `${source}:${conversationId}`,
         cwd: normalizeCwd(cwd),
         firstTs,
         title: title || "Claude text turns",
@@ -201,7 +203,46 @@ function userCreatedCodexFiles(codexRoot) {
     return userCreatedCodexSessionFiles(codexRoot).map((file) => file.path);
 }
 function userCreatedClaudeFiles(claudeRoot) {
-    return walkLocalFiles(claudeRoot, (candidate) => candidate.endsWith(".jsonl"), (name) => name === "subagents" || name === "workflows").filter(isUserCreatedClaudeSessionFile);
+    return walk(claudeRoot, (candidate) => candidate.endsWith(".jsonl"), (name) => name === "subagents" || name === "workflows").filter(isUserCreatedClaudeSessionFile);
+}
+function coworkConversationId(filePath, root) {
+    const relative = path.relative(root, filePath);
+    if (!relative || relative.startsWith(`..${path.sep}`) || path.isAbsolute(relative))
+        return null;
+    const parts = relative.split(path.sep);
+    for (let index = 0; index + 2 < parts.length; index += 1) {
+        if (/^local_[A-Za-z0-9_-]{1,194}$/.test(parts[index] || "")
+            && parts[index + 1] === ".claude"
+            && parts[index + 2] === "projects") {
+            return parts[index] || null;
+        }
+    }
+    return null;
+}
+function claudeSessionCandidates(opts = {}) {
+    const candidates = [];
+    const claudeRoot = opts.claudeRoot ?? resolveClaudeProjectsDir();
+    if (claudeRoot) {
+        for (const filePath of userCreatedClaudeFiles(claudeRoot)) {
+            candidates.push({ filePath, source: "claude-code" });
+        }
+    }
+    // Supplying an explicit Claude root is an isolated discovery request (tests, diagnostics, or a
+    // moved profile). Callers can still add Cowork roots explicitly. Normal onboarding supplies no
+    // roots, so the platform-default Cowork directory is included automatically.
+    const defaultCoworkRoot = opts.claudeRoot === undefined
+        ? resolveClaudeCoworkSessionsDir()
+        : null;
+    const coworkRoots = opts.coworkRoots ?? (defaultCoworkRoot ? [defaultCoworkRoot] : []);
+    for (const root of coworkRoots) {
+        for (const filePath of userCreatedClaudeFiles(root)) {
+            const conversationId = coworkConversationId(filePath, root);
+            if (!conversationId)
+                continue;
+            candidates.push({ filePath, source: "claude-desktop", conversationId });
+        }
+    }
+    return candidates;
 }
 /** Discover every user-created local session, newest first (by first-turn timestamp). */
 export function discoverSessions(opts = {}) {
@@ -211,17 +252,31 @@ export function discoverSessions(opts = {}) {
         if (s)
             out.push(s);
     }
-    const claudeRoot = opts.claudeRoot ?? resolveClaudeProjectsDir();
-    if (claudeRoot) {
-        for (const f of userCreatedClaudeFiles(claudeRoot)) {
-            const s = assembleClaude(f);
-            if (s)
-                out.push(s);
-        }
+    for (const candidate of claudeSessionCandidates(opts)) {
+        const s = assembleClaude(candidate.filePath, candidate);
+        if (s)
+            out.push(s);
     }
     out.sort((a, b) => String(b.firstTs || "").localeCompare(String(a.firstTs || "")));
     return out;
 }
+function sourceCounts(sessions, pending) {
+    const codexCount = sessions.filter((session) => session.source === "codex").length;
+    const claudeCodeCount = sessions.filter((session) => session.source === "claude-code").length;
+    const coworkCount = sessions.filter((session) => session.source === "claude-desktop").length;
+    const pendingCodex = pending.filter((session) => session.source === "codex").length;
+    const pendingClaudeCode = pending.filter((session) => session.source === "claude-code").length;
+    const pendingCowork = pending.filter((session) => session.source === "claude-desktop").length;
+    return {
+        codexCount,
+        claudeCount: claudeCodeCount + coworkCount,
+        claudeCodeCount,
+        coworkCount,
+        pendingCodex,
+        pendingClaudeCode,
+        pendingCowork,
+    };
+}
 const IMPORT_STATUS_CHUNK_SIZE = 1000;
 function initialJsonObjects(file, maxBytes = 1024 * 1024) {
     let fd;
@@ -281,7 +336,7 @@ function isUserCreatedClaudeSessionFile(file) {
     });
 }
 function fastSessionInfo(file, source) {
-    let conversationKey = `${source === "codex" ? "codex" : "claude-code"}:${sha16(file)}`;
+    let conversationKey = `${source}:${sha16(file)}`;
     let hasTextTurn = false;
     let hasRealKey = false;
     for (const obj of initialJsonObjects(file)) {
@@ -303,11 +358,11 @@ function fastSessionInfo(file, source) {
                 hasTextTurn = true;
             continue;
         }
-        if (source === "claude-code" && typeof obj.sessionId === "string" && obj.sessionId) {
-            conversationKey = `claude-code:${obj.sessionId}`;
+        if (typeof obj.sessionId === "string" && obj.sessionId) {
+            conversationKey = `${source}:${obj.sessionId}`;
             hasRealKey = true;
         }
-        if (source === "claude-code" && (obj.type === "user" || obj.type === "assistant")) {
+        if (obj.type === "user" || obj.type === "assistant") {
             const message = isRecord(obj.message) ? obj.message : {};
             if (hasClaudeText(message.content))
                 hasTextTurn = true;
@@ -332,19 +387,25 @@ function fastSessionEntries(opts = {}) {
             mtimeMs: Math.round(file.mtimeMs),
         });
     }
-    const claudeRoot = opts.claudeRoot ?? resolveClaudeProjectsDir();
-    if (claudeRoot) {
-        for (const filePath of userCreatedClaudeFiles(claudeRoot)) {
-            const stat = statSafe(filePath);
-            const filenameId = path.basename(filePath, path.extname(filePath));
-            const filenameHasStableId = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(filenameId);
-            const info = filenameHasStableId
-                ? { conversationKey: `claude-code:${filenameId.toLowerCase()}`, hasTextTurn: true, hasRealKey: true }
-                : fastSessionInfo(filePath, "claude-code");
-            // Same rule as codex: include on text OR a real session id so large sessions aren't undercounted,
-            // while keeping the key stable (claude-code sessionId appears on every line, so hasRealKey is reliable).
-            if (info.hasTextTurn || info.hasRealKey)
-                out.push({ filePath, source: "claude-code", conversationKey: info.conversationKey, size: stat.size, mtimeMs: stat.mtimeMs });
+    for (const candidate of claudeSessionCandidates(opts)) {
+        const stat = statSafe(candidate.filePath);
+        const filenameId = path.basename(candidate.filePath, path.extname(candidate.filePath));
+        const filenameHasStableId = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(filenameId);
+        const stableId = candidate.conversationId
+            ?? (filenameHasStableId ? filenameId.toLowerCase() : null);
+        const info = stableId
+            ? { conversationKey: `${candidate.source}:${stableId}`, hasTextTurn: true, hasRealKey: true }
+            : fastSessionInfo(candidate.filePath, candidate.source);
+        // Same rule as codex: include on text OR a real session id so large sessions aren't undercounted,
+        // while keeping the key stable. Cowork keys use the outer local_<id>, not the nested CLI UUID.
+        if (info.hasTextTurn || info.hasRealKey) {
+            out.push({
+                filePath: candidate.filePath,
+                source: candidate.source,
+                conversationKey: info.conversationKey,
+                size: stat.size,
+                mtimeMs: stat.mtimeMs,
+            });
         }
     }
     return out;
@@ -508,7 +569,7 @@ function printMigrationEstimate(e, useJson) {
     console.log("");
     console.log("Migration estimate (local metadata only; no transcripts uploaded)");
     console.log(`  Sessions: ${humanNum(e.sessions)} total · ${humanNum(e.pending)} pending · ${humanNum(e.alreadyMigrated)} already processed`);
-    console.log(`  Sources: ${humanNum(e.pendingCodex)} Codex + ${humanNum(e.pendingClaudeCode)} Claude Code pending`);
+    console.log(`  Sources: ${humanNum(e.pendingCodex)} Codex + ${humanNum(e.pendingClaudeCode)} Claude Code + ${humanNum(e.pendingCowork)} Cowork pending`);
     console.log(`  Assembled transcript size: ${humanNum(e.chars.total)} chars ≈ ${humanNum(e.approxInputTokens.total)} input tokens`);
     console.log(`  Size percentiles: p50 ${humanNum(e.chars.p50)} chars · p90 ${humanNum(e.chars.p90)} · p95 ${humanNum(e.chars.p95)} · max ${humanNum(e.chars.max)}`);
     console.log(`  Turns: ${humanNum(e.turns.total)} total · p50 ${humanNum(e.turns.p50)} · p90 ${humanNum(e.turns.p90)} · max ${humanNum(e.turns.max)}`);
@@ -617,7 +678,7 @@ function percentile(nums, p) {
 export function estimateMigration(sessions, pending) {
     const chars = pending.map((s) => s.rawData.length);
     const turns = pending.map((s) => s.turnCount);
-    const pendingCodex = pending.filter((s) => s.source === "codex").length;
+    const counts = sourceCounts(sessions, pending);
     const bucketDefs = [
         { label: "small <=10k chars", min: 0, max: 10_000 },
         { label: "routine 10k-30k", min: 10_000, max: 30_000 },
@@ -642,8 +703,10 @@ export function estimateMigration(sessions, pending) {
         alreadyMigrated: sessions.length - pending.length,
         codex: sessions.filter((s) => s.source === "codex").length,
         claudeCode: sessions.filter((s) => s.source === "claude-code").length,
-        pendingCodex,
-        pendingClaudeCode: pending.length - pendingCodex,
+        cowork: counts.coworkCount,
+        pendingCodex: counts.pendingCodex,
+        pendingClaudeCode: counts.pendingClaudeCode,
+        pendingCowork: counts.pendingCowork,
         chars: {
             total: sum(chars),
             p50: percentile(chars, 0.5),
@@ -725,7 +788,7 @@ export function estimateMigrationEtaFromLengths(lengths, skippedActive = 0, opts
     };
 }
 export function summarizeFastMigratableDiscovery(discovery) {
-    const pendingCodex = discovery.pendingCodex ?? discovery.pending.filter((s) => s.source === "codex").length;
+    const counts = sourceCounts(discovery.sessions, discovery.pending);
     return {
         sessions: discovery.sessions.length,
         pending: discovery.pending.length,
@@ -734,8 +797,11 @@ export function summarizeFastMigratableDiscovery(discovery) {
         skippedActive: discovery.skippedActive,
         codexCount: discovery.codexCount,
         claudeCount: discovery.claudeCount,
-        pendingCodex,
-        pendingClaudeCode: discovery.pendingClaudeCode ?? discovery.pending.length - pendingCodex,
+        claudeCodeCount: discovery.claudeCodeCount ?? counts.claudeCodeCount,
+        coworkCount: discovery.coworkCount ?? counts.coworkCount,
+        pendingCodex: discovery.pendingCodex ?? counts.pendingCodex,
+        pendingClaudeCode: discovery.pendingClaudeCode ?? counts.pendingClaudeCode,
+        pendingCowork: discovery.pendingCowork ?? counts.pendingCowork,
         eta: estimateMigrationEtaFromLengths(discovery.pending.map((s) => s.size), discovery.skippedActive, {
             secondsPerSession: measuredSecondsPerSession() ?? undefined,
         }),
@@ -773,8 +839,7 @@ export function discoverMigratableFastDiscovery(opts = {}) {
         return !e || e.size !== s.size;
     });
     const pending = opts.limit && opts.limit > 0 ? pendingAll.slice(0, opts.limit) : pendingAll;
-    const codexCount = sessions.filter((s) => s.source === "codex").length;
-    const pendingCodex = pending.filter((s) => s.source === "codex").length;
+    const counts = sourceCounts(sessions, pending);
     return {
         sessions,
         pending,
@@ -782,10 +847,7 @@ export function discoverMigratableFastDiscovery(opts = {}) {
         alreadyMigrated: selectable.length - pendingAll.length,
         skippedActive,
         limited: pending.length < pendingAll.length,
-        codexCount,
-        claudeCount: sessions.length - codexCount,
-        pendingCodex,
-        pendingClaudeCode: pending.length - pendingCodex,
+        ...counts,
     };
 }
 export function discoverMigratableSummaryFast(opts = {}) {
@@ -843,8 +905,7 @@ export function discoverMigratableSessions(opts = {}) {
         return !e || e.size !== s.size;
     });
     const pending = opts.limit && opts.limit > 0 ? pendingAll.slice(0, opts.limit) : pendingAll;
-    const codexCount = sessions.filter((s) => s.source === "codex").length;
-    const pendingCodex = pending.filter((s) => s.source === "codex").length;
+    const counts = sourceCounts(sessions, pending);
     return {
         sessions,
         pending,
@@ -852,10 +913,7 @@ export function discoverMigratableSessions(opts = {}) {
         alreadyMigrated: selectableSessions.length - pendingAll.length,
         skippedActive,
         limited: pending.length < pendingAll.length,
-        codexCount,
-        claudeCount: sessions.length - codexCount,
-        pendingCodex,
-        pendingClaudeCode: pending.length - pendingCodex,
+        ...counts,
     };
 }
 /**
@@ -873,11 +931,16 @@ export function discoverPendingSessionsTargeted(processedKeys, opts = {}) {
     const filtered = processedKeys ? applyFastAccountImportStatus(fast, processedKeys, opts) : fast;
     const pending = [];
     for (const entry of filtered.pending) {
-        const s = entry.source === "codex" ? assembleCodex(entry.filePath) : assembleClaude(entry.filePath);
+        const s = entry.source === "codex"
+            ? assembleCodex(entry.filePath)
+            : assembleClaude(entry.filePath, {
+                source: entry.source,
+                conversationId: bareId(entry),
+            });
         if (s)
             pending.push(s);
     }
-    const pendingCodex = pending.filter((s) => s.source === "codex").length;
+    const pendingCounts = sourceCounts(pending, pending);
     return {
         sessions: pending,
         pending,
@@ -887,8 +950,11 @@ export function discoverPendingSessionsTargeted(processedKeys, opts = {}) {
         limited: filtered.limited,
         codexCount: filtered.codexCount,
         claudeCount: filtered.claudeCount,
-        pendingCodex,
-        pendingClaudeCode: pending.length - pendingCodex,
+        claudeCodeCount: filtered.claudeCodeCount,
+        coworkCount: filtered.coworkCount,
+        pendingCodex: pendingCounts.pendingCodex,
+        pendingClaudeCode: pendingCounts.pendingClaudeCode,
+        pendingCowork: pendingCounts.pendingCowork,
         accountChecked: filtered.accountChecked,
         accountCheckFailed: filtered.accountCheckFailed,
         accountCheckUnavailable: filtered.accountCheckUnavailable,
@@ -901,7 +967,7 @@ export function applyAccountImportStatus(discovery, processedKeys, opts = {}) {
     const skippedActive = discovery.sessions.length - selectableSessions.length;
     const pendingAll = selectableSessions.filter((s) => !processedKeys.has(s.conversationKey));
     const pending = opts.limit && opts.limit > 0 ? pendingAll.slice(0, opts.limit) : pendingAll;
-    const pendingCodex = pending.filter((s) => s.source === "codex").length;
+    const counts = sourceCounts(discovery.sessions, pending);
     return {
         ...discovery,
         pending,
@@ -909,8 +975,9 @@ export function applyAccountImportStatus(discovery, processedKeys, opts = {}) {
         alreadyMigrated: selectableSessions.length - pendingAll.length,
         skippedActive,
         limited: pending.length < pendingAll.length,
-        pendingCodex,
-        pendingClaudeCode: pending.length - pendingCodex,
+        pendingCodex: counts.pendingCodex,
+        pendingClaudeCode: counts.pendingClaudeCode,
+        pendingCowork: counts.pendingCowork,
         accountChecked: true,
         accountCheckFailed: false,
         accountCheckUnavailable: false,
@@ -923,7 +990,7 @@ export function applyFastAccountImportStatus(discovery, processedKeys, opts = {}
     const skippedActive = discovery.sessions.length - selectableSessions.length;
     const pendingAll = selectableSessions.filter((s) => !processedKeys.has(s.conversationKey));
     const pending = opts.limit && opts.limit > 0 ? pendingAll.slice(0, opts.limit) : pendingAll;
-    const pendingCodex = pending.filter((s) => s.source === "codex").length;
+    const counts = sourceCounts(discovery.sessions, pending);
     return {
         ...discovery,
         pending,
@@ -931,8 +998,9 @@ export function applyFastAccountImportStatus(discovery, processedKeys, opts = {}
         alreadyMigrated: selectableSessions.length - pendingAll.length,
         skippedActive,
         limited: pending.length < pendingAll.length,
-        pendingCodex,
-        pendingClaudeCode: pending.length - pendingCodex,
+        pendingCodex: counts.pendingCodex,
+        pendingClaudeCode: counts.pendingClaudeCode,
+        pendingCowork: counts.pendingCowork,
         accountChecked: true,
         accountCheckFailed: false,
         accountCheckUnavailable: false,
@@ -1238,10 +1306,10 @@ export async function cmdMigrate(flags) {
             }
         }
     }
-    const { sessions, pending, pendingTotal, alreadyMigrated, skippedActive, limited, codexCount, claudeCount, accountChecked, accountCheckFailed, accountCheckUnavailable } = discovery;
+    const { sessions, pending, pendingTotal, alreadyMigrated, skippedActive, limited, codexCount, claudeCodeCount, coworkCount, accountChecked, accountCheckFailed, accountCheckUnavailable } = discovery;
     const estimateSessions = includeActive ? sessions : sessions.filter((s) => !isActiveMigrationSession(s));
     if (!sessions.length) {
-        console.log("No local Codex/Claude Code sessions found to migrate.");
+        console.log("No local Codex, Claude Code, or Cowork sessions found to migrate.");
         return;
     }
     if (flags.estimate === true && flags.json === true) {
@@ -1254,7 +1322,7 @@ export async function cmdMigrate(flags) {
     const pendingText = limited
         ? `${c.bold(String(pending.length))} of ${c.bold(String(pendingTotal))} ${pendingName} selected`
         : `${c.bold(String(pending.length))} ${pendingName} to import`;
-    console.log(`Found ${c.bold(String(sessions.length))} sessions (${codexCount} Codex + ${claudeCount} Claude Code) · ${pendingText}` +
+    console.log(`Found ${c.bold(String(sessions.length))} sessions (${codexCount} Codex + ${claudeCodeCount} Claude Code + ${coworkCount} Cowork) · ${pendingText}` +
         (alreadyMigrated ? c.dim(`, ${alreadyMigrated} already migrated`) : "") +
         (skippedActive ? c.dim(`, ${skippedActive} active skipped`) : ""));
     if (accountChecked)
@@ -1279,7 +1347,8 @@ export async function cmdMigrate(flags) {
     if (flags["dry-run"] === true) {
         console.log(c.dim("\n--dry-run: discovered + assembled only, nothing sent.\n"));
         for (const s of pending.slice(0, 50)) {
-            console.log(`  ${s.source === "codex" ? "codex " : "claude"} ${(s.firstTs || "").slice(0, 10)}  ${humanNum(s.rawData.length)} chars  ${s.turnCount} text turns`);
+            const sourceLabel = s.source === "codex" ? "codex " : s.source === "claude-desktop" ? "cowork" : "claude";
+            console.log(`  ${sourceLabel} ${(s.firstTs || "").slice(0, 10)}  ${humanNum(s.rawData.length)} chars  ${s.turnCount} text turns`);
         }
         if (pending.length > 50)
             console.log(c.dim(`  … and ${pending.length - 50} more`));
@@ -1304,7 +1373,8 @@ export async function cmdMigrate(flags) {
             metricsFile,
             selection,
             onProgress: (ev) => {
-                const tag = `${c.dim(`[${ev.index}/${ev.total}]`)} ${ev.session.source === "codex" ? "codex " : "claude"} ${(ev.session.firstTs || "").slice(0, 10)}`;
+                const sourceLabel = ev.session.source === "codex" ? "codex " : ev.session.source === "claude-desktop" ? "cowork" : "claude";
+                const tag = `${c.dim(`[${ev.index}/${ev.total}]`)} ${sourceLabel} ${(ev.session.firstTs || "").slice(0, 10)}`;
                 if (ev.error) {
                     console.log(`${tag}  ${c.red("✗ failed")} ${c.dim(truncate(ev.error, 60))}` + (ev.durationMs ? c.dim(`  ${humanDuration(ev.durationMs)}`) : ""));
                     return;