jfl 0.9.6 → 0.9.7

package/dist/commands/peter.js

@@ -583,6 +583,274 @@ async function runWithPR(projectRoot, task) {
     gitExec(["checkout", baseBranch], projectRoot);
     console.log(chalk.green("  PP: Done\n"));
 }
+// ============================================================================
+// Pickup — self-driving loop: poll backlog → pick → branch → execute → PR
+// ============================================================================
+function slugify(text) {
+    return text
+        .toLowerCase()
+        .replace(/[^a-z0-9]+/g, "-")
+        .replace(/^-+|-+$/g, "")
+        .slice(0, 40);
+}
+/**
+ * Extract cross-repo close reference from issue body metadata.
+ * Looks for patterns like "402goose/JFL-GTM#25" in the jfl metadata block,
+ * or falls back to same-repo #N.
+ */
+function extractCloseRef(card) {
+    // Check for explicit cross-repo ref in metadata block
+    const metaMatch = card.description.match(/<!--\s*jfl:([\s\S]*?)-->/);
+    if (metaMatch) {
+        const meta = metaMatch[1];
+        const crossRepoMatch = meta.match(/close_ref:\s*(.+)/);
+        if (crossRepoMatch)
+            return crossRepoMatch[1].trim();
+    }
+    // Default: same-repo reference
+    return `#${card.number}`;
+}
+/**
+ * Append an entry to the pickup queue for audit/tracking.
+ */
+function appendPickupQueue(projectRoot, entry) {
+    const queuePath = path.join(projectRoot, ".jfl", "pickup-queue.jsonl");
+    const dir = path.dirname(queuePath);
+    if (!fs.existsSync(dir))
+        fs.mkdirSync(dir, { recursive: true });
+    fs.appendFileSync(queuePath, JSON.stringify(entry) + "\n");
+}
+/**
+ * Poll jfl/backlog for source:linear issues, pick the highest priority,
+ * move to in_progress, create branch, execute, create PR, close on merge.
+ */
+async function runPickup(projectRoot) {
+    console.log(chalk.bold("\n  Peter Parker — Backlog Pickup\n"));
+    console.log(chalk.gray("  Polling jfl/backlog for source:linear issues...\n"));
+    if (!hasPi() && !hasRalphTui()) {
+        console.log(chalk.yellow("  Neither pi nor ralph-tui is installed"));
+        console.log(chalk.gray("  Install pi: npm i -g @mariozechner/pi-coding-agent"));
+        console.log(chalk.gray("  Or ralph-tui: bun install -g ralph-tui\n"));
+        return;
+    }
+    const { GitHubKanban } = await import("../lib/kanban-github.js");
+    let kb;
+    try {
+        kb = new GitHubKanban(projectRoot);
+    }
+    catch (err) {
+        console.log(chalk.red(`  PP: ${err.message}`));
+        return;
+    }
+    // Fetch backlog cards with source:linear
+    let cards;
+    try {
+        cards = await kb.getCards({ column: "backlog", source: "linear" });
+    }
+    catch (err) {
+        console.log(chalk.red(`  PP: Failed to fetch backlog: ${err.message}`));
+        return;
+    }
+    if (cards.length === 0) {
+        console.log(chalk.yellow("  No source:linear issues in jfl/backlog. Nothing to pick up.\n"));
+        return;
+    }
+    // Already sorted by priority desc from getCards
+    const card = cards[0];
+    console.log(chalk.cyan(`  Picked: #${card.number} — ${card.title}`));
+    console.log(chalk.gray(`  Priority: ${card.priority}  Source: ${card.source}`));
+    if (card.labels.length > 0) {
+        console.log(chalk.gray(`  Labels: ${card.labels.join(", ")}`));
+    }
+    console.log();
+    // Move to in_progress
+    try {
+        kb.pick(card.number, "peter-parker");
+        console.log(chalk.gray(`  📋 Issue #${card.number} → in_progress (assigned: peter-parker)`));
+    }
+    catch (err) {
+        console.log(chalk.yellow(`  PP: Could not move issue: ${err.message}`));
+        // Continue anyway — don't block on label move failure
+    }
+    // Build task prompt from issue title + description
+    const taskLines = [`GitHub #${card.number}: ${card.title}`];
+    if (card.description) {
+        // Strip the jfl metadata block from the description for the prompt
+        const cleanDesc = card.description.replace(/<!--\s*jfl:[\s\S]*?-->/g, "").trim();
+        if (cleanDesc)
+            taskLines.push("", cleanDesc);
+    }
+    const task = taskLines.join("\n");
+    // Create branch
+    const baseBranch = "main";
+    const slug = slugify(card.title);
+    const branchName = `pp/issue-${card.number}-${slug}`;
+    console.log(chalk.cyan(`\n  PP: Creating branch ${branchName}`));
+    gitExec(["fetch", "origin", baseBranch], projectRoot);
+    let checkout = gitExec(["checkout", "-b", branchName, `origin/${baseBranch}`], projectRoot);
+    if (!checkout.ok) {
+        checkout = gitExec(["checkout", "-b", branchName, baseBranch], projectRoot);
+    }
+    if (!checkout.ok) {
+        console.log(chalk.red(`  PP: Failed to create branch ${branchName}`));
+        // Revert kanban move
+        try {
+            kb.move(card.number, "backlog");
+        }
+        catch { }
+        return;
+    }
+    // Track pickup
+    appendPickupQueue(projectRoot, {
+        ts: new Date().toISOString(),
+        issue: card.number,
+        title: card.title,
+        branch: branchName,
+        source: card.source,
+        priority: card.priority,
+        status: "in_progress",
+    });
+    // Run the agent
+    console.log(chalk.cyan(`  PP: Running agent on task...\n`));
+    if (hasPi()) {
+        await runAgentWithPi(projectRoot, task);
+    }
+    else {
+        await runAgentWithRalphTui(projectRoot, task);
+    }
+    // Check for changes
+    const diffCheck = gitExec(["diff", "--quiet", "HEAD"], projectRoot);
+    const untrackedResult = spawnSync("git", ["ls-files", "--others", "--exclude-standard"], {
+        cwd: projectRoot,
+        encoding: "utf-8",
+        stdio: "pipe",
+    });
+    const untracked = (untrackedResult.stdout || "").trim();
+    if (diffCheck.ok && !untracked) {
+        console.log(chalk.yellow("\n  PP: No changes made, reverting to backlog"));
+        gitExec(["checkout", baseBranch], projectRoot);
+        gitExec(["branch", "-D", branchName], projectRoot);
+        try {
+            kb.move(card.number, "backlog");
+        }
+        catch { }
+        appendPickupQueue(projectRoot, {
+            ts: new Date().toISOString(),
+            issue: card.number,
+            branch: branchName,
+            status: "no_changes",
+        });
+        return;
+    }
+    // Commit
+    console.log(chalk.cyan("  PP: Changes detected, committing..."));
+    const commitMsg = `fix(pp): #${card.number} ${card.title}`;
+    const commitHash = signedAgentCommit(projectRoot, commitMsg, {
+        agentId: "peter-parker",
+        sessionId: branchName,
+    });
+    if (!commitHash) {
+        console.log(chalk.red("  PP: Commit failed"));
+        gitExec(["checkout", baseBranch], projectRoot);
+        try {
+            kb.move(card.number, "backlog");
+        }
+        catch { }
+        return;
+    }
+    // Push
+    console.log(chalk.cyan("  PP: Pushing branch..."));
+    const pushResult = gitExec(["push", "-u", "origin", branchName], projectRoot);
+    if (!pushResult.ok) {
+        console.log(chalk.red("  PP: Push failed"));
+        console.log(chalk.gray(`  ${pushResult.output}`));
+        gitExec(["checkout", baseBranch], projectRoot);
+        try {
+            kb.move(card.number, "backlog");
+        }
+        catch { }
+        return;
+    }
+    // Create PR
+    console.log(chalk.cyan("  PP: Creating PR..."));
+    const closeRef = extractCloseRef(card);
+    const prTitle = `PP: #${card.number} ${card.title.slice(0, 60)}`;
+    const prBody = [
+        "## Auto-generated by Peter Parker (Backlog Pickup)",
+        "",
+        `**Issue:** #${card.number} — ${card.title}`,
+        `**Branch:** \`${branchName}\``,
+        `**Source:** ${card.source}`,
+        "",
+        `Closes ${closeRef}`,
+        "",
+        "### Eval Suite",
+        "This PR will be evaluated by the CI eval suite.",
+        "Auto-merge will trigger if eval score improves over baseline.",
+        "",
+        "---",
+        "*Generated by JFL self-driving loop (pickup)*",
+    ].join("\n");
+    let prResult = ghExec([
+        "pr", "create",
+        "--title", prTitle,
+        "--body", prBody,
+        "--base", baseBranch,
+        "--head", branchName,
+        "--label", "pp-generated",
+    ], projectRoot);
+    if (!prResult.ok) {
+        prResult = ghExec([
+            "pr", "create",
+            "--title", prTitle,
+            "--body", prBody,
+            "--base", baseBranch,
+            "--head", branchName,
+        ], projectRoot);
+    }
+    if (!prResult.ok) {
+        console.log(chalk.red("  PP: Failed to create PR"));
+        console.log(chalk.gray(`  ${prResult.output}`));
+    }
+    else {
+        const prUrl = prResult.output;
+        console.log(chalk.green(`\n  PP: PR created at ${prUrl}`));
+        // Move to eval column
+        try {
+            kb.move(card.number, "eval");
+        }
+        catch { }
+        // Track completion
+        appendPickupQueue(projectRoot, {
+            ts: new Date().toISOString(),
+            issue: card.number,
+            branch: branchName,
+            pr_url: prUrl,
+            status: "pr_created",
+        });
+        await postHubEvent(projectRoot, "peter:pickup-complete", {
+            issue: card.number,
+            title: card.title,
+            branch: branchName,
+            pr_url: prUrl,
+            source: card.source,
+        });
+    }
+    // Write journal entry
+    writeJournalEntry(projectRoot, {
+        v: 1,
+        ts: new Date().toISOString(),
+        session: branchName,
+        type: "feature",
+        status: "complete",
+        title: `Pickup: #${card.number} ${card.title}`,
+        summary: `Auto-picked source:linear issue from backlog and executed. Branch: ${branchName}`,
+        detail: `Issue: #${card.number} — ${card.title}\nSource: ${card.source}\nPriority: ${card.priority}`,
+        agent_id: "peter-parker",
+    });
+    gitExec(["checkout", baseBranch], projectRoot);
+    console.log(chalk.green("  PP: Pickup complete.\n"));
+}
 function buildRLState(evals, trajectoryLength, recentDeltas) {
     const latest = evals.sort((a, b) => b.ts.localeCompare(a.ts))[0];
     return {
@@ -2265,12 +2533,17 @@ export async function peterCommand(action, options = {}) {
             await runReview(projectRoot);
             break;
         }
+        case "pickup": {
+            await runPickup(projectRoot);
+            break;
+        }
         default: {
             console.log(chalk.bold("\n  Peter Parker - Model-Routed Agent Orchestrator\n"));
             console.log(chalk.gray("  Commands:"));
             console.log("    jfl peter setup [--cost|--balanced|--quality]  Generate agent config");
             console.log("    jfl peter run [--task <task>]                  Run orchestrator");
             console.log("    jfl peter pr --task <task>                     Run + branch + PR");
+            console.log("    jfl peter pickup                               Poll backlog, pick source:linear issue, execute, PR");
             console.log("    jfl peter experiment                           Proactive: pick + execute next experiment");
             console.log("    jfl peter autoresearch [--rounds N] [--budget $] [--pi]");
             console.log("                                                   Autoresearch mode with Pi runtime");