@c-d-cc/reap 0.15.10 → 0.15.11

package/RELEASE_NOTICE.md

@@ -1,5 +1,11 @@
 # Release Notices
 
+## v0.15.11
+### en
+Fixed `reap pull` incorrectly recommending merge for ahead-only branches. Now uses `git rev-list` for accurate ahead/behind/diverged detection.
+### ko
+`reap pull`이 ahead 상태에서 불필요한 merge를 추천하던 문제 수정. `git rev-list` 기반 정확한 ahead/behind/diverged 감지.
+
 ## v0.15.10
 ### en
 Fixed release notice language matching (e.g. "korean" → "ko").

package/dist/cli.js

@@ -10230,7 +10230,7 @@ function checkLatestVersion() {
   }
 }
 function getCurrentVersion() {
-  return "0.15.10";
+  return "0.15.11";
 }
 function formatVersionLine(current, skipCheck) {
   if (skipCheck) {
@@ -10361,12 +10361,25 @@ async function createBacklog(backlogDir, opts) {
     status: "pending",
     priority
   };
-  const bodyContent = opts.body ? `
+  const summary = opts.body ? `${opts.body}
+` : "";
+  const bodyContent = `
 # ${opts.title}
 
-${opts.body}
-` : `
-# ${opts.title}
+${summary}
+## Problem
+<!-- Describe the current issue and why this work is needed -->
+
+## Solution
+<!-- Describe the approach, implementation direction, and key ideas -->
+
+## Files to Change
+<!-- List specific file/function/module paths that need modification -->
+
+## Context
+<!-- Related generations, issues, or background that led to this task. Remove if not applicable -->
+
+<!-- Feel free to add more sections if needed (e.g., Constraints, Alternatives, References) -->
 `;
   const content = `---
 ${import_yaml8.default.stringify(frontmatter).trim()}
@@ -10412,13 +10425,14 @@ async function execute(paths, argv) {
     body: flags.body,
     priority: flags.priority
   });
+  const filePath = `${paths.backlog}/${filename}`;
   emitOutput({
     status: "ok",
     command: "make",
     phase: "done",
     completed: ["backlog-create"],
-    message: `Backlog created: ${filename}. Edit the file directly to add detailed content (headers, lists, code blocks, etc.).`,
-    context: { filename, type: flags.type, title: flags.title, path: `${paths.backlog}/${filename}` }
+    message: `Backlog created: ${filePath}. Fill in the template sections (문제/해결/수정 대상/배경) and remove HTML comments.`,
+    context: { filename, type: flags.type, title: flags.title, path: filePath }
   });
 }
 var init_backlog2 = __esm(() => {
@@ -12429,7 +12443,7 @@ async function execute17(paths) {
   const gm = new GenerationManager(paths);
   const state = await gm.current();
   const configContent = await readTextFile(paths.config);
-  const installedVersion = "0.15.10";
+  const installedVersion = "0.15.11";
   const autoUpdate = configContent?.match(/autoUpdate:\s*(true|false)/)?.[1] === "true";
   const versionDisplay = formatVersionLine(installedVersion, !autoUpdate);
   const rawLang = detectLanguage(configContent);
@@ -12969,31 +12983,6 @@ class MergeGenerationManager {
     await writeTextFile(this.paths.currentYml, import_yaml10.default.stringify(state));
   }
 }
-function canFastForward(localLatestId, remoteLatestId, allMetas) {
-  if (localLatestId === remoteLatestId) {
-    return { fastForward: true, reason: "Already up to date — same generation on both branches." };
-  }
-  const metaMap = new Map;
-  for (const m of allMetas)
-    metaMap.set(m.id, m);
-  const remoteAncestors = new Set;
-  const queue = [remoteLatestId];
-  while (queue.length > 0) {
-    const id = queue.shift();
-    if (remoteAncestors.has(id))
-      continue;
-    remoteAncestors.add(id);
-    const meta = metaMap.get(id);
-    if (meta?.parents) {
-      for (const p of meta.parents)
-        queue.push(p);
-    }
-  }
-  if (remoteAncestors.has(localLatestId)) {
-    return { fastForward: true, reason: `Local generation ${localLatestId} is already included in remote ${remoteLatestId}. Fast-forward possible.` };
-  }
-  return { fastForward: false, reason: "Branches have diverged — full merge required." };
-}
 function findCommonAncestor(idA, idB, metas) {
   const metaMap = new Map;
   for (const m of metas)
@@ -14050,6 +14039,19 @@ var exports_pull = {};
 __export(exports_pull, {
   execute: () => execute29
 });
+import { execSync as execSync8 } from "child_process";
+function getAheadBehind(target, cwd) {
+  try {
+    const result = execSync8(`git rev-list --left-right --count HEAD...${target}`, {
+      cwd,
+      encoding: "utf-8"
+    }).trim();
+    const [aheadStr, behindStr] = result.split(/\s+/);
+    return { ahead: parseInt(aheadStr, 10) || 0, behind: parseInt(behindStr, 10) || 0 };
+  } catch {
+    throw new Error(`Failed to compare HEAD with ${target}. Ensure both refs exist.`);
+  }
+}
 async function execute29(paths, phase, argv = []) {
   const positionals = argv.filter((a) => !a.startsWith("--"));
   const targetBranchArg = positionals[0];
@@ -14087,85 +14089,76 @@ async function execute29(paths, phase, argv = []) {
       emitError("pull", `Branch "${targetBranch}" does not exist. Run \`git fetch\` first.`);
     }
     const currentBranch = gitCurrentBranch(paths.projectRoot);
-    const mgm = new MergeGenerationManager(paths);
-    const localMetas = await listMeta(paths);
-    let remoteMetasRaw = [];
-    try {
-      const remoteMetas = mgm.listMetaFromRef(targetBranch, paths.projectRoot);
-      remoteMetasRaw = remoteMetas;
-    } catch {}
-    if (localMetas.length === 0 && remoteMetasRaw.length === 0) {
+    const { ahead, behind } = getAheadBehind(targetBranch, paths.projectRoot);
+    if (ahead === 0 && behind === 0) {
       emitOutput({
         status: "ok",
         command: "pull",
         phase: "up-to-date",
         completed: ["gate", "fetch", "detect"],
-        context: { targetBranch, currentBranch },
-        message: "No lineage on either branch. Already up to date."
+        context: { targetBranch, currentBranch, ahead, behind },
+        message: "Already up to date."
       });
-      return;
-    }
-    if (localMetas.length > 0 && remoteMetasRaw.length > 0) {
-      const localLatest = localMetas.sort((a, b) => new Date(b.completedAt).getTime() - new Date(a.completedAt).getTime())[0];
-      const remoteLatest = remoteMetasRaw.sort((a, b) => new Date(b.completedAt).getTime() - new Date(a.completedAt).getTime())[0];
-      const allMetas = [...localMetas];
-      for (const rm6 of remoteMetasRaw) {
-        if (!allMetas.find((m) => m.id === rm6.id))
-          allMetas.push(rm6);
-      }
-      const ffResult = canFastForward(localLatest.id, remoteLatest.id, allMetas);
-      if (ffResult.fastForward) {
-        emitOutput({
-          status: "prompt",
-          command: "pull",
-          phase: "fast-forward",
-          completed: ["gate", "fetch", "detect", "ff-check"],
-          context: {
-            targetBranch,
-            currentBranch,
-            localLatestId: localLatest.id,
-            remoteLatestId: remoteLatest.id,
-            reason: ffResult.reason
-          },
-          prompt: [
-            `Fast-forward possible: ${ffResult.reason}`,
-            "",
-            `Run \`git merge --ff ${targetBranch}\`, then \`git submodule update --init\`.`,
-            "No merge generation needed."
-          ].join(`
+    } else if (ahead > 0 && behind === 0) {
+      emitOutput({
+        status: "ok",
+        command: "pull",
+        phase: "ahead",
+        completed: ["gate", "fetch", "detect"],
+        context: { targetBranch, currentBranch, ahead, behind },
+        message: `Local is ${ahead} commit(s) ahead of ${targetBranch}. Consider pushing.`,
+        prompt: [
+          `## Local is ahead by ${ahead} commit(s)`,
+          "",
+          `Your branch is ahead of \`${targetBranch}\`. No pull needed.`,
+          "Run `git push` to update the remote."
+        ].join(`
 `)
-        });
-        return;
-      }
-    }
-    emitOutput({
-      status: "prompt",
-      command: "pull",
-      phase: "start-merge",
-      completed: ["gate", "fetch", "detect", "ff-check"],
-      context: {
-        targetBranch,
-        currentBranch,
-        diverged: true
-      },
-      prompt: [
-        "## Branches have diverged -- full merge required",
-        "",
-        "Execute the following sequence:",
-        `1. Run /reap.merge.start ${targetBranch} (creates merge generation + detect report)`,
-        "2. Run /reap.merge.evolve (runs detect -> mate -> merge -> sync -> validation -> completion)",
-        "3. Run `git submodule update --init` after merge completes"
-      ].join(`
+      });
+    } else if (ahead === 0 && behind > 0) {
+      emitOutput({
+        status: "prompt",
+        command: "pull",
+        phase: "fast-forward",
+        completed: ["gate", "fetch", "detect"],
+        context: { targetBranch, currentBranch, ahead, behind },
+        prompt: [
+          `## Behind by ${behind} commit(s) -- fast-forward possible`,
+          "",
+          `Run \`git merge --ff ${targetBranch}\`, then \`git submodule update --init\`.`,
+          "No merge generation needed."
+        ].join(`
 `)
-    });
+      });
+    } else {
+      emitOutput({
+        status: "prompt",
+        command: "pull",
+        phase: "start-merge",
+        completed: ["gate", "fetch", "detect"],
+        context: {
+          targetBranch,
+          currentBranch,
+          ahead,
+          behind,
+          diverged: true
+        },
+        prompt: [
+          `## Branches have diverged (ahead: ${ahead}, behind: ${behind}) -- full merge required`,
+          "",
+          "Execute the following sequence:",
+          `1. Run /reap.merge.start ${targetBranch} (creates merge generation + detect report)`,
+          "2. Run /reap.merge.evolve (runs detect -> mate -> merge -> sync -> validation -> completion)",
+          "3. Run `git submodule update --init` after merge completes"
+        ].join(`
+`)
+      });
+    }
   }
 }
 var init_pull = __esm(() => {
   init_generation();
-  init_merge_generation();
   init_git();
-  init_lineage();
-  init_merge_generation();
 });
 
 // src/cli/commands/run/config.ts
