devguard 0.1.0 → 0.2.1

package/README.md

@@ -1,10 +1,10 @@
-# devGuard
+# devguard
 
-MCP server that auto-generates dev diary entries from your git activity. What changed, what decisions were made, what broke, what's next — so you can pick up where you left off.
+MCP server that keeps a dev diary for you — what changed, what decisions were made, what broke, what's next. Picks up where you left off so you never lose context between sessions.
 
 ## Why
 
-You vibe code for 3 hours, close your laptop, and come back the next day with no idea what you were doing. devGuard fixes that. It reads your git state and writes a diary entry automatically.
+You vibe code for 3 hours, close your laptop, and come back the next day with no idea what you were doing. Devguard fixes that. It reads your git state, tracks your branches, and writes diary entries automatically.
 
 ## Install
 
@@ -25,9 +25,40 @@ From then on, your AI writes diary entries on its own — after finishing a feat
 | Tool | What it does |
 |------|-------------|
 | `get_context` | Reads git branch, status, recent commits, and diffs |
-| `write_entry` | Saves a diary entry to `.devguard/entries/` |
+| `write_entry` | Saves a diary entry with what changed, decisions, issues, and next steps |
 | `read_entries` | Reads recent entries to catch you up |
-| `catch_me_up` | Morning briefing — diary entries + git state in one shot |
+| `catch_me_up` | Morning briefing — diary entries + git state + branch map in one shot |
+| `branch_map` | Opens a visual branch map in your browser |
 | `setup` | Re-run setup manually if needed |
 
-Entries are markdown files stored locally in your project under `.devguard/`, one file per day. Multiple sessions and agents all append to the same daily file.
+## Branch Map
+
+Run `branch_map` to open an interactive HTML visualization of your repo in the browser. It shows:
+
+- **All branches** with status (ahead/behind main), files changed, and latest commit
+- **Collapsible diary summaries** per branch — what changed, decisions made, issues hit, next steps
+- **Commit navigator** — click any branch to explore its commits on a visual timeline
+- **Per-commit detail** — files changed, insertions/deletions, and diary entries linked to each commit
+- **Auto-generated summaries** for commits without diary entries — categorized by type (Feature, Fix, Refactor, etc.) with affected areas and change scale
+
+Designed for people who don't want to think about git.
+
+## Branch-Aware Diary
+
+Entries are automatically routed by branch:
+- **main/master** → `.devguard/entries/` (daily files)
+- **feature branches** → `.devguard/branches/<branch-name>.md` (one file per branch)
+
+This means `catch_me_up` shows you the current branch's full story first, then the main stem, then other active branches — so you always know what's happening everywhere.
+
+## How It Works
+
+Entries are markdown files stored locally in your project under `.devguard/`. Each entry captures:
+- **Summary** — one-line description of what happened
+- **What Changed** — files modified, features added, bugs fixed
+- **Decisions** — key choices made and why
+- **Issues** — what broke, what's stuck
+- **Next Steps** — what to do next session
+- **Commit hash** — links the entry to a specific commit for traceability
+
+Multiple sessions and agents all append to the same file. The diary builds up over time, making summaries richer and the branch map more useful with every session.

package/dist/index.js

@@ -8,12 +8,13 @@ const write_entry_js_1 = require("./tools/write-entry.js");
 const read_entries_js_1 = require("./tools/read-entries.js");
 const catch_me_up_js_1 = require("./tools/catch-me-up.js");
 const setup_js_1 = require("./tools/setup.js");
+const branch_map_js_1 = require("./tools/branch-map.js");
 const auto_setup_js_1 = require("./utils/auto-setup.js");
-// Auto-setup on first run: adds .devguard/ to .gitignore
+// Auto-setup on first run: adds .devdiary/ to .gitignore
 // and auto-logging instruction to CLAUDE.md or .cursorrules
 (0, auto_setup_js_1.autoSetup)(process.cwd());
 const server = new mcp_js_1.McpServer({
-    name: "devguard",
+    name: "devdiary",
     version: "0.1.0",
 });
 (0, get_context_js_1.registerGetContext)(server);
