zozul-cli 0.3.6 → 0.3.8

package/src/parser/watcher.ts

@@ -30,9 +30,9 @@ export async function watchSessionFiles(opts: WatcherOptions): Promise<() => voi
   if (catchUp) {
     const files = discoverSessionFiles();
     let caught = 0;
-    for (const { filePath, projectPath } of files) {
+    for (const { filePath, projectPath, parentSessionId, agentType } of files) {
       try {
-        await ingestSessionFile(repo, filePath, projectPath);
+        await ingestSessionFile(repo, filePath, projectPath, { parentSessionId, agentType });
         caught++;
       } catch {
         // Ignore parse errors on individual files
@@ -61,7 +61,11 @@ export async function watchSessionFiles(opts: WatcherOptions): Promise<() => voi
       timers.delete(filePath);
       try {
         const projectPath = decodeProjectPath(filePath);
-        await ingestSessionFile(repo, filePath, projectPath ?? undefined);
+        const subagentInfo = extractSubagentInfo(filePath);
+        await ingestSessionFile(repo, filePath, projectPath ?? undefined, {
+          parentSessionId: subagentInfo?.parentSessionId,
+          agentType: subagentInfo?.agentType,
+        });
         if (verbose) {
           process.stderr.write(`[watcher] ingested: ${filePath}\n`);
         }
@@ -103,14 +107,35 @@ export async function watchSessionFiles(opts: WatcherOptions): Promise<() => voi
   };
 }
 
+/**
+ * Extract parent session ID and agent type from a subagent file path.
+ * Path format: .../<parent-uuid>/subagents/<agent-id>.jsonl
+ */
+function extractSubagentInfo(filePath: string): { parentSessionId: string; agentType: string | undefined } | null {
+  const match = filePath.match(/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\/subagents\/([^/]+)\.jsonl$/i);
+  if (!match) return null;
+  const parentSessionId = match[1];
+  let agentType: string | undefined;
+  try {
+    const metaPath = filePath.replace(".jsonl", ".meta.json");
+    const meta = JSON.parse(fs.readFileSync(metaPath, "utf-8"));
+    agentType = meta.agentType;
+  } catch { /* missing or invalid meta */ }
+  return { parentSessionId, agentType };
+}
+
 /**
  * Extract the decoded project path from an absolute JSONL file path.
- * ~/.claude/projects/<encoded>/<uuid>.jsonl
- * where <encoded> has "/" replaced with "-".
+ * Handles both main sessions and subagent files:
+ *   ~/.claude/projects/<encoded>/<uuid>.jsonl
+ *   ~/.claude/projects/<encoded>/<uuid>/subagents/<agent-id>.jsonl
  */
 function decodeProjectPath(filePath: string): string | null {
-  // Match project dir directly containing the UUID file
-  const match = filePath.match(/projects\/([^/]+)\/[0-9a-f-]{36}\.jsonl$/i);
-  if (!match) return null;
-  return match[1].replace(/-/g, "/");
+  // Main session: projects/<encoded>/<uuid>.jsonl
+  const parentMatch = filePath.match(/projects\/([^/]+)\/[0-9a-f-]{36}\.jsonl$/i);
+  if (parentMatch) return parentMatch[1].replace(/-/g, "/");
+  // Subagent: projects/<encoded>/<uuid>/subagents/<agent-id>.jsonl
+  const subMatch = filePath.match(/projects\/([^/]+)\/[0-9a-f-]{36}\/subagents\/[^/]+\.jsonl$/i);
+  if (subMatch) return subMatch[1].replace(/-/g, "/");
+  return null;
 }

package/src/storage/db.ts

@@ -116,11 +116,23 @@ function migrate(db: Database.Database): void {
       last_synced_at TEXT
     );
   `);
+
+  // Additive migrations (safe to re-run; errors mean column already exists)
+  const addColumns = [
+    `ALTER TABLE sessions ADD COLUMN parent_session_id TEXT`,
+    `ALTER TABLE sessions ADD COLUMN agent_type TEXT`,
+  ];
+  for (const sql of addColumns) {
+    try { db.exec(sql); } catch { /* column already exists */ }
+  }
+  db.exec(`CREATE INDEX IF NOT EXISTS idx_sessions_parent ON sessions(parent_session_id)`);
 }
 
 export type SessionRow = {
   id: string;
   project_path: string | null;
+  parent_session_id: string | null;
+  agent_type: string | null;
   started_at: string;
   ended_at: string | null;
   total_input_tokens: number;

package/src/storage/repo.ts

@@ -22,27 +22,33 @@ export class SessionRepo {
 
   upsertSession(session: Omit<SessionRow, "ended_at"> & { ended_at?: string | null }): void {
     this.db.prepare(`
-      INSERT INTO sessions (id, project_path, started_at, ended_at, total_input_tokens,
-        total_output_tokens, total_cache_read_tokens, total_cache_creation_tokens,
+      INSERT INTO sessions (id, project_path, parent_session_id, agent_type, started_at, ended_at,
+        total_input_tokens, total_output_tokens, total_cache_read_tokens, total_cache_creation_tokens,
         total_cost_usd, total_turns, total_duration_ms, model)
-      VALUES (@id, @project_path, @started_at, @ended_at, @total_input_tokens,
-        @total_output_tokens, @total_cache_read_tokens, @total_cache_creation_tokens,
+      VALUES (@id, @project_path, @parent_session_id, @agent_type, @started_at, @ended_at,
+        @total_input_tokens, @total_output_tokens, @total_cache_read_tokens, @total_cache_creation_tokens,
         @total_cost_usd, @total_turns, @total_duration_ms, @model)
       ON CONFLICT(id) DO UPDATE SET
         started_at    = MIN(started_at, @started_at),
         project_path  = COALESCE(@project_path, project_path),
+        parent_session_id = COALESCE(@parent_session_id, parent_session_id),
+        agent_type    = COALESCE(@agent_type, agent_type),
         ended_at      = COALESCE(@ended_at, ended_at),
         total_turns   = @total_turns,
         model         = COALESCE(@model, model),
-        -- Use MAX for tokens so OTEL values aren't clobbered by JSONL re-ingest.
-        -- Cost and duration are OTEL-only — never overwrite from JSONL.
+        -- Use MAX so OTEL values aren't clobbered by JSONL re-ingest,
+        -- but JSONL values fill in as a floor for sessions without OTEL data.
         total_input_tokens          = MAX(total_input_tokens, @total_input_tokens),
         total_output_tokens         = MAX(total_output_tokens, @total_output_tokens),
         total_cache_read_tokens     = MAX(total_cache_read_tokens, @total_cache_read_tokens),
-        total_cache_creation_tokens = MAX(total_cache_creation_tokens, @total_cache_creation_tokens)
+        total_cache_creation_tokens = MAX(total_cache_creation_tokens, @total_cache_creation_tokens),
+        total_cost_usd              = MAX(total_cost_usd, @total_cost_usd),
+        total_duration_ms           = MAX(total_duration_ms, @total_duration_ms)
     `).run({
       ...session,
       ended_at: session.ended_at ?? null,
+      parent_session_id: session.parent_session_id ?? null,
+      agent_type: session.agent_type ?? null,
     });
   }
 
@@ -177,20 +183,20 @@ export class SessionRepo {
   listSessions(limit = 50, offset = 0, from?: string, to?: string): SessionRow[] {
     if (from && to) {
       return this.db.prepare(`
-        SELECT * FROM sessions WHERE started_at >= ? AND started_at <= ? ORDER BY started_at DESC LIMIT ? OFFSET ?
+        SELECT * FROM sessions WHERE parent_session_id IS NULL AND started_at >= ? AND started_at <= ? ORDER BY started_at DESC LIMIT ? OFFSET ?
       `).all(from, to, limit, offset) as SessionRow[];
     }
     return this.db.prepare(`
-      SELECT * FROM sessions ORDER BY started_at DESC LIMIT ? OFFSET ?
+      SELECT * FROM sessions WHERE parent_session_id IS NULL ORDER BY started_at DESC LIMIT ? OFFSET ?
     `).all(limit, offset) as SessionRow[];
   }
 
   countSessions(from?: string, to?: string): number {
     if (from && to) {
-      const row = this.db.prepare(`SELECT COUNT(*) as n FROM sessions WHERE started_at >= ? AND started_at <= ?`).get(from, to) as { n: number };
+      const row = this.db.prepare(`SELECT COUNT(*) as n FROM sessions WHERE parent_session_id IS NULL AND started_at >= ? AND started_at <= ?`).get(from, to) as { n: number };
       return row.n;
     }
-    const row = this.db.prepare(`SELECT COUNT(*) as n FROM sessions`).get() as { n: number };
+    const row = this.db.prepare(`SELECT COUNT(*) as n FROM sessions WHERE parent_session_id IS NULL`).get() as { n: number };
     return row.n;
   }
 
@@ -198,6 +204,12 @@ export class SessionRepo {
     return this.db.prepare(`SELECT * FROM sessions WHERE id = ?`).get(id) as SessionRow | undefined;
   }
 
+  getSubSessions(parentSessionId: string): SessionRow[] {
+    return this.db.prepare(`
+      SELECT * FROM sessions WHERE parent_session_id = ? ORDER BY started_at ASC
+    `).all(parentSessionId) as SessionRow[];
+  }
+
   getSessionTurns(sessionId: string): TurnRow[] {
     return this.db.prepare(`
       SELECT * FROM turns WHERE session_id = ? ORDER BY turn_index ASC
@@ -219,7 +231,7 @@ export class SessionRepo {
   getAggregateStats(from?: string, to?: string) {
     if (from && to) {
       return this.db.prepare(`
-        WITH fs AS (SELECT * FROM sessions WHERE started_at >= ? AND started_at <= ?),
+        WITH fs AS (SELECT * FROM sessions WHERE parent_session_id IS NULL AND started_at >= ? AND started_at <= ?),
              fh AS (SELECT * FROM hook_events WHERE timestamp >= ? AND timestamp <= ?)
         SELECT
           (SELECT COUNT(*)                       FROM fs) as total_sessions,
@@ -235,13 +247,13 @@ export class SessionRepo {
     }
     return this.db.prepare(`
       SELECT
-        (SELECT COUNT(*) FROM sessions) as total_sessions,
-        (SELECT SUM(total_input_tokens)          FROM sessions) as total_input_tokens,
-        (SELECT SUM(total_output_tokens)         FROM sessions) as total_output_tokens,
-        (SELECT SUM(total_cache_read_tokens)     FROM sessions) as total_cache_read_tokens,
-        (SELECT SUM(total_cost_usd)              FROM sessions) as total_cost_usd,
-        (SELECT SUM(total_turns)                 FROM sessions) as total_turns,
-        (SELECT SUM(total_duration_ms)           FROM sessions) as total_duration_ms,
+        (SELECT COUNT(*) FROM sessions WHERE parent_session_id IS NULL) as total_sessions,
+        (SELECT SUM(total_input_tokens)          FROM sessions WHERE parent_session_id IS NULL) as total_input_tokens,
+        (SELECT SUM(total_output_tokens)         FROM sessions WHERE parent_session_id IS NULL) as total_output_tokens,
+        (SELECT SUM(total_cache_read_tokens)     FROM sessions WHERE parent_session_id IS NULL) as total_cache_read_tokens,
+        (SELECT SUM(total_cost_usd)              FROM sessions WHERE parent_session_id IS NULL) as total_cost_usd,
+        (SELECT SUM(total_turns)                 FROM sessions WHERE parent_session_id IS NULL) as total_turns,
+        (SELECT SUM(total_duration_ms)           FROM sessions WHERE parent_session_id IS NULL) as total_duration_ms,
         (SELECT COUNT(*) FROM hook_events WHERE event_name = 'UserPromptSubmit') as total_user_prompts,
         (SELECT COUNT(*) FROM hook_events WHERE event_name = 'Stop') as total_interruptions
     `).get();
@@ -476,6 +488,7 @@ export class SessionRepo {
 
     // Only show real user turns (each row = one interaction block)
     conditions.push("t.is_real_user = 1");
+    conditions.push("t.session_id IN (SELECT id FROM sessions WHERE parent_session_id IS NULL)");
 
     const where = conditions.length > 0 ? "WHERE " + conditions.join(" AND ") : "";
     params.push(limit, offset);
@@ -600,7 +613,7 @@ export class SessionRepo {
    * Safe to call repeatedly — always produces correct values from append-only source data.
    */
   getTaskGroups(from?: string, to?: string): { tags: string; turn_count: number; human_interventions: number; total_duration_ms: number; total_cost_usd: number; last_seen: string }[] {
-    const timeFilter = from && to ? "\n    WHERE t.timestamp >= ? AND t.timestamp <= ?" : "";
+    const timeFilter = from && to ? " AND t.timestamp >= ? AND t.timestamp <= ?" : "";
     const params: unknown[] = from && to ? [from, to] : [];
 
     return this.db.prepare(`
@@ -618,7 +631,8 @@ export class SessionRepo {
         MAX(t.timestamp) as last_seen
       FROM turns t
       LEFT JOIN turn_tag_sets tts ON tts.turn_id = t.id
-      JOIN sessions s ON s.id = t.session_id${timeFilter}
+      JOIN sessions s ON s.id = t.session_id
+      WHERE s.parent_session_id IS NULL${timeFilter}
       GROUP BY COALESCE(tts.tag_set, 'Untagged')
       ORDER BY last_seen DESC
     `).all(...params) as { tags: string; turn_count: number; human_interventions: number; total_duration_ms: number; total_cost_usd: number; last_seen: string }[];

package/src/sync/sync.test.ts

@@ -104,6 +104,8 @@ describe("zozul sync e2e", () => {
     repo.upsertSession({
       id: "sess-001",
       project_path: "/projects/test",
+      parent_session_id: null,
+      agent_type: null,
       started_at: "2026-03-28T10:00:00Z",
       total_input_tokens: 100,
       total_output_tokens: 50,
@@ -249,6 +251,8 @@ describe("zozul sync e2e", () => {
     repo.upsertSession({
       id: "sess-002",
       project_path: null,
+      parent_session_id: null,
+      agent_type: null,
       started_at: "2026-03-28T11:00:00Z",
       total_input_tokens: 10,
       total_output_tokens: 10,
@@ -296,6 +300,8 @@ describe("zozul sync e2e", () => {
     repo.upsertSession({
       id: "sess-A",
       project_path: null,
+      parent_session_id: null,
+      agent_type: null,
       started_at: "2026-03-28T12:00:00Z",
       total_input_tokens: 10,
       total_output_tokens: 10,
@@ -330,6 +336,8 @@ describe("zozul sync e2e", () => {
     repo.upsertSession({
       id: "sess-B",
       project_path: "/new",
+      parent_session_id: null,
+      agent_type: null,
       started_at: "2026-03-28T13:00:00Z",
       total_input_tokens: 20,
       total_output_tokens: 20,
@@ -369,6 +377,8 @@ describe("zozul sync e2e", () => {
     repo.upsertSession({
       id: "sess-dry",
       project_path: null,
+      parent_session_id: null,
+      agent_type: null,
       started_at: "2026-03-28T14:00:00Z",
       total_input_tokens: 5,
       total_output_tokens: 5,
@@ -411,6 +421,8 @@ describe("zozul sync e2e", () => {
     repo.upsertSession({
       id: "sess-err",
       project_path: null,
+      parent_session_id: null,
+      agent_type: null,
       started_at: "2026-03-28T15:00:00Z",
       total_input_tokens: 10,
       total_output_tokens: 10,

package/src/sync/transform.ts

@@ -7,6 +7,8 @@ import type {
 export type ApiSession = {
   id: string;
   project_path: string | null;
+  parent_session_id: string | null;
+  agent_type: string | null;
   started_at: string;
   ended_at: string | null;
   total_input_tokens: number;
@@ -103,6 +105,8 @@ export function transformSession(row: SessionRow): ApiSession {
   return {
     id: row.id,
     project_path: row.project_path,
+    parent_session_id: row.parent_session_id,
+    agent_type: row.agent_type,
     started_at: row.started_at,
     ended_at: row.ended_at,
     total_input_tokens: row.total_input_tokens,