atris 3.12.1 → 3.14.0

package/lib/todo-fallback.js

@@ -0,0 +1,142 @@
+// Pure TODO.md markdown parser. The original lib/todo.js logic, extracted so
+// the shim in lib/todo.js can fall back to it when the SQLite store is empty
+// (or when ATRIS_TASK_DB is not enabled).
+//
+// Do not add new callers. Use lib/todo.js (the shim) — it merges DB + markdown.
+
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+
+function parseTodoFile(todoPath) {
+  if (!fs.existsSync(todoPath)) return { backlog: [], inProgress: [], completed: [] };
+  const content = fs.readFileSync(todoPath, 'utf8');
+  return {
+    backlog: parseSection(content, 'Backlog'),
+    inProgress: parseSection(content, 'In Progress'),
+    completed: parseSection(content, 'Completed'),
+  };
+}
+
+function parseSection(content, sectionName) {
+  const escaped = sectionName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+  const match = content.match(new RegExp(`##\\s+${escaped}\\n([\\s\\S]*?)(?=\\n##|$)`, 'i'));
+  if (!match) return [];
+
+  const body = (match[1] || '').trim();
+  if (!body || /^\(clean\)/i.test(body) || /^\(empty/i.test(body) || /^\(see /i.test(body)) return [];
+
+  const tasks = [];
+  const lines = body.split('\n');
+  let current = null;
+
+  for (const rawLine of lines) {
+    const line = rawLine.trimEnd();
+
+    const taskMatch = line.match(/^- \*\*([A-Za-z][A-Za-z0-9#]*\d[a-z]?):\*\*\s*(.+)$/);
+    if (taskMatch) {
+      if (current) tasks.push(current);
+      const allTags = [...taskMatch[2].matchAll(/\[(\w+)\]/g)].map(m => m[1]);
+      const tag = allTags.includes('endgame') ? 'endgame' : (allTags[0] || null);
+      current = {
+        id: taskMatch[1],
+        title: taskMatch[2].replace(/\s*\[\w+\]/g, '').trim(),
+        tag,
+        tags: allTags,
+        claimed: null,
+        stage: null,
+        verify: null,
+      };
+      continue;
+    }
+
+    const checkMatch = line.match(/^- \[[ x]\]\s+(.+)$/);
+    if (checkMatch && !current) {
+      tasks.push({ id: null, title: checkMatch[1].trim(), tag: null, claimed: null, stage: null, verify: null });
+      continue;
+    }
+
+    const plainMatch = line.match(/^- (.+)$/);
+    if (plainMatch && !current && !plainMatch[1].startsWith('**')) {
+      tasks.push({ id: null, title: plainMatch[1].trim(), tag: null, claimed: null, stage: null, verify: null });
+      continue;
+    }
+
+    if (!current) continue;
+
+    const claimMatch = line.match(/\*\*Claimed by:\*\*\s*(.+)$/) || line.match(/Claimed by:\s*(.+)$/);
+    if (claimMatch) { current.claimed = claimMatch[1].trim(); continue; }
+
+    const stageMatch = line.match(/\*\*Stage:\*\*\s*(.+)$/) || line.match(/Stage:\s*(.+)$/);
+    if (stageMatch) { current.stage = stageMatch[1].trim(); continue; }
+
+    const verifyMatch = line.match(/\*\*Verify:\*\*\s*(.+)$/) || line.match(/Verify:\s*(.+)$/);
+    if (verifyMatch) { current.verify = verifyMatch[1].trim(); continue; }
+  }
+
+  if (current) tasks.push(current);
+  return tasks;
+}
+
+function getTeamMemberJournal(atrisDir, memberName) {
+  const journalDir = path.join(atrisDir, 'team', memberName, 'journal');
+  if (!fs.existsSync(journalDir)) return null;
+
+  let files;
+  try {
+    files = fs.readdirSync(journalDir).filter(f => f.endsWith('.md')).sort().reverse();
+  } catch { return null; }
+
+  if (files.length === 0) return null;
+
+  const latestFile = files[0];
+  let content;
+  try { content = fs.readFileSync(path.join(journalDir, latestFile), 'utf8'); }
+  catch { return null; }
+
+  const date = latestFile.replace('.md', '');
+  const taskMatch = content.match(/\*\*Task:\*\*\s*(.+)/);
+  const deliveredMatch = content.match(/\*\*Delivered:\*\*\s*(.+)/);
+  const patternMatch = content.match(/\*\*Pattern:\*\*\s*(.+)/);
+  const learnedMatch = content.match(/\*\*Learned:\*\*\s*(.+)/);
+
+  return {
+    date,
+    file: path.join(journalDir, latestFile),
+    task: taskMatch ? taskMatch[1].trim() : null,
+    delivered: deliveredMatch ? deliveredMatch[1].trim() : null,
+    pattern: patternMatch ? patternMatch[1].trim() : null,
+    learned: learnedMatch ? learnedMatch[1].trim() : null,
+    raw: content,
+  };
+}
+
+function listTeamMembers(atrisDir) {
+  const teamDir = path.join(atrisDir, 'team');
+  if (!fs.existsSync(teamDir)) return [];
+  return fs.readdirSync(teamDir).filter(name => {
+    if (name.startsWith('_') || name.startsWith('.')) return false;
+    const full = path.join(teamDir, name);
+    try { return fs.statSync(full).isDirectory(); } catch { return false; }
+  });
+}
+
+function getTeamActivity(atrisDir) {
+  const members = listTeamMembers(atrisDir);
+  const activity = [];
+  for (const member of members) {
+    const journal = getTeamMemberJournal(atrisDir, member);
+    if (journal) activity.push({ member, ...journal });
+  }
+  activity.sort((a, b) => b.date.localeCompare(a.date));
+  return activity;
+}
+
+module.exports = {
+  parseTodoFile,
+  parseSection,
+  getTeamMemberJournal,
+  listTeamMembers,
+  getTeamActivity,
+};

package/lib/todo.js

@@ -1,204 +1,119 @@
-const fs = require('fs');
-const path = require('path');
-
-/**
- * Parse TODO.md into structured task objects.
- * Supports format: - **T1:** Description
- *   with optional **Claimed by:** and **Stage:** lines
- */
-function parseTodo(todoPath) {
-  if (!fs.existsSync(todoPath)) return { backlog: [], inProgress: [], completed: [] };
-
-  const content = fs.readFileSync(todoPath, 'utf8');
+// SHIM. Same export surface as the legacy markdown parser, but reads from the
+// SQLite task store first when ATRIS_TASK_DB=1 is set, falling back to the
+// pure markdown parser at lib/todo-fallback.js.
+//
+// All 3 callers (commands/autopilot.js, commands/status.js, commands/run.js)
+// inherit the strangler without changing their import path.
+//
+// When ATRIS_TASK_DB=1:
+//   parseTodo({path}) returns DB-derived tasks first; markdown rows whose
+//   title doesn't already exist in DB are appended (so import is gradual).
+// Otherwise: behaves exactly like the old parser.
+
+'use strict';
+
+const fallback = require('./todo-fallback');
+
+const TASK_DB_ENABLED = process.env.ATRIS_TASK_DB === '1';
+
+function dbToShimRow(row) {
+  const metadata = row.metadata && typeof row.metadata === 'object' ? row.metadata : {};
+  const verify = typeof metadata.verify === 'string' && metadata.verify.trim()
+    ? metadata.verify.trim()
+    : null;
+  const claimed = row.claimed_by || metadata.claimed || null;
+  // Map DB row → the shape the existing consumers expect from parseTodo().
   return {
-    backlog: parseSection(content, 'Backlog'),
-    inProgress: parseSection(content, 'In Progress'),
-    completed: parseSection(content, 'Completed'),
+    id: row.id,
+    title: row.title,
+    tag: row.tag || null,
+    tags: row.tag ? [row.tag] : [],
+    claimed,
+    stage: row.status === 'claimed' ? 'in_progress' : (metadata.stage || null),
+    verify,
+    _source: 'db',
   };
 }
 
-/**
- * Parse a specific section from TODO.md content into task objects.
- * @param {string} content - Full TODO.md content
- * @param {string} sectionName - Section name to extract (e.g., 'Backlog')
- * @returns {Array} Array of parsed task objects
- */
-function parseSection(content, sectionName) {
-  const escaped = sectionName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-  const match = content.match(new RegExp(`##\\s+${escaped}\\n([\\s\\S]*?)(?=\\n##|$)`, 'i'));
-  if (!match) return [];
-
-  const body = (match[1] || '').trim();
-  if (!body || /^\(clean\)/i.test(body) || /^\(empty/i.test(body) || /^\(see /i.test(body)) return [];
-
-  const tasks = [];
-  const lines = body.split('\n');
-  let current = null;
-
-  for (const rawLine of lines) {
-    const line = rawLine.trimEnd();
-
-    // New task line: - **T1:** Description or - **T1a:** Description [tag] [tag]
-    // Accepts task IDs like T1, W3b, M12c, R1, T#1 — letter(s), optional symbols, digits, optional trailing letter.
-    const taskMatch = line.match(/^- \*\*([A-Za-z][A-Za-z0-9#]*\d[a-z]?):\*\*\s*(.+)$/);
-    if (taskMatch) {
-      if (current) tasks.push(current);
-      // Capture ALL bracketed tags in the line, not just the last one. Endgame is priority.
-      const allTags = [...taskMatch[2].matchAll(/\[(\w+)\]/g)].map(m => m[1]);
-      const tag = allTags.includes('endgame') ? 'endgame' : (allTags[0] || null);
-      current = {
-        id: taskMatch[1],
-        title: taskMatch[2].replace(/\s*\[\w+\]/g, '').trim(),
-        tag,
-        tags: allTags,
-        claimed: null,
-        stage: null,
-        verify: null,
-      };
-      continue;
-    }
-
-    // Also support checkbox format: - [x] Description
-    const checkMatch = line.match(/^- \[[ x]\]\s+(.+)$/);
-    if (checkMatch && !current) {
-      tasks.push({
-        id: null,
-        title: checkMatch[1].trim(),
-        tag: null,
-        claimed: null,
-        stage: null,
-        verify: null,
-      });
-      continue;
-    }
-
-    // Plain bullet without ID: - Description
-    const plainMatch = line.match(/^- (.+)$/);
-    if (plainMatch && !current && !plainMatch[1].startsWith('**')) {
-      tasks.push({
-        id: null,
-        title: plainMatch[1].trim(),
-        tag: null,
-        claimed: null,
-        stage: null,
-        verify: null,
-      });
-      continue;
-    }
-
-    if (!current) continue;
-
-    // Claimed by line
-    const claimMatch = line.match(/\*\*Claimed by:\*\*\s*(.+)$/) || line.match(/Claimed by:\s*(.+)$/);
-    if (claimMatch) {
-      current.claimed = claimMatch[1].trim();
-      continue;
-    }
-
-    // Stage line
-    const stageMatch = line.match(/\*\*Stage:\*\*\s*(.+)$/) || line.match(/Stage:\s*(.+)$/);
-    if (stageMatch) {
-      current.stage = stageMatch[1].trim();
-      continue;
-    }
+function dbBuckets(workspaceRoot) {
+  const taskDb = require('./task-db');
+  const db = taskDb.open();
+  const rows = taskDb.listTasks(db, { workspaceRoot, limit: 500 });
+  // Need raw source_key for merge dedup, plus the shim shape for callers.
+  const backlog = [];
+  const inProgress = [];
+  const completed = [];
+  const sourceKeys = new Set();
+  // Query directly so the shim can dedup against markdown by the strong key
+  // even if future list filters hide rows.
+  const stmt = db.prepare('SELECT id, source_key FROM tasks WHERE workspace_root = ? AND source_key IS NOT NULL');
+  for (const r of stmt.all(workspaceRoot)) sourceKeys.add(r.source_key);
+  for (const r of rows) {
+    const shaped = dbToShimRow(r);
+    if (r.status === 'open') backlog.push(shaped);
+    else if (r.status === 'claimed') inProgress.push(shaped);
+    else if (r.status === 'done' || r.status === 'failed') completed.push(shaped);
+  }
+  return { backlog, inProgress, completed, sourceKeys };
+}
 
-    // Verify line
-    const verifyMatch = line.match(/\*\*Verify:\*\*\s*(.+)$/) || line.match(/Verify:\s*(.+)$/);
-    if (verifyMatch) {
-      current.verify = verifyMatch[1].trim();
-      continue;
+function mergeBuckets(dbBuck, mdBuck, todoPath) {
+  // Append markdown rows that aren't already in the DB. Dedup by source_key
+  // (strong: same source_file + normalized_title hash) first, and by
+  // normalized_title as a compatibility fallback for legacy markdown rows
+  // that pre-date the import path.
+  const taskDb = require('./task-db');
+  const norm = (t) => String(t || '').toLowerCase().trim().replace(/\s+/g, ' ');
+  const seenTitles = new Set();
+  const out = { backlog: [], inProgress: [], completed: [] };
+  for (const k of ['backlog', 'inProgress', 'completed']) {
+    for (const r of dbBuck[k]) { out[k].push(r); seenTitles.add(norm(r.title)); }
+    for (const r of mdBuck[k]) {
+      const sk = todoPath ? taskDb.sourceKey(todoPath, r.title) : null;
+      if (sk && dbBuck.sourceKeys && dbBuck.sourceKeys.has(sk)) continue;
+      if (seenTitles.has(norm(r.title))) continue;
+      out[k].push({ ...r, _source: 'md' });
     }
   }
-
-  if (current) tasks.push(current);
-  return tasks;
+  return out;
 }
 
-/**
- * Get latest journal entry for a team member.
- * Reads the most recent file in atris/team/[member]/journal/
- * Returns { date, entries[] } or null
- */
-function getTeamMemberJournal(atrisDir, memberName) {
-  const journalDir = path.join(atrisDir, 'team', memberName, 'journal');
-  if (!fs.existsSync(journalDir)) return null;
-
-  let files;
+function parseTodo(todoPath) {
+  // Legacy pure-markdown path.
+  if (!TASK_DB_ENABLED) return fallback.parseTodoFile(todoPath);
+
+  // DB-first merged view. Workspace scope = directory containing todoPath
+  // (or its parent), so the DB stays per-repo.
+  const path = require('path');
+  const fs = require('fs');
+  const taskDb = require('./task-db');
+  let workspaceRoot;
   try {
-    files = fs.readdirSync(journalDir)
-      .filter(f => f.endsWith('.md'))
-      .sort()
-      .reverse();
+    const todoAbs = path.resolve(todoPath);
+    // typical layout: <repo>/atris/TODO.md → workspace = <repo>
+    const guess = path.dirname(path.dirname(todoAbs));
+    // Normalize via taskDb so it matches what `task add` writes.
+    workspaceRoot = fs.existsSync(guess) ? taskDb.workspaceRoot(guess) : taskDb.workspaceRoot();
   } catch {
-    return null;
+    workspaceRoot = taskDb.workspaceRoot();
   }
 
-  if (files.length === 0) return null;
-
-  const latestFile = files[0];
-  let content;
+  let dbBuck;
   try {
-    content = fs.readFileSync(path.join(journalDir, latestFile), 'utf8');
-  } catch {
-    return null;
-  }
-  const date = latestFile.replace('.md', '');
-
-  // Extract key fields from journal entry
-  const taskMatch = content.match(/\*\*Task:\*\*\s*(.+)/);
-  const deliveredMatch = content.match(/\*\*Delivered:\*\*\s*(.+)/);
-  const patternMatch = content.match(/\*\*Pattern:\*\*\s*(.+)/);
-  const learnedMatch = content.match(/\*\*Learned:\*\*\s*(.+)/);
-
-  return {
-    date,
-    file: path.join(journalDir, latestFile),
-    task: taskMatch ? taskMatch[1].trim() : null,
-    delivered: deliveredMatch ? deliveredMatch[1].trim() : null,
-    pattern: patternMatch ? patternMatch[1].trim() : null,
-    learned: learnedMatch ? learnedMatch[1].trim() : null,
-    raw: content,
-  };
-}
-
-/**
- * Get all team members that have directories in atris/team/
- */
-function listTeamMembers(atrisDir) {
-  const teamDir = path.join(atrisDir, 'team');
-  if (!fs.existsSync(teamDir)) return [];
-
-  return fs.readdirSync(teamDir)
-    .filter(name => {
-      if (name.startsWith('_') || name.startsWith('.')) return false;
-      const full = path.join(teamDir, name);
-      try { return fs.statSync(full).isDirectory(); } catch { return false; }
-    });
-}
-
-/**
- * Get team activity: latest journal entry per member
- */
-function getTeamActivity(atrisDir) {
-  const members = listTeamMembers(atrisDir);
-  const activity = [];
-
-  for (const member of members) {
-    const journal = getTeamMemberJournal(atrisDir, member);
-    if (journal) {
-      activity.push({ member, ...journal });
-    }
+    dbBuck = dbBuckets(workspaceRoot);
+  } catch (e) {
+    // If sqlite blew up (missing in node, perms), don't break the legacy path.
+    if (process.env.ATRIS_DEBUG) console.error('[todo shim] db read failed:', e.message);
+    return fallback.parseTodoFile(todoPath);
   }
-
-  // Sort by date descending (most recent first)
-  activity.sort((a, b) => b.date.localeCompare(a.date));
-  return activity;
+  const mdBuck = fallback.parseTodoFile(todoPath);
+  return mergeBuckets(dbBuck, mdBuck, todoPath);
 }
 
 module.exports = {
   parseTodo,
-  parseSection,
-  getTeamMemberJournal,
-  listTeamMembers,
-  getTeamActivity,
+  parseSection: fallback.parseSection,
+  getTeamMemberJournal: fallback.getTeamMemberJournal,
+  listTeamMembers: fallback.listTeamMembers,
+  getTeamActivity: fallback.getTeamActivity,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atris",
-  "version": "3.12.1",
+  "version": "3.14.0",
   "description": "Atris — an operating system for intelligence. Integrates with any agent.",
   "main": "bin/atris.js",
   "bin": {
@@ -8,7 +8,7 @@
   },
   "files": [
     "bin/",
-    "cli/",
+    "cli/*.py",
     "commands/",
     "utils/",
     "lib/",