@@ -21,10 +22,11 @@ const server = new mcp_js_1.McpServer({
 (0, read_entries_js_1.registerReadEntries)(server);
 (0, catch_me_up_js_1.registerCatchMeUp)(server);
 (0, setup_js_1.registerSetup)(server);
+(0, branch_map_js_1.registerBranchMap)(server);
 async function main() {
     const transport = new stdio_js_1.StdioServerTransport();
     await server.connect(transport);
-    console.error("devguard MCP server running on stdio");
+    console.error("devdiary MCP server running on stdio");
 }
 main().catch((err) => {
     console.error("Fatal error:", err);

package/dist/tools/agent-check.d.ts

@@ -0,0 +1,2 @@
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+export declare function registerAgentCheck(server: McpServer): void;

package/dist/tools/agent-check.js

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerAgentCheck = registerAgentCheck;
+const zod_1 = require("zod");
+const collision_js_1 = require("../utils/collision.js");
+function registerAgentCheck(server) {
+    server.tool("agent_check", "Check for file collisions between active agents. Call with no files to see all current collisions, or pass a list of files to check if they conflict with any active agent.", {
+        project_path: zod_1.z.string().describe("Absolute path to the project directory"),
+        files: zod_1.z
+            .array(zod_1.z.string())
+            .optional()
+            .describe("Files to check for conflicts. If omitted, reports all collisions."),
+        exclude_agent_id: zod_1.z
+            .string()
+            .optional()
+            .describe("Agent to exclude from collision check (usually yourself)"),
+    }, async ({ project_path, files, exclude_agent_id, }) => {
+        if (files && files.length > 0) {
+            const collisions = (0, collision_js_1.checkFilesForCollisions)(project_path, files, exclude_agent_id);
+            if (collisions.length === 0) {
+                return {
+                    content: [
+                        {
+                            type: "text",
+                            text: "No conflicts. These files are not claimed by any other active agent.",
+                        },
+                    ],
+                };
+            }
+            const lines = collisions.map((c) => `- **${c.file}** — claimed by: ${c.agents.join(", ")}`);
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: `**Conflicts found (${collisions.length}):**\n${lines.join("\n")}\n\nCoordinate with these agents before modifying shared files.`,
+                    },
+                ],
+            };
+        }
+        // No files specified — report all collisions
+        const collisions = (0, collision_js_1.detectCollisions)(project_path);
+        if (collisions.length === 0) {
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: "No file collisions between active agents.",
+                    },
+                ],
+            };
+        }
+        const lines = collisions.map((c) => `- **${c.file}** — shared by: ${c.agents.join(", ")}`);
+        return {
+            content: [
+                {
+                    type: "text",
+                    text: `**Active collisions (${collisions.length}):**\n${lines.join("\n")}\n\nThese files are claimed by multiple active agents. Agents should coordinate before editing.`,
+                },
+            ],
+        };
+    });
+}

package/dist/tools/agent-list.d.ts

@@ -0,0 +1,2 @@
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+export declare function registerAgentList(server: McpServer): void;

package/dist/tools/agent-list.js

@@ -0,0 +1,70 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerAgentList = registerAgentList;
+const zod_1 = require("zod");
+const storage = __importStar(require("../utils/storage.js"));
+function registerAgentList(server) {
+    server.tool("agent_list", "List all registered agents and their current status.", {
+        project_path: zod_1.z.string().describe("Absolute path to the project directory"),
+    }, async ({ project_path }) => {
+        const files = storage.listAgentFiles(project_path);
+        if (files.length === 0) {
+            return {
+                content: [{ type: "text", text: "No agents registered." }],
+            };
+        }
+        const summaries = files.map((f) => {
+            const agentId = f.replace(/\.md$/, "");
+            const content = storage.readAgentFile(project_path, agentId);
+            const statusMatch = content?.match(/^status:\s*(.+)$/m);
+            const taskMatch = content?.match(/^task:\s*"?(.+?)"?$/m);
+            const nameMatch = content?.match(/^name:\s*(.+)$/m);
+            const status = statusMatch?.[1] ?? "unknown";
+            const task = taskMatch?.[1] ?? "";
+            const name = nameMatch?.[1] ?? "";
+            const label = name ? `**${name}** (${agentId})` : `**${agentId}**`;
+            return `- ${label} [${status}]: ${task}`;
+        });
+        return {
+            content: [
+                {
+                    type: "text",
+                    text: `**Registered agents (${files.length}):**\n${summaries.join("\n")}`,
+                },
+            ],
+        };
+    });
+}

package/dist/tools/agent-register.d.ts

@@ -0,0 +1,2 @@
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+export declare function registerAgentRegister(server: McpServer): void;

package/dist/tools/agent-register.js

