@cccarv82/freya 1.0.27 → 1.0.29

package/cli/web-ui.js

@@ -337,6 +337,79 @@
     }
   }
 
+  function renderTasks(list) {
+    const el = $('tasksList');
+    if (!el) return;
+    el.innerHTML = '';
+    for (const t of list || []) {
+      const row = document.createElement('div');
+      row.className = 'rep';
+      const pri = (t.priority || '').toUpperCase();
+      row.innerHTML = '<div style="display:flex; justify-content:space-between; gap:10px; align-items:center">'
+        + '<div style="min-width:0"><div style="font-weight:700">' + escapeHtml(t.description || '') + '</div>'
+        + '<div style="opacity:.7; font-size:11px; margin-top:4px">' + escapeHtml(String(t.category || '')) + (pri ? (' · ' + escapeHtml(pri)) : '') + '</div></div>'
+        + '<button class="btn small" type="button">Complete</button>'
+        + '</div>';
+      const btn = row.querySelector('button');
+      btn.onclick = async () => {
+        try {
+          setPill('run', 'completing…');
+          await api('/api/tasks/complete', { dir: dirOrDefault(), id: t.id });
+          await refreshToday();
+          setPill('ok', 'completed');
+          setTimeout(() => setPill('ok', 'idle'), 800);
+        } catch (e) {
+          setPill('err', 'complete failed');
+          setOut(String(e && e.message ? e.message : e));
+        }
+      };
+      el.appendChild(row);
+    }
+    if (!el.childElementCount) {
+      const empty = document.createElement('div');
+      empty.className = 'help';
+      empty.textContent = 'No DO_NOW tasks.';
+      el.appendChild(empty);
+    }
+  }
+
+  function renderBlockers(list) {
+    const el = $('blockersList');
+    if (!el) return;
+    el.innerHTML = '';
+    for (const b of list || []) {
+      const row = document.createElement('div');
+      row.className = 'rep';
+      const sev = String(b.severity || '').toUpperCase();
+      row.innerHTML = '<div style="display:flex; justify-content:space-between; gap:10px; align-items:center">'
+        + '<div style="min-width:0"><div style="font-weight:800">' + escapeHtml(sev) + '</div>'
+        + '<div style="margin-top:4px">' + escapeHtml(b.title || '') + '</div>'
+        + '</div>'
+        + '<div style="opacity:.7; font-size:11px; white-space:nowrap">' + escapeHtml(fmtWhen(new Date(b.createdAt || Date.now()).getTime())) + '</div>'
+        + '</div>';
+      el.appendChild(row);
+    }
+    if (!el.childElementCount) {
+      const empty = document.createElement('div');
+      empty.className = 'help';
+      empty.textContent = 'No OPEN blockers.';
+      el.appendChild(empty);
+    }
+  }
+
+  async function refreshToday() {
+    try {
+      const [t, b] = await Promise.all([
+        api('/api/tasks/list', { dir: dirOrDefault(), category: 'DO_NOW', status: 'PENDING', limit: 5 }),
+        api('/api/blockers/list', { dir: dirOrDefault(), status: 'OPEN', limit: 5 })
+      ]);
+      renderTasks((t && t.tasks) || []);
+      renderBlockers((b && b.blockers) || []);
+    } catch (e) {
+      // keep silent in background refresh
+    }
+  }
+
   async function pickDir() {
     try {
       setPill('run', 'picker…');
@@ -680,6 +753,7 @@
   window.publish = publish;
   window.saveSettings = saveSettings;
   window.refreshReports = refreshReports;
+  window.refreshToday = refreshToday;
   window.renderReportsList = renderReportsList;
   window.copyOut = copyOut;
   window.copyPath = copyPath;

package/cli/web.js

@@ -368,6 +368,16 @@ function safeJson(res, code, obj) {
   res.end(body);
 }
 
+function looksEmptyWorkspace(dir) {
+  try {
+    if (!exists(dir)) return true;
+    const entries = fs.readdirSync(dir).filter((n) => !['.debuglogs', '.DS_Store'].includes(n));
+    return entries.length === 0;
+  } catch {
+    return true;
+  }
+}
+
 function looksLikeFreyaWorkspace(dir) {
   // minimal check: has scripts/validate-data.js and data/
   return (
@@ -638,6 +648,22 @@ function buildHtml(safeDefault) {
                 </div>
               </div>
 
+              <div class="panel">
+                <div class="panelHead">
+                  <b>Today</b>
+                  <div class="stack">
+                    <button class="btn small" onclick="refreshToday()">Refresh</button>
+                  </div>
+                </div>
+                <div class="panelBody">
+                  <div class="small" style="margin-bottom:8px; opacity:.8">Do Now</div>
+                  <div id="tasksList" style="display:grid; gap:8px"></div>
+                  <div style="height:12px"></div>
+                  <div class="small" style="margin-bottom:8px; opacity:.8">Open blockers</div>
+                  <div id="blockersList" style="display:grid; gap:8px"></div>
+                </div>
+              </div>
+
               <div class="panel">
                 <div class="panelHead">
                   <b>Preview</b>
@@ -974,8 +1000,8 @@ async function cmdWeb({ port, dir, open, dev }) {
           const schema = {
             actions: [
               { type: 'append_daily_log', text: '<string>' },
-              { type: 'create_task', description: '<string>', priority: 'HIGH|MEDIUM|LOW', category: 'DO_NOW|SCHEDULE|DELEGATE|IGNORE' },
-              { type: 'create_blocker', title: '<string>', severity: 'CRITICAL|HIGH|MEDIUM|LOW', notes: '<string>' },
+              { type: 'create_task', description: '<string>', priority: 'HIGH|MEDIUM|LOW', category: 'DO_NOW|SCHEDULE|DELEGATE|IGNORE', projectSlug: '<string optional>' },
+              { type: 'create_blocker', title: '<string>', severity: 'CRITICAL|HIGH|MEDIUM|LOW', notes: '<string>', projectSlug: '<string optional>' },
               { type: 'suggest_report', name: 'daily|status|sm-weekly|blockers' },
               { type: 'oracle_query', query: '<string>' }
             ]
@@ -1056,7 +1082,8 @@ async function cmdWeb({ port, dir, open, dev }) {
               const priorityRaw = String(a.priority || '').trim().toLowerCase();
               const priority = (priorityRaw === 'high' || priorityRaw === 'medium' || priorityRaw === 'low') ? priorityRaw : undefined;
               if (!description) { preview.errors.push('Task missing description'); continue; }
-              preview.tasks.push({ description, category: validTaskCats.has(category) ? category : 'DO_NOW', priority });
+              const projectSlug = String(a.projectSlug || '').trim();
+              preview.tasks.push({ description, category: validTaskCats.has(category) ? category : 'DO_NOW', priority, projectSlug: projectSlug || undefined });
               continue;
             }
 
@@ -1072,7 +1099,8 @@ async function cmdWeb({ port, dir, open, dev }) {
                 else severity = 'MEDIUM';
               }
               if (!title) { preview.errors.push('Blocker missing title'); continue; }
-              preview.blockers.push({ title, notes, severity });
+              const projectSlug = String(a.projectSlug || '').trim();
+              preview.blockers.push({ title, notes, severity, projectSlug: projectSlug || undefined });
               continue;
             }
 
@@ -1228,7 +1256,8 @@ async function cmdWeb({ port, dir, open, dev }) {
               if (applyMode !== 'all' && applyMode !== 'tasks') continue;
               const description = normalizeWhitespace(a.description);
               if (!description) continue;
-              const key = sha1(normalizeTextForKey(description));
+              const projectSlug = String(a.projectSlug || '').trim();
+              const key = sha1(normalizeTextForKey((projectSlug ? projectSlug + ' ' : '') + description));
               if (existingTaskKeys24h.has(key)) { applied.tasksSkipped++; continue; }
               const category = validTaskCats.has(String(a.category || '').trim()) ? String(a.category).trim() : 'DO_NOW';
               const priority = normPriority(a.priority);
@@ -1239,6 +1268,7 @@ async function cmdWeb({ port, dir, open, dev }) {
                 status: 'PENDING',
                 createdAt: now,
               };
+              if (projectSlug) task.projectSlug = projectSlug;
               if (priority) task.priority = priority;
               taskLog.tasks.push(task);
               applied.tasks++;
@@ -1248,7 +1278,8 @@ async function cmdWeb({ port, dir, open, dev }) {
             if (type === 'create_blocker') {
               if (applyMode !== 'all' && applyMode !== 'blockers') continue;
               const title = normalizeWhitespace(a.title);
-              const key = sha1(normalizeTextForKey(title));
+              const projectSlug = String(a.projectSlug || '').trim();
+              const key = sha1(normalizeTextForKey((projectSlug ? projectSlug + ' ' : '') + title));
               if (existingBlockerKeys24h.has(key)) { applied.blockersSkipped++; continue; }
               const notes = normalizeWhitespace(a.notes);
               if (!title) continue;
@@ -1261,6 +1292,7 @@ async function cmdWeb({ port, dir, open, dev }) {
                 status: 'OPEN',
                 severity,
               };
+              if (projectSlug) blocker.projectSlug = projectSlug;
               blockerLog.blockers.push(blocker);
               applied.blockers++;
               continue;
@@ -1351,6 +1383,93 @@ async function cmdWeb({ port, dir, open, dev }) {
           return safeJson(res, r.code === 0 ? 200 : 400, r.code === 0 ? { output } : { error: output || 'migrate failed', output });
         }
 
+
+        if (req.url === '/api/tasks/list') {
+          const limit = Math.max(1, Math.min(50, Number(payload.limit || 10)));
+          const cat = payload.category ? String(payload.category).trim() : null;
+          const status = payload.status ? String(payload.status).trim() : null;
+
+          const file = path.join(workspaceDir, 'data', 'tasks', 'task-log.json');
+          const doc = readJsonOrNull(file) || { schemaVersion: 1, tasks: [] };
+          const tasks = Array.isArray(doc.tasks) ? doc.tasks.slice() : [];
+
+          const filtered = tasks
+            .filter((t) => {
+              if (!t || typeof t !== 'object') return false;
+              if (cat && String(t.category || '').trim() !== cat) return false;
+              if (status && String(t.status || '').trim() !== status) return false;
+              return true;
+            })
+            .sort((a, b) => {
+              const pa = String(a.priority || '').toLowerCase();
+              const pb = String(b.priority || '').toLowerCase();
+              const rank = (p) => (p === 'high' ? 0 : p === 'medium' ? 1 : p === 'low' ? 2 : 3);
+              const ra = rank(pa), rb = rank(pb);
+              if (ra !== rb) return ra - rb;
+              return String(b.createdAt || '').localeCompare(String(a.createdAt || ''));
+            })
+            .slice(0, limit);
+
+          return safeJson(res, 200, { ok: true, tasks: filtered });
+        }
+
+        if (req.url === '/api/tasks/complete') {
+          const id = String(payload.id || '').trim();
+          if (!id) return safeJson(res, 400, { error: 'Missing id' });
+
+          const file = path.join(workspaceDir, 'data', 'tasks', 'task-log.json');
+          const doc = readJsonOrNull(file) || { schemaVersion: 1, tasks: [] };
+          const tasks = Array.isArray(doc.tasks) ? doc.tasks : [];
+
+          const now = isoNow();
+          let updated = null;
+          for (const t of tasks) {
+            if (t && t.id === id) {
+              t.status = 'COMPLETED';
+              t.completedAt = now;
+              updated = t;
+              break;
+            }
+          }
+
+          if (!updated) return safeJson(res, 404, { error: 'Task not found' });
+          writeJson(file, doc);
+          return safeJson(res, 200, { ok: true, task: updated });
+        }
+
+        if (req.url === '/api/blockers/list') {
+          const limit = Math.max(1, Math.min(50, Number(payload.limit || 10)));
+          const status = payload.status ? String(payload.status).trim() : 'OPEN';
+
+          const file = path.join(workspaceDir, 'data', 'blockers', 'blocker-log.json');
+          const doc = readJsonOrNull(file) || { schemaVersion: 1, blockers: [] };
+          const blockers = Array.isArray(doc.blockers) ? doc.blockers.slice() : [];
+
+          const sevRank = (s) => {
+            const v = String(s || '').toUpperCase();
+            if (v === 'CRITICAL') return 0;
+            if (v === 'HIGH') return 1;
+            if (v === 'MEDIUM') return 2;
+            if (v === 'LOW') return 3;
+            return 9;
+          };
+
+          const filtered = blockers
+            .filter((b) => {
+              if (!b || typeof b !== 'object') return false;
+              if (status && String(b.status || '').trim() !== status) return false;
+              return true;
+            })
+            .sort((a, b) => {
+              const ra = sevRank(a.severity);
+              const rb = sevRank(b.severity);
+              if (ra !== rb) return ra - rb;
+              return String(a.createdAt || '').localeCompare(String(b.createdAt || ''));
+            })
+            .slice(0, limit);
+
+          return safeJson(res, 200, { ok: true, blockers: filtered });
+        }
         if (req.url === '/api/report') {
           const script = payload.script;
           if (!script) return safeJson(res, 400, { error: 'Missing script' });
@@ -1415,12 +1534,21 @@ async function cmdWeb({ port, dir, open, dev }) {
 
   const url = `http://${host}:${port}/`;
 
-  // Optional dev seed (safe: only creates files if missing)
+  // Optional dev seed
+  // Safety rules:
+  // - only seed when workspace is empty OR already initialized as a Freya workspace
+  // - never overwrite non-dev user content
   if (dev) {
     const target = dir ? path.resolve(process.cwd(), dir) : path.join(process.cwd(), 'freya');
     try {
-      seedDevWorkspace(target);
-      process.stdout.write(`Dev seed: created demo files in ${target}\n`);
+      const targetOk = looksLikeFreyaWorkspace(target);
+      const empty = looksEmptyWorkspace(target);
+      if (!targetOk && !empty) {
+        process.stdout.write(`Dev seed: skipped (workspace not empty and not initialized) -> ${target}\n`);
+      } else {
+        seedDevWorkspace(target);
+        process.stdout.write(`Dev seed: created demo files in ${target}\n`);
+      }
     } catch (e) {
       process.stdout.write(`Dev seed failed: ${e.message || String(e)}\n`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cccarv82/freya",
-  "version": "1.0.27",
+  "version": "1.0.29",
   "description": "Personal AI Assistant with local-first persistence",
   "scripts": {
     "health": "node scripts/validate-data.js",