ccc-notifier 0.6.3 → 0.8.0

package/dist/{sweep-CONNNBK7.js → chunk-C7QOYVGT.js}

@@ -1,38 +1,39 @@
 #!/usr/bin/env node
 import {
-  listCodexRollouts
-} from "./chunk-HLJAJS2W.js";
-import {
-  codexHome
-} from "./chunk-HTYUYKFW.js";
-import {
-  collectSubagentUsage
-} from "./chunk-OYD6H3ZZ.js";
-import {
+  addCountedCalls,
+  aggregateNewTurn,
+  anyOf,
+  callFingerprints,
+  claudeTranscriptRoots,
   extractBucket,
   getUsdJpy,
+  listCodexRollouts,
   promptCandidate,
-  splitIntoCodexTurnDrafts
-} from "./chunk-D4D76RGQ.js";
+  setCountedCalls,
+  splitIntoCodexTurnDrafts,
+  surfaceForClaudePath
+} from "./chunk-GAOGTALW.js";
 import {
+  codexHome,
   computeCost,
   loadPriceTable
-} from "./chunk-6HTETN26.js";
+} from "./chunk-Q45AAPJY.js";
 import {
   writeDashboardHtml
-} from "./chunk-PYU7CAK2.js";
-import "./chunk-DGXUSPS4.js";
-import {
-  formatJPY,
-  formatUSD,
-  modelDisplayName
-} from "./chunk-J5QAYTFE.js";
+} from "./chunk-DSTGXYSY.js";
 import {
   invalidateCanonicalDashboards,
   makeFullDashboardState,
-  waitForDataLock,
   writeFullDashboardStateAtomic
-} from "./chunk-27SJELD2.js";
+} from "./chunk-3M5UQK76.js";
+import {
+  waitForDataLock
+} from "./chunk-PXMXEFM7.js";
+import {
+  formatJPY,
+  formatUSD,
+  modelDisplayName
+} from "./chunk-XOGYLFX3.js";
 import {
   appendTurn,
   loadCursor,
@@ -44,13 +45,146 @@ import {
   resetHistoryAndCursors,
   sanitizeCursor,
   saveCursor
-} from "./chunk-OOAC5ULQ.js";
+} from "./chunk-WONMZ466.js";
 
 // src/sweep.ts
 import { readFile } from "fs/promises";
 import { promises as fsp } from "fs";
+import { join as join2 } from "path";
+
+// src/subagents.ts
+import { promises as fs } from "fs";
 import { join } from "path";