@@ -14178,7 +14171,7 @@ async function execute30(paths) {
   const lines = [
     `REAP Configuration (${paths.config})`,
     "",
-    `  version:         ${"0.15.10"} (package)`,
+    `  version:         ${"0.15.11"} (package)`,
     `  project:         ${config.project}`,
     `  entryMode:       ${config.entryMode}`,
     `  strict:          ${config.strict ?? false}`,
@@ -14466,7 +14459,7 @@ var exports_run = {};
 __export(exports_run, {
   runCommand: () => runCommand
 });
-import { execSync as execSync8 } from "child_process";
+import { execSync as execSync9 } from "child_process";
 async function runCommand(command, phase, argv = []) {
   const cwd = process.cwd();
   const paths = new ReapPaths(cwd);
@@ -14484,7 +14477,7 @@ async function runCommand(command, phase, argv = []) {
     try {
       const config = await ConfigManager.read(paths);
       if (config.autoIssueReport) {
-        const version = "0.15.10";
+        const version = "0.15.11";
         const errMsg = err instanceof Error ? err.message : String(err);
         const title = `[auto] reap run ${command}: ${errMsg.slice(0, 80)}`;
         const body = [
@@ -14494,7 +14487,7 @@ async function runCommand(command, phase, argv = []) {
           `**OS**: ${process.platform} ${process.arch}`,
           `**Node**: ${process.version}`
         ].join("\\n");
-        execSync8(`gh issue create --repo c-d-cc/reap --title "${title}" --label "auto-reported,bug" --body "${body}"`, { stdio: "ignore", timeout: 1e4 });
+        execSync9(`gh issue create --repo c-d-cc/reap --title "${title}" --label "auto-reported,bug" --body "${body}"`, { stdio: "ignore", timeout: 1e4 });
       }
     } catch {}
     emitError(command, err instanceof Error ? err.message : String(err));
@@ -16434,7 +16427,7 @@ async function getStatus(projectRoot) {
   const totalCompleted = await mgr.countAllCompleted();
   const integrityResult = await checkIntegrity(paths);
   return {
-    version: "0.15.10",
+    version: "0.15.11",
     project: config.project,
     entryMode: config.entryMode,
     lastSyncedGeneration: config.lastSyncedGeneration,
@@ -16757,7 +16750,7 @@ init_fs();
 init_version();
 init_config();
 import { join as join34 } from "path";
-program.name("reap").description("REAP — Recursive Evolutionary Autonomous Pipeline").version("0.15.10");
+program.name("reap").description("REAP — Recursive Evolutionary Autonomous Pipeline").version("0.15.11");
 program.command("init").description("Initialize a new REAP project (Genesis)").argument("[project-name]", "Project name (defaults to current directory name)").option("-m, --mode <mode>", "Entry mode: greenfield, migration, adoption", "greenfield").option("-p, --preset <preset>", "Bootstrap with a genome preset (e.g., bun-hono-react)").action(async (projectName, options) => {
   try {
     const cwd = process.cwd();
@@ -16814,7 +16807,7 @@ program.command("status").description("Show current project and Generation statu
     const paths = new ReapPaths(cwd);
     const config = await ConfigManager.read(paths);
     const skipCheck = config.autoUpdate === false;
-    const installedVersion = "0.15.10";
+    const installedVersion = "0.15.11";
     const versionLine = formatVersionLine(installedVersion, skipCheck);
     console.log(`${versionLine} | Project: ${status.project} (${status.entryMode})`);
     console.log(`Completed Generations: ${status.totalGenerations}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@c-d-cc/reap",
-  "version": "0.15.10",
+  "version": "0.15.11",
   "description": "Recursive Evolutionary Autonomous Pipeline — AI and humans evolve software across generations",
   "type": "module",
   "license": "MIT",