forge-cc 0.1.4 → 0.1.6

package/dist/worktree/session.js

@@ -0,0 +1,193 @@
+import { join } from "node:path";
+import { openSync, closeSync, unlinkSync, mkdirSync, existsSync, } from "node:fs";
+import { readJsonFileSync, writeJsonFileSync, generateSessionId, } from "../utils/platform.js";
+/**
+ * Get the path to the session registry file.
+ * Located at <repoRoot>/.forge/sessions.json
+ */
+export function getRegistryPath(repoRoot) {
+    return join(repoRoot, ".forge", "sessions.json");
+}
+// ---------------------------------------------------------------------------
+// File-based lock for registry writes
+// ---------------------------------------------------------------------------
+const LOCK_RETRIES = 10;
+const LOCK_RETRY_MS = 100;
+function getLockPath(repoRoot) {
+    return join(repoRoot, ".forge", "sessions.lock");
+}
+/**
+ * Acquire an exclusive lock file. Retries with backoff on contention.
+ * Uses O_CREAT|O_EXCL which atomically fails if the file exists.
+ */
+function acquireLock(repoRoot) {
+    const lockPath = getLockPath(repoRoot);
+    const dir = join(repoRoot, ".forge");
+    if (!existsSync(dir)) {
+        mkdirSync(dir, { recursive: true });
+    }
+    for (let attempt = 0; attempt < LOCK_RETRIES; attempt++) {
+        try {
+            // O_CREAT | O_EXCL | O_WRONLY — fails if file already exists
+            const fd = openSync(lockPath, "wx");
+            closeSync(fd);
+            return;
+        }
+        catch {
+            if (attempt === LOCK_RETRIES - 1) {
+                // Last attempt — force-remove stale lock and try once more
+                try {
+                    unlinkSync(lockPath);
+                    const fd = openSync(lockPath, "wx");
+                    closeSync(fd);
+                    return;
+                }
+                catch {
+                    throw new Error(`Failed to acquire session registry lock at ${lockPath} after ${LOCK_RETRIES} attempts`);
+                }
+            }
+            // Busy-wait (sync context)
+            const waitUntil = Date.now() + LOCK_RETRY_MS;
+            while (Date.now() < waitUntil) {
+                // spin
+            }
+        }
+    }
+}
+/**
+ * Release the lock file.
+ */
+function releaseLock(repoRoot) {
+    try {
+        unlinkSync(getLockPath(repoRoot));
+    }
+    catch {
+        // Lock already removed — non-fatal
+    }
+}
+/**
+ * Execute a callback while holding the registry lock.
+ * Ensures read-modify-write operations are serialized.
+ */
+function withRegistryLock(repoRoot, fn) {
+    acquireLock(repoRoot);
+    try {
+        return fn();
+    }
+    finally {
+        releaseLock(repoRoot);
+    }
+}
+/**
+ * Load the session registry. Returns empty registry if file doesn't exist.
+ */
+export function loadRegistry(repoRoot) {
+    const data = readJsonFileSync(getRegistryPath(repoRoot));
+    if (data === null) {
+        return { sessions: [] };
+    }
+    return data;
+}
+/**
+ * Save the session registry atomically.
+ */
+export function saveRegistry(repoRoot, registry) {
+    writeJsonFileSync(getRegistryPath(repoRoot), registry);
+}
+/**
+ * Register a new session. Returns the created session.
+ * Uses file-based locking to prevent lost updates from concurrent writes.
+ */
+export function registerSession(repoRoot, params) {
+    return withRegistryLock(repoRoot, () => {
+        const registry = loadRegistry(repoRoot);
+        const session = {
+            id: generateSessionId(),
+            user: params.user.name,
+            email: params.user.email,
+            skill: params.skill,
+            milestone: params.milestone,
+            branch: params.branch,
+            worktreePath: params.worktreePath,
+            startedAt: new Date().toISOString(),
+            pid: process.pid,
+            status: "active",
+        };
+        registry.sessions.push(session);
+        saveRegistry(repoRoot, registry);
+        return session;
+    });
+}
+/**
+ * Deregister (remove) a session by ID.
+ * Uses file-based locking to prevent lost updates.
+ */
+export function deregisterSession(repoRoot, sessionId) {
+    withRegistryLock(repoRoot, () => {
+        const registry = loadRegistry(repoRoot);
+        registry.sessions = registry.sessions.filter((s) => s.id !== sessionId);
+        saveRegistry(repoRoot, registry);
+    });
+}
+/**
+ * Update a session's status.
+ * Uses file-based locking to prevent lost updates.
+ */
+export function updateSessionStatus(repoRoot, sessionId, status) {
+    withRegistryLock(repoRoot, () => {
+        const registry = loadRegistry(repoRoot);
+        const session = registry.sessions.find((s) => s.id === sessionId);
+        if (session) {
+            session.status = status;
+            saveRegistry(repoRoot, registry);
+        }
+    });
+}
+/**
+ * Check if a process with the given PID is still running.
+ */
+function isPidAlive(pid) {
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Find and mark stale sessions.
+ * A session is stale if its PID is no longer running.
+ * Uses file-based locking to prevent lost updates.
+ */
+export function detectStaleSessions(repoRoot) {
+    return withRegistryLock(repoRoot, () => {
+        const registry = loadRegistry(repoRoot);
+        const newlyStale = [];
+        for (const session of registry.sessions) {
+            if (session.status === "active" && !isPidAlive(session.pid)) {
+                session.status = "stale";
+                newlyStale.push(session);
+            }
+        }
+        if (newlyStale.length > 0) {
+            saveRegistry(repoRoot, registry);
+        }
+        return newlyStale;
+    });
+}
+/**
+ * Get all active sessions.
+ */
+export function getActiveSessions(repoRoot) {
+    const registry = loadRegistry(repoRoot);
+    return registry.sessions.filter((s) => s.status === "active");
+}
+/**
+ * Get a session by ID.
+ */
+export function getSession(repoRoot, sessionId) {
+    const registry = loadRegistry(repoRoot);
+    return registry.sessions.find((s) => s.id === sessionId) ?? null;
+}
+//# sourceMappingURL=session.js.map

package/dist/worktree/session.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/worktree/session.ts"],"names":[],"mappings":"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"}

package/dist/worktree/state-merge.d.ts

@@ -0,0 +1,43 @@
+export interface MergeResult {
+    stateUpdated: boolean;
+    roadmapUpdated: boolean;
+    warnings: string[];
+}
+/**
+ * Merge state from a completed worktree session back to the main repo.
+ *
+ * - STATE.md: updates the milestone row with completion status and the
+ *   Last Session date.
+ * - ROADMAP.md: marks the milestone row as complete with the given date.
+ *
+ * Uses synchronous I/O throughout — consistent with all other worktree modules.
+ *
+ * @param mainRepoDir - Absolute path to the main repository
+ * @param worktreeDir - Absolute path to the completed worktree
+ * @param milestoneNumber - The milestone that was completed
+ * @param completionDate - Date string (YYYY-MM-DD) for the completion
+ */
+export declare function mergeSessionState(mainRepoDir: string, worktreeDir: string, milestoneNumber: number, completionDate: string): MergeResult;
+/**
+ * Update a specific milestone row in a ROADMAP.md file.
+ * Uses structured line-by-line parsing (not regex replace) to safely
+ * update the status column of the milestone's table row.
+ *
+ * @param roadmapPath - Absolute path to ROADMAP.md
+ * @param milestoneNumber - Which milestone to update
+ * @param newStatus - New status string (e.g., "Complete (2026-02-15)")
+ * @returns true if the milestone was found and updated
+ */
+export declare function updateRoadmapMilestoneStatus(roadmapPath: string, milestoneNumber: number, newStatus: string): boolean;
+/**
+ * Update the milestone progress table in STATE.md.
+ * Reads the current STATE.md, finds the milestone row, updates its status.
+ * Also updates the `**Last Session:**` date if present.
+ * Preserves all other content.
+ *
+ * @param statePath - Absolute path to STATE.md
+ * @param milestoneNumber - Which milestone to update
+ * @param newStatus - New status string
+ * @returns true if the milestone was found and updated
+ */
+export declare function updateStateMilestoneRow(statePath: string, milestoneNumber: number, newStatus: string): boolean;

package/dist/worktree/state-merge.js

@@ -0,0 +1,162 @@
+import { readFileSync, existsSync } from "node:fs";
+import { join } from "node:path";
+import { atomicWriteFileSync } from "../utils/platform.js";
+// ---------------------------------------------------------------------------
+// mergeSessionState
+// ---------------------------------------------------------------------------
+/**
+ * Merge state from a completed worktree session back to the main repo.
+ *
+ * - STATE.md: updates the milestone row with completion status and the
+ *   Last Session date.
+ * - ROADMAP.md: marks the milestone row as complete with the given date.
+ *
+ * Uses synchronous I/O throughout — consistent with all other worktree modules.
+ *
+ * @param mainRepoDir - Absolute path to the main repository
+ * @param worktreeDir - Absolute path to the completed worktree
+ * @param milestoneNumber - The milestone that was completed
+ * @param completionDate - Date string (YYYY-MM-DD) for the completion
+ */
+export function mergeSessionState(mainRepoDir, worktreeDir, milestoneNumber, completionDate) {
+    const warnings = [];
+    let stateUpdated = false;
+    let roadmapUpdated = false;
+    const completionStatus = `Complete (${completionDate})`;
+    // --- Check that the worktree has planning files --------------------------
+    const worktreeStatePath = join(worktreeDir, ".planning", "STATE.md");
+    const worktreeRoadmapPath = join(worktreeDir, ".planning", "ROADMAP.md");
+    if (!existsSync(worktreeStatePath)) {
+        warnings.push(`Worktree STATE.md not found at ${worktreeStatePath} — skipping state merge`);
+    }
+    if (!existsSync(worktreeRoadmapPath)) {
+        warnings.push(`Worktree ROADMAP.md not found at ${worktreeRoadmapPath} — skipping roadmap merge`);
+    }
+    // --- Update main repo STATE.md ------------------------------------------
+    const mainStatePath = join(mainRepoDir, ".planning", "STATE.md");
+    if (existsSync(mainStatePath)) {
+        const milestoneUpdated = updateStateMilestoneRow(mainStatePath, milestoneNumber, completionStatus);
+        if (milestoneUpdated) {
+            stateUpdated = true;
+        }
+        else {
+            warnings.push(`Milestone ${milestoneNumber} row not found in main repo STATE.md — no state update performed`);
+        }
+    }
+    else {
+        warnings.push(`Main repo STATE.md not found at ${mainStatePath} — cannot update state`);
+    }
+    // --- Update main repo ROADMAP.md ----------------------------------------
+    const mainRoadmapPath = join(mainRepoDir, ".planning", "ROADMAP.md");
+    if (existsSync(mainRoadmapPath)) {
+        const milestoneUpdated = updateRoadmapMilestoneStatus(mainRoadmapPath, milestoneNumber, completionStatus);
+        if (milestoneUpdated) {
+            roadmapUpdated = true;
+        }
+        else {
+            warnings.push(`Milestone ${milestoneNumber} row not found in main repo ROADMAP.md — no roadmap update performed`);
+        }
+    }
+    else {
+        warnings.push(`Main repo ROADMAP.md not found at ${mainRoadmapPath} — cannot update roadmap`);
+    }
+    return { stateUpdated, roadmapUpdated, warnings };
+}
+// ---------------------------------------------------------------------------
+// updateRoadmapMilestoneStatus
+// ---------------------------------------------------------------------------
+/**
+ * Update a specific milestone row in a ROADMAP.md file.
+ * Uses structured line-by-line parsing (not regex replace) to safely
+ * update the status column of the milestone's table row.
+ *
+ * @param roadmapPath - Absolute path to ROADMAP.md
+ * @param milestoneNumber - Which milestone to update
+ * @param newStatus - New status string (e.g., "Complete (2026-02-15)")
+ * @returns true if the milestone was found and updated
+ */
+export function updateRoadmapMilestoneStatus(roadmapPath, milestoneNumber, newStatus) {
+    const content = readFileSync(roadmapPath, "utf-8");
+    const lines = content.split("\n");
+    let found = false;
+    for (let i = 0; i < lines.length; i++) {
+        const line = lines[i];
+        // Match table rows: | <number> | <name> | <status> |
+        // Cells are separated by |. Split and check the first data cell.
+        if (!line.trimStart().startsWith("|"))
+            continue;
+        const cells = line.split("|");
+        // A valid table row split by | produces: ["", " cell1 ", " cell2 ", " cell3 ", ""]
+        // We need at least 4 separators (5 segments) for a 3-column table row.
+        if (cells.length < 5)
+            continue;
+        const firstCell = cells[1].trim();
+        const parsedNumber = parseInt(firstCell, 10);
+        if (isNaN(parsedNumber) || parsedNumber !== milestoneNumber)
+            continue;
+        // Check if this is already completed — if so, last completer wins with warning.
+        const currentStatus = cells[3].trim();
+        const alreadyComplete = currentStatus.toLowerCase().startsWith("complete");
+        // Update the status cell (index 3), preserving cell padding.
+        cells[3] = ` ${newStatus} `;
+        lines[i] = cells.join("|");
+        found = true;
+        if (alreadyComplete) {
+            // Last completer wins — overwrite is intentional but callers may
+            // want to know. We still return true since the update was applied.
+        }
+        break;
+    }
+    if (found) {
+        atomicWriteFileSync(roadmapPath, lines.join("\n"));
+    }
+    return found;
+}
+// ---------------------------------------------------------------------------
+// updateStateMilestoneRow
+// ---------------------------------------------------------------------------
+/**
+ * Update the milestone progress table in STATE.md.
+ * Reads the current STATE.md, finds the milestone row, updates its status.
+ * Also updates the `**Last Session:**` date if present.
+ * Preserves all other content.
+ *
+ * @param statePath - Absolute path to STATE.md
+ * @param milestoneNumber - Which milestone to update
+ * @param newStatus - New status string
+ * @returns true if the milestone was found and updated
+ */
+export function updateStateMilestoneRow(statePath, milestoneNumber, newStatus) {
+    const content = readFileSync(statePath, "utf-8");
+    const lines = content.split("\n");
+    let milestoneFound = false;
+    // Extract the date from the status string for Last Session update.
+    // Status format is typically "Complete (YYYY-MM-DD)".
+    const dateMatch = newStatus.match(/\((\d{4}-\d{2}-\d{2})\)/);
+    const completionDate = dateMatch ? dateMatch[1] : null;
+    for (let i = 0; i < lines.length; i++) {
+        const line = lines[i];
+        // --- Update milestone table row ----------------------------------------
+        if (line.trimStart().startsWith("|")) {
+            const cells = line.split("|");
+            if (cells.length >= 5) {
+                const firstCell = cells[1].trim();
+                const parsedNumber = parseInt(firstCell, 10);
+                if (!isNaN(parsedNumber) && parsedNumber === milestoneNumber) {
+                    cells[3] = ` ${newStatus} `;
+                    lines[i] = cells.join("|");
+                    milestoneFound = true;
+                }
+            }
+        }
+        // --- Update Last Session date ------------------------------------------
+        if (completionDate && line.match(/\*\*Last Session:\*\*/)) {
+            lines[i] = line.replace(/(\*\*Last Session:\*\*\s*)\S+/, `$1${completionDate}`);
+        }
+    }
+    if (milestoneFound) {
+        atomicWriteFileSync(statePath, lines.join("\n"));
+    }
+    return milestoneFound;
+}
+//# sourceMappingURL=state-merge.js.map

package/dist/worktree/state-merge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"state-merge.js","sourceRoot":"","sources":["../../src/worktree/state-merge.ts"],"names":[],"mappings":"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"}

