@hanzlaa/rcode 4.3.1 → 4.3.3

package/server/lib/html/client/util.js

@@ -80,6 +80,22 @@ export function allTasks(phases) {
   );
 }
 
+/**
+ * Map a numeric phase id to its milestone bucket.
+ * Single source of truth — imported by PhasesView and SprintsView so that
+ * milestone boundaries (19, 33) never diverge between the two views.
+ * M1 = phases 1–19, M2 = 20–33, M3 = 34+.
+ *
+ * @param {number|string} id — phase id
+ * @returns {'M1'|'M2'|'M3'}
+ */
+export function phaseMilestone(id) {
+  const n = Number(id);
+  if (n <= 19) return 'M1';
+  if (n <= 33) return 'M2';
+  return 'M3';
+}
+
 /**
  * Return a status chip descriptor — NOT an HTML string.
  * Components decide how to render the CSS class and label.
@@ -98,6 +114,31 @@ export function chip(status) {
   return { cls, label: status };
 }
 
+/**
+ * Return a status chip descriptor for orchestrator session statuses.
+ * Session objects use a different vocabulary than phases/sprints
+ * ('running', 'stopped', 'starting', 'error'), so a separate normaliser
+ * keeps the two status domains from coupling inside chip().
+ *
+ * Mapping:
+ *   running  → 'sess-running'  (accent-blue — live activity)
+ *   starting → 'sess-starting' (amber — transient / pending)
+ *   stopped  → 'sess-stopped'  (text-secondary — idle / muted)
+ *   error    → 'sess-error'    (accent-red — needs attention)
+ *
+ * @param {string} status
+ * @returns {{ cls: string, label: string }}
+ */
+export function sessionChip(status) {
+  const s = String(status || '').toLowerCase();
+  const cls =
+    s === 'running'  ? 'sess-running'  :
+    s === 'starting' ? 'sess-starting' :
+    s === 'error'    ? 'sess-error'    :
+    s === 'stopped'  ? 'sess-stopped'  : 'sess-stopped';
+  return { cls, label: status };
+}
+
 /**
  * Props for a clickable card row that navigates to a hash route.
  * Spread onto a list row (`<li ...${rowLink('tasks')}>`) to make it act like

package/server/lib/html/client/views/KanbanView.js

@@ -10,7 +10,7 @@
 import { html, useState, useCallback } from '../preact.js';
 import { useStore, refresh } from '../store.js';
 import { allTasks, currentPhaseName } from '../util.js';
-import { stopStory, openOrchPanel } from '../orchestrator.js';
+import { stopStory, openOrchPanel, openTermPanel, setTaskStatus } from '../orchestrator.js';
 import { openRunnerPicker } from '../components/RunnerPicker.js';
 import { showToast } from '../components/shared.js';
 
@@ -56,6 +56,12 @@ function KanbanCard({ task, col, live, orchDown, onDragStart, onDragEnd }) {
     e.stopPropagation();
     stopStory(sid);
   }
+  // Live session → full interactive xterm terminal (you can type to the agent).
+  function handleTerm(e) {
+    e.stopPropagation();
+    openTermPanel(sid, sid);
+  }
+  // Ended session → lightweight read-only log view (no live TUI to mangle).
   function handleView(e) {
     e.stopPropagation();
     openOrchPanel(sid);
@@ -92,7 +98,7 @@ function KanbanCard({ task, col, live, orchDown, onDragStart, onDragEnd }) {
               onClick=${handleRun}>▶ Run</button>
           ` : isRunning ? html`
             <button class="kanban-stop-btn" onClick=${handleStop}>■ Stop</button>
-            <button class="kanban-view-btn" onClick=${handleView}>↗ View</button>
+            <button class="kanban-view-btn" onClick=${handleTerm}>↗ Terminal</button>
           ` : html`
             <button class="kanban-view-btn" onClick=${handleView}>↗ Logs</button>
           `}
@@ -188,9 +194,32 @@ export function KanbanView() {
 
   function handleDrop(e, colId) {
     if (!dragging || !dragging.id) return;
-    setVisualMoves(prev => ({ ...prev, [dragging.id]: colId }));
+    const taskId = dragging.id;
+    const prevCol = effCol(dragging, runningByStory);
+    const isRunning = !!(runningByStory && runningByStory[taskId]);
+
+    // Optimistic visual move
+    setVisualMoves(prev => ({ ...prev, [taskId]: colId }));
+
+    const anchor = document.querySelector('[data-story-id="' + taskId + '"]') || e.currentTarget;
+
+    if (colId === 'in_progress' && (prevCol === 'todo' || prevCol === 'blocked') && !isRunning) {
+      openRunnerPicker(anchor, {
+        kind: 'session', storyId: taskId, cmd: '/rcode-dev-story ' + taskId, title: taskId,
+      });
+      setTaskStatus(taskId, 'in_progress').then(() => {
+        refresh();
+        setVisualMoves(prev => { const n = { ...prev }; delete n[taskId]; return n; });
+      });
+    } else {
+      setTaskStatus(taskId, colId).then(() => {
+        refresh();
+        setVisualMoves(prev => { const n = { ...prev }; delete n[taskId]; return n; });
+      });
+      showToast('Moved to ' + (COLS.find(c => c.id === colId)?.label || colId));
+    }
+
     setDragging(null);
-    showToast('Moved (visual only — not persisted)'); // visual only — not persisted
   }
 
   // ---- Manual refresh ----

package/server/lib/html/client/views/PhasesView.js

@@ -9,7 +9,7 @@
 
 import { html, useState } from '../preact.js';
 import { useStore } from '../store.js';
-import { pct, humanDate, phaseHints, chip } from '../util.js';
+import { pct, humanDate, phaseHints, chip, phaseMilestone } from '../util.js';
 import {
   Chip, ProgressBar, Breadcrumb, CmdHints, RunningBadge, SprintCard, PhaseCard,
 } from '../components/shared.js';
@@ -122,17 +122,6 @@ function PhaseDetail({ phase: p, S }) {
   `;
 }
 
-/**
- * Map a numeric phase id to its milestone bucket.
- * M1 = phases 1–19, M2 = 20–33, M3 = 34+.
- */
-function phaseMilestone(id) {
-  const n = Number(id);
-  if (n <= 19) return 'M1';
-  if (n <= 33) return 'M2';
-  return 'M3';
-}
-
 export function PhasesView({ subId, filters }) {
   const S = useStore();
   const phases = S.phases || [];

package/server/lib/html/client/views/SprintsView.js

@@ -10,7 +10,7 @@
 
 import { html, useState } from '../preact.js';
 import { useStore } from '../store.js';
-import { pct, humanDate, allSprints, sprintHints, chip } from '../util.js';
+import { pct, humanDate, allSprints, sprintHints, chip, phaseMilestone } from '../util.js';
 import {
   Chip, ProgressBar, Breadcrumb, CmdHints, RunningBadge, SprintCard, TaskCard,
 } from '../components/shared.js';
@@ -118,17 +118,6 @@ function SprintDetail({ sprint: s, S }) {
   `;
 }
 
-/**
- * Map a numeric phase id to its milestone bucket.
- * M1 = phases 1–19, M2 = 20–33, M3 = 34+.
- */
-function phaseMilestone(id) {
-  const n = Number(id);
-  if (n <= 19) return 'M1';
-  if (n <= 33) return 'M2';
-  return 'M3';
-}
-
 export function SprintsView({ subId, filters }) {
   const S = useStore();
   const sprints = allSprints(S.phases || []);

package/server/lib/html/css.js

@@ -770,6 +770,46 @@ section .body {
 }
 .task-detail-row strong { color: var(--text-muted); font-weight: 500; min-width: 64px; flex-shrink: 0; }
 .task-detail-cmds { margin-top: var(--space-3); }
+/* ── Per-task actions + result (#905) ───────────────────────────── */
+.task-actions {
+  margin-top: var(--space-3);
+  padding-top: var(--space-3);
+  border-top: 1px solid var(--border-subtle);
+}
+.task-actions-title {
+  color: var(--text-muted);
+  font-weight: 500;
+  margin-bottom: var(--space-2);
+}
+.task-actions-list {
+  margin: 0;
+  padding-left: var(--space-5);
+  display: flex;
+  flex-direction: column;
+  gap: var(--space-1);
+}
+.task-action-step {
+  color: var(--text-secondary);
+  line-height: 1.45;
+}
+.task-outcome {
+  display: flex;
+  align-items: baseline;
+  gap: var(--space-2);
+  margin-top: var(--space-3);
+  padding: var(--space-2) var(--space-3);
+  background: var(--bg-elev-2);
+  border-left: 2px solid var(--accent-green);
+  border-radius: var(--radius-4);
+}
+.task-outcome-label {
+  color: var(--accent-green);
+  font-weight: 600;
+  text-transform: uppercase;
+  letter-spacing: 0.04em;
+  flex-shrink: 0;
+}
+.task-outcome-text { color: var(--text-secondary); line-height: 1.45; }
 .task-expand-icon {
   font-size: 8px;
   color: var(--text-muted);
@@ -1451,9 +1491,9 @@ footer {
   top: 0;
   right: 0;
   bottom: 0;
-  width: 440px;
-  max-width: 42vw;
-  min-width: 320px;
+  width: var(--orch-w, 720px);
+  max-width: 70vw;
+  min-width: 360px;
   background: var(--bg-elev-1);
   border-left: 1px solid var(--border-subtle);
   display: flex;
@@ -1463,6 +1503,20 @@ footer {
   transition: transform var(--t-menu) var(--ease);
   box-shadow: -8px 0 32px rgba(0,0,0,0.4);
 }
+.orch-panel-resize {
+  position: absolute;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  width: 6px;
+  cursor: ew-resize;
+  z-index: 10;
+}
+.orch-panel-resize:hover,
+.orch-panel-resize.dragging {
+  background: var(--accent, #5865f2);
+  opacity: 0.35;
+}
 .orch-panel.open {
   transform: translateX(0);
 }
@@ -4390,6 +4444,11 @@ summary:focus-visible,
 .summary-count-chip.blocked  { color: var(--accent-red); }
 .summary-count-chip.planned,
 .summary-count-chip.todo     { color: var(--text-secondary); }
+/* Session status chips — use sessionChip() vocabulary, not chip() */
+.summary-count-chip.sess-running  { color: var(--accent-blue); }
+.summary-count-chip.sess-starting { color: var(--amber); }
+.summary-count-chip.sess-stopped  { color: var(--text-secondary); }
+.summary-count-chip.sess-error    { color: var(--accent-red); }
 
 /* ── Filter chips ────────────────────────────────────────────────── */
 .filter-chips {

package/server/lib/scanner.js

@@ -80,6 +80,23 @@ function parseYamlList(text, key) {
   return [];
 }
 
+/**
+ * Parse a SPRINT.md <action> block into an ordered list of action steps.
+ * Action blocks are numbered ("1. …\n2. …"); each step may span several lines.
+ * Whitespace within a step is collapsed so each renders as one readable line.
+ * Falls back to non-empty lines when the block is not numbered. Returns [].
+ */
+function parseActionSteps(raw) {
+  if (!raw) return [];
+  const t = raw.trim();
+  if (!t) return [];
+  const matches = [...t.matchAll(/(?:^|\n)\s*\d+\.\s+([\s\S]*?)(?=\n\s*\d+\.\s|$)/g)];
+  if (matches.length) {
+    return matches.map(m => m[1].replace(/\s+/g, ' ').trim()).filter(Boolean);
+  }
+  return t.split('\n').map(l => l.replace(/^[-*]\s+/, '').trim()).filter(Boolean);
+}
+
 /**
  * Derive the phase → sprint → story tree from the .planning/phases/ filesystem,
  * which is the committed source of truth. state.json sprint/story records are
@@ -93,9 +110,10 @@ function parseYamlList(text, key) {
  * @param {function} [listCached] per-scan dir lister from makeDirLister()
  * @returns {Array|null}         phases with a populated `sprints` array each
  */
-function buildPhaseTree(projectDir, rawPhases, listCached) {
+function buildPhaseTree(projectDir, rawPhases, listCached, overrides) {
   if (!Array.isArray(rawPhases)) return null;
   const list = listCached || makeDirLister();
+  const ov = (overrides && typeof overrides === 'object' && !Array.isArray(overrides)) ? overrides : {};
   const phasesDir = path.join(projectDir, '.planning', 'phases');
   const allEntries = list(phasesDir);
   if (allEntries === null) return rawPhases;
@@ -144,7 +162,16 @@ function buildPhaseTree(projectDir, rawPhases, listCached) {
           title:  titleM ? titleM[1].trim() : `Task ${stories.length + 1}`,
           status: phaseComplete ? 'done' : 'todo',
         };
+        if (ov[story.id]) story.status = ov[story.id].status;
         if (acM && acM[1].trim()) story.acceptance = acM[1].trim();
+        // Per-task execution transparency (#905): the ordered <action> steps
+        // (what the task does) + the <done> outcome (the result). Read-only —
+        // parsed from the same SPRINT.md text already loaded above.
+        const actionM = tm[2].match(/<action>\s*([\s\S]*?)\s*<\/action>/);
+        const doneM   = tm[2].match(/<done>\s*([\s\S]*?)\s*<\/done>/);
+        const steps   = actionM ? parseActionSteps(actionM[1]) : [];
+        if (steps.length) story.actions = steps;
+        if (doneM && doneM[1].trim()) story.outcome = doneM[1].replace(/\s+/g, ' ').trim();
         stories.push(story);
       }
       // Fallback for pre-<task> SPRINT.md format (phases 20-30 era):
@@ -153,10 +180,11 @@ function buildPhaseTree(projectDir, rawPhases, listCached) {
         const headRe = /^#{2,4}\s+(?:Story|Task)\s+([^\s—–-]+)\s*[—–-]\s*(.+?)\s*$/gm;
         let hm;
         while ((hm = headRe.exec(text))) {
+          const hId = hm[1].trim();
           stories.push({
-            id:     hm[1].trim(),
+            id:     hId,
             title:  hm[2].trim(),
-            status: phaseComplete ? 'done' : 'todo',
+            status: ov[hId] ? ov[hId].status : (phaseComplete ? 'done' : 'todo'),
           });
         }
       }
@@ -566,7 +594,14 @@ function scanStateUncached(rcodeDir) {
     } catch { /* ignore */ }
   }
 
-  state.phaseTree = buildPhaseTree(projectDir, state.raw && state.raw.phases, listCached);
+  let boardOverrides = {};
+  try {
+    const ovRaw = fs.readFileSync(path.join(rcodeDir, 'board-overrides.json'), 'utf8');
+    const ovParsed = JSON.parse(ovRaw);
+    if (ovParsed && typeof ovParsed === 'object' && !Array.isArray(ovParsed)) boardOverrides = ovParsed;
+  } catch { boardOverrides = {}; }
+
+  state.phaseTree = buildPhaseTree(projectDir, state.raw && state.raw.phases, listCached, boardOverrides);
 
   // Derive the redesign dashboard contract (DATA-CONTRACT.md). Attached to the
   // scan so GET /api/state returns the exact shape and client.js seeds it into
@@ -607,6 +642,7 @@ function scanSignature(rcodeDir, projectDir) {
   statOne(path.join(rcodeDir, 'config.yaml'));
   statOne(path.join(rcodeDir, 'HANDOFF.json'));
   statOne(path.join(rcodeDir, 'context', 'active.md'));
+  statOne(path.join(rcodeDir, 'board-overrides.json'));
   (function walk(dir, depth) {
     if (depth > SIG_WALK_MAX_DEPTH) return;
     for (const e of listDir(dir)) {

package/server/orchestrator.js

@@ -280,6 +280,22 @@ function appendRejection(entry) {
   }
 }
 
+// ── Board overlay ─────────────────────────────────────────────────────────────
+// Writes a single entry to .rcode/board-overrides.json. The scanner reads this
+// file on every scan and applies it on top of derived story statuses.
+function setTaskOverride(storyId, status, runner) {
+  const overridesPath = path.join(PROJECT_ROOT, '.rcode', 'board-overrides.json');
+  let overrides = {};
+  try {
+    const raw = fs.readFileSync(overridesPath, 'utf8');
+    const parsed = JSON.parse(raw);
+    if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) overrides = parsed;
+  } catch { overrides = {}; }
+  overrides[storyId] = { status, runner: runner || null, updatedAt: new Date().toISOString() };
+  fs.mkdirSync(path.dirname(overridesPath), { recursive: true });
+  fs.writeFileSync(overridesPath, JSON.stringify(overrides, null, 2));
+}
+
 // ── helpers ──────────────────────────────────────────────────────────────────
 
 function json(res, code, body) {
@@ -557,6 +573,14 @@ async function handleRun(req, res) {
     const status = signal ? 'stopped' : (exitCode === 0 ? 'done' : 'exited');
     setStatus(s, status);
     persistRun(storyId, s, status);
+    if (status === 'done'
+        && !storyId.startsWith('cmd-')
+        && !storyId.startsWith('sprint-')
+        && !storyId.startsWith('phase-')) {
+      try { setTaskOverride(storyId, 'done', null); } catch (err) {
+        console.error('[orchestrator] board-overrides write failed:', err.message);
+      }
+    }
   });
 
   // CLIs with no interactive initial-prompt flag (see registry) get the
@@ -622,6 +646,23 @@ function handleRejections(res) {
   json(res, 200, { rejections: readRejections() });
 }
 
+const TASK_STATUS_ENUM = new Set(['todo', 'in_progress', 'blocked', 'done']);
+
+async function handleTaskStatus(req, res) {
+  const body    = await parseBody(req);
+  const storyId = String(body.storyId || '').trim();
+  if (!validStoryId(storyId)) { json(res, 400, { error: 'invalid storyId' }); return; }
+  const status = String(body.status || '').trim();
+  if (!TASK_STATUS_ENUM.has(status)) { json(res, 400, { error: 'invalid status — must be one of todo,in_progress,blocked,done' }); return; }
+  try {
+    setTaskOverride(storyId, status, null);
+  } catch (err) {
+    console.error('[orchestrator] handleTaskStatus write failed:', err.message);
+    json(res, 500, { error: 'could not write board-overrides' }); return;
+  }
+  json(res, 200, { ok: true });
+}
+
 // ── WebSocket data plane ───────────────────────────────────────────────────────
 
 function attachWebSocket(ws, storyId) {
@@ -704,6 +745,7 @@ const server = http.createServer(async (req, res) => {
   if (method === 'POST' && pathOnly === '/api/clean-sessions') { await handleCleanSessions(req, res); return; }
   if (method === 'POST' && pathOnly === '/api/reject')         { await handleReject(req, res); return; }
   if (method === 'GET'  && pathOnly === '/api/rejections')     { handleRejections(res); return; }
+  if (method === 'POST' && pathOnly === '/api/task-status')    { await handleTaskStatus(req, res); return; }
 
   res.writeHead(404); res.end('Not found');
 });