@@ -0,0 +1,105 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerAgentRegister = registerAgentRegister;
+const zod_1 = require("zod");
+const git = __importStar(require("../utils/git.js"));
+const storage = __importStar(require("../utils/storage.js"));
+function registerAgentRegister(server) {
+    server.tool("agent_register", "Register a subagent before it starts work. Declares the agent's task and which files it plans to touch. Creates a per-agent log file and records the registration in the daily ledger so other agents can see it.", {
+        project_path: zod_1.z.string().describe("Absolute path to the project directory"),
+        agent_id: zod_1.z.string().describe("Unique slug for this agent (e.g. refactor-auth, add-tests)"),
+        task_summary: zod_1.z.string().describe("One-line description of what this agent will do"),
+        files_touching: zod_1.z
+            .array(zod_1.z.string())
+            .describe("List of file paths this agent plans to modify"),
+    }, async ({ project_path, agent_id, task_summary, files_touching }) => {
+        const now = new Date();
+        const isoDate = now.toISOString();
+        const time = storage.formatTime(now);
+        const branch = git.isGitRepo(project_path)
+            ? git.getBranch(project_path)
+            : "unknown";
+        const filesList = files_touching.join(", ");
+        // 1. Create per-agent MD file
+        const frontmatter = [
+            "---",
+            `agent_id: ${agent_id}`,
+            `task: "${task_summary}"`,
+            `registered: ${isoDate}`,
+            `status: active`,
+            `files_touching:`,
+            ...files_touching.map((f) => `  - ${f}`),
+            "---",
+        ].join("\n");
+        const agentContent = [
+            frontmatter,
+            "",
+            `# Agent: ${agent_id}`,
+            "",
+            "## Task",
+            task_summary,
+            "",
+            "## Files",
+            ...files_touching.map((f) => `- ${f}`),
+            "",
+            "---",
+            "",
+            `<!-- registered: ${time} -->`,
+            "Agent registered and starting work.",
+            "",
+        ].join("\n");
+        const agentFilePath = storage.writeAgentFile(project_path, agent_id, agentContent);
+        // 2. Append registration to daily ledger
+        const ledgerEntry = [
+            `<!-- agent: ${agent_id} | status: active | files: ${filesList} -->`,
+            `### [Agent] ${agent_id}`,
+            `**Task:** ${task_summary}`,
+            `**Files:** ${filesList}`,
+            `**Branch:** ${branch}`,
+            `**Registered:** ${isoDate}`,
+            "",
+        ].join("\n");
+        const ledgerPath = storage.writeEntry(project_path, ledgerEntry);
+        return {
+            content: [
+                {
+                    type: "text",
+                    text: `Agent "${agent_id}" registered.\nAgent log: ${agentFilePath}\nDaily ledger: ${ledgerPath}\n\nTask: ${task_summary}\nFiles: ${filesList}`,
+                },
+            ],
+        };
+    });
+}

package/dist/tools/agent-update.d.ts

@@ -0,0 +1,2 @@
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+export declare function registerAgentUpdate(server: McpServer): void;

package/dist/tools/agent-update.js

@@ -0,0 +1,111 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerAgentUpdate = registerAgentUpdate;
+const zod_1 = require("zod");
+const storage = __importStar(require("../utils/storage.js"));
+function registerAgentUpdate(server) {
+    server.tool("agent_update", "Update an agent's status, task, or append a log message. Use this to mark agents as done, paused, or blocked, update their scope, or record progress notes.", {
+        project_path: zod_1.z.string().describe("Absolute path to the project directory"),
+        agent_id: zod_1.z.string().describe("The agent's slug (e.g. entries, context)"),
+        status: zod_1.z
+            .enum(["active", "done", "paused", "blocked"])
+            .optional()
+            .describe("New status for the agent"),
+        task_summary: zod_1.z.string().optional().describe("Updated task description"),
+        log_message: zod_1.z.string().optional().describe("A progress note to append to the agent's log"),
+    }, async ({ project_path, agent_id, status, task_summary, log_message }) => {
+        const existing = storage.readAgentFile(project_path, agent_id);
+        if (!existing) {
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: `Agent "${agent_id}" not found. Register it first with agent_register.`,
+                    },
+                ],
+            };
+        }
+        let updated = existing;
+        const changes = [];
+        // Update status in frontmatter
+        if (status) {
+            updated = updated.replace(/^status:\s*.+$/m, `status: ${status}`);
+            changes.push(`status → ${status}`);
+        }
+        // Update task in frontmatter
+        if (task_summary) {
+            updated = updated.replace(/^task:\s*"?.+?"?$/m, `task: "${task_summary}"`);
+            // Also update the Task section body
+            updated = updated.replace(/## Task\n.+/, `## Task\n${task_summary}`);
+            changes.push(`task → "${task_summary}"`);
+        }
+        // Write back if frontmatter changed
+        if (status || task_summary) {
+            storage.writeAgentFile(project_path, agent_id, updated);
+        }
+        // Append log message
+        if (log_message) {
+            storage.appendToAgentFile(project_path, agent_id, log_message);
+            changes.push(`log appended`);
+        }
+        if (changes.length === 0) {
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: `No changes specified for agent "${agent_id}". Provide status, task_summary, or log_message.`,
+                    },
+                ],
+            };
+        }
+        // Record in daily ledger
+        const ledgerEntry = [
+            `<!-- agent-update: ${agent_id} | ${changes.join(", ")} -->`,
+            `### [Agent Update] ${agent_id}`,
+            `**Changes:** ${changes.join(", ")}`,
+            "",
+        ].join("\n");
+        storage.writeEntry(project_path, ledgerEntry);
+        return {
+            content: [
+                {
+                    type: "text",
+                    text: `Agent "${agent_id}" updated: ${changes.join(", ")}`,
+                },
+            ],
+        };
+    });
+}

