@su-record/vibe 2.7.5 → 2.7.6

package/dist/infra/lib/memory/SessionRAGStore.js

@@ -16,93 +16,108 @@ export class SessionRAGStore {
     // Schema Initialization
     // ==========================================================================
     initializeTables() {
-        this.db.exec(`
-      CREATE TABLE IF NOT EXISTS session_decisions (
-        id INTEGER PRIMARY KEY AUTOINCREMENT,
-        sessionId TEXT,
-        title TEXT NOT NULL,
-        description TEXT,
-        rationale TEXT,
-        alternatives TEXT,
-        impact TEXT,
-        status TEXT DEFAULT 'active' CHECK(status IN ('active','superseded','cancelled')),
-        priority INTEGER DEFAULT 1,
-        relatedFiles TEXT,
-        tags TEXT,
-        timestamp TEXT NOT NULL
-      );
-
-      CREATE INDEX IF NOT EXISTS idx_sdec_session ON session_decisions(sessionId);
-      CREATE INDEX IF NOT EXISTS idx_sdec_status ON session_decisions(status);
-      CREATE INDEX IF NOT EXISTS idx_sdec_priority ON session_decisions(priority);
-      CREATE INDEX IF NOT EXISTS idx_sdec_timestamp ON session_decisions(timestamp);
+        this.db.exec(`
+      CREATE TABLE IF NOT EXISTS session_decisions (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        sessionId TEXT,
+        title TEXT NOT NULL,
+        description TEXT,
+        rationale TEXT,
+        alternatives TEXT,
+        impact TEXT,
+        status TEXT DEFAULT 'active' CHECK(status IN ('active','superseded','cancelled')),
+        priority INTEGER DEFAULT 1,
+        relatedFiles TEXT,
+        tags TEXT,
+        timestamp TEXT NOT NULL
+      );
+
+      CREATE INDEX IF NOT EXISTS idx_sdec_session ON session_decisions(sessionId);
+      CREATE INDEX IF NOT EXISTS idx_sdec_status ON session_decisions(status);
+      CREATE INDEX IF NOT EXISTS idx_sdec_priority ON session_decisions(priority);
+      CREATE INDEX IF NOT EXISTS idx_sdec_timestamp ON session_decisions(timestamp);
     `);
-        this.db.exec(`
-      CREATE TABLE IF NOT EXISTS session_constraints (
-        id INTEGER PRIMARY KEY AUTOINCREMENT,
-        sessionId TEXT,
-        title TEXT NOT NULL,
-        description TEXT,
-        type TEXT NOT NULL CHECK(type IN ('technical','business','resource','quality')),
-        severity TEXT DEFAULT 'medium' CHECK(severity IN ('low','medium','high','critical')),
-        scope TEXT,
-        timestamp TEXT NOT NULL
-      );
-
-      CREATE INDEX IF NOT EXISTS idx_scon_session ON session_constraints(sessionId);
-      CREATE INDEX IF NOT EXISTS idx_scon_type ON session_constraints(type);
-      CREATE INDEX IF NOT EXISTS idx_scon_severity ON session_constraints(severity);
+        this.db.exec(`
+      CREATE TABLE IF NOT EXISTS session_constraints (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        sessionId TEXT,
+        title TEXT NOT NULL,
+        description TEXT,
+        type TEXT NOT NULL CHECK(type IN ('technical','business','resource','quality')),
+        severity TEXT DEFAULT 'medium' CHECK(severity IN ('low','medium','high','critical')),
+        scope TEXT,
+        timestamp TEXT NOT NULL
+      );
+
+      CREATE INDEX IF NOT EXISTS idx_scon_session ON session_constraints(sessionId);
+      CREATE INDEX IF NOT EXISTS idx_scon_type ON session_constraints(type);
+      CREATE INDEX IF NOT EXISTS idx_scon_severity ON session_constraints(severity);
     `);
-        this.db.exec(`
-      CREATE TABLE IF NOT EXISTS session_goals (
-        id INTEGER PRIMARY KEY AUTOINCREMENT,
-        sessionId TEXT,
-        parentId INTEGER,
-        title TEXT NOT NULL,
-        description TEXT,
-        status TEXT DEFAULT 'active' CHECK(status IN ('active','completed','blocked','cancelled')),
-        priority INTEGER DEFAULT 1,
-        progressPercent INTEGER DEFAULT 0 CHECK(progressPercent >= 0 AND progressPercent <= 100),
-        successCriteria TEXT,
-        timestamp TEXT NOT NULL,
-        completedAt TEXT,
-        FOREIGN KEY(parentId) REFERENCES session_goals(id)
-      );
-
-      CREATE INDEX IF NOT EXISTS idx_sgoal_session ON session_goals(sessionId);
-      CREATE INDEX IF NOT EXISTS idx_sgoal_status ON session_goals(status);
-      CREATE INDEX IF NOT EXISTS idx_sgoal_priority ON session_goals(priority);
-      CREATE INDEX IF NOT EXISTS idx_sgoal_parent ON session_goals(parentId);
+        this.db.exec(`
+      CREATE TABLE IF NOT EXISTS session_goals (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        sessionId TEXT,
+        parentId INTEGER,
+        title TEXT NOT NULL,
+        description TEXT,
+        status TEXT DEFAULT 'active' CHECK(status IN ('active','completed','blocked','cancelled')),
+        priority INTEGER DEFAULT 1,
+        progressPercent INTEGER DEFAULT 0 CHECK(progressPercent >= 0 AND progressPercent <= 100),
+        successCriteria TEXT,
+        timestamp TEXT NOT NULL,
+        completedAt TEXT,
+        FOREIGN KEY(parentId) REFERENCES session_goals(id)
+      );
+
+      CREATE INDEX IF NOT EXISTS idx_sgoal_session ON session_goals(sessionId);
+      CREATE INDEX IF NOT EXISTS idx_sgoal_status ON session_goals(status);
+      CREATE INDEX IF NOT EXISTS idx_sgoal_priority ON session_goals(priority);
+      CREATE INDEX IF NOT EXISTS idx_sgoal_parent ON session_goals(parentId);
     `);
-        this.db.exec(`
-      CREATE TABLE IF NOT EXISTS session_evidence (
-        id INTEGER PRIMARY KEY AUTOINCREMENT,
-        sessionId TEXT,
-        type TEXT NOT NULL CHECK(type IN ('test','build','lint','coverage','hud','review')),
-        title TEXT NOT NULL,
-        status TEXT NOT NULL CHECK(status IN ('pass','fail','warning','info')),
-        details TEXT,
-        metrics TEXT,
-        relatedGoals TEXT,
-        timestamp TEXT NOT NULL
-      );
-
-      CREATE INDEX IF NOT EXISTS idx_sevi_session ON session_evidence(sessionId);
-      CREATE INDEX IF NOT EXISTS idx_sevi_type ON session_evidence(type);
-      CREATE INDEX IF NOT EXISTS idx_sevi_status ON session_evidence(status);
-      CREATE INDEX IF NOT EXISTS idx_sevi_timestamp ON session_evidence(timestamp);
+        this.db.exec(`
+      CREATE TABLE IF NOT EXISTS session_evidence (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        sessionId TEXT,
+        type TEXT NOT NULL CHECK(type IN ('test','build','lint','coverage','hud','review')),
+        title TEXT NOT NULL,
+        status TEXT NOT NULL CHECK(status IN ('pass','fail','warning','info')),
+        details TEXT,
+        metrics TEXT,
+        relatedGoals TEXT,
+        timestamp TEXT NOT NULL
+      );
+
+      CREATE INDEX IF NOT EXISTS idx_sevi_session ON session_evidence(sessionId);
+      CREATE INDEX IF NOT EXISTS idx_sevi_type ON session_evidence(type);
+      CREATE INDEX IF NOT EXISTS idx_sevi_status ON session_evidence(status);
+      CREATE INDEX IF NOT EXISTS idx_sevi_timestamp ON session_evidence(timestamp);
     `);
         // Phase 5: Conversation history table
-        this.db.exec(`
-      CREATE TABLE IF NOT EXISTS conversation_history (
-        id INTEGER PRIMARY KEY AUTOINCREMENT,
-        chatId TEXT NOT NULL,
-        role TEXT NOT NULL CHECK(role IN ('user', 'assistant')),
-        content TEXT NOT NULL,
-        timestamp TEXT NOT NULL DEFAULT (datetime('now'))
-      );
-      CREATE INDEX IF NOT EXISTS idx_conv_chat_time ON conversation_history(chatId, timestamp);
+        this.db.exec(`
+      CREATE TABLE IF NOT EXISTS conversation_history (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        chatId TEXT NOT NULL,
+        role TEXT NOT NULL CHECK(role IN ('user', 'assistant')),
+        content TEXT NOT NULL,
+        timestamp TEXT NOT NULL DEFAULT (datetime('now'))
+      );
+      CREATE INDEX IF NOT EXISTS idx_conv_chat_time ON conversation_history(chatId, timestamp);
     `);
+        // Schema migration: add taskId column to all session tables
+        const tables = [
+            'session_decisions',
+            'session_constraints',
+            'session_goals',
+            'session_evidence',
+        ];
+        for (const table of tables) {
+            try {
+                this.db.exec(`ALTER TABLE ${table} ADD COLUMN taskId TEXT`);
+            }
+            catch {
+                // Column already exists — idempotent
+            }
+        }
         this.initializeFTS5();
     }
     initializeFTS5() {
@@ -110,84 +125,84 @@ export class SessionRAGStore {
             return;
         try {
             // Decisions FTS
-            this.db.exec(`
-        CREATE VIRTUAL TABLE IF NOT EXISTS session_decisions_fts
-          USING fts5(title, description, rationale, content=session_decisions, content_rowid=id);
-
-        CREATE TRIGGER IF NOT EXISTS sdec_fts_ai AFTER INSERT ON session_decisions BEGIN
-          INSERT INTO session_decisions_fts(rowid, title, description, rationale)
-            VALUES (new.id, new.title, new.description, new.rationale);
-        END;
-        CREATE TRIGGER IF NOT EXISTS sdec_fts_ad AFTER DELETE ON session_decisions BEGIN
-          INSERT INTO session_decisions_fts(session_decisions_fts, rowid, title, description, rationale)
-            VALUES('delete', old.id, old.title, old.description, old.rationale);
-        END;
-        CREATE TRIGGER IF NOT EXISTS sdec_fts_au AFTER UPDATE ON session_decisions BEGIN
-          INSERT INTO session_decisions_fts(session_decisions_fts, rowid, title, description, rationale)
-            VALUES('delete', old.id, old.title, old.description, old.rationale);
-          INSERT INTO session_decisions_fts(rowid, title, description, rationale)
-            VALUES (new.id, new.title, new.description, new.rationale);
-        END;
+            this.db.exec(`
+        CREATE VIRTUAL TABLE IF NOT EXISTS session_decisions_fts
+          USING fts5(title, description, rationale, content=session_decisions, content_rowid=id);
+
+        CREATE TRIGGER IF NOT EXISTS sdec_fts_ai AFTER INSERT ON session_decisions BEGIN
+          INSERT INTO session_decisions_fts(rowid, title, description, rationale)
+            VALUES (new.id, new.title, new.description, new.rationale);
+        END;
+        CREATE TRIGGER IF NOT EXISTS sdec_fts_ad AFTER DELETE ON session_decisions BEGIN
+          INSERT INTO session_decisions_fts(session_decisions_fts, rowid, title, description, rationale)
+            VALUES('delete', old.id, old.title, old.description, old.rationale);
+        END;
+        CREATE TRIGGER IF NOT EXISTS sdec_fts_au AFTER UPDATE ON session_decisions BEGIN
+          INSERT INTO session_decisions_fts(session_decisions_fts, rowid, title, description, rationale)
+            VALUES('delete', old.id, old.title, old.description, old.rationale);
+          INSERT INTO session_decisions_fts(rowid, title, description, rationale)
+            VALUES (new.id, new.title, new.description, new.rationale);
+        END;
       `);
             // Constraints FTS
-            this.db.exec(`
-        CREATE VIRTUAL TABLE IF NOT EXISTS session_constraints_fts
-          USING fts5(title, description, content=session_constraints, content_rowid=id);
-
-        CREATE TRIGGER IF NOT EXISTS scon_fts_ai AFTER INSERT ON session_constraints BEGIN
-          INSERT INTO session_constraints_fts(rowid, title, description)
-            VALUES (new.id, new.title, new.description);
-        END;
-        CREATE TRIGGER IF NOT EXISTS scon_fts_ad AFTER DELETE ON session_constraints BEGIN
-          INSERT INTO session_constraints_fts(session_constraints_fts, rowid, title, description)
-            VALUES('delete', old.id, old.title, old.description);
-        END;
-        CREATE TRIGGER IF NOT EXISTS scon_fts_au AFTER UPDATE ON session_constraints BEGIN
-          INSERT INTO session_constraints_fts(session_constraints_fts, rowid, title, description)
-            VALUES('delete', old.id, old.title, old.description);
-          INSERT INTO session_constraints_fts(rowid, title, description)
-            VALUES (new.id, new.title, new.description);
-        END;
+            this.db.exec(`
+        CREATE VIRTUAL TABLE IF NOT EXISTS session_constraints_fts
+          USING fts5(title, description, content=session_constraints, content_rowid=id);
+
+        CREATE TRIGGER IF NOT EXISTS scon_fts_ai AFTER INSERT ON session_constraints BEGIN
+          INSERT INTO session_constraints_fts(rowid, title, description)
+            VALUES (new.id, new.title, new.description);
+        END;
+        CREATE TRIGGER IF NOT EXISTS scon_fts_ad AFTER DELETE ON session_constraints BEGIN
+          INSERT INTO session_constraints_fts(session_constraints_fts, rowid, title, description)
+            VALUES('delete', old.id, old.title, old.description);
+        END;
+        CREATE TRIGGER IF NOT EXISTS scon_fts_au AFTER UPDATE ON session_constraints BEGIN
+          INSERT INTO session_constraints_fts(session_constraints_fts, rowid, title, description)
+            VALUES('delete', old.id, old.title, old.description);
+          INSERT INTO session_constraints_fts(rowid, title, description)
+            VALUES (new.id, new.title, new.description);
+        END;
       `);
             // Goals FTS
-            this.db.exec(`
-        CREATE VIRTUAL TABLE IF NOT EXISTS session_goals_fts
-          USING fts5(title, description, content=session_goals, content_rowid=id);
-
-        CREATE TRIGGER IF NOT EXISTS sgoal_fts_ai AFTER INSERT ON session_goals BEGIN
-          INSERT INTO session_goals_fts(rowid, title, description)
-            VALUES (new.id, new.title, new.description);
-        END;
-        CREATE TRIGGER IF NOT EXISTS sgoal_fts_ad AFTER DELETE ON session_goals BEGIN
-          INSERT INTO session_goals_fts(session_goals_fts, rowid, title, description)
-            VALUES('delete', old.id, old.title, old.description);
-        END;
-        CREATE TRIGGER IF NOT EXISTS sgoal_fts_au AFTER UPDATE ON session_goals BEGIN
-          INSERT INTO session_goals_fts(session_goals_fts, rowid, title, description)
-            VALUES('delete', old.id, old.title, old.description);
-          INSERT INTO session_goals_fts(rowid, title, description)
-            VALUES (new.id, new.title, new.description);
-        END;
+            this.db.exec(`
+        CREATE VIRTUAL TABLE IF NOT EXISTS session_goals_fts
+          USING fts5(title, description, content=session_goals, content_rowid=id);
+
+        CREATE TRIGGER IF NOT EXISTS sgoal_fts_ai AFTER INSERT ON session_goals BEGIN
+          INSERT INTO session_goals_fts(rowid, title, description)
+            VALUES (new.id, new.title, new.description);
+        END;
+        CREATE TRIGGER IF NOT EXISTS sgoal_fts_ad AFTER DELETE ON session_goals BEGIN
+          INSERT INTO session_goals_fts(session_goals_fts, rowid, title, description)
+            VALUES('delete', old.id, old.title, old.description);
+        END;
+        CREATE TRIGGER IF NOT EXISTS sgoal_fts_au AFTER UPDATE ON session_goals BEGIN
+          INSERT INTO session_goals_fts(session_goals_fts, rowid, title, description)
+            VALUES('delete', old.id, old.title, old.description);
+          INSERT INTO session_goals_fts(rowid, title, description)
+            VALUES (new.id, new.title, new.description);
+        END;
       `);
             // Evidence FTS
-            this.db.exec(`
-        CREATE VIRTUAL TABLE IF NOT EXISTS session_evidence_fts
-          USING fts5(title, details, content=session_evidence, content_rowid=id);
-
-        CREATE TRIGGER IF NOT EXISTS sevi_fts_ai AFTER INSERT ON session_evidence BEGIN
-          INSERT INTO session_evidence_fts(rowid, title, details)
-            VALUES (new.id, new.title, new.details);
-        END;
-        CREATE TRIGGER IF NOT EXISTS sevi_fts_ad AFTER DELETE ON session_evidence BEGIN
-          INSERT INTO session_evidence_fts(session_evidence_fts, rowid, title, details)
-            VALUES('delete', old.id, old.title, old.details);
-        END;
-        CREATE TRIGGER IF NOT EXISTS sevi_fts_au AFTER UPDATE ON session_evidence BEGIN
-          INSERT INTO session_evidence_fts(session_evidence_fts, rowid, title, details)
-            VALUES('delete', old.id, old.title, old.details);
-          INSERT INTO session_evidence_fts(rowid, title, details)
-            VALUES (new.id, new.title, new.details);
-        END;
+            this.db.exec(`
+        CREATE VIRTUAL TABLE IF NOT EXISTS session_evidence_fts
+          USING fts5(title, details, content=session_evidence, content_rowid=id);
+
+        CREATE TRIGGER IF NOT EXISTS sevi_fts_ai AFTER INSERT ON session_evidence BEGIN
+          INSERT INTO session_evidence_fts(rowid, title, details)
+            VALUES (new.id, new.title, new.details);
+        END;
+        CREATE TRIGGER IF NOT EXISTS sevi_fts_ad AFTER DELETE ON session_evidence BEGIN
+          INSERT INTO session_evidence_fts(session_evidence_fts, rowid, title, details)
+            VALUES('delete', old.id, old.title, old.details);
+        END;
+        CREATE TRIGGER IF NOT EXISTS sevi_fts_au AFTER UPDATE ON session_evidence BEGIN
+          INSERT INTO session_evidence_fts(session_evidence_fts, rowid, title, details)
+            VALUES('delete', old.id, old.title, old.details);
+          INSERT INTO session_evidence_fts(rowid, title, details)
+            VALUES (new.id, new.title, new.details);
+        END;
       `);
         }
         catch {
@@ -199,11 +214,11 @@ export class SessionRAGStore {
     // ==========================================================================
     addDecision(input) {
         const timestamp = new Date().toISOString();
-        const stmt = this.db.prepare(`
-      INSERT INTO session_decisions (sessionId, title, description, rationale, alternatives, impact, status, priority, relatedFiles, tags, timestamp)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+        const stmt = this.db.prepare(`
+      INSERT INTO session_decisions (sessionId, taskId, title, description, rationale, alternatives, impact, status, priority, relatedFiles, tags, timestamp)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     `);
-        const result = stmt.run(input.sessionId || null, input.title, input.description || null, input.rationale || null, input.alternatives ? JSON.stringify(input.alternatives) : null, input.impact || null, input.status || 'active', input.priority ?? 1, input.relatedFiles ? JSON.stringify(input.relatedFiles) : null, input.tags ? JSON.stringify(input.tags) : null, timestamp);
+        const result = stmt.run(input.sessionId || null, input.taskId || null, input.title, input.description || null, input.rationale || null, input.alternatives ? JSON.stringify(input.alternatives) : null, input.impact || null, input.status || 'active', input.priority ?? 1, input.relatedFiles ? JSON.stringify(input.relatedFiles) : null, input.tags ? JSON.stringify(input.tags) : null, timestamp);
         return result.lastInsertRowid;
     }
     getDecision(id) {
@@ -274,13 +289,13 @@ export class SessionRAGStore {
     searchDecisions(query, limit = 20) {
         if (this.fts5Available) {
             try {
-                const rows = this.db.prepare(`
-          SELECT d.*, bm25(session_decisions_fts) as rank
-          FROM session_decisions_fts fts
-          JOIN session_decisions d ON d.id = fts.rowid
-          WHERE session_decisions_fts MATCH ?
-          ORDER BY rank
-          LIMIT ?
+                const rows = this.db.prepare(`
+          SELECT d.*, bm25(session_decisions_fts) as rank
+          FROM session_decisions_fts fts
+          JOIN session_decisions d ON d.id = fts.rowid
+          WHERE session_decisions_fts MATCH ?
+          ORDER BY rank
+          LIMIT ?
         `).all(MemoryStorage.sanitizeFTS5Query(query), limit);
                 return rows.map(this.rowToDecision);
             }
@@ -289,10 +304,10 @@ export class SessionRAGStore {
             }
         }
         const pattern = `%${query}%`;
-        const rows = this.db.prepare(`
-      SELECT * FROM session_decisions
-      WHERE title LIKE ? OR description LIKE ? OR rationale LIKE ?
-      ORDER BY priority DESC, timestamp DESC LIMIT ?
+        const rows = this.db.prepare(`
+      SELECT * FROM session_decisions
+      WHERE title LIKE ? OR description LIKE ? OR rationale LIKE ?
+      ORDER BY priority DESC, timestamp DESC LIMIT ?
     `).all(pattern, pattern, pattern, limit);
         return rows.map(this.rowToDecision);
     }
@@ -321,11 +336,11 @@ export class SessionRAGStore {
     // ==========================================================================
     addConstraint(input) {
         const timestamp = new Date().toISOString();
-        const stmt = this.db.prepare(`
-      INSERT INTO session_constraints (sessionId, title, description, type, severity, scope, timestamp)
-      VALUES (?, ?, ?, ?, ?, ?, ?)
+        const stmt = this.db.prepare(`
+      INSERT INTO session_constraints (sessionId, taskId, title, description, type, severity, scope, timestamp)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?)
     `);
-        const result = stmt.run(input.sessionId || null, input.title, input.description || null, input.type, input.severity || 'medium', input.scope || null, timestamp);
+        const result = stmt.run(input.sessionId || null, input.taskId || null, input.title, input.description || null, input.type, input.severity || 'medium', input.scope || null, timestamp);
         return result.lastInsertRowid;
     }
     getConstraint(id) {
@@ -384,13 +399,13 @@ export class SessionRAGStore {
     searchConstraints(query, limit = 20) {
         if (this.fts5Available) {
             try {
-                const rows = this.db.prepare(`
-          SELECT c.*, bm25(session_constraints_fts) as rank
-          FROM session_constraints_fts fts
-          JOIN session_constraints c ON c.id = fts.rowid
-          WHERE session_constraints_fts MATCH ?
-          ORDER BY rank
-          LIMIT ?
+                const rows = this.db.prepare(`
+          SELECT c.*, bm25(session_constraints_fts) as rank
+          FROM session_constraints_fts fts
+          JOIN session_constraints c ON c.id = fts.rowid
+          WHERE session_constraints_fts MATCH ?
+          ORDER BY rank
+          LIMIT ?
         `).all(MemoryStorage.sanitizeFTS5Query(query), limit);
                 return rows.map(this.rowToConstraint);
             }
@@ -399,10 +414,10 @@ export class SessionRAGStore {
             }
         }
         const pattern = `%${query}%`;
-        const rows = this.db.prepare(`
-      SELECT * FROM session_constraints
-      WHERE title LIKE ? OR description LIKE ?
-      ORDER BY timestamp DESC LIMIT ?
+        const rows = this.db.prepare(`
+      SELECT * FROM session_constraints
+      WHERE title LIKE ? OR description LIKE ?
+      ORDER BY timestamp DESC LIMIT ?
     `).all(pattern, pattern, limit);
         return rows.map(this.rowToConstraint);
     }
@@ -427,11 +442,11 @@ export class SessionRAGStore {
     // ==========================================================================
     addGoal(input) {
         const timestamp = new Date().toISOString();
-        const stmt = this.db.prepare(`
-      INSERT INTO session_goals (sessionId, parentId, title, description, status, priority, progressPercent, successCriteria, timestamp, completedAt)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+        const stmt = this.db.prepare(`
+      INSERT INTO session_goals (sessionId, taskId, parentId, title, description, status, priority, progressPercent, successCriteria, timestamp, completedAt)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     `);
-        const result = stmt.run(input.sessionId || null, input.parentId || null, input.title, input.description || null, input.status || 'active', input.priority ?? 1, input.progressPercent ?? 0, input.successCriteria ? JSON.stringify(input.successCriteria) : null, timestamp, null);
+        const result = stmt.run(input.sessionId || null, input.taskId || null, input.parentId || null, input.title, input.description || null, input.status || 'active', input.priority ?? 1, input.progressPercent ?? 0, input.successCriteria ? JSON.stringify(input.successCriteria) : null, timestamp, null);
         return result.lastInsertRowid;
     }
     getGoal(id) {
@@ -496,41 +511,41 @@ export class SessionRAGStore {
         return rows.map(this.rowToGoal);
     }
     getActiveGoals(limit = 10) {
-        const rows = this.db.prepare(`
-      SELECT * FROM session_goals
-      WHERE status = 'active'
-      ORDER BY priority DESC, timestamp DESC
-      LIMIT ?
+        const rows = this.db.prepare(`
+      SELECT * FROM session_goals
+      WHERE status = 'active'
+      ORDER BY priority DESC, timestamp DESC
+      LIMIT ?
     `).all(limit);
         return rows.map(this.rowToGoal);
     }
     getGoalHierarchy(rootId) {
         if (rootId) {
             // Get root + all descendants (max 3 levels)
-            const rows = this.db.prepare(`
-        SELECT * FROM session_goals
-        WHERE id = ? OR parentId = ?
-        ORDER BY parentId NULLS FIRST, priority DESC
+            const rows = this.db.prepare(`
+        SELECT * FROM session_goals
+        WHERE id = ? OR parentId = ?
+        ORDER BY parentId NULLS FIRST, priority DESC
       `).all(rootId, rootId);
             return rows.map(this.rowToGoal);
         }
         // Get all top-level goals with children
-        const rows = this.db.prepare(`
-      SELECT * FROM session_goals
-      ORDER BY parentId NULLS FIRST, priority DESC, timestamp DESC
+        const rows = this.db.prepare(`
+      SELECT * FROM session_goals
+      ORDER BY parentId NULLS FIRST, priority DESC, timestamp DESC
     `).all();
         return rows.map(this.rowToGoal);
     }
     searchGoals(query, limit = 20) {
         if (this.fts5Available) {
             try {
-                const rows = this.db.prepare(`
-          SELECT g.*, bm25(session_goals_fts) as rank
-          FROM session_goals_fts fts
-          JOIN session_goals g ON g.id = fts.rowid
-          WHERE session_goals_fts MATCH ?
-          ORDER BY rank
-          LIMIT ?
+                const rows = this.db.prepare(`
+          SELECT g.*, bm25(session_goals_fts) as rank
+          FROM session_goals_fts fts
+          JOIN session_goals g ON g.id = fts.rowid
+          WHERE session_goals_fts MATCH ?
+          ORDER BY rank
+          LIMIT ?
         `).all(MemoryStorage.sanitizeFTS5Query(query), limit);
                 return rows.map(this.rowToGoal);
             }
@@ -539,10 +554,10 @@ export class SessionRAGStore {
             }
         }
         const pattern = `%${query}%`;
-        const rows = this.db.prepare(`
-      SELECT * FROM session_goals
-      WHERE title LIKE ? OR description LIKE ?
-      ORDER BY priority DESC, timestamp DESC LIMIT ?
+        const rows = this.db.prepare(`
+      SELECT * FROM session_goals
+      WHERE title LIKE ? OR description LIKE ?
+      ORDER BY priority DESC, timestamp DESC LIMIT ?
     `).all(pattern, pattern, limit);
         return rows.map(this.rowToGoal);
     }
@@ -570,11 +585,11 @@ export class SessionRAGStore {
     // ==========================================================================
     addEvidence(input) {
         const timestamp = new Date().toISOString();
-        const stmt = this.db.prepare(`
-      INSERT INTO session_evidence (sessionId, type, title, status, details, metrics, relatedGoals, timestamp)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+        const stmt = this.db.prepare(`
+      INSERT INTO session_evidence (sessionId, taskId, type, title, status, details, metrics, relatedGoals, timestamp)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
     `);
-        const result = stmt.run(input.sessionId || null, input.type, input.title, input.status, input.details ? JSON.stringify(input.details) : null, input.metrics ? JSON.stringify(input.metrics) : null, input.relatedGoals ? JSON.stringify(input.relatedGoals) : null, timestamp);
+        const result = stmt.run(input.sessionId || null, input.taskId || null, input.type, input.title, input.status, input.details ? JSON.stringify(input.details) : null, input.metrics ? JSON.stringify(input.metrics) : null, input.relatedGoals ? JSON.stringify(input.relatedGoals) : null, timestamp);
         return result.lastInsertRowid;
     }
     getEvidence(id) {
@@ -602,23 +617,23 @@ export class SessionRAGStore {
         return rows.map(this.rowToEvidence);
     }
     getRecentEvidence(limit = 10) {
-        const rows = this.db.prepare(`
-      SELECT * FROM session_evidence
-      ORDER BY timestamp DESC
-      LIMIT ?
+        const rows = this.db.prepare(`
+      SELECT * FROM session_evidence
+      ORDER BY timestamp DESC
+      LIMIT ?
     `).all(limit);
         return rows.map(this.rowToEvidence);
     }
     searchEvidence(query, limit = 20) {
         if (this.fts5Available) {
             try {
-                const rows = this.db.prepare(`
-          SELECT e.*, bm25(session_evidence_fts) as rank
-          FROM session_evidence_fts fts
-          JOIN session_evidence e ON e.id = fts.rowid
-          WHERE session_evidence_fts MATCH ?
-          ORDER BY rank
-          LIMIT ?
+                const rows = this.db.prepare(`
+          SELECT e.*, bm25(session_evidence_fts) as rank
+          FROM session_evidence_fts fts
+          JOIN session_evidence e ON e.id = fts.rowid
+          WHERE session_evidence_fts MATCH ?
+          ORDER BY rank
+          LIMIT ?
         `).all(MemoryStorage.sanitizeFTS5Query(query), limit);
                 return rows.map(this.rowToEvidence);
             }
@@ -627,10 +642,10 @@ export class SessionRAGStore {
             }
         }
         const pattern = `%${query}%`;
-        const rows = this.db.prepare(`
-      SELECT * FROM session_evidence
-      WHERE title LIKE ? OR details LIKE ?
-      ORDER BY timestamp DESC LIMIT ?
+        const rows = this.db.prepare(`
+      SELECT * FROM session_evidence
+      WHERE title LIKE ? OR details LIKE ?
+      ORDER BY timestamp DESC LIMIT ?
     `).all(pattern, pattern, limit);
         return rows.map(this.rowToEvidence);
     }
@@ -652,6 +667,25 @@ export class SessionRAGStore {
         };
     }
     // ==========================================================================
+    // Task-scoped cleanup
+    // ==========================================================================
+    deleteByTaskId(taskId) {
+        const tables = [
+            'session_decisions',
+            'session_constraints',
+            'session_goals',
+            'session_evidence',
+        ];
+        for (const table of tables) {
+            try {
+                this.db.prepare(`DELETE FROM ${table} WHERE taskId = ?`).run(taskId);
+            }
+            catch {
+                // Column may not exist yet — idempotent
+            }
+        }
+    }
+    // ==========================================================================
     // Stats
     // ==========================================================================
     getStats() {