mrvn-cli 0.4.4 → 0.4.6

package/dist/marvin-serve.js

@@ -18054,8 +18054,9 @@ function findByJiraKey(store, jiraKey) {
   const docs = store.list({ type: JIRA_TYPE });
   return docs.find((d) => d.frontmatter.jiraKey === jiraKey);
 }
-function createJiraTools(store) {
+function createJiraTools(store, projectConfig) {
   const jiraUserConfig = loadUserConfig().jira;
+  const defaultProjectKey = projectConfig?.jira?.projectKey;
   return [
     // --- Local read tools ---
     tool20(
@@ -18219,10 +18220,22 @@ function createJiraTools(store) {
       "Create a Jira issue from any Marvin artifact (D/A/Q/F/E) and create a tracking JI-xxx document",
       {
         artifactId: external_exports.string().describe("Marvin artifact ID (e.g. 'D-001', 'F-003', 'E-002')"),
-        projectKey: external_exports.string().describe("Jira project key (e.g. 'PROJ')"),
+        projectKey: external_exports.string().optional().describe("Jira project key (e.g. 'PROJ'). Falls back to jira.projectKey from .marvin/config.yaml if not provided."),
         issueType: external_exports.enum(["Story", "Task", "Bug", "Epic"]).optional().describe("Jira issue type (default: 'Task')")
       },
       async (args) => {
+        const resolvedProjectKey = args.projectKey ?? defaultProjectKey;
+        if (!resolvedProjectKey) {
+          return {
+            content: [
+              {
+                type: "text",
+                text: "No projectKey provided and no default configured. Either pass projectKey or set jira.projectKey in .marvin/config.yaml."
+              }
+            ],
+            isError: true
+          };
+        }
         const jira = createJiraClient(jiraUserConfig);
         if (!jira) return jiraNotConfiguredError();
         const artifact = store.get(args.artifactId);
@@ -18242,7 +18255,7 @@ function createJiraTools(store) {
           `Status: ${artifact.frontmatter.status}`
         ].join("\n");
         const jiraResult = await jira.client.createIssue({
-          project: { key: args.projectKey },
+          project: { key: resolvedProjectKey },
           summary: artifact.frontmatter.title,
           description,
           issuetype: { name: args.issueType ?? "Task" }
@@ -18383,14 +18396,14 @@ var jiraSkill = {
   documentTypeRegistrations: [
     { type: "jira-issue", dirName: "jira-issues", idPrefix: "JI" }
   ],
-  tools: (store) => createJiraTools(store),
+  tools: (store, projectConfig) => createJiraTools(store, projectConfig),
   promptFragments: {
     "product-owner": `You have the **Jira Integration** skill. You can pull issues from Jira and push Marvin artifacts to Jira.
 
 **Available tools:**
 - \`list_jira_issues\` / \`get_jira_issue\` \u2014 browse locally synced Jira issues
 - \`pull_jira_issue\` / \`pull_jira_issues_jql\` \u2014 import issues from Jira by key or JQL query
-- \`push_artifact_to_jira\` \u2014 create a Jira issue from a Marvin artifact (decision, feature, etc.)
+- \`push_artifact_to_jira\` \u2014 create a Jira issue from a Marvin artifact (decision, feature, etc.). The \`projectKey\` parameter is optional when a default is configured in \`.marvin/config.yaml\` under \`jira.projectKey\`.
 - \`sync_jira_issue\` \u2014 bidirectional sync of a local JI-xxx with Jira
 - \`link_artifact_to_jira\` \u2014 link a Marvin artifact to an existing JI-xxx
 
@@ -18404,7 +18417,7 @@ var jiraSkill = {
 **Available tools:**
 - \`list_jira_issues\` / \`get_jira_issue\` \u2014 browse locally synced Jira issues
 - \`pull_jira_issue\` / \`pull_jira_issues_jql\` \u2014 import issues from Jira by key or JQL query
-- \`push_artifact_to_jira\` \u2014 create a Jira issue from a Marvin artifact (decision, action, epic, task, etc.)
+- \`push_artifact_to_jira\` \u2014 create a Jira issue from a Marvin artifact (decision, action, epic, task, etc.). The \`projectKey\` parameter is optional when a default is configured in \`.marvin/config.yaml\` under \`jira.projectKey\`.
 - \`sync_jira_issue\` \u2014 bidirectional sync of a local JI-xxx with Jira
 - \`link_artifact_to_jira\` \u2014 link a Marvin artifact to an existing JI-xxx
 
@@ -18418,7 +18431,7 @@ var jiraSkill = {
 **Available tools:**
 - \`list_jira_issues\` / \`get_jira_issue\` \u2014 browse locally synced Jira issues
 - \`pull_jira_issue\` / \`pull_jira_issues_jql\` \u2014 import issues from Jira by key or JQL query
-- \`push_artifact_to_jira\` \u2014 create a Jira issue from a Marvin artifact (decision, action, etc.)
+- \`push_artifact_to_jira\` \u2014 create a Jira issue from a Marvin artifact (decision, action, etc.). The \`projectKey\` parameter is optional when a default is configured in \`.marvin/config.yaml\` under \`jira.projectKey\`.
 - \`sync_jira_issue\` \u2014 bidirectional sync of a local JI-xxx with Jira
 - \`link_artifact_to_jira\` \u2014 link a Marvin artifact to an existing JI-xxx
 
@@ -18489,8 +18502,8 @@ function gatherContext(store, focusFeature, includeDecisions = true, includeQues
       title: e.frontmatter.title,
       status: e.frontmatter.status,
       linkedFeature: normalizeLinkedFeatures(e.frontmatter.linkedFeature),
-      targetDate: e.frontmatter.targetDate ?? null,
-      estimatedEffort: e.frontmatter.estimatedEffort ?? null,
+      targetDate: typeof e.frontmatter.targetDate === "string" ? e.frontmatter.targetDate : null,
+      estimatedEffort: typeof e.frontmatter.estimatedEffort === "string" ? e.frontmatter.estimatedEffort : null,
       content: e.content,
       linkedTaskCount: tasks.filter(
         (t) => normalizeLinkedEpics(t.frontmatter.linkedEpic).includes(e.frontmatter.id)
@@ -18501,10 +18514,10 @@ function gatherContext(store, focusFeature, includeDecisions = true, includeQues
       title: t.frontmatter.title,
       status: t.frontmatter.status,
       linkedEpic: normalizeLinkedEpics(t.frontmatter.linkedEpic),
-      acceptanceCriteria: t.frontmatter.acceptanceCriteria ?? null,
-      technicalNotes: t.frontmatter.technicalNotes ?? null,
-      complexity: t.frontmatter.complexity ?? null,
-      estimatedPoints: t.frontmatter.estimatedPoints ?? null,
+      acceptanceCriteria: typeof t.frontmatter.acceptanceCriteria === "string" ? t.frontmatter.acceptanceCriteria : null,
+      technicalNotes: typeof t.frontmatter.technicalNotes === "string" ? t.frontmatter.technicalNotes : null,
+      complexity: typeof t.frontmatter.complexity === "string" ? t.frontmatter.complexity : null,
+      estimatedPoints: typeof t.frontmatter.estimatedPoints === "number" ? t.frontmatter.estimatedPoints : null,
       priority: t.frontmatter.priority ?? null
     })),
     decisions: allDecisions.map((d) => ({
@@ -18979,12 +18992,12 @@ function collectSkillRegistrations(skillIds, allSkills) {
   }
   return registrations;
 }
-function getSkillTools(skillIds, allSkills, store) {
+function getSkillTools(skillIds, allSkills, store, projectConfig) {
   const tools = [];
   for (const id of skillIds) {
     const skill = allSkills.get(id);
     if (skill?.tools) {
-      tools.push(...skill.tools(store));
+      tools.push(...skill.tools(store, projectConfig));
     }
   }
   return tools;
@@ -19129,8 +19142,223 @@ function getDiagramData(store) {
   }
   return { sprints, epics, features, statusCounts };
 }
+function computeUrgency(dueDateStr, todayStr) {
+  const due = new Date(dueDateStr).getTime();
+  const today = new Date(todayStr).getTime();
+  const diffDays = Math.floor((due - today) / 864e5);
+  if (diffDays < 0) return "overdue";
+  if (diffDays <= 3) return "due-3d";
+  if (diffDays <= 7) return "due-7d";
+  if (diffDays <= 14) return "upcoming";
+  return "later";
+}
+var DONE_STATUSES = /* @__PURE__ */ new Set(["done", "closed", "resolved", "cancelled"]);
+function getUpcomingData(store) {
+  const today = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
+  const allDocs = store.list();
+  const docById = /* @__PURE__ */ new Map();
+  for (const doc of allDocs) {
+    docById.set(doc.frontmatter.id, doc);
+  }
+  const actions = allDocs.filter(
+    (d) => d.frontmatter.type === "action" && !DONE_STATUSES.has(d.frontmatter.status)
+  );
+  const actionsWithDue = actions.filter((d) => d.frontmatter.dueDate);
+  const sprints = allDocs.filter((d) => d.frontmatter.type === "sprint");
+  const epics = allDocs.filter((d) => d.frontmatter.type === "epic");
+  const tasks = allDocs.filter((d) => d.frontmatter.type === "task");
+  const epicToTasks = /* @__PURE__ */ new Map();
+  for (const task of tasks) {
+    const tags = task.frontmatter.tags ?? [];
+    for (const tag of tags) {
+      if (tag.startsWith("epic:")) {
+        const epicId = tag.slice(5);
+        if (!epicToTasks.has(epicId)) epicToTasks.set(epicId, []);
+        epicToTasks.get(epicId).push(task);
+      }
+    }
+  }
+  function getSprintTasks(sprintDoc) {
+    const linkedEpics = normalizeLinkedEpics(sprintDoc.frontmatter.linkedEpics);
+    const result = [];
+    for (const epicId of linkedEpics) {
+      const epicTasks = epicToTasks.get(epicId) ?? [];
+      result.push(...epicTasks);
+    }
+    return result;
+  }
+  function countRelatedTasks(actionDoc) {
+    const actionTags = actionDoc.frontmatter.tags ?? [];
+    const relatedTaskIds = /* @__PURE__ */ new Set();
+    for (const tag of actionTags) {
+      if (tag.startsWith("sprint:")) {
+        const sprintId = tag.slice(7);
+        const sprint = docById.get(sprintId);
+        if (sprint) {
+          const sprintTaskDocs = getSprintTasks(sprint);
+          for (const t of sprintTaskDocs) relatedTaskIds.add(t.frontmatter.id);
+        }
+      }
+    }
+    return relatedTaskIds.size;
+  }
+  const dueSoonActions = actionsWithDue.map((d) => ({
+    id: d.frontmatter.id,
+    title: d.frontmatter.title,
+    status: d.frontmatter.status,
+    owner: d.frontmatter.owner,
+    dueDate: d.frontmatter.dueDate,
+    urgency: computeUrgency(d.frontmatter.dueDate, today),
+    relatedTaskCount: countRelatedTasks(d)
+  })).sort((a, b) => a.dueDate.localeCompare(b.dueDate));
+  const todayMs = new Date(today).getTime();
+  const fourteenDaysMs = 14 * 864e5;
+  const nearSprints = sprints.filter((s) => {
+    const endDate = s.frontmatter.endDate;
+    if (!endDate) return false;
+    const endMs = new Date(endDate).getTime();
+    const diff = endMs - todayMs;
+    return diff >= 0 && diff <= fourteenDaysMs;
+  });
+  const taskSprintMap = /* @__PURE__ */ new Map();
+  for (const sprint of nearSprints) {
+    const sprintEnd = sprint.frontmatter.endDate;
+    const sprintTaskDocs = getSprintTasks(sprint);
+    for (const task of sprintTaskDocs) {
+      if (DONE_STATUSES.has(task.frontmatter.status)) continue;
+      const existing = taskSprintMap.get(task.frontmatter.id);
+      if (!existing || sprintEnd < existing.sprintEnd) {
+        taskSprintMap.set(task.frontmatter.id, { task, sprint, sprintEnd });
+      }
+    }
+  }
+  const dueSoonSprintTasks = [...taskSprintMap.values()].map(({ task, sprint, sprintEnd }) => ({
+    id: task.frontmatter.id,
+    title: task.frontmatter.title,
+    status: task.frontmatter.status,
+    sprintId: sprint.frontmatter.id,
+    sprintTitle: sprint.frontmatter.title,
+    sprintEndDate: sprintEnd,
+    urgency: computeUrgency(sprintEnd, today)
+  })).sort((a, b) => a.sprintEndDate.localeCompare(b.sprintEndDate));
+  const openItems = allDocs.filter(
+    (d) => ["action", "question", "task"].includes(d.frontmatter.type) && !DONE_STATUSES.has(d.frontmatter.status)
+  );
+  const fourteenDaysAgo = new Date(todayMs - fourteenDaysMs).toISOString().slice(0, 10);
+  const recentMeetings = allDocs.filter(
+    (d) => d.frontmatter.type === "meeting" && (d.frontmatter.updated ?? d.frontmatter.created) >= fourteenDaysAgo
+  );
+  const crossRefCounts = /* @__PURE__ */ new Map();
+  for (const doc of allDocs) {
+    const content = doc.content ?? "";
+    for (const item of openItems) {
+      if (doc.frontmatter.id === item.frontmatter.id) continue;
+      if (content.includes(item.frontmatter.id)) {
+        crossRefCounts.set(
+          item.frontmatter.id,
+          (crossRefCounts.get(item.frontmatter.id) ?? 0) + 1
+        );
+      }
+    }
+  }
+  const activeSprints = sprints.filter((s) => {
+    const status = s.frontmatter.status;
+    if (status === "active") return true;
+    const startDate = s.frontmatter.startDate;
+    if (!startDate) return false;
+    const startMs = new Date(startDate).getTime();
+    const diff = startMs - todayMs;
+    return diff >= 0 && diff <= fourteenDaysMs;
+  });
+  const activeSprintIds = new Set(activeSprints.map((s) => s.frontmatter.id));
+  const activeEpicIds = /* @__PURE__ */ new Set();
+  for (const s of activeSprints) {
+    for (const epicId of normalizeLinkedEpics(s.frontmatter.linkedEpics)) {
+      activeEpicIds.add(epicId);
+    }
+  }
+  const trending = openItems.map((doc) => {
+    const signals = [];
+    let score = 0;
+    const updated = doc.frontmatter.updated ?? doc.frontmatter.created;
+    const ageDays = daysBetween(updated, today);
+    const recencyPts = Math.max(0, Math.round(20 * (1 - ageDays / 30)));
+    if (recencyPts > 0) {
+      signals.push({ factor: "recency", points: recencyPts });
+      score += recencyPts;
+    }
+    const tags = doc.frontmatter.tags ?? [];
+    const linkedToActiveSprint = tags.some(
+      (t) => t.startsWith("sprint:") && activeSprintIds.has(t.slice(7))
+    );
+    const linkedToActiveEpic = tags.some(
+      (t) => t.startsWith("epic:") && activeEpicIds.has(t.slice(5))
+    );
+    if (linkedToActiveSprint) {
+      signals.push({ factor: "sprint proximity", points: 25 });
+      score += 25;
+    } else if (linkedToActiveEpic) {
+      signals.push({ factor: "sprint proximity", points: 15 });
+      score += 15;
+    }
+    const mentionCount = recentMeetings.filter(
+      (m) => (m.content ?? "").includes(doc.frontmatter.id)
+    ).length;
+    if (mentionCount > 0) {
+      const meetingPts = Math.min(15, mentionCount * 5);
+      signals.push({ factor: "meeting mentions", points: meetingPts });
+      score += meetingPts;
+    }
+    const priority = doc.frontmatter.priority?.toLowerCase();
+    const priorityPts = priority === "critical" ? 15 : priority === "high" ? 10 : priority === "medium" ? 3 : 0;
+    if (priorityPts > 0) {
+      signals.push({ factor: "priority", points: priorityPts });
+      score += priorityPts;
+    }
+    if (["action", "question"].includes(doc.frontmatter.type)) {
+      const createdDays = daysBetween(doc.frontmatter.created, today);
+      if (createdDays >= 14) {
+        const agingPts = Math.min(10, Math.floor((createdDays - 14) / 7) * 3 + 5);
+        signals.push({ factor: "aging", points: agingPts });
+        score += agingPts;
+      }
+    }
+    const refs = crossRefCounts.get(doc.frontmatter.id) ?? 0;
+    if (refs > 0) {
+      const crossRefPts = Math.min(15, refs * 5);
+      signals.push({ factor: "cross-references", points: crossRefPts });
+      score += crossRefPts;
+    }
+    return {
+      id: doc.frontmatter.id,
+      title: doc.frontmatter.title,
+      type: doc.frontmatter.type,
+      status: doc.frontmatter.status,
+      score,
+      signals
+    };
+  }).filter((item) => item.score > 0).sort((a, b) => b.score - a.score).slice(0, 15);
+  return { dueSoonActions, dueSoonSprintTasks, trending };
+}
 
 // src/web/templates/layout.ts
+function collapsibleSection(sectionId, title, content, opts) {
+  const tag = opts?.titleTag ?? "div";
+  const cls = opts?.titleClass ?? "section-title";
+  const collapsed = opts?.defaultCollapsed ? " collapsed" : "";
+  return `
+    <div class="collapsible${collapsed}" data-section-id="${escapeHtml(sectionId)}">
+      <${tag} class="${cls} collapsible-header" onclick="toggleSection(this)">
+        <svg class="collapsible-chevron" viewBox="0 0 16 16" width="14" height="14" fill="currentColor">
+          <path d="M4.94 5.72a.75.75 0 0 1 1.06-.02L8 7.56l1.97-1.84a.75.75 0 1 1 1.02 1.1l-2.5 2.34a.75.75 0 0 1-1.02 0l-2.5-2.34a.75.75 0 0 1-.03-1.06z"/>
+        </svg>
+        <span>${title}</span>
+      </${tag}>
+      <div class="collapsible-body">
+        ${content}
+      </div>
+    </div>`;
+}
 function escapeHtml(str) {
   return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
 }
@@ -19252,6 +19480,7 @@ function inline(text) {
 function layout(opts, body) {
   const topItems = [
     { href: "/", label: "Overview" },
+    { href: "/upcoming", label: "Upcoming" },
     { href: "/timeline", label: "Timeline" },
     { href: "/board", label: "Board" },
     { href: "/gar", label: "GAR Report" },
@@ -19297,6 +19526,32 @@ function layout(opts, body) {
       ${body}
     </main>
   </div>
+  <script>
+    function toggleSection(header) {
+      var section = header.closest('.collapsible');
+      if (!section) return;
+      section.classList.toggle('collapsed');
+      var id = section.getAttribute('data-section-id');
+      if (id) {
+        try {
+          var state = JSON.parse(localStorage.getItem('marvin-collapsed') || '{}');
+          state[id] = section.classList.contains('collapsed');
+          localStorage.setItem('marvin-collapsed', JSON.stringify(state));
+        } catch(e) {}
+      }
+    }
+    // Restore collapsed state on load
+    (function() {
+      try {
+        var state = JSON.parse(localStorage.getItem('marvin-collapsed') || '{}');
+        document.querySelectorAll('.collapsible[data-section-id]').forEach(function(el) {
+          var id = el.getAttribute('data-section-id');
+          if (state[id] === true) el.classList.add('collapsed');
+          else if (state[id] === false) el.classList.remove('collapsed');
+        });
+      } catch(e) {}
+    })();
+  </script>
   <script src="https://cdn.jsdelivr.net/npm/mermaid@11/dist/mermaid.min.js"></script>
   <script>mermaid.initialize({
     startOnLoad: true,
@@ -20120,13 +20375,60 @@ tr:hover td {
   white-space: nowrap;
 }
 
+.gantt-grid-line {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  width: 1px;
+  background: var(--border);
+  opacity: 0.35;
+}
+
+.gantt-sprint-line {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  width: 1px;
+  background: var(--text-dim);
+  opacity: 0.3;
+}
+
 .gantt-today {
   position: absolute;
   top: 0;
   bottom: 0;
-  width: 2px;
+  width: 3px;
   background: var(--red);
-  opacity: 0.7;
+  opacity: 0.8;
+  border-radius: 1px;
+}
+
+/* Sprint band in timeline */
+.gantt-sprint-band-row {
+  border-bottom: 1px solid var(--border);
+  margin-bottom: 0.25rem;
+}
+
+.gantt-sprint-band {
+  height: 32px;
+}
+
+.gantt-sprint-block {
+  position: absolute;
+  top: 2px;
+  bottom: 2px;
+  background: var(--bg-hover);
+  border: 1px solid var(--border);
+  border-radius: 4px;
+  font-size: 0.65rem;
+  color: var(--text-dim);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  padding: 0 0.4rem;
 }
 
 /* Pie chart color overrides */
@@ -20138,6 +20440,90 @@ tr:hover td {
   fill: var(--bg) !important;
   font-weight: 600;
 }
+
+/* Urgency row indicators */
+.urgency-row-overdue { border-left: 3px solid var(--red); }
+.urgency-row-due-3d { border-left: 3px solid var(--amber); }
+.urgency-row-due-7d { border-left: 3px solid #e2a308; }
+
+/* Urgency badge pills */
+.urgency-badge-overdue { background: rgba(248, 113, 113, 0.15); color: var(--red); }
+.urgency-badge-due-3d { background: rgba(251, 191, 36, 0.15); color: var(--amber); }
+.urgency-badge-due-7d { background: rgba(226, 163, 8, 0.15); color: #e2a308; }
+.urgency-badge-upcoming { background: rgba(108, 140, 255, 0.15); color: var(--accent); }
+.urgency-badge-later { background: rgba(139, 143, 164, 0.1); color: var(--text-dim); }
+
+/* Trending */
+.trending-rank {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 24px;
+  height: 24px;
+  border-radius: 50%;
+  background: var(--bg-hover);
+  font-size: 0.75rem;
+  font-weight: 600;
+  color: var(--text-dim);
+}
+
+.trending-score {
+  display: inline-block;
+  padding: 0.15rem 0.6rem;
+  border-radius: 999px;
+  font-size: 0.7rem;
+  font-weight: 700;
+  background: rgba(108, 140, 255, 0.15);
+  color: var(--accent);
+}
+
+.signal-tag {
+  display: inline-block;
+  padding: 0.1rem 0.45rem;
+  border-radius: 4px;
+  font-size: 0.65rem;
+  background: var(--bg-hover);
+  color: var(--text-dim);
+  margin-right: 0.25rem;
+  margin-bottom: 0.15rem;
+  white-space: nowrap;
+}
+
+.text-dim { color: var(--text-dim); }
+
+/* Collapsible sections */
+.collapsible-header {
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  gap: 0.4rem;
+  user-select: none;
+}
+
+.collapsible-header:hover {
+  color: var(--accent);
+}
+
+.collapsible-chevron {
+  transition: transform 0.2s ease;
+  flex-shrink: 0;
+}
+
+.collapsible.collapsed .collapsible-chevron {
+  transform: rotate(-90deg);
+}
+
+.collapsible-body {
+  overflow: hidden;
+  max-height: 5000px;
+  transition: max-height 0.3s ease, opacity 0.2s ease;
+  opacity: 1;
+}
+
+.collapsible.collapsed .collapsible-body {
+  max-height: 0;
+  opacity: 0;
+}
 `;
 }
 
@@ -20190,35 +20576,73 @@ function buildTimelineGantt(data, maxSprints = 6) {
     );
     tick += 7 * DAY;
   }
+  const gridLines = [];
+  let gridTick = timelineStart;
+  const gridStartDay = new Date(gridTick).getDay();
+  gridTick += (8 - gridStartDay) % 7 * DAY;
+  while (gridTick <= timelineEnd) {
+    gridLines.push(`<div class="gantt-grid-line" style="left:${pct(gridTick).toFixed(2)}%"></div>`);
+    gridTick += 7 * DAY;
+  }
+  const sprintBoundaries = /* @__PURE__ */ new Set();
+  for (const sprint of visibleSprints) {
+    sprintBoundaries.add(toMs(sprint.startDate));
+    sprintBoundaries.add(toMs(sprint.endDate));
+  }
+  const sprintLines = [...sprintBoundaries].map(
+    (ms) => `<div class="gantt-sprint-line" style="left:${pct(ms).toFixed(2)}%"></div>`
+  );
   const now = Date.now();
   let todayMarker = "";
   if (now >= timelineStart && now <= timelineEnd) {
     todayMarker = `<div class="gantt-today" style="left:${pct(now).toFixed(2)}%"></div>`;
   }
-  const rows = [];
+  const sprintBlocks = visibleSprints.map((sprint) => {
+    const sStart = toMs(sprint.startDate);
+    const sEnd = toMs(sprint.endDate);
+    const left = pct(sStart).toFixed(2);
+    const width = (pct(sEnd) - pct(sStart)).toFixed(2);
+    return `<div class="gantt-sprint-block" style="left:${left}%;width:${width}%">${sanitize(sprint.id, 20)}</div>`;
+  }).join("");
+  const sprintBandRow = `<div class="gantt-row gantt-sprint-band-row">
+      <div class="gantt-label gantt-section-label">Sprints</div>
+      <div class="gantt-track gantt-sprint-band">${sprintBlocks}</div>
+    </div>`;
+  const epicSpanMap = /* @__PURE__ */ new Map();
   for (const sprint of visibleSprints) {
     const sStart = toMs(sprint.startDate);
     const sEnd = toMs(sprint.endDate);
-    rows.push(`<div class="gantt-section-row">
-      <div class="gantt-label gantt-section-label">${sanitize(sprint.id + " " + sprint.title, 50)}</div>
-      <div class="gantt-track">
-        <div class="gantt-section-bg" style="left:${pct(sStart).toFixed(2)}%;width:${(pct(sEnd) - pct(sStart)).toFixed(2)}%"></div>
-      </div>
-    </div>`);
-    const linked = sprint.linkedEpics.map((eid) => epicMap.get(eid)).filter(Boolean);
-    const items = linked.length > 0 ? linked.map((e) => ({ label: sanitize(e.id + " " + e.title), status: e.status })) : [{ label: sanitize(sprint.title), status: sprint.status }];
-    for (const item of items) {
-      const cls = item.status === "done" || item.status === "completed" ? "gantt-bar-done" : item.status === "in-progress" || item.status === "active" ? "gantt-bar-active" : item.status === "blocked" ? "gantt-bar-blocked" : "gantt-bar-default";
-      const left = pct(sStart).toFixed(2);
-      const width = (pct(sEnd) - pct(sStart)).toFixed(2);
-      rows.push(`<div class="gantt-row">
-        <div class="gantt-label">${item.label}</div>
+    for (const eid of sprint.linkedEpics) {
+      if (!epicMap.has(eid)) continue;
+      const existing = epicSpanMap.get(eid);
+      if (existing) {
+        existing.startMs = Math.min(existing.startMs, sStart);
+        existing.endMs = Math.max(existing.endMs, sEnd);
+      } else {
+        epicSpanMap.set(eid, { startMs: sStart, endMs: sEnd });
+      }
+    }
+  }
+  const sortedEpicIds = [...epicSpanMap.keys()].sort((a, b) => {
+    const aSpan = epicSpanMap.get(a);
+    const bSpan = epicSpanMap.get(b);
+    if (aSpan.startMs !== bSpan.startMs) return aSpan.startMs - bSpan.startMs;
+    return a.localeCompare(b);
+  });
+  const epicRows = sortedEpicIds.map((eid) => {
+    const epic = epicMap.get(eid);
+    const { startMs, endMs } = epicSpanMap.get(eid);
+    const cls = epic.status === "done" || epic.status === "completed" ? "gantt-bar-done" : epic.status === "in-progress" || epic.status === "active" ? "gantt-bar-active" : epic.status === "blocked" ? "gantt-bar-blocked" : "gantt-bar-default";
+    const left = pct(startMs).toFixed(2);
+    const width = (pct(endMs) - pct(startMs)).toFixed(2);
+    const label = sanitize(epic.id + " " + epic.title);
+    return `<div class="gantt-row">
+        <div class="gantt-label">${label}</div>
         <div class="gantt-track">
           <div class="gantt-bar ${cls}" style="left:${left}%;width:${width}%"></div>
         </div>
-      </div>`);
-    }
-  }
+      </div>`;
+  }).join("\n");
   const note = truncated ? `<div class="mermaid-note">${hiddenCount} earlier sprint${hiddenCount > 1 ? "s" : ""} not shown</div>` : "";
   return `${note}
     <div class="gantt">
@@ -20227,11 +20651,12 @@ function buildTimelineGantt(data, maxSprints = 6) {
           <div class="gantt-label"></div>
           <div class="gantt-track gantt-dates">${markers.join("")}</div>
         </div>
-        ${rows.join("\n")}
+        ${sprintBandRow}
+        ${epicRows}
       </div>
       <div class="gantt-overlay">
         <div class="gantt-label"></div>
-        <div class="gantt-track">${todayMarker}</div>
+        <div class="gantt-track">${gridLines.join("")}${sprintLines.join("")}${todayMarker}</div>
       </div>
     </div>`;
 }
@@ -20310,13 +20735,14 @@ function buildArtifactFlowchart(data) {
       var svg = document.getElementById('flow-lines');
       if (!container || !svg) return;
 
-      // Build adjacency map (bidirectional) for traversal
-      var adj = {};
+      // Build directed adjacency maps for traversal
+      var fwd = {};   // from \u2192 [to] (Feature\u2192Epic, Epic\u2192Sprint)
+      var bwd = {};   // to \u2192 [from] (Sprint\u2192Epic, Epic\u2192Feature)
       edges.forEach(function(e) {
-        if (!adj[e.from]) adj[e.from] = [];
-        if (!adj[e.to]) adj[e.to] = [];
-        adj[e.from].push(e.to);
-        adj[e.to].push(e.from);
+        if (!fwd[e.from]) fwd[e.from] = [];
+        if (!bwd[e.to]) bwd[e.to] = [];
+        fwd[e.from].push(e.to);
+        bwd[e.to].push(e.from);
       });
 
       function drawLines() {
@@ -20349,14 +20775,28 @@ function buildArtifactFlowchart(data) {
         });
       }
 
-      // Find all nodes reachable from a starting node
+      // Find directly related nodes via directed traversal
+      // Follows forward edges (Feature\u2192Epic\u2192Sprint) and backward edges
+      // (Sprint\u2192Epic\u2192Feature) separately to avoid sideways expansion
       function findConnected(startId) {
         var visited = {};
-        var queue = [startId];
         visited[startId] = true;
+        // Traverse forward (from\u2192to direction)
+        var queue = [startId];
+        while (queue.length) {
+          var id = queue.shift();
+          (fwd[id] || []).forEach(function(neighbor) {
+            if (!visited[neighbor]) {
+              visited[neighbor] = true;
+              queue.push(neighbor);
+            }
+          });
+        }
+        // Traverse backward (to\u2192from direction)
+        queue = [startId];
         while (queue.length) {
           var id = queue.shift();
-          (adj[id] || []).forEach(function(neighbor) {
+          (bwd[id] || []).forEach(function(neighbor) {
             if (!visited[neighbor]) {
               visited[neighbor] = true;
               queue.push(neighbor);
@@ -20496,11 +20936,12 @@ function overviewPage(data, diagrams, navGroups) {
 
     <div class="section-title"><a href="/timeline">Project Timeline &rarr;</a></div>
 
-    <div class="section-title">Artifact Relationships</div>
-    ${buildArtifactFlowchart(diagrams)}
+    ${collapsibleSection("overview-relationships", "Artifact Relationships", buildArtifactFlowchart(diagrams))}
 
-    <div class="section-title">Recent Activity</div>
-    ${data.recent.length > 0 ? `
+    ${collapsibleSection(
+    "overview-recent",
+    "Recent Activity",
+    data.recent.length > 0 ? `
     <div class="table-wrap">
       <table>
         <thead>
@@ -20516,7 +20957,8 @@ function overviewPage(data, diagrams, navGroups) {
           ${rows}
         </tbody>
       </table>
-    </div>` : `<div class="empty"><p>No documents yet.</p></div>`}
+    </div>` : `<div class="empty"><p>No documents yet.</p></div>`
+  )}
   `;
 }
 
@@ -20661,23 +21103,24 @@ function garPage(report) {
       <div class="label">Overall: ${escapeHtml(report.overall)}</div>
     </div>
 
-    <div class="gar-areas">
-      ${areaCards}
-    </div>
+    ${collapsibleSection("gar-areas", "Areas", `<div class="gar-areas">${areaCards}</div>`)}
 
-    <div class="section-title">Status Distribution</div>
-    ${buildStatusPie("Action Status", {
-    Open: report.metrics.scope.open,
-    Done: report.metrics.scope.done,
-    "In Progress": Math.max(0, report.metrics.scope.total - report.metrics.scope.open - report.metrics.scope.done)
-  })}
+    ${collapsibleSection(
+    "gar-status-dist",
+    "Status Distribution",
+    buildStatusPie("Action Status", {
+      Open: report.metrics.scope.open,
+      Done: report.metrics.scope.done,
+      "In Progress": Math.max(0, report.metrics.scope.total - report.metrics.scope.open - report.metrics.scope.done)
+    })
+  )}
   `;
 }
 
 // src/web/templates/pages/health.ts
 function healthPage(report, metrics) {
   const dotClass = `dot-${report.overall}`;
-  function renderSection(title, categories) {
+  function renderSection(sectionId, title, categories) {
     const cards = categories.map(
       (cat) => `
         <div class="gar-area">
@@ -20689,10 +21132,9 @@ function healthPage(report, metrics) {
           ${cat.items.length > 0 ? `<ul>${cat.items.map((item) => `<li><span class="ref-id">${escapeHtml(item.id)}</span>${escapeHtml(item.detail)}</li>`).join("")}</ul>` : ""}
         </div>`
     ).join("\n");
-    return `
-      <div class="health-section-title">${escapeHtml(title)}</div>
-      <div class="gar-areas">${cards}</div>
-    `;
+    return collapsibleSection(sectionId, title, `<div class="gar-areas">${cards}</div>`, {
+      titleClass: "health-section-title"
+    });
   }
   return `
     <div class="page-header">
@@ -20705,35 +21147,43 @@ function healthPage(report, metrics) {
       <div class="label">Overall: ${escapeHtml(report.overall)}</div>
     </div>
 
-    ${renderSection("Completeness", report.completeness)}
-
-    <div class="health-section-title">Completeness Overview</div>
-    ${buildHealthGauge(
-    metrics ? Object.entries(metrics.completeness).map(([name, cat]) => ({
-      name: name.replace(/\b\w/g, (c) => c.toUpperCase()),
-      complete: cat.complete,
-      total: cat.total
-    })) : report.completeness.map((c) => {
-      const match = c.summary.match(/(\d+)\s*\/\s*(\d+)/);
-      return {
-        name: c.name,
-        complete: match ? parseInt(match[1], 10) : 0,
-        total: match ? parseInt(match[2], 10) : 0
-      };
-    })
+    ${renderSection("health-completeness", "Completeness", report.completeness)}
+
+    ${collapsibleSection(
+    "health-completeness-overview",
+    "Completeness Overview",
+    buildHealthGauge(
+      metrics ? Object.entries(metrics.completeness).map(([name, cat]) => ({
+        name: name.replace(/\b\w/g, (c) => c.toUpperCase()),
+        complete: cat.complete,
+        total: cat.total
+      })) : report.completeness.map((c) => {
+        const match = c.summary.match(/(\d+)\s*\/\s*(\d+)/);
+        return {
+          name: c.name,
+          complete: match ? parseInt(match[1], 10) : 0,
+          total: match ? parseInt(match[2], 10) : 0
+        };
+      })
+    ),
+    { titleClass: "health-section-title" }
   )}
 
-    ${renderSection("Process", report.process)}
-
-    <div class="health-section-title">Process Summary</div>
-    ${metrics ? buildStatusPie("Process Health", {
-    Stale: metrics.process.stale.length,
-    "Aging Actions": metrics.process.agingActions.length,
-    Healthy: Math.max(
-      0,
-      (metrics.completeness ? Object.values(metrics.completeness).reduce((sum, c) => sum + c.total, 0) : 0) - metrics.process.stale.length - metrics.process.agingActions.length
-    )
-  }) : ""}
+    ${renderSection("health-process", "Process", report.process)}
+
+    ${collapsibleSection(
+    "health-process-summary",
+    "Process Summary",
+    metrics ? buildStatusPie("Process Health", {
+      Stale: metrics.process.stale.length,
+      "Aging Actions": metrics.process.agingActions.length,
+      Healthy: Math.max(
+        0,
+        (metrics.completeness ? Object.values(metrics.completeness).reduce((sum, c) => sum + c.total, 0) : 0) - metrics.process.stale.length - metrics.process.agingActions.length
+      )
+    }) : "",
+    { titleClass: "health-section-title" }
+  )}
   `;
 }
 
@@ -20791,13 +21241,147 @@ function timelinePage(diagrams) {
   return `
     <div class="page-header">
       <h2>Project Timeline</h2>
-      <div class="subtitle">Sprint schedule with linked epics</div>
+      <div class="subtitle">Epic timeline across sprints</div>
     </div>
 
     ${buildTimelineGantt(diagrams)}
   `;
 }
 
+// src/web/templates/pages/upcoming.ts
+function urgencyBadge(tier) {
+  const labels = {
+    overdue: "Overdue",
+    "due-3d": "Due in 3d",
+    "due-7d": "Due in 7d",
+    upcoming: "Upcoming",
+    later: "Later"
+  };
+  return `<span class="badge urgency-badge-${tier}">${labels[tier]}</span>`;
+}
+function urgencyRowClass(tier) {
+  if (tier === "overdue") return " urgency-row-overdue";
+  if (tier === "due-3d") return " urgency-row-due-3d";
+  if (tier === "due-7d") return " urgency-row-due-7d";
+  return "";
+}
+function upcomingPage(data) {
+  const hasActions = data.dueSoonActions.length > 0;
+  const hasSprintTasks = data.dueSoonSprintTasks.length > 0;
+  const hasTrending = data.trending.length > 0;
+  const actionsTable = hasActions ? collapsibleSection(
+    "upcoming-actions",
+    "Due Soon \u2014 Actions",
+    `<div class="table-wrap">
+      <table>
+        <thead>
+          <tr>
+            <th>ID</th>
+            <th>Title</th>
+            <th>Status</th>
+            <th>Owner</th>
+            <th>Due Date</th>
+            <th>Urgency</th>
+            <th>Tasks</th>
+          </tr>
+        </thead>
+        <tbody>
+          ${data.dueSoonActions.map(
+      (a) => `
+          <tr class="${urgencyRowClass(a.urgency)}">
+            <td><a href="/docs/action/${escapeHtml(a.id)}">${escapeHtml(a.id)}</a></td>
+            <td>${escapeHtml(a.title)}</td>
+            <td>${statusBadge(a.status)}</td>
+            <td>${a.owner ? escapeHtml(a.owner) : '<span class="text-dim">\u2014</span>'}</td>
+            <td>${formatDate(a.dueDate)}</td>
+            <td>${urgencyBadge(a.urgency)}</td>
+            <td>${a.relatedTaskCount > 0 ? a.relatedTaskCount : "\u2014"}</td>
+          </tr>`
+    ).join("")}
+        </tbody>
+      </table>
+    </div>`,
+    { titleTag: "h3" }
+  ) : "";
+  const sprintTasksTable = hasSprintTasks ? collapsibleSection(
+    "upcoming-sprint-tasks",
+    "Due Soon \u2014 Sprint Tasks",
+    `<div class="table-wrap">
+      <table>
+        <thead>
+          <tr>
+            <th>ID</th>
+            <th>Title</th>
+            <th>Status</th>
+            <th>Sprint</th>
+            <th>Sprint Ends</th>
+            <th>Urgency</th>
+          </tr>
+        </thead>
+        <tbody>
+          ${data.dueSoonSprintTasks.map(
+      (t) => `
+          <tr class="${urgencyRowClass(t.urgency)}">
+            <td><a href="/docs/task/${escapeHtml(t.id)}">${escapeHtml(t.id)}</a></td>
+            <td>${escapeHtml(t.title)}</td>
+            <td>${statusBadge(t.status)}</td>
+            <td><a href="/docs/sprint/${escapeHtml(t.sprintId)}">${escapeHtml(t.sprintId)}</a></td>
+            <td>${formatDate(t.sprintEndDate)}</td>
+            <td>${urgencyBadge(t.urgency)}</td>
+          </tr>`
+    ).join("")}
+        </tbody>
+      </table>
+    </div>`,
+    { titleTag: "h3" }
+  ) : "";
+  const trendingTable = hasTrending ? collapsibleSection(
+    "upcoming-trending",
+    "Trending",
+    `<div class="table-wrap">
+      <table>
+        <thead>
+          <tr>
+            <th>#</th>
+            <th>ID</th>
+            <th>Title</th>
+            <th>Type</th>
+            <th>Status</th>
+            <th>Score</th>
+            <th>Signals</th>
+          </tr>
+        </thead>
+        <tbody>
+          ${data.trending.map(
+      (t, i) => `
+          <tr>
+            <td><span class="trending-rank">${i + 1}</span></td>
+            <td><a href="/docs/${escapeHtml(t.type)}/${escapeHtml(t.id)}">${escapeHtml(t.id)}</a></td>
+            <td>${escapeHtml(t.title)}</td>
+            <td>${escapeHtml(typeLabel(t.type))}</td>
+            <td>${statusBadge(t.status)}</td>
+            <td><span class="trending-score">${t.score}</span></td>
+            <td>${t.signals.map((s) => `<span class="signal-tag">${escapeHtml(s.factor)} +${s.points}</span>`).join(" ")}</td>
+          </tr>`
+    ).join("")}
+        </tbody>
+      </table>
+    </div>`,
+    { titleTag: "h3" }
+  ) : "";
+  const emptyState = !hasActions && !hasSprintTasks && !hasTrending ? '<div class="empty"><p>No upcoming items or trending activity found.</p></div>' : "";
+  return `
+    <div class="page-header">
+      <h2>Upcoming</h2>
+      <div class="subtitle">Time-sensitive items and trending activity</div>
+    </div>
+    ${actionsTable}
+    ${sprintTasksTable}
+    ${trendingTable}
+    ${emptyState}
+  `;
+}
+
 // src/web/router.ts
 function handleRequest(req, res, store, projectName, navGroups) {
   const parsed = new URL(req.url ?? "/", `http://${req.headers.host ?? "localhost"}`);
@@ -20838,6 +21422,12 @@ function handleRequest(req, res, store, projectName, navGroups) {
       respond(res, layout({ title: "Health Check", activePath: "/health", projectName, navGroups }, body));
       return;
     }
+    if (pathname === "/upcoming") {
+      const data = getUpcomingData(store);
+      const body = upcomingPage(data);
+      respond(res, layout({ title: "Upcoming", activePath: "/upcoming", projectName, navGroups }, body));
+      return;
+    }
     const boardMatch = pathname.match(/^\/board(?:\/([^/]+))?$/);
     if (boardMatch) {
       const type = boardMatch[1];
@@ -20995,6 +21585,7 @@ function createWebTools(store, projectName, navGroups) {
         const base = `http://localhost:${runningServer.port}`;
         const urls = {
           overview: base,
+          upcoming: `${base}/upcoming`,
           gar: `${base}/gar`,
           board: `${base}/board`
         };
@@ -21068,6 +21659,18 @@ function createWebTools(store, projectName, navGroups) {
         };
       },
       { annotations: { readOnlyHint: true } }
+    ),
+    tool22(
+      "get_dashboard_upcoming",
+      "Get upcoming data: due-soon actions and sprint tasks, plus trending items scored by relevance signals. Works without the web server running.",
+      {},
+      async () => {
+        const data = getUpcomingData(store);
+        return {
+          content: [{ type: "text", text: JSON.stringify(data, null, 2) }]
+        };
+      },
+      { annotations: { readOnlyHint: true } }
     )
   ];
 }
@@ -21527,7 +22130,7 @@ function collectTools(marvinDir) {
   const sessionStore = new SessionStore(marvinDir);
   const allSkills = loadAllSkills(marvinDir);
   const allSkillIds = [...allSkills.keys()];
-  const codeSkillTools = getSkillTools(allSkillIds, allSkills, store);
+  const codeSkillTools = getSkillTools(allSkillIds, allSkills, store, config2);
   const skillsWithActions = allSkillIds.map((id) => allSkills.get(id)).filter((s) => s.actions && s.actions.length > 0);
   const projectRoot = path9.dirname(marvinDir);
   const actionTools = createSkillActionTools(skillsWithActions, { store, marvinDir, projectRoot });