sidekick-shared 0.13.2 → 0.13.3

package/dist/aggregation/EventAggregator.d.ts

@@ -63,6 +63,13 @@ export interface SerializedAggregatorState {
     patternState?: SerializedPatternState;
     heatmapState?: SerializedHeatmapState;
 }
+/**
+ * Parses dependency references from a todo item's content text.
+ *
+ * Looks for patterns like "(blocked by Task A and Task B)" and maps
+ * referenced task names back to todo-{i} IDs by substring matching.
+ */
+export declare function parseTodoDependencies(content: string, allTodos: Array<Record<string, unknown>>): string[];
 interface BurnSample {
     time: number;
     tokens: number;
@@ -150,6 +157,11 @@ export declare class EventAggregator {
     private extractTaskStateFromFollowEvent;
     private applyTaskUpdate;
     private resolveTaskCreate;
+    private handleTodoWrite;
+    private handleUpdatePlan;
+    private handleAgentSpawn;
+    private resolveAgentResult;
+    private isGoalGateTask;
     private extractSubagentFromEvent;
     private extractSubagentFromFollowEvent;
     private completeSubagent;

package/dist/aggregation/EventAggregator.js

@@ -10,6 +10,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventAggregator = void 0;
+exports.parseTodoDependencies = parseTodoDependencies;
 const jsonl_1 = require("../parsers/jsonl");
 const planExtractor_1 = require("../parsers/planExtractor");
 const eventBridge_1 = require("../watchers/eventBridge");
@@ -26,6 +27,34 @@ const DEFAULT_BURN_SAMPLE_MS = 10_000;
 const COMPACTION_DROP_THRESHOLD = 0.8; // >20% drop
 /** Schema version for serialized snapshots. */
 const SNAPSHOT_SCHEMA_VERSION = 1;
+// ── Goal gate detection regex ──
+const GOAL_GATE_REGEX = /\b(CRITICAL|MUST|blocker|required|must.?complete|goal.?gate|essential|do.?not.?skip|blocking)\b/i;
+// ── Todo dependency parsing ──
+/**
+ * Parses dependency references from a todo item's content text.
+ *
+ * Looks for patterns like "(blocked by Task A and Task B)" and maps
+ * referenced task names back to todo-{i} IDs by substring matching.
+ */
+function parseTodoDependencies(content, allTodos) {
+    const depPattern = /(?:blocked by|depends on|waiting on|requires)\s+(.+?)(?:\)|$)/i;
+    const match = content.match(depPattern);
+    if (!match)
+        return [];
+    const refs = match[1].split(/\s+and\s+|,\s*|&\s*/).map(r => r.trim()).filter(Boolean);
+    const result = [];
+    for (const ref of refs) {
+        const refLower = ref.toLowerCase();
+        for (let j = 0; j < allTodos.length; j++) {
+            const otherContent = String(allTodos[j].content || allTodos[j].subject || '').toLowerCase();
+            if (otherContent.includes(refLower) || refLower.includes(otherContent.split(':')[0].trim())) {
+                result.push(`todo-${j}`);
+                break;
+            }
+        }
+    }
+    return result;
+}
 // ── EventAggregator ──
 class EventAggregator {
     // Options
@@ -848,17 +877,29 @@ class EventAggregator {
                         activeForm: input.activeForm,
                         subagentType: input.subagentType,
                         isGoalGate: input.isGoalGate,
+                        timestamp: new Date(event.timestamp),
                     });
                 }
                 else if (name === 'TaskUpdate') {
                     this.applyTaskUpdate(input);
                 }
+                else if (name === 'TodoWrite') {
+                    this.handleTodoWrite(input, new Date(event.timestamp));
+                }
+                else if (name === 'UpdatePlan') {
+                    this.handleUpdatePlan(input, new Date(event.timestamp));
+                }
+                else if ((name === 'Agent' || name === 'Task') && toolUseId) {
+                    this.handleAgentSpawn(toolUseId, input, new Date(event.timestamp));
+                }
             }
             else if (block.type === 'tool_result') {
                 const toolUseId = block.tool_use_id;
                 if (!toolUseId)
                     continue;
-                this.resolveTaskCreate(toolUseId, block.content ?? block.output, event.timestamp);
+                const isError = block.is_error ?? false;
+                this.resolveTaskCreate(toolUseId, block.content ?? block.output, event.timestamp, isError);
+                this.resolveAgentResult(toolUseId, isError, event.timestamp);
             }
         }
     }