package/dist/tools/branch-map.d.ts

@@ -0,0 +1,2 @@
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+export declare function registerBranchMap(server: McpServer): void;

package/dist/tools/branch-map.js

@@ -0,0 +1,108 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerBranchMap = registerBranchMap;
+const zod_1 = require("zod");
+const git = __importStar(require("../utils/git.js"));
+const storage = __importStar(require("../utils/storage.js"));
+const branch_map_html_js_1 = require("../utils/branch-map-html.js");
+function registerBranchMap(server) {
+    server.tool("branch_map", "Opens a visual branch map in the browser. Shows all branches, what they're for, and where you are — designed for people who don't want to think about git.", {
+        project_path: zod_1.z.string().describe("Absolute path to the project directory"),
+    }, async ({ project_path }) => {
+        if (!git.isGitRepo(project_path)) {
+            return {
+                content: [{ type: "text", text: "This project isn't using git yet — no branches to show." }],
+            };
+        }
+        const branch = git.getBranch(project_path);
+        const gitBranches = git.getLocalBranches(project_path);
+        const branchFiles = storage.listBranchFiles(project_path);
+        const branchFileMap = new Map(branchFiles.map((b) => [b.branch, b.content]));
+        const mainBranch = gitBranches.includes("main") ? "main" : "master";
+        // Also read main stem entries for diary content on main
+        const mainEntries = storage.readEntries(project_path, 5);
+        const mainDiaryEntries = mainEntries.flatMap((content) => storage.parseDiaryEntries(content));
+        const branches = gitBranches.map((b) => {
+            const isCurrent = b === branch;
+            const isMain = b === "main" || b === "master";
+            const sanitized = b.replace(/\//g, "-");
+            const content = branchFileMap.get(sanitized);
+            let summary;
+            let diaryEntries = [];
+            if (content) {
+                summary = storage.extractLatestSummary(content);
+                diaryEntries = storage.parseDiaryEntries(content);
+            }
+            else if (isMain && mainDiaryEntries.length > 0) {
+                summary = mainDiaryEntries[0]?.summary || git.getBranchLastCommit(project_path, b) || "Empty branch";
+                diaryEntries = mainDiaryEntries;
+            }
+            else {
+                summary = git.getBranchLastCommit(project_path, b) || "Empty branch";
+            }
+            const ahead = isMain ? 0 : git.getBranchCommitCount(project_path, b, mainBranch);
+            const behind = isMain ? 0 : git.getBehindCount(project_path, b, mainBranch);
+            const commits = git.getBranchCommits(project_path, b, 10);
+            // Enrich commits with per-commit file data for branch viewer
+            for (const c of commits) {
+                c.files = git.getCommitFiles(project_path, c.shortHash);
+                const stats = git.getCommitStats(project_path, c.shortHash);
+                c.insertions = stats.insertions;
+                c.deletions = stats.deletions;
+                c.body = git.getCommitBody(project_path, c.shortHash);
+            }
+            const filesChanged = isMain ? 0 : git.getFilesChangedCount(project_path, b, mainBranch);
+            return { name: b, isCurrent, isMain, summary, ahead, behind, commits, filesChanged, diaryEntries };
+        });
+        // Build events from branch data
+        const events = [];
+        branches.forEach((b) => {
+            if (!b.isMain && b.ahead > 0) {
+                events.push({ type: "fork", label: `Forked: ${b.name}`, branch: b.name });
+            }
+        });
+        if (branches.some((b) => !b.isMain && b.ahead === 0 && !b.isCurrent)) {
+            const merged = branches.filter((b) => !b.isMain && b.ahead === 0 && !b.isCurrent);
+            merged.forEach((b) => {
+                events.push({ type: "merge", label: `Merged: ${b.name} into main`, branch: b.name });
+            });
+        }
+        const filePath = (0, branch_map_html_js_1.generateAndOpenBranchMap)(project_path, branches, events);
+        return {
+            content: [{ type: "text", text: `Branch map opened in your browser.\n\nSaved to: ${filePath}` }],
+        };
+    });
+}

package/dist/tools/catch-me-up.js

@@ -42,10 +42,69 @@ function registerCatchMeUp(server) {
         project_path: zod_1.z.string().describe("Absolute path to the project directory"),
     }, async ({ project_path }) => {
         const parts = [];
-        // Recent diary entries
+        const branch = git.isGitRepo(project_path)
+            ? git.getBranch(project_path)
+            : "main";
+        const isMainBranch = branch === "main" || branch === "master";
+        // Branch Map — visual overview of all branches
+        if (git.isGitRepo(project_path)) {
+            const gitBranches = git.getLocalBranches(project_path);
+            const branchFiles = storage.listBranchFiles(project_path);
+            const branchFileMap = new Map(branchFiles.map((b) => [b.branch, b.content]));
+            if (gitBranches.length > 1 || branchFiles.length > 0) {
+                const mainBranch = gitBranches.includes("main") ? "main" : "master";
+                const branchData = gitBranches.map((b) => {
+                    const isCurrent = b === branch;
+                    const isMain = b === "main" || b === "master";
+                    const sanitized = b.replace(/\//g, "-");
+                    const content = branchFileMap.get(sanitized);
+                    let summary;
+                    if (content) {
+                        summary = storage.extractLatestSummary(content);
+                    }
+                    else {
+                        summary = git.getBranchLastCommit(project_path, b) || "Empty branch";
+                    }
+                    let status = "";
+                    if (isCurrent)
+                        status = "current";
+                    else if (isMain)
+                        status = "main";
+                    else {
+                        const ahead = git.getBranchCommitCount(project_path, b, mainBranch);
+                        status = ahead > 0 ? `${ahead} ahead` : "";
+                    }
+                    return { name: b, isCurrent, isMain, summary, status };
+                });
+                const lines = [];
+                lines.push("## Branch Map\n");
+                for (const b of branchData) {
+                    const marker = b.isCurrent ? "> " : b.isMain ? "  " : "  ";
+                    const icon = b.isCurrent ? "[*]" : b.isMain ? "[o]" : "[-]";
+                    const statusTag = b.status ? ` (${b.status})` : "";
+                    const truncSummary = b.summary.length > 60
+                        ? b.summary.slice(0, 57) + "..."
+                        : b.summary;
+                    lines.push(`${marker}${icon} **${b.name}**${statusTag} — ${truncSummary}`);
+                }
+                parts.push(lines.join("\n"));
+            }
+        }
+        // If on a feature branch, show its log first
+        if (!isMainBranch) {
+            const branchLog = storage.readBranchEntry(project_path, branch);
+            if (branchLog) {
+                parts.push(`## Current Branch: ${branch}\n`);
+                parts.push(branchLog);
+            }
+            else {
+                parts.push(`## Current Branch: ${branch}\n\nNo diary entries for this branch yet.`);
+            }
+        }
+        // Recent main stem entries
         const entries = storage.readEntries(project_path, 3);
         if (entries.length > 0) {
-            parts.push("## Recent Diary Entries\n");
+            parts.push("## Main Stem (Recent Daily Entries)\n");
             entries.forEach((entry, i) => {
                 parts.push(`### ${i === 0 ? "Latest" : `Entry ${i + 1}`}\n${entry}`);
             });
@@ -53,9 +112,23 @@ function registerCatchMeUp(server) {
         else {
             parts.push("## No previous diary entries found.\n");
         }
+        // Other branch logs
+        const allBranches = storage.listBranchFiles(project_path);
+        const otherBranches = allBranches.filter((b) => b.branch !== branch.replace(/\//g, "-"));
+        if (otherBranches.length > 0) {
+            parts.push("## Other Branches\n");
+            for (const b of otherBranches) {
+                // Show just the last entry snippet for each
+                const lines = b.content.split("\n");
+                const lastSeparator = b.content.lastIndexOf("---\n\n<!--");
+                const snippet = lastSeparator >= 0
+                    ? b.content.slice(lastSeparator).split("\n").slice(0, 15).join("\n")
+                    : lines.slice(-10).join("\n");
+                parts.push(`### ${b.branch}\n${snippet}`);
+            }
+        }
         // Current git state
         if (git.isGitRepo(project_path)) {
-            const branch = git.getBranch(project_path);
             const status = git.getStatus(project_path);
             const commits = git.getRecentCommits(project_path, 5);
             const diff = git.getDiffFull(project_path);