-import { homedir } from "os";
+var MAX_AGENT_FILES = 200;
+function emptyBuckets() {
+  return { input: 0, output: 0, cacheWrite5m: 0, cacheWrite1h: 0, cacheRead: 0 };
+}
+function addToModel(target, model, b) {
+  const cur = target[model] ?? emptyBuckets();
+  cur.input += b.input;
+  cur.output += b.output;
+  cur.cacheWrite5m += b.cacheWrite5m;
+  cur.cacheWrite1h += b.cacheWrite1h;
+  cur.cacheRead += b.cacheRead;
+  target[model] = cur;
+}
+function mergeUsage(target, src) {
+  for (const [model, b] of Object.entries(src)) addToModel(target, model, b);
+}
+function sameCursor(a, b) {
+  return a !== null && a.offset === b.offset && a.lastUuid === b.lastUuid && a.lastTs === b.lastTs && a.seenMessageKeys.length === b.seenMessageKeys.length && a.seenMessageKeys.every((key, i) => key === b.seenMessageKeys[i]);
+}
+function subagentsDirOf(mainTranscriptPath) {
+  const base = mainTranscriptPath.endsWith(".jsonl") ? mainTranscriptPath.slice(0, -".jsonl".length) : mainTranscriptPath;
+  return join(base, "subagents");
+}
+async function listAgentFiles(dir, entries, includeAllFiles) {
+  const files = entries.filter((e) => e.isFile() && e.name.startsWith("agent-") && e.name.endsWith(".jsonl")).map((e) => join(dir, e.name));
+  if (includeAllFiles || files.length <= MAX_AGENT_FILES) return files;
+  const withMtime = [];
+  for (const p of files) {
+    let mtime = 0;
+    try {
+      mtime = (await fs.stat(p)).mtimeMs;
+    } catch {
+      mtime = 0;
+    }
+    withMtime.push({ path: p, mtime });
+  }
+  withMtime.sort((a, b) => b.mtime - a.mtime);
+  return withMtime.slice(0, MAX_AGENT_FILES).map((x) => x.path);
+}
+async function collectSubagentUsage(mainTranscriptPath, opts = {}) {
+  const dir = subagentsDirOf(mainTranscriptPath);
+  let entries;
+  try {
+    entries = await fs.readdir(dir, { withFileTypes: true });
+  } catch (err) {
+    if (opts.strictRead && err.code !== "ENOENT") throw err;
+    return null;
+  }
+  const files = await listAgentFiles(dir, entries, opts.includeAllFiles === true);
+  const perModel = {};
+  let apiCalls = 0;
+  let agentFiles = 0;
+  const newCursors = [];
+  const groups = [];
+  let sessionId = "";
+  let cwd = null;
+  let gitBranch = null;
+  let lastTs = null;
+  const readCursor = opts.readCursor ?? ((path) => sanitizeCursor(loadCursor(path)));
+  const excluded = /* @__PURE__ */ new Set();
+  const excludeFilter = anyOf([excluded, opts.excludeMessageKeys]);
+  if (!opts.ignoreCursors) {
+    for (const filePath of files) {
+      const prior = readCursor(filePath);
+      for (const key of prior?.seenMessageKeys ?? []) excluded.add(key);
+    }
+  }
+  for (const filePath of files) {
+    try {
+      if (opts.strictRead) {
+        const file = await fs.open(filePath, "r");
+        await file.close();
+      }
+      const cursor = opts.ignoreCursors ? null : readCursor(filePath);
+      const recovery = cursor === null && opts.recovery !== void 0 ? opts.recovery() : void 0;
+      const agg = await aggregateNewTurn(filePath, cursor, {
+        excludeMessageKeys: recovery?.excludeMessageKeys === void 0 ? excludeFilter : anyOf([excludeFilter, recovery.excludeMessageKeys]),
+        minTimestampMs: opts.minTimestampMs ?? recovery?.minTimestampMs ?? null,
+        returnEmpty: true
+      });
+      if (agg === null) continue;
+      if (!sameCursor(cursor, agg.newCursor)) {
+        newCursors.push({ path: filePath, cursor: agg.newCursor });
+      }
+      for (const key of agg.messageKeys) excluded.add(key);
+      if (agg.apiCalls === 0) continue;
+      mergeUsage(perModel, agg.main);
+      mergeUsage(perModel, agg.sidechain);
+      apiCalls += agg.apiCalls;
+      agentFiles += 1;
+      const groupUsage = {};
+      mergeUsage(groupUsage, agg.main);
+      mergeUsage(groupUsage, agg.sidechain);
+      groups.push({
+        perModel: groupUsage,
+        apiCalls: agg.apiCalls,
+        messageKeys: agg.messageKeys,
+        firstTs: agg.firstTs,
+        lastTs: agg.lastTs
+      });
+      if (agg.sessionId) sessionId = agg.sessionId;
+      if (agg.cwd !== null) cwd = agg.cwd;
+      if (agg.gitBranch !== null) gitBranch = agg.gitBranch;
+      if (agg.lastTs !== null && (lastTs === null || agg.lastTs > lastTs)) lastTs = agg.lastTs;
+    } catch (err) {
+      if (opts.strictRead) throw err;
+      logError("subagents:file", err);
+    }
+  }
+  return { perModel, apiCalls, agentFiles, newCursors, groups, sessionId, cwd, gitBranch, lastTs };
+}
+
+// src/codex/originator.ts
+var ORIGINATOR_TO_SURFACE = {
+  "codex-tui": "cli",
+  "codex_cli_rs": "cli",
+  "codex_exec": "cli",
+  "Codex Desktop": "desktop",
+  "codex_desktop": "desktop",
+  "codex_work_desktop": "desktop",
+  "codex_vscode": "vscode",
+  "Claude Code": "claude-code",
+  "codex-chrome-extension-sidepanel": "chrome-extension"
+};
+function normalizeCodexOriginator(originator) {
+  if (typeof originator !== "string" || originator.length === 0) return "other";
+  return ORIGINATOR_TO_SURFACE[originator] ?? "other";
+}
+
+// src/sweep.ts
 var NEWLINE = 10;
 var MAX_SEEN_KEYS = 500;
 var SYNTHETIC_MODEL = "<synthetic>";
