ralph-cli-sandboxed 0.6.0 → 0.6.2

package/dist/commands/chat.js

@@ -4,9 +4,9 @@
  */
 import { existsSync, readFileSync, writeFileSync, watch } from "fs";
 import { join, basename, extname } from "path";
-import { spawn } from "child_process";
+import { execSync, spawn } from "child_process";
 import YAML from "yaml";
-import { loadConfig, getRalphDir, isRunningInContainer, getPrdFiles } from "../utils/config.js";
+import { loadConfig, getRalphDir, isRunningInContainer, getPrdFiles, loadBranchState, getProjectName as getConfigProjectName } from "../utils/config.js";
 import { createTelegramClient } from "../providers/telegram.js";
 import { createSlackClient } from "../providers/slack.js";
 import { createDiscordClient } from "../providers/discord.js";
@@ -163,6 +163,290 @@ function addPrdTask(description) {
         return false;
     }
 }
+/**
+ * Get the current git branch in the project directory.
+ */
+function getBaseBranch() {
+    try {
+        return execSync("git rev-parse --abbrev-ref HEAD", {
+            encoding: "utf-8",
+            cwd: process.cwd(),
+        }).trim();
+    }
+    catch {
+        return "main";
+    }
+}
+/**
+ * Check if a git branch exists.
+ */
+function branchExists(branch) {
+    try {
+        execSync(`git rev-parse --verify "${branch}"`, {
+            stdio: "pipe",
+            cwd: process.cwd(),
+        });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Convert branch name to worktree directory name.
+ */
+function branchToWorktreeName(branch) {
+    const projectName = getConfigProjectName();
+    return `${projectName}_${branch.replace(/\//g, "-")}`;
+}
+/**
+ * Handle /branch list — show branches from PRD grouped by branch field.
+ */
+async function handleBranchList(chatId, client, state) {
+    const prdFiles = getPrdFiles();
+    if (prdFiles.none || !prdFiles.primary) {
+        await client.sendMessage(chatId, `${state.projectName}: No PRD file found.`);
+        return;
+    }
+    const content = readFileSync(prdFiles.primary, "utf-8");
+    const items = parsePrdContent(prdFiles.primary, content);
+    if (!Array.isArray(items) || items.length === 0) {
+        await client.sendMessage(chatId, `${state.projectName}: No PRD items found.`);
+        return;
+    }
+    const activeBranch = loadBranchState();
+    // Group items by branch
+    const branchGroups = new Map();
+    const noBranchItems = [];
+    for (const item of items) {
+        if (item.branch) {
+            const group = branchGroups.get(item.branch) || [];
+            group.push(item);
+            branchGroups.set(item.branch, group);
+        }
+        else {
+            noBranchItems.push(item);
+        }
+    }
+    if (branchGroups.size === 0 && noBranchItems.length === 0) {
+        await client.sendMessage(chatId, `${state.projectName}: No PRD items found.`);
+        return;
+    }
+    const lines = [`${state.projectName}: Branches\n`];
+    const sortedBranches = [...branchGroups.keys()].sort();
+    for (const branchName of sortedBranches) {
+        const branchItems = branchGroups.get(branchName);
+        const passing = branchItems.filter((e) => e.passes === true).length;
+        const total = branchItems.length;
+        const allPassing = passing === total;
+        const isActive = activeBranch?.currentBranch === branchName;
+        const icon = allPassing ? "[OK]" : "[ ]";
+        const active = isActive ? " << active" : "";
+        lines.push(`  ${icon} ${branchName}  ${passing}/${total}${active}`);
+    }
+    if (noBranchItems.length > 0) {
+        const passing = noBranchItems.filter((e) => e.passes === true).length;
+        const total = noBranchItems.length;
+        const icon = passing === total ? "[OK]" : "[ ]";
+        lines.push(`  ${icon} (no branch)  ${passing}/${total}`);
+    }
+    await client.sendMessage(chatId, lines.join("\n"));
+}
+/**
+ * Handle /branch pr <name> — add a PRD item to create a pull request.
+ */
+async function handleBranchPr(args, chatId, client, state) {
+    const branchName = args[0];
+    if (!branchName) {
+        const usage = client.provider === "slack"
+            ? "/ralph branch pr <branch-name>"
+            : "/branch pr <branch-name>";
+        await client.sendMessage(chatId, `${state.projectName}: Usage: ${usage}`);
+        return;
+    }
+    if (!branchExists(branchName)) {
+        await client.sendMessage(chatId, `${state.projectName}: Branch "${branchName}" does not exist.`);
+        return;
+    }
+    const baseBranch = getBaseBranch();
+    const prdFiles = getPrdFiles();
+    if (prdFiles.none || !prdFiles.primary) {
+        await client.sendMessage(chatId, `${state.projectName}: No PRD file found.`);
+        return;
+    }
+    const content = readFileSync(prdFiles.primary, "utf-8");
+    const items = parsePrdContent(prdFiles.primary, content);
+    if (!Array.isArray(items)) {
+        await client.sendMessage(chatId, `${state.projectName}: Failed to parse PRD file.`);
+        return;
+    }
+    items.push({
+        category: "feature",
+        description: `Create a pull request from \`${branchName}\` into \`${baseBranch}\``,
+        steps: [
+            `Ensure all changes on \`${branchName}\` are committed`,
+            `Push \`${branchName}\` to the remote if not already pushed`,
+            `Create a pull request from \`${branchName}\` into \`${baseBranch}\` using the appropriate tool (e.g. gh pr create)`,
+            "Include a descriptive title and summary of the changes in the PR",
+        ],
+        passes: false,
+        branch: branchName,
+    });
+    const ext = extname(prdFiles.primary).toLowerCase();
+    if (ext === ".yaml" || ext === ".yml") {
+        writeFileSync(prdFiles.primary, YAML.stringify(items));
+    }
+    else {
+        writeFileSync(prdFiles.primary, JSON.stringify(items, null, 2) + "\n");
+    }
+    await client.sendMessage(chatId, `${state.projectName}: Added PRD entry: Create PR for ${branchName} -> ${baseBranch}`);
+}
+/**
+ * Handle /branch merge <name> — merge branch into base branch.
+ * Skips confirmation (user explicitly typed the command in chat).
+ */
+async function handleBranchMerge(args, chatId, client, state) {
+    const branchName = args[0];
+    if (!branchName) {
+        const usage = client.provider === "slack"
+            ? "/ralph branch merge <branch-name>"
+            : "/branch merge <branch-name>";
+        await client.sendMessage(chatId, `${state.projectName}: Usage: ${usage}`);
+        return;
+    }
+    if (!branchExists(branchName)) {
+        await client.sendMessage(chatId, `${state.projectName}: Branch "${branchName}" does not exist.`);
+        return;
+    }
+    const baseBranch = getBaseBranch();
+    const cwd = process.cwd();
+    try {
+        execSync(`git merge "${branchName}" --no-edit`, { stdio: "pipe", cwd });
+        await client.sendMessage(chatId, `${state.projectName}: Merged "${branchName}" into "${baseBranch}".`);
+    }
+    catch {
+        // Check for merge conflicts
+        let conflictingFiles = [];
+        try {
+            const status = execSync("git status --porcelain", { encoding: "utf-8", cwd });
+            conflictingFiles = status
+                .split("\n")
+                .filter((line) => line.startsWith("UU") || line.startsWith("AA") || line.startsWith("DD") ||
+                line.startsWith("AU") || line.startsWith("UA") || line.startsWith("DU") ||
+                line.startsWith("UD"))
+                .map((line) => line.substring(3).trim());
+        }
+        catch {
+            // Ignore status errors
+        }
+        if (conflictingFiles.length > 0) {
+            // Abort the merge
+            try {
+                execSync("git merge --abort", { stdio: "pipe", cwd });
+            }
+            catch {
+                // Ignore abort errors
+            }
+            await client.sendMessage(chatId, `${state.projectName}: Merge conflict! Conflicting files:\n${conflictingFiles.join("\n")}\nMerge aborted.`);
+        }
+        else {
+            try {
+                execSync("git merge --abort", { stdio: "pipe", cwd });
+            }
+            catch {
+                // Ignore
+            }
+            await client.sendMessage(chatId, `${state.projectName}: Merge of "${branchName}" failed. Merge aborted.`);
+        }
+        return;
+    }
+    // Clean up worktree if it exists
+    const dirName = branchToWorktreeName(branchName);
+    const config = loadConfig();
+    const worktreesPath = config.docker?.worktreesPath;
+    if (worktreesPath) {
+        const worktreePath = join(worktreesPath, dirName);
+        if (existsSync(worktreePath)) {
+            try {
+                execSync(`git worktree remove "${worktreePath}"`, { stdio: "pipe", cwd });
+            }
+            catch {
+                // Non-critical, ignore
+            }
+        }
+    }
+}
+/**
+ * Handle /branch delete <name> — delete branch, worktree, and untag PRD items.
+ * Skips confirmation (user explicitly typed the command in chat).
+ */
+async function handleBranchDelete(args, chatId, client, state) {
+    const branchName = args[0];
+    if (!branchName) {
+        const usage = client.provider === "slack"
+            ? "/ralph branch delete <branch-name>"
+            : "/branch delete <branch-name>";
+        await client.sendMessage(chatId, `${state.projectName}: Usage: ${usage}`);
+        return;
+    }
+    if (!branchExists(branchName)) {
+        await client.sendMessage(chatId, `${state.projectName}: Branch "${branchName}" does not exist.`);
+        return;
+    }
+    const cwd = process.cwd();
+    const results = [];
+    // Step 1: Remove worktree if it exists
+    const dirName = branchToWorktreeName(branchName);
+    const config = loadConfig();
+    const worktreesPath = config.docker?.worktreesPath;
+    if (worktreesPath) {
+        const worktreePath = join(worktreesPath, dirName);
+        if (existsSync(worktreePath)) {
+            try {
+                execSync(`git worktree remove "${worktreePath}" --force`, { stdio: "pipe", cwd });
+                results.push("Worktree removed.");
+            }
+            catch {
+                results.push("Warning: Could not remove worktree.");
+            }
+        }
+    }
+    // Step 2: Delete the git branch
+    try {
+        execSync(`git branch -D "${branchName}"`, { stdio: "pipe", cwd });
+        results.push("Branch deleted.");
+    }
+    catch {
+        results.push("Warning: Could not delete git branch.");
+    }
+    // Step 3: Remove branch tag from PRD items
+    const prdFiles = getPrdFiles();
+    if (!prdFiles.none && prdFiles.primary) {
+        const content = readFileSync(prdFiles.primary, "utf-8");
+        const items = parsePrdContent(prdFiles.primary, content);
+        if (Array.isArray(items)) {
+            const taggedCount = items.filter((e) => e.branch === branchName).length;
+            if (taggedCount > 0) {
+                const updatedItems = items.map((item) => {
+                    if (item.branch === branchName) {
+                        const { branch: _, ...rest } = item;
+                        return rest;
+                    }
+                    return item;
+                });
+                const ext = extname(prdFiles.primary).toLowerCase();
+                if (ext === ".yaml" || ext === ".yml") {
+                    writeFileSync(prdFiles.primary, YAML.stringify(updatedItems));
+                }
+                else {
+                    writeFileSync(prdFiles.primary, JSON.stringify(updatedItems, null, 2) + "\n");
+                }
+                results.push(`${taggedCount} PRD item(s) untagged.`);
+            }
+        }
+    }
+    await client.sendMessage(chatId, `${state.projectName}: Deleted "${branchName}". ${results.join(" ")}`);
+}
 /**
  * Execute a shell command and return the output.
  */
@@ -428,6 +712,37 @@ async function handleCommand(command, client, config, state, debug) {
             }
             break;
         }
+        case "branch": {
+            const subCmd = args[0]?.toLowerCase();
+            const branchArgs = args.slice(1);
+            switch (subCmd) {
+                case "list":
+                    await handleBranchList(chatId, client, state);
+                    break;
+                case "pr":
+                    await handleBranchPr(branchArgs, chatId, client, state);
+                    break;
+                case "merge":
+                    await handleBranchMerge(branchArgs, chatId, client, state);
+                    break;
+                case "delete":
+                    await handleBranchDelete(branchArgs, chatId, client, state);
+                    break;
+                default: {
+                    const usage = client.provider === "slack"
+                        ? `/ralph branch list - List branches
+/ralph branch pr <name> - Add PRD item to create PR
+/ralph branch merge <name> - Merge branch into base
+/ralph branch delete <name> - Delete branch and worktree`
+                        : `/branch list - List branches
+/branch pr <name> - Add PRD item to create PR
+/branch merge <name> - Merge branch into base
+/branch delete <name> - Delete branch and worktree`;
+                    await client.sendMessage(chatId, `${state.projectName}: ${usage}`);
+                }
+            }
+            break;
+        }
         case "help": {
             const isSlack = client.provider === "slack";
             const helpText = isSlack
@@ -438,6 +753,7 @@ async function handleCommand(command, client, config, state, debug) {
 /ralph add [desc] - Add task
 /ralph exec [cmd] - Shell command
 /ralph action [name] - Run action
+/ralph branch ... - Manage branches
 /ralph <prompt> - Run Claude Code`
                 : `/help - This help
 /status - PRD progress
@@ -446,6 +762,7 @@ async function handleCommand(command, client, config, state, debug) {
 /add [desc] - Add task
 /exec [cmd] - Shell command
 /action [name] - Run action
+/branch ... - Manage branches
 /claude [prompt] - Run Claude Code`;
             await client.sendMessage(chatId, helpText);
             break;
@@ -640,6 +957,7 @@ async function startChat(config, debug) {
             console.log("  /ralph add ...    - Add new task to PRD");
             console.log("  /ralph exec ...   - Execute shell command");
             console.log("  /ralph action ... - Run daemon action");
+            console.log("  /ralph branch ... - Manage branches");
             console.log("  /ralph <prompt>   - Run Claude Code with prompt");
         }
         else {

package/dist/commands/docker.js

@@ -187,31 +187,36 @@ RUN sh -c "$(wget -O- https://github.com/deluan/zsh-in-docker/releases/download/
     -a "export HISTFILE=/commandhistory/.zsh_history" \\
     -a 'alias ll="ls -la"'
 
-# Set custom prompt for node user (after oh-my-zsh to avoid override)
+# Copy oh-my-zsh config to node user (after oh-my-zsh to avoid override)
 RUN cp -r /root/.oh-my-zsh /home/node/.oh-my-zsh && chown -R node:node /home/node/.oh-my-zsh && \\
     cp /root/.zshrc /home/node/.zshrc && chown node:node /home/node/.zshrc && \\
-    sed -i 's|/root/.oh-my-zsh|/home/node/.oh-my-zsh|g' /home/node/.zshrc && \\
-    echo 'PROMPT="%K{yellow}%F{black}[ralph]%f%k%K{yellow}%F{black}%d%f%k\\$ "' >> /home/node/.zshrc && \\
-    echo '' >> /home/node/.zshrc && \\
-    echo '# Ralph ASCII art banner' >> /home/node/.zshrc && \\
-    echo 'if [ -z "$RALPH_BANNER_SHOWN" ]; then' >> /home/node/.zshrc && \\
-    echo '  export RALPH_BANNER_SHOWN=1' >> /home/node/.zshrc && \\
-    echo '  echo ""' >> /home/node/.zshrc && \\
-    echo '  echo "\\033[38;2;255;245;157m██████╗  █████╗ ██╗     ██████╗ ██╗  ██╗     ██████╗██╗     ██╗\\033[0m"' >> /home/node/.zshrc && \\
-    echo '  echo "\\033[38;2;255;238;88m██╔══██╗██╔══██╗██║     ██╔══██╗██║  ██║    ██╔════╝██║     ██║\\033[0m"' >> /home/node/.zshrc && \\
-    echo '  echo "\\033[38;2;255;235;59m██████╔╝███████║██║     ██████╔╝███████║    ██║     ██║     ██║  sandboxed\\033[0m"' >> /home/node/.zshrc && \\
-    echo '  echo "\\033[38;2;253;216;53m██╔══██╗██╔══██║██║     ██╔═══╝ ██╔══██║    ██║     ██║     ██║\\033[0m"' >> /home/node/.zshrc && \\
-    echo '  echo "\\033[38;2;251;192;45m██║  ██║██║  ██║███████╗██║     ██║  ██║    ╚██████╗███████╗██║\\033[0m"' >> /home/node/.zshrc && \\
-    echo '  echo "\\033[38;2;249;168;37m╚═╝  ╚═╝╚═╝  ╚═╝╚══════╝╚═╝     ╚═╝  ╚═╝     ╚═════╝╚══════╝╚═╝\\033[0m"' >> /home/node/.zshrc && \\
-    echo '  RALPH_VERSION=$(ralph --version 2>/dev/null | head -1 || echo "unknown")' >> /home/node/.zshrc && \\
-    echo '  echo "\\033[38;5;248mv$RALPH_VERSION\\033[0m"' >> /home/node/.zshrc && \\
-    echo '  echo ""' >> /home/node/.zshrc && \\
-    echo 'fi' >> /home/node/.zshrc
+    sed -i 's|/root/.oh-my-zsh|/home/node/.oh-my-zsh|g' /home/node/.zshrc
+
+# Set custom prompt and Ralph ASCII art banner
+RUN cat >> /home/node/.zshrc <<'RALPH_BANNER'
+PROMPT="%K{yellow}%F{black}[ralph]%f%k%K{yellow}%F{black}%d%f%k\\$ "
+
+# Ralph ASCII art banner
+if [ -z "$RALPH_BANNER_SHOWN" ]; then
+  export RALPH_BANNER_SHOWN=1
+  echo ""
+  echo "\\033[38;2;255;245;157m██████╗  █████╗ ██╗     ██████╗ ██╗  ██╗     ██████╗██╗     ██╗\\033[0m"
+  echo "\\033[38;2;255;238;88m██╔══██╗██╔══██╗██║     ██╔══██╗██║  ██║    ██╔════╝██║     ██║\\033[0m"
+  echo "\\033[38;2;255;235;59m██████╔╝███████║██║     ██████╔╝███████║    ██║     ██║     ██║  sandboxed\\033[0m"
+  echo "\\033[38;2;253;216;53m██╔══██╗██╔══██║██║     ██╔═══╝ ██╔══██║    ██║     ██║     ██║\\033[0m"
+  echo "\\033[38;2;251;192;45m██║  ██║██║  ██║███████╗██║     ██║  ██║    ╚██████╗███████╗██║\\033[0m"
+  echo "\\033[38;2;249;168;37m╚═╝  ╚═╝╚═╝  ╚═╝╚══════╝╚═╝     ╚═╝  ╚═╝     ╚═════╝╚══════╝╚═╝\\033[0m"
+  RALPH_VERSION=$(ralph --version 2>/dev/null | head -1 || echo "unknown")
+  echo "\\033[38;5;248mv$RALPH_VERSION\\033[0m"
+  echo ""
+fi
+RALPH_BANNER
 
 ${cliSnippet}
 
 # Install ralph-cli-sandboxed from npm registry
 RUN npm install -g ralph-cli-sandboxed
+RUN ralph logo
 ${languageSnippet}
 # Setup sudo only for firewall script (no general sudo for security)
 RUN echo "node ALL=(ALL) NOPASSWD: /usr/local/bin/init-firewall.sh" >> /etc/sudoers.d/node-firewall

package/dist/commands/run.js

@@ -483,11 +483,11 @@ function validateAndRecoverPrd(prdPath, validPrd) {
     }
     // If we can't even parse the JSON, restore from valid copy (with new items if we found any)
     if (!parsed) {
-        console.log("\n\x1b[33mWarning: PRD corrupted (invalid JSON) - restored from memory.\x1b[0m");
+        console.log("\nNote: PRD corrupted (invalid JSON) - restored from memory.");
         const mergedPrd = [...validPrd, ...newItems];
         writePrd(prdPath, mergedPrd);
         if (newItems.length > 0) {
-            console.log(`\x1b[32mPreserved ${newItems.length} newly-added item(s).\x1b[0m`);
+            console.log(`Preserved ${newItems.length} newly-added item(s).`);
         }
         return { recovered: true, itemsUpdated: 0, newItemsPreserved: newItems.length };
     }
@@ -498,23 +498,23 @@ function validateAndRecoverPrd(prdPath, validPrd) {
         return { recovered: false, itemsUpdated: 0, newItemsPreserved: 0 };
     }
     // PRD is corrupted - use smart merge to extract passes flags
-    console.log("\n\x1b[33mWarning: PRD format corrupted by LLM - recovering...\x1b[0m");
+    console.log("\nNote: PRD format corrupted by LLM - recovering...");
     const mergeResult = smartMerge(validPrd, parsed.content);
     // Add any newly-added items
     const mergedPrd = [...mergeResult.merged, ...newItems];
     // Write the valid structure back (with new items)
     writePrd(prdPath, mergedPrd);
     if (mergeResult.itemsUpdated > 0) {
-        console.log(`\x1b[32mRecovered: merged ${mergeResult.itemsUpdated} passes flag(s) into valid PRD structure.\x1b[0m`);
+        console.log(`Recovered: merged ${mergeResult.itemsUpdated} passes flag(s) into valid PRD structure.`);
     }
     else {
-        console.log("\x1b[32mRecovered: restored valid PRD structure.\x1b[0m");
+        console.log("Recovered: restored valid PRD structure.");
     }
     if (newItems.length > 0) {
-        console.log(`\x1b[32mPreserved ${newItems.length} newly-added item(s).\x1b[0m`);
+        console.log(`Preserved ${newItems.length} newly-added item(s).`);
     }
     if (mergeResult.warnings.length > 0) {
-        mergeResult.warnings.forEach((w) => console.log(`  \x1b[33m${w}\x1b[0m`));
+        mergeResult.warnings.forEach((w) => console.log(`  ${w}`));
     }
     return { recovered: true, itemsUpdated: mergeResult.itemsUpdated, newItemsPreserved: newItems.length };
 }
@@ -1034,9 +1034,19 @@ export async function run(args) {
                 consecutiveFailures = 0;
                 lastExitCode = 0;
             }
-            // Check for completion signal
+            // Check for completion signal from the LLM.
+            // The LLM only sees a subset of items (branch group or no-branch group),
+            // so its COMPLETE signal means "this group is done", not "all PRD items are done".
+            // We must verify the full PRD before treating this as a global completion.
             if (iterOutput.includes("<promise>COMPLETE</promise>")) {
-                if (loopMode) {
+                const fullCounts = countPrdItems(paths.prd, category);
+                if (fullCounts.incomplete > 0) {
+                    // There are still incomplete items in other groups — continue the loop
+                    if (debug) {
+                        console.log(`\n\x1b[90m[ralph] LLM signalled COMPLETE for current group, but ${fullCounts.incomplete} item(s) remain. Continuing...\x1b[0m`);
+                    }
+                }
+                else if (loopMode) {
                     console.log("\n" + "=".repeat(50));
                     console.log("PRD iteration complete. Waiting for new items...");
                     console.log(`(Checking every ${POLL_INTERVAL_MS / 1000} seconds. Press Ctrl+C to stop)`);
@@ -1054,9 +1064,8 @@ export async function run(args) {
                 else {
                     console.log("\n" + "=".repeat(50));
                     if (allMode) {
-                        const counts = countPrdItems(paths.prd, category);
                         console.log("PRD COMPLETE - All tasks finished!");
-                        console.log(`Final Status: ${counts.complete}/${counts.total} complete`);
+                        console.log(`Final Status: ${fullCounts.complete}/${fullCounts.total} complete`);
                     }
                     else {
                         console.log("PRD COMPLETE - All features implemented!");

package/dist/providers/slack.js

@@ -475,7 +475,7 @@ export class SlackChatClient {
         // Handle the unified /ralph command
         // Subcommands: help, status, run, stop, add, exec, action
         // Anything else is treated as a prompt for Claude
-        const knownSubcommands = ["help", "status", "run", "stop", "add", "exec", "action"];
+        const knownSubcommands = ["help", "status", "run", "stop", "add", "exec", "action", "branch"];
         if (this.debug) {
             console.log(`[slack] Registering command: /ralph`);
         }

package/dist/utils/chat-client.js

@@ -38,6 +38,7 @@ export function parseCommand(text, message) {
         "start",
         "action",
         "claude",
+        "branch",
     ];
     // Check for slash command format: /command [args...]
     if (trimmed.startsWith("/")) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ralph-cli-sandboxed",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "AI-driven development automation CLI for Claude Code",
   "type": "module",
   "bin": {