package/hooks/pre-commit-verify.js

@@ -35,8 +35,9 @@ function checkPreCommit(hookData) {
   const projectDir = process.cwd();
 
   // Check 1: Wrong branch protection
+  let branch = "unknown";
   try {
-    const branch = execSync("git branch --show-current", {
+    branch = execSync("git branch --show-current", {
       encoding: "utf-8",
     }).trim();
     if (branch === "main" || branch === "master") {
@@ -49,8 +50,13 @@ function checkPreCommit(hookData) {
     // Can't determine branch — allow
   }
 
-  // Check 2: Verify cache exists
-  const cachePath = join(projectDir, ".forge", "last-verify.json");
+  // Check 2: Verify cache exists — per-branch first, fall back to legacy path
+  const slug = branch.replace(/\//g, "-").toLowerCase();
+  const perBranchCachePath = join(projectDir, ".forge", "verify-cache", `${slug}.json`);
+  const legacyCachePath = join(projectDir, ".forge", "last-verify.json");
+  const cachePath = existsSync(perBranchCachePath)
+    ? perBranchCachePath
+    : legacyCachePath;
   if (!existsSync(cachePath)) {
     return {
       decision: "block",

package/hooks/version-check.js

@@ -1,78 +1,78 @@
-#!/usr/bin/env node
-
-import { execSync } from "node:child_process";
-import { readFileSync } from "node:fs";
-import { join, dirname } from "node:path";
-import { fileURLToPath } from "node:url";
-
-// Read hook input from stdin
-let input = "";
-process.stdin.setEncoding("utf-8");
-process.stdin.on("data", (chunk) => {
-  input += chunk;
-});
-process.stdin.on("end", () => {
-  try {
-    checkForUpdate();
-  } catch {
-    // Silent failure — never crash, never block
-  }
-  // Always exit cleanly with no output (allow session to proceed)
-  process.exit(0);
-});
-
-function checkForUpdate() {
-  // Get installed version from forge-cc's own package.json
-  const __dirname = dirname(fileURLToPath(import.meta.url));
-  const pkgPath = join(__dirname, "..", "package.json");
-  const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
-  const currentVersion = pkg.version;
-
-  if (!currentVersion) return;
-
-  // Query npm registry for latest version (5 second timeout)
-  let latestVersion;
-  try {
-    const result = execSync("npm view forge-cc version --json", {
-      encoding: "utf-8",
-      timeout: 5000,
-      stdio: ["pipe", "pipe", "pipe"],
-    });
-    latestVersion = JSON.parse(result);
-  } catch {
-    // Offline, npm slow, or package not published yet — skip silently
-    return;
-  }
-
-  if (typeof latestVersion !== "string" || !latestVersion) return;
-
-  // Compare versions using semver-compatible numeric comparison
-  if (isOutdated(currentVersion, latestVersion)) {
-    process.stderr.write(
-      `[forge] Update available: v${currentVersion} → v${latestVersion}. Run /forge:update to upgrade.\n`
-    );
-  }
-}
-
-/**
- * Returns true if `current` is older than `latest`.
- * Splits on ".", compares major/minor/patch numerically.
- */
-function isOutdated(current, latest) {
-  const parseParts = (v) =>
-    v
-      .replace(/^v/, "")
-      .split(".")
-      .map((n) => parseInt(n, 10));
-
-  const cur = parseParts(current);
-  const lat = parseParts(latest);
-
-  for (let i = 0; i < 3; i++) {
-    const c = cur[i] || 0;
-    const l = lat[i] || 0;
-    if (l > c) return true;
-    if (c > l) return false;
-  }
-  return false;
-}
+#!/usr/bin/env node
+
+import { execSync } from "node:child_process";
+import { readFileSync } from "node:fs";
+import { join, dirname } from "node:path";
+import { fileURLToPath } from "node:url";
+
+// Read hook input from stdin
+let input = "";
+process.stdin.setEncoding("utf-8");
+process.stdin.on("data", (chunk) => {
+  input += chunk;
+});
+process.stdin.on("end", () => {
+  try {
+    checkForUpdate();
+  } catch {
+    // Silent failure — never crash, never block
+  }
+  // Always exit cleanly with no output (allow session to proceed)
+  process.exit(0);
+});
+
+function checkForUpdate() {
+  // Get installed version from forge-cc's own package.json
+  const __dirname = dirname(fileURLToPath(import.meta.url));
+  const pkgPath = join(__dirname, "..", "package.json");
+  const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
+  const currentVersion = pkg.version;
+
+  if (!currentVersion) return;
+
+  // Query npm registry for latest version (5 second timeout)
+  let latestVersion;
+  try {
+    const result = execSync("npm view forge-cc version --json", {
+      encoding: "utf-8",
+      timeout: 5000,
+      stdio: ["pipe", "pipe", "pipe"],
+    });
+    latestVersion = JSON.parse(result);
+  } catch {
+    // Offline, npm slow, or package not published yet — skip silently
+    return;
+  }
+
+  if (typeof latestVersion !== "string" || !latestVersion) return;
+
+  // Compare versions using semver-compatible numeric comparison
+  if (isOutdated(currentVersion, latestVersion)) {
+    process.stderr.write(
+      `[forge] Update available: v${currentVersion} → v${latestVersion}. Run /forge:update to upgrade.\n`
+    );
+  }
+}
+
+/**
+ * Returns true if `current` is older than `latest`.
+ * Splits on ".", compares major/minor/patch numerically.
+ */
+function isOutdated(current, latest) {
+  const parseParts = (v) =>
+    v
+      .replace(/^v/, "")
+      .split(".")
+      .map((n) => parseInt(n, 10));
+
+  const cur = parseParts(current);
+  const lat = parseParts(latest);
+
+  for (let i = 0; i < 3; i++) {
+    const c = cur[i] || 0;
+    const l = lat[i] || 0;
+    if (l > c) return true;
+    if (c > l) return false;
+  }
+  return false;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "forge-cc",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Pre-PR verification harness for Claude Code agents — gate runner + CLI + MCP server",
   "type": "module",
   "license": "MIT",