@@ -879,11 +920,21 @@ class EventAggregator {
                     activeForm: input.activeForm,
                     subagentType: input.subagentType,
                     isGoalGate: input.isGoalGate,
+                    timestamp: new Date(event.timestamp),
                 });
             }
             else if (event.toolName === 'TaskUpdate') {
                 this.applyTaskUpdate(input);
             }
+            else if (event.toolName === 'TodoWrite') {
+                this.handleTodoWrite(input, new Date(event.timestamp));
+            }
+            else if (event.toolName === 'UpdatePlan') {
+                this.handleUpdatePlan(input, new Date(event.timestamp));
+            }
+            else if ((event.toolName === 'Agent' || event.toolName === 'Task') && toolUseId) {
+                this.handleAgentSpawn(toolUseId, input, new Date(event.timestamp));
+            }
         }
         else if (event.type === 'tool_result') {
             if (!raw)
@@ -891,7 +942,9 @@ class EventAggregator {
             const toolUseId = raw.tool_use_id;
             if (!toolUseId)
                 return;
-            this.resolveTaskCreate(toolUseId, raw.content, event.timestamp);
+            const isError = raw.is_error ?? false;
+            this.resolveTaskCreate(toolUseId, raw.content, event.timestamp, isError);
+            this.resolveAgentResult(toolUseId, isError, event.timestamp);
         }
     }
     applyTaskUpdate(input) {
@@ -908,11 +961,16 @@ class EventAggregator {
                         this.activeTaskId = null;
                     return;
                 }
+                const oldStatus = existing.status;
                 existing.status = newStatus;
                 existing.updatedAt = new Date();
-                if (newStatus === 'in_progress') {
+                if (newStatus === 'in_progress' && oldStatus !== 'in_progress') {
                     this.activeTaskId = taskId;
                 }
+                else if (oldStatus === 'in_progress' && newStatus !== 'in_progress') {
+                    if (this.activeTaskId === taskId)
+                        this.activeTaskId = null;
+                }
             }
             if (input.subject)
                 existing.subject = input.subject;
@@ -921,11 +979,23 @@ class EventAggregator {
             if (input.activeForm)
                 existing.activeForm = input.activeForm;
             if (input.addBlockedBy && Array.isArray(input.addBlockedBy)) {
-                existing.blockedBy.push(...input.addBlockedBy);
+                for (const id of input.addBlockedBy) {
+                    const idStr = String(id);
+                    if (!existing.blockedBy.includes(idStr)) {
+                        existing.blockedBy.push(idStr);
+                    }
+                }
             }
             if (input.addBlocks && Array.isArray(input.addBlocks)) {
-                existing.blocks.push(...input.addBlocks);
+                for (const id of input.addBlocks) {
+                    const idStr = String(id);
+                    if (!existing.blocks.includes(idStr)) {
+                        existing.blocks.push(idStr);
+                    }
+                }
             }
+            // Re-evaluate goal gate after update
+            existing.isGoalGate = this.isGoalGateTask(existing);
         }
         else {
             // TaskUpdate for unknown task — create placeholder
@@ -933,9 +1003,10 @@ class EventAggregator {
             if (status === 'deleted')
                 return;
             const now = new Date();
-            this.tasks.set(taskId, {
+            const task = {
                 taskId,
                 subject: input.subject || `Task ${taskId}`,
+                description: input.description,
                 status: status,
                 createdAt: now,
                 updatedAt: now,
@@ -943,27 +1014,32 @@ class EventAggregator {
                 blocks: [],
                 associatedToolCalls: [],
                 activeForm: input.activeForm,
-            });
+            };
+            task.isGoalGate = this.isGoalGateTask(task);
+            this.tasks.set(taskId, task);
             if (status === 'in_progress') {
                 this.activeTaskId = taskId;
             }
         }
     }
-    resolveTaskCreate(toolUseId, content, timestamp) {
+    resolveTaskCreate(toolUseId, content, timestamp, isError) {
         const pending = this.pendingTaskCreates.get(toolUseId);
         if (!pending)
             return;
         this.pendingTaskCreates.delete(toolUseId);
+        // Don't create task on error
+        if (isError)
+            return;
         const taskId = this.extractTaskIdFromResult(content);
         if (!taskId)
             return;
         const now = new Date(timestamp);
-        this.tasks.set(taskId, {
+        const task = {
             taskId,
             subject: pending.subject,
             description: pending.description,
             status: 'pending',
-            createdAt: now,
+            createdAt: pending.timestamp ?? now,
             updatedAt: now,
             blockedBy: [],
             blocks: [],
@@ -971,7 +1047,197 @@ class EventAggregator {
             activeForm: pending.activeForm,
             subagentType: pending.subagentType,
             isGoalGate: pending.isGoalGate,
-        });
+        };
+        // Evaluate goal gate from content if not explicitly set
+        task.isGoalGate = task.isGoalGate || this.isGoalGateTask(task);
+        this.tasks.set(taskId, task);
+    }
+    // ═══════════════════════════════════════════════════════════════════════
+    // Private: TodoWrite handling (OpenCode)
+    // ═══════════════════════════════════════════════════════════════════════
+    handleTodoWrite(input, now) {
+        const todos = input.todos;
+        if (!Array.isArray(todos))
+            return;
+        // Remove all non-subagent tasks (subagent tasks should persist)
+        for (const [taskId, task] of this.tasks) {
+            if (!task.isSubagent) {
+                this.tasks.delete(taskId);
+            }
+        }
+        // Reset active task if it was a non-subagent task
+        if (this.activeTaskId && !this.tasks.has(this.activeTaskId)) {
+            this.activeTaskId = null;
+        }
+        for (let i = 0; i < todos.length; i++) {
+            const todo = todos[i];
+            const taskId = `todo-${i}`;
+            const content = String(todo.content || todo.subject || `Todo ${i + 1}`);
+            const rawStatus = String(todo.status || 'pending').toLowerCase();
+            const priority = todo.priority ? String(todo.priority) : undefined;
+            // Map OpenCode todo status values to TaskStatus
+            let status;
+            if (rawStatus === 'completed' || rawStatus === 'done') {
+                status = 'completed';
+            }
+            else if (rawStatus === 'in_progress' || rawStatus === 'in-progress') {
+                status = 'in_progress';
+            }
+            else {
+                status = 'pending';
+            }
+            const task = {
+                taskId,
+                subject: content,
+                description: priority ? `Priority: ${priority}` : undefined,
+                status,
+                createdAt: now,
+                updatedAt: now,
+                blockedBy: [],
+                blocks: [],
+                associatedToolCalls: [],
+            };
+            this.tasks.set(taskId, task);
+            if (status === 'in_progress') {
+                this.activeTaskId = taskId;
+            }
+        }
+        // Second pass: parse dependency info from content text
+        for (let i = 0; i < todos.length; i++) {
+            const task = this.tasks.get(`todo-${i}`);
+            if (!task)
+                continue;
+            // Check for explicit blockedBy field
+            if (Array.isArray(todos[i].blockedBy)) {
+                for (const ref of todos[i].blockedBy) {
+                    const refStr = String(ref);
+                    if (!task.blockedBy.includes(refStr)) {
+                        task.blockedBy.push(refStr);
+                    }
+                }
+            }
+            // Parse dependency references from content text
+            const deps = parseTodoDependencies(String(todos[i].content || ''), todos);
+            for (const depId of deps) {
+                if (depId !== `todo-${i}` && !task.blockedBy.includes(depId)) {
+                    task.blockedBy.push(depId);
+                    const depTask = this.tasks.get(depId);
+                    if (depTask && !depTask.blocks.includes(`todo-${i}`)) {
+                        depTask.blocks.push(`todo-${i}`);
+                    }
+                }
+            }
+        }
+    }
+    // ═══════════════════════════════════════════════════════════════════════
+    // Private: UpdatePlan handling (Codex)
+    // ═══════════════════════════════════════════════════════════════════════
+    handleUpdatePlan(input, now) {
+        const plan = input.plan;
+        if (!Array.isArray(plan))
+            return;
+        const seenPlanTaskIds = new Set();
+        let activePlanTaskId = null;
+        for (let i = 0; i < plan.length; i++) {
+            const entry = plan[i];
+            const step = String(entry.step || '').trim();
+            if (!step)
+                continue;
+            const rawStatus = String(entry.status || 'pending').toLowerCase();
+            let status;
+            if (rawStatus === 'completed')
+                status = 'completed';
+            else if (rawStatus === 'in_progress' || rawStatus === 'in-progress')
+                status = 'in_progress';
+            else
+                status = 'pending';
+            const taskId = `plan-${i}`;
+            seenPlanTaskIds.add(taskId);
+            const existing = this.tasks.get(taskId);
+            if (existing) {
+                existing.subject = step;
+                existing.status = status;
+                existing.updatedAt = now;
+                if (!existing.activeForm) {
+                    existing.activeForm = `Working on ${step}`;
+                }
+            }
+            else {
+                const task = {
+                    taskId,
+                    subject: step,
+                    status,
+                    createdAt: now,
+                    updatedAt: now,
+                    activeForm: `Working on ${step}`,
+                    blockedBy: [],
+                    blocks: [],
+                    associatedToolCalls: [],
+                };
+                this.tasks.set(taskId, task);
+            }
+            if (status === 'in_progress') {
+                activePlanTaskId = taskId;
+            }
+        }
+        // Mark missing synthetic plan tasks as deleted
+        for (const [taskId, task] of this.tasks) {
+            if (!taskId.startsWith('plan-'))
+                continue;
+            if (!seenPlanTaskIds.has(taskId) && task.status !== 'deleted') {
+                task.status = 'deleted';
+                task.updatedAt = now;
+            }
+        }
+        if (activePlanTaskId) {
+            this.activeTaskId = activePlanTaskId;
+        }
+        else if (this.activeTaskId?.startsWith('plan-')) {
+            this.activeTaskId = null;
+        }
+    }
+    // ═══════════════════════════════════════════════════════════════════════
+    // Private: Agent/Task (subagent) as tracked task
+    // ═══════════════════════════════════════════════════════════════════════
+    handleAgentSpawn(toolUseId, input, now) {
+        const agentTaskId = `agent-${toolUseId}`;
+        const description = input.description ? String(input.description) : 'Subagent';
+        const subagentType = input.subagent_type || input.subagentType || undefined;
+        const task = {
+            taskId: agentTaskId,
+            subject: description,
+            status: 'in_progress',
+            createdAt: now,
+            updatedAt: now,
+            activeForm: subagentType ? `Running ${subagentType} agent` : 'Running subagent',
+            blockedBy: [],
+            blocks: [],
+            associatedToolCalls: [],
+            isSubagent: true,
+            subagentType,
+            toolUseId,
+        };
+        this.tasks.set(agentTaskId, task);
+    }
+    resolveAgentResult(toolUseId, isError, timestamp) {
+        const agentTaskId = `agent-${toolUseId}`;
+        const agentTask = this.tasks.get(agentTaskId);
+        if (!agentTask)
+            return;
+        agentTask.status = isError ? 'deleted' : 'completed';
+        agentTask.updatedAt = new Date(timestamp);
+    }
+    // ═══════════════════════════════════════════════════════════════════════
+    // Private: Goal gate detection
+    // ═══════════════════════════════════════════════════════════════════════
+    isGoalGateTask(task) {
+        if (GOAL_GATE_REGEX.test(task.subject))
+            return true;
+        if (task.description && GOAL_GATE_REGEX.test(task.description))
+            return true;
+        if (task.blocks.length >= 3)
+            return true;
+        return false;
     }
     // ═══════════════════════════════════════════════════════════════════════
     // Private: Subagent Tracking from SessionEvent

package/dist/index.d.ts

@@ -66,7 +66,7 @@ export type { SessionDumpOptions } from './formatters/sessionDump';
 export { highlight as highlightEvent, clearHighlightCache, HIGHLIGHT_CSS } from './formatters/eventHighlighter';
 export type { HighlightFormat } from './formatters/eventHighlighter';
 export { ALL_PHRASES, getRandomPhrase } from './phrases';
-export { EventAggregator } from './aggregation/EventAggregator';
+export { EventAggregator, parseTodoDependencies } from './aggregation/EventAggregator';
 export type { SerializedAggregatorState } from './aggregation/EventAggregator';
 export { saveSnapshot, loadSnapshot, deleteSnapshot, isSnapshotValid, getSnapshotPath } from './aggregation/snapshot';
 export type { SessionSnapshot } from './aggregation/snapshot';

package/dist/index.js

@@ -4,8 +4,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findActiveClaudeSession = exports.discoverSessionDirectory = exports.getClaudeSessionDirectory = exports.encodeClaudeWorkspacePath = exports.detectSessionActivity = exports.extractTaskInfo = exports.scanSubagentDir = exports.normalizeCodexToolInput = exports.normalizeCodexToolName = exports.extractPatchFilePaths = exports.CodexRolloutParser = exports.parseDbPartData = exports.parseDbMessageData = exports.convertOpenCodeMessage = exports.detectPlanModeFromText = exports.normalizeToolInput = exports.normalizeToolName = exports.TRUNCATION_PATTERNS = exports.JsonlParser = exports.CodexProvider = exports.OpenCodeProvider = exports.ClaudeCodeProvider = exports.getAllDetectedProviders = exports.detectProvider = exports.readClaudeCodePlanFiles = exports.getPlanAnalytics = exports.writePlans = exports.getLatestPlan = exports.readPlans = exports.readLatestHandoff = exports.readHistory = exports.readNotes = exports.readDecisions = exports.readTasks = exports.getProjectSlugRaw = exports.getProjectSlug = exports.encodeWorkspacePath = exports.getGlobalDataPath = exports.getProjectDataPath = exports.getConfigDir = exports.MAX_PLANS_PER_PROJECT = exports.PLAN_SCHEMA_VERSION = exports.createEmptyTokenTotals = exports.HISTORICAL_DATA_SCHEMA_VERSION = exports.STALENESS_THRESHOLDS = exports.IMPORTANCE_DECAY_FACTORS = exports.KNOWLEDGE_NOTE_SCHEMA_VERSION = exports.DECISION_LOG_SCHEMA_VERSION = exports.normalizeTaskStatus = exports.TASK_PERSISTENCE_SCHEMA_VERSION = void 0;
-exports.PatternExtractor = exports.HeatmapTracker = exports.FrequencyTracker = exports.getSnapshotPath = exports.isSnapshotValid = exports.deleteSnapshot = exports.loadSnapshot = exports.saveSnapshot = exports.EventAggregator = exports.getRandomPhrase = exports.ALL_PHRASES = exports.HIGHLIGHT_CSS = exports.clearHighlightCache = exports.highlightEvent = exports.formatSessionJson = exports.formatSessionMarkdown = exports.formatSessionText = exports.classifyNoise = exports.shouldMergeWithPrevious = exports.classifyFollowEvent = exports.classifyMessage = exports.getSoftNoiseReason = exports.isHardNoiseFollowEvent = exports.isHardNoise = exports.formatToolSummary = exports.toFollowEvents = exports.createWatcher = exports.parseChangelog = exports.extractProposedPlanShared = exports.parsePlanMarkdownShared = exports.PlanExtractor = exports.composeContext = exports.FilterEngine = exports.searchSessions = exports.CodexDatabase = exports.OpenCodeDatabase = exports.discoverDebugLogs = exports.collapseDuplicates = exports.filterByLevel = exports.parseDebugLog = exports.scanSubagentTraces = exports.findAllSessionsWithWorktrees = exports.discoverWorktreeSiblings = exports.resolveWorktreeMainRepo = exports.getAllClaudeProjectFolders = exports.decodeEncodedPath = exports.getMostRecentlyActiveSessionDir = exports.findSubdirectorySessionDirs = exports.findSessionsInDirectory = exports.findAllClaudeSessions = void 0;
-exports.fetchQuota = exports.readClaudeMaxAccessTokenSync = exports.readClaudeMaxCredentials = exports.openInBrowser = exports.parseTranscript = exports.generateHtmlReport = void 0;
+exports.HeatmapTracker = exports.FrequencyTracker = exports.getSnapshotPath = exports.isSnapshotValid = exports.deleteSnapshot = exports.loadSnapshot = exports.saveSnapshot = exports.parseTodoDependencies = exports.EventAggregator = exports.getRandomPhrase = exports.ALL_PHRASES = exports.HIGHLIGHT_CSS = exports.clearHighlightCache = exports.highlightEvent = exports.formatSessionJson = exports.formatSessionMarkdown = exports.formatSessionText = exports.classifyNoise = exports.shouldMergeWithPrevious = exports.classifyFollowEvent = exports.classifyMessage = exports.getSoftNoiseReason = exports.isHardNoiseFollowEvent = exports.isHardNoise = exports.formatToolSummary = exports.toFollowEvents = exports.createWatcher = exports.parseChangelog = exports.extractProposedPlanShared = exports.parsePlanMarkdownShared = exports.PlanExtractor = exports.composeContext = exports.FilterEngine = exports.searchSessions = exports.CodexDatabase = exports.OpenCodeDatabase = exports.discoverDebugLogs = exports.collapseDuplicates = exports.filterByLevel = exports.parseDebugLog = exports.scanSubagentTraces = exports.findAllSessionsWithWorktrees = exports.discoverWorktreeSiblings = exports.resolveWorktreeMainRepo = exports.getAllClaudeProjectFolders = exports.decodeEncodedPath = exports.getMostRecentlyActiveSessionDir = exports.findSubdirectorySessionDirs = exports.findSessionsInDirectory = exports.findAllClaudeSessions = void 0;
+exports.fetchQuota = exports.readClaudeMaxAccessTokenSync = exports.readClaudeMaxCredentials = exports.openInBrowser = exports.parseTranscript = exports.generateHtmlReport = exports.PatternExtractor = void 0;
 var taskPersistence_1 = require("./types/taskPersistence");
 Object.defineProperty(exports, "TASK_PERSISTENCE_SCHEMA_VERSION", { enumerable: true, get: function () { return taskPersistence_1.TASK_PERSISTENCE_SCHEMA_VERSION; } });
 Object.defineProperty(exports, "normalizeTaskStatus", { enumerable: true, get: function () { return taskPersistence_1.normalizeTaskStatus; } });
@@ -155,6 +155,7 @@ Object.defineProperty(exports, "getRandomPhrase", { enumerable: true, get: funct
 // Aggregation
 var EventAggregator_1 = require("./aggregation/EventAggregator");
 Object.defineProperty(exports, "EventAggregator", { enumerable: true, get: function () { return EventAggregator_1.EventAggregator; } });
+Object.defineProperty(exports, "parseTodoDependencies", { enumerable: true, get: function () { return EventAggregator_1.parseTodoDependencies; } });
 var snapshot_1 = require("./aggregation/snapshot");
 Object.defineProperty(exports, "saveSnapshot", { enumerable: true, get: function () { return snapshot_1.saveSnapshot; } });
 Object.defineProperty(exports, "loadSnapshot", { enumerable: true, get: function () { return snapshot_1.loadSnapshot; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sidekick-shared",
-  "version": "0.13.2",
+  "version": "0.13.3",
   "description": "Shared data access layer for Sidekick — readers, types, providers, credentials, quota",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",