@@ -97,11 +231,11 @@ function isRecord(v) {
 function strOrNull(v) {
   return typeof v === "string" ? v : null;
 }
-function emptyBuckets() {
+function emptyBuckets2() {
   return { input: 0, output: 0, cacheWrite5m: 0, cacheWrite1h: 0, cacheRead: 0 };
 }
-function addToModel(target, model, b) {
-  const cur = target[model] ?? emptyBuckets();
+function addToModel2(target, model, b) {
+  const cur = target[model] ?? emptyBuckets2();
   cur.input += b.input;
   cur.output += b.output;
   cur.cacheWrite5m += b.cacheWrite5m;
@@ -110,7 +244,7 @@ function addToModel(target, model, b) {
   target[model] = cur;
 }
 function sumBuckets(usage) {
-  const total = emptyBuckets();
+  const total = emptyBuckets2();
   for (const b of Object.values(usage)) {
     total.input += b.input;
     total.output += b.output;
@@ -151,11 +285,11 @@ async function readAll(path) {
     return null;
   }
 }
-async function splitIntoTurnDrafts(transcriptPath, cursor) {
+async function splitIntoTurnDrafts(transcriptPath, cursor, opts = {}) {
   const buffer = await readAll(transcriptPath);
   if (buffer === null) {
     const nc = cursor ?? { offset: 0, lastUuid: null, lastTs: null, seenMessageKeys: [] };
-    return { drafts: [], newCursor: nc, messageKeys: [] };
+    return { drafts: [], newCursor: nc, messageKeys: [], unreadable: true };
   }
   const fileSize = buffer.length;
   let startOffset;
@@ -167,7 +301,7 @@ async function splitIntoTurnDrafts(transcriptPath, cursor) {
     startOffset = 0;
     rescan = cursor !== null;
   }
-  const priorSeen = new Set(cursor?.seenMessageKeys ?? []);
+  const priorSeen = anyOf([new Set(cursor?.seenMessageKeys ?? []), opts.excludeMessageKeys]);
   const tsFloor = cursor?.lastTs ?? null;
   const drafts = [];
   const runSeen = /* @__PURE__ */ new Set();
@@ -179,17 +313,20 @@ async function splitIntoTurnDrafts(transcriptPath, cursor) {
     if (cur.pending.size === 0) return;
     const mainPerModel = {};
     const sidechainPerModel = {};
+    const draftKeys = [];
     for (const [key, pm] of cur.pending) {
       runSeen.add(key);
       newKeys.push(key);
-      if (pm.isSidechain) addToModel(sidechainPerModel, pm.model, pm.bucket);
-      else addToModel(mainPerModel, pm.model, pm.bucket);
+      draftKeys.push(key);
+      if (pm.isSidechain) addToModel2(sidechainPerModel, pm.model, pm.bucket);
+      else addToModel2(mainPerModel, pm.model, pm.bucket);
     }
     drafts.push({
       prompt: cur.prompt ?? "",
       mainPerModel,
       sidechainPerModel,
       apiCalls: cur.pending.size,
+      messageKeys: draftKeys,
       firstTs: cur.firstTs,
       lastTs: cur.lastTs,
       cwd: cur.cwd,
@@ -277,7 +414,7 @@ async function splitIntoTurnDrafts(transcriptPath, cursor) {
   };
   return { drafts, newCursor, messageKeys: newKeys };
 }
-function draftToRecord(draft, ts, table, fx) {
+function draftToRecord(draft, ts, table, fx, surface) {
   const breakdown = computeCost(draft.mainPerModel, draft.sidechainPerModel, table);
   const sidechainHasModels = Object.keys(draft.sidechainPerModel).length > 0;
   const rec = {
@@ -297,9 +434,11 @@ function draftToRecord(draft, ts, table, fx) {
     fxRate: fx.rate,
     fxSource: fx.source,
     prompt: draft.prompt,
-    ingest: "sweep"
+    ingest: "sweep",
+    surface
   };
   if (breakdown.unknownModels.length > 0) rec.unknownModels = breakdown.unknownModels;
+  setCountedCalls(rec, callFingerprints(draft.messageKeys));
   return rec;
 }
 function mergeUnknownModels(rec, extra) {
@@ -308,11 +447,73 @@ function mergeUnknownModels(rec, extra) {
   for (const m of extra) if (!merged.includes(m)) merged.push(m);
   rec.unknownModels = merged;
 }
-async function processTranscriptLocked(mainPath, table, fx, daysCutoff, dryRun, summary, opts = {}) {
+function attachSubagentGroups(records, sa, table, fx, surface, ingest) {
+  const parentRecords = [...records];
+  let addedUSD = 0;
+  for (const group of sa.groups) {
+    const saBreakdown = computeCost(group.perModel, {}, table);
+    addedUSD += saBreakdown.usd;
+    const saBlock = {
+      costUSD: saBreakdown.usd,
+      costByModel: { ...saBreakdown.byModel },
+      tokens: sumBuckets(group.perModel),
+      apiCalls: group.apiCalls,
+      agentFiles: 1
+    };
+    const groupMs = group.lastTs === null ? NaN : Date.parse(group.lastTs);
+    let target;
+    if (Number.isFinite(groupMs)) {
+      target = parentRecords.find((rec) => {
+        const recMs = Date.parse(rec.ts);
+        return Number.isFinite(recMs) && recMs >= groupMs;
+      });
+    } else {
+      target = parentRecords[parentRecords.length - 1];
+    }
+    if (target === void 0) {
+      target = {
+        schemaVersion: 1,
+        ts: group.lastTs ?? sa.lastTs ?? (/* @__PURE__ */ new Date()).toISOString(),
+        sessionId: sa.sessionId,
+        project: sa.cwd ?? "",
+        gitBranch: sa.gitBranch,
+        models: collectModels(group.perModel, {}),
+        tokens: emptyBuckets2(),
+        sidechainTokens: null,
+        apiCalls: 0,
+        costUSD: 0,
+        costByModel: {},
+        costJPY: 0,
+        fxRate: fx.rate,
+        fxSource: fx.source,
+        prompt: "",
+        ingest,
+        surface
+      };
+      records.push(target);
+    }
+    addCountedCalls(target, callFingerprints(group.messageKeys));
+    if (target.subagents === void 0) {
+      target.subagents = saBlock;
+    } else {
+      target.subagents.costUSD += saBlock.costUSD;
+      target.subagents.apiCalls += saBlock.apiCalls;
+      target.subagents.agentFiles += 1;
+      addToBuckets(target.subagents.tokens, saBlock.tokens);
+      for (const [model, usd] of Object.entries(saBlock.costByModel)) {
+        target.subagents.costByModel[model] = (target.subagents.costByModel[model] ?? 0) + usd;
+      }
+    }
+    mergeUnknownModels(target, saBreakdown.unknownModels);
+  }
+  return addedUSD;
+}
+async function processTranscriptLocked(mainPath, table, fx, daysCutoff, dryRun, summary, roots, opts = {}) {
   if (opts.strictRead) {
     const file = await fsp.open(mainPath, "r");
     await file.close();
   }
+  const surface = surfaceForClaudePath(mainPath, roots);
   const cursor = opts.ignoreCursors ? null : sanitizeCursor(loadCursor(mainPath));
   const { drafts, newCursor, messageKeys } = await splitIntoTurnDrafts(mainPath, cursor);
   const records = [];
@@ -322,7 +523,7 @@ async function processTranscriptLocked(mainPath, table, fx, daysCutoff, dryRun,
       const tsMs = Date.parse(ts);
       if (!Number.isFinite(tsMs) || tsMs < daysCutoff) continue;
     }
-    records.push(draftToRecord(draft, ts, table, fx));
+    records.push(draftToRecord(draft, ts, table, fx, surface));
   }
   let sa = null;
   try {
@@ -338,63 +539,8 @@ async function processTranscriptLocked(mainPath, table, fx, daysCutoff, dryRun,
     logError("sweep:subagents", err);
     sa = null;
   }
-  const saHasUsage = sa !== null && sa.apiCalls > 0;
-  if (saHasUsage) {
-    const parentRecords = [...records];
-    for (const group of sa.groups) {
-      const saBreakdown = computeCost(group.perModel, {}, table);
-      summary.subagentsUSD += saBreakdown.usd;
-      const saBlock = {
-        costUSD: saBreakdown.usd,
-        costByModel: { ...saBreakdown.byModel },
-        tokens: sumBuckets(group.perModel),
-        apiCalls: group.apiCalls,
-        agentFiles: 1
-      };
-      const groupMs = group.lastTs === null ? NaN : Date.parse(group.lastTs);
-      let target;
-      if (Number.isFinite(groupMs)) {
-        target = parentRecords.find((rec) => {
-          const recMs = Date.parse(rec.ts);
-          return Number.isFinite(recMs) && recMs >= groupMs;
-        });
-      } else {
-        target = parentRecords[parentRecords.length - 1];
-      }
-      if (target === void 0) {
-        target = {
-          schemaVersion: 1,
-          ts: group.lastTs ?? sa.lastTs ?? (/* @__PURE__ */ new Date()).toISOString(),
-          sessionId: sa.sessionId,
-          project: sa.cwd ?? "",
-          gitBranch: sa.gitBranch,
-          models: collectModels(group.perModel, {}),
-          tokens: emptyBuckets(),
-          sidechainTokens: null,
-          apiCalls: 0,
-          costUSD: 0,
-          costByModel: {},
-          costJPY: 0,
-          fxRate: fx.rate,
-          fxSource: fx.source,
-          prompt: "",
-          ingest: "sweep"
-        };
-        records.push(target);
-      }
-      if (target.subagents === void 0) {
-        target.subagents = saBlock;
-      } else {
-        target.subagents.costUSD += saBlock.costUSD;
-        target.subagents.apiCalls += saBlock.apiCalls;
-        target.subagents.agentFiles += 1;
-        addToBuckets(target.subagents.tokens, saBlock.tokens);
-        for (const [model, usd] of Object.entries(saBlock.costByModel)) {
-          target.subagents.costByModel[model] = (target.subagents.costByModel[model] ?? 0) + usd;
-        }
-      }
-      mergeUnknownModels(target, saBreakdown.unknownModels);
-    }
+  if (sa !== null && sa.apiCalls > 0) {
+    summary.subagentsUSD += attachSubagentGroups(records, sa, table, fx, surface, "sweep");
     summary.agentFiles += sa.agentFiles;
   }
   for (const rec of records) {
@@ -436,9 +582,47 @@ function codexDraftToRecord(draft, ts, table, fx) {
     fxSource: fx.source,
     prompt: draft.agg.prompt ?? "",
     ingest: "sweep",
-    source: "codex"
+    source: "codex",
+    surface: normalizeCodexOriginator(draft.agg.originator)
   };
+  if (typeof draft.agg.originator === "string") rec.originator = draft.agg.originator;
   if (breakdown.unknownModels.length > 0) rec.unknownModels = breakdown.unknownModels;
+  setCountedCalls(rec, draft.agg.codexEventKeys ?? []);
+  return rec;
+}
+function codexChildDraftToRecord(draft, ts, table, fx, ingest) {
+  const main = draft.agg.main;
+  const breakdown = computeCost(main, {}, table);
+  const rec = {
+    schemaVersion: 1,
+    ts,
+    sessionId: draft.agg.sessionId,
+    project: draft.agg.cwd ?? "",
+    gitBranch: null,
+    models: collectModels(main, {}),
+    tokens: emptyBuckets2(),
+    sidechainTokens: null,
+    apiCalls: 0,
+    costUSD: 0,
+    costByModel: {},
+    costJPY: 0,
+    fxRate: fx.rate,
+    fxSource: fx.source,
+    prompt: "",
+    ingest,
+    source: "codex",
+    surface: normalizeCodexOriginator(draft.agg.originator),
+    subagents: {
+      costUSD: breakdown.usd,
+      costByModel: { ...breakdown.byModel },
+      tokens: sumBuckets(main),
+      apiCalls: draft.agg.apiCalls,
+      agentFiles: 1
+    }
+  };
+  if (typeof draft.agg.originator === "string") rec.originator = draft.agg.originator;
+  if (breakdown.unknownModels.length > 0) rec.unknownModels = breakdown.unknownModels;
+  setCountedCalls(rec, draft.agg.codexEventKeys ?? []);
   return rec;
 }
 async function processCodexRolloutLocked(rolloutPath, table, fx, daysCutoff, dryRun, summary, opts = {}) {
@@ -449,21 +633,27 @@ async function processCodexRolloutLocked(rolloutPath, table, fx, daysCutoff, dry
   const cursor = opts.ignoreCursors ? null : sanitizeCursor(loadCursor(rolloutPath));
   const drafts = await splitIntoCodexTurnDrafts(rolloutPath, cursor);
   if (drafts === null || drafts.length === 0) return;
-  if (drafts[0].isSubagentRollout) return;
+  const isChild = drafts[0].isSubagentRollout;
+  const isForkedChild = isChild && drafts[0].isForkedRollout;
   const records = [];
-  for (const draft of drafts) {
-    const ts = draft.endTs ?? (/* @__PURE__ */ new Date()).toISOString();
-    if (daysCutoff !== null) {
-      const tsMs = Date.parse(ts);
-      if (!Number.isFinite(tsMs) || tsMs < daysCutoff) continue;
+  if (!isForkedChild) {
+    for (const draft of drafts) {
+      const ts = draft.endTs ?? (/* @__PURE__ */ new Date()).toISOString();
+      if (daysCutoff !== null) {
+        const tsMs = Date.parse(ts);
+        if (!Number.isFinite(tsMs) || tsMs < daysCutoff) continue;
+      }
+      records.push(
+        isChild ? codexChildDraftToRecord(draft, ts, table, fx, "sweep") : codexDraftToRecord(draft, ts, table, fx)
+      );
     }
-    records.push(codexDraftToRecord(draft, ts, table, fx));
   }
   for (const rec of records) {
     summary.newRecords += 1;
     summary.totalUSD += rec.costUSD;
     summary.codexRecords += 1;
     summary.codexUSD += rec.costUSD;
+    summary.subagentsUSD += rec.subagents?.costUSD ?? 0;
     if (rec.costByModel) {
       for (const [m, c] of Object.entries(rec.costByModel)) {
         summary.byModel[m] = (summary.byModel[m] ?? 0) + c;
@@ -490,7 +680,7 @@ async function discoverCodexSweepSource() {
   if (!homeStat.isDirectory()) {
     return { discovery: { rollouts: [], unreadableDirs: 1 } };
   }
-  const sessionsRoot = join(home, "sessions");
+  const sessionsRoot = join2(home, "sessions");
   try {
     await fsp.lstat(sessionsRoot);
   } catch (err) {
@@ -499,10 +689,6 @@ async function discoverCodexSweepSource() {
   }
   return { discovery: await listCodexRollouts(sessionsRoot) };
 }
-function projectsRoot(override) {
-  if (override) return override;
-  return process.env.CCCN_CLAUDE_PROJECTS || join(homedir(), ".claude", "projects");
-}
 function parseSweepFlags(argv) {
   const flags = {
     dryRun: false,
@@ -532,7 +718,7 @@ function parseSweepFlags(argv) {
 async function listProjectDirs(root) {
   try {
     const entries = await fsp.readdir(root, { withFileTypes: true });
-    return entries.filter((e) => e.isDirectory()).map((e) => join(root, e.name));
+    return entries.filter((e) => e.isDirectory()).map((e) => join2(root, e.name));
   } catch {
     return null;
   }
@@ -540,7 +726,7 @@ async function listProjectDirs(root) {
 async function listTranscriptsStrict(projectDir) {
   try {
     const entries = await fsp.readdir(projectDir, { withFileTypes: true });
-    return entries.filter((e) => e.isFile() && e.name.endsWith(".jsonl")).map((e) => join(projectDir, e.name));
+    return entries.filter((e) => e.isFile() && e.name.endsWith(".jsonl")).map((e) => join2(projectDir, e.name));
   } catch {
     return null;
   }
@@ -587,7 +773,7 @@ function reportSourceFailure(summary, dryRun, scope, err, count = 1) {
   }
   logError(scope, err);
 }
-async function scanAllSources(projectDirs, codexSource, table, fx, daysCutoff, dryRun, summary, progress) {
+async function scanAllSources(projectDirs, codexSource, table, fx, daysCutoff, dryRun, summary, progress, claudeRoots) {
   const codexRollouts = codexSource?.discovery.rollouts.length ?? 0;
   progress({
     type: "scan-start",
@@ -611,7 +797,7 @@ async function scanAllSources(projectDirs, codexSource, table, fx, daysCutoff, d
   for (const mainPath of transcriptPaths) {
     summary.transcripts += 1;
     try {
-      await processTranscriptLocked(mainPath, table, fx, daysCutoff, dryRun, summary, {
+      await processTranscriptLocked(mainPath, table, fx, daysCutoff, dryRun, summary, claudeRoots, {
         ignoreCursors: true,
         strictRead: true
       });
@@ -672,16 +858,29 @@ async function runSweep(argv, deps = {}) {
   }
   const flags = parsed.flags;
   const progress = createSweepProgressReporter();
-  const root = projectsRoot(flags.projects);
-  const projectDirs = await listProjectDirs(root);
+  const claudeRoots = await claudeTranscriptRoots({ projectsOverride: flags.projects });
+  const cliRoot = claudeRoots.find((r) => r.surface === "cli");
+  const cliProjectDirs = await listProjectDirs(cliRoot.path);
   const codexSource = await discoverCodexSweepSource();
-  if (projectDirs === null) {
-    if (codexSource === null || codexSource.discovery.unreadableDirs > 0) {
-      console.log(`\u8D70\u67FB\u30EB\u30FC\u30C8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: ${root}`);
+  const desktopProjectDirs = [];
+  for (const root of claudeRoots) {
+    if (root.surface !== "desktop") continue;
+    const dirs = await listProjectDirs(root.path);
+    if (dirs !== null) desktopProjectDirs.push(...dirs);
+  }
+  if (cliProjectDirs === null) {
+    const codexUsable = codexSource !== null && codexSource.discovery.unreadableDirs === 0;
+    if (!codexUsable && desktopProjectDirs.length === 0) {
+      console.log(`\u8D70\u67FB\u30EB\u30FC\u30C8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: ${cliRoot.path}`);
       return 1;
     }
-    console.log(`Claude \u306E\u8D70\u67FB\u30EB\u30FC\u30C8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: ${root}(Codex \u306E\u307F\u8D70\u67FB\u3057\u307E\u3059)`);
+    const remaining = [
+      desktopProjectDirs.length > 0 ? "\u30C7\u30B9\u30AF\u30C8\u30C3\u30D7" : null,
+      codexUsable ? "Codex" : null
+    ].filter((v) => v !== null);
+    console.log(`Claude CLI \u306E\u8D70\u67FB\u30EB\u30FC\u30C8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: ${cliRoot.path}(${remaining.join(" / ")} \u306E\u307F\u8D70\u67FB\u3057\u307E\u3059)`);
   }
+  const projectDirs = cliProjectDirs === null && desktopProjectDirs.length === 0 ? null : [...cliProjectDirs ?? [], ...desktopProjectDirs];
   progress({ type: "preparing", dryRun: flags.dryRun });
   const cfg = flags.dryRun ? readConfigReadOnly((err) => {
     const message = err instanceof Error ? err.message : String(err);
@@ -708,7 +907,7 @@ async function runSweep(argv, deps = {}) {
   const lockProvider = deps.lockProvider ?? (() => waitForDataLock());
   if (flags.dryRun) {
     try {
-      await scanAllSources(projectDirs, codexSource, table, fx, daysCutoff, true, summary, progress);
+      await scanAllSources(projectDirs, codexSource, table, fx, daysCutoff, true, summary, progress, claudeRoots);
     } catch (err) {
       reportSourceFailure(summary, true, "sweep:dry-run", err);
     }
@@ -732,7 +931,7 @@ async function runSweep(argv, deps = {}) {
   try {
     invalidateCanonicalDashboards();
     resetHistoryAndCursors();
-    await scanAllSources(projectDirs, codexSource, table, fx, daysCutoff, false, summary, progress);
+    await scanAllSources(projectDirs, codexSource, table, fx, daysCutoff, false, summary, progress, claudeRoots);
     try {
       invalidateCanonicalDashboards();
       if (summary.sourceFailures === 0 && cfg.dashboard.autoRegenerate) {
@@ -789,7 +988,12 @@ async function runSweep(argv, deps = {}) {
   console.log("\u5C65\u6B74\u3068\u53D6\u308A\u8FBC\u307F\u4F4D\u7F6E\u3092\u5143JSONL\u304B\u3089\u5168\u518D\u751F\u6210\u3057\u307E\u3057\u305F");
   return 0;
 }
+
 export {
-  runSweep,
-  splitIntoTurnDrafts
+  normalizeCodexOriginator,
+  collectSubagentUsage,
+  splitIntoTurnDrafts,
+  attachSubagentGroups,
+  codexChildDraftToRecord,
+  runSweep
 };