@c-d-cc/reap 0.6.1 → 0.7.0

package/dist/cli.js

@@ -8918,6 +8918,9 @@ class ReapPaths {
   static get userReapTemplates() {
     return join(ReapPaths.userReapDir, "templates");
   }
+  static get userReapCommands() {
+    return join(ReapPaths.userReapDir, "commands");
+  }
   static get packageTemplatesDir() {
     const dir = dirname(fileURLToPath(import.meta.url));
     const distPath = join(dir, "templates");
@@ -9045,12 +9048,22 @@ class ClaudeCodeAdapter {
     return this.commandsDir;
   }
   async installCommands(commandNames, sourceDir) {
-    await mkdir(this.commandsDir, { recursive: true });
+    await mkdir(ReapPaths.userReapCommands, { recursive: true });
     for (const cmd of commandNames) {
       const src = join2(sourceDir, `${cmd}.md`);
-      const dest = join2(this.commandsDir, `${cmd}.md`);
+      const dest = join2(ReapPaths.userReapCommands, `${cmd}.md`);
       await writeTextFile(dest, await readTextFileOrThrow(src));
     }
+    await mkdir(this.commandsDir, { recursive: true });
+    for (const cmd of commandNames) {
+      const dest = join2(this.commandsDir, `${cmd}.md`);
+      const redirectContent = `---
+description: "REAP — redirected to ~/.reap/commands/"
+---
+Read \`~/.reap/commands/${cmd}.md\` and follow the instructions there.
+`;
+      await writeTextFile(dest, redirectContent);
+    }
   }
   async removeStaleCommands(validNames) {
     try {
@@ -9265,12 +9278,22 @@ class OpenCodeAdapter {
     return this.commandsDir;
   }
   async installCommands(commandNames, sourceDir) {
-    await mkdir2(this.commandsDir, { recursive: true });
+    await mkdir2(ReapPaths.userReapCommands, { recursive: true });
     for (const cmd of commandNames) {
       const src = join3(sourceDir, `${cmd}.md`);
-      const dest = join3(this.commandsDir, `${cmd}.md`);
+      const dest = join3(ReapPaths.userReapCommands, `${cmd}.md`);
       await writeTextFile(dest, await readTextFileOrThrow(src));
     }
+    await mkdir2(this.commandsDir, { recursive: true });
+    for (const cmd of commandNames) {
+      const dest = join3(this.commandsDir, `${cmd}.md`);
+      const redirectContent = `---
+description: "REAP — redirected to ~/.reap/commands/"
+---
+Read \`~/.reap/commands/${cmd}.md\` and follow the instructions there.
+`;
+      await writeTextFile(dest, redirectContent);
+    }
   }
   async removeStaleCommands(validNames) {
     try {
@@ -10330,21 +10353,41 @@ async function updateProject(projectRoot, dryRun = false) {
   const adapters = await AgentRegistry.getActiveAdapters(config ?? undefined);
   const commandsDir = ReapPaths.packageCommandsDir;
   const commandFiles = await readdir8(commandsDir);
+  await mkdir6(ReapPaths.userReapCommands, { recursive: true });
+  for (const file of commandFiles) {
+    if (!file.endsWith(".md"))
+      continue;
+    const src = await readTextFileOrThrow(join9(commandsDir, file));
+    const dest = join9(ReapPaths.userReapCommands, file);
+    const existing = await readTextFile(dest);
+    if (existing !== null && existing === src) {
+      result.skipped.push(`~/.reap/commands/${file}`);
+    } else {
+      if (!dryRun)
+        await writeTextFile(dest, src);
+      result.updated.push(`~/.reap/commands/${file}`);
+    }
+  }
   for (const adapter of adapters) {
     const agentCmdDir = adapter.getCommandsDir();
     const label = `${adapter.displayName}`;
     for (const file of commandFiles) {
       if (!file.endsWith(".md"))
         continue;
-      const src = await readTextFileOrThrow(join9(commandsDir, file));
+      const cmdName = file.replace(/\.md$/, "");
+      const redirectContent = `---
+description: "REAP — redirected to ~/.reap/commands/"
+---
+Read \`~/.reap/commands/${cmdName}.md\` and follow the instructions there.
+`;
       const dest = join9(agentCmdDir, file);
       const existingContent = await readTextFile(dest);
-      if (existingContent !== null && existingContent === src) {
+      if (existingContent !== null && existingContent === redirectContent) {
         result.skipped.push(`[${label}] commands/${file}`);
       } else {
         if (!dryRun) {
           await mkdir6(agentCmdDir, { recursive: true });
-          await writeTextFile(dest, src);
+          await writeTextFile(dest, redirectContent);
         }
         result.updated.push(`[${label}] commands/${file}`);
       }
@@ -10589,7 +10632,7 @@ async function fixProject(projectRoot) {
 
 // src/cli/index.ts
 import { join as join10 } from "path";
-program.name("reap").description("REAP — Recursive Evolutionary Autonomous Pipeline").version("0.6.1");
+program.name("reap").description("REAP — Recursive Evolutionary Autonomous Pipeline").version("0.7.0");
 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();

package/dist/templates/commands/reap.help.md

@@ -56,8 +56,14 @@ Genome(`.reap/genome/`)에 프로젝트의 설계 원칙과 규칙을 기록하
 | `/reap.sync` | 현재 소스코드와 Genome 간 차이를 분석하고 동기화 |
 | `/reap.update` | REAP 최신 버전 확인 및 업그레이드 |
 | `/reap.help` | 도움말. `/reap.help {topic}`으로 주제별 상세 설명 |
+| | **Collaboration** |
+| `/reap.pull {branch}` | fetch + divergence 감지 + merge generation 자동 실행 |
+| `/reap.push` | REAP 상태 검증 + git push |
+| `/reap.merge {branch}` | merge generation 전체 lifecycle 실행 |
+| `/reap.merge.start` | merge generation 생성 + detect |
+| `/reap.merge.evolve` | merge 6단계 자율 실행 |
 
-💡 `/reap.help {topic}` — workflow, genome, backlog, strict, agents, hooks, config, evolve, regression, author ...
+💡 `/reap.help {topic}` — workflow, genome, backlog, strict, agents, hooks, config, evolve, regression, merge, pull, push, author ...
 
 **Config**: Strict: {on/off} · Auto-Update: {on/off} · Language: {value}
 
@@ -82,5 +88,7 @@ For command-name topics: read `reap.{name}.md` from the same directory as this f
 - **regression** — `/reap.back`: 이전 stage 회귀. timeline + artifact에 Regression 섹션 기록.
 - **minor-fix** — 5분 이내, 설계 변경 없는 수정. stage 전환 없이 현재 artifact에 기록.
 - **compression** — 10,000줄 + 5세대 이상 시 lineage 자동 압축. L1(40줄), L2(60줄).
+- **merge** / **collaboration** — 분산 협업: genome-first merge 6단계 (detect→mate→merge→sync→validation→completion). `/reap.pull`로 fetch+merge, `/reap.push`로 검증+push. 상세: `domain/collaboration.md`, `domain/merge-lifecycle.md`.
 - **author** — HyeonIL Choi. Email: hichoi@c-d.cc / Homepage: https://c-d.cc / LinkedIn: https://www.linkedin.com/in/hichoi-dev / GitHub: https://github.com/casamia918
 - **start** / **objective** / **planning** / **implementation** / **validation** / **completion** / **next** / **back** / **sync** / **status** / **update** / **help** — Read `reap.{name}.md` from same directory, explain.
+- **pull** / **push** / **merge.start** / **merge.detect** / **merge.mate** / **merge.merge** / **merge.sync** / **merge.validation** / **merge.completion** / **merge.evolve** — Read `reap.{name}.md` from same directory, explain.

package/dist/templates/commands/reap.pull.md

@@ -34,6 +34,7 @@ If the target branch already includes all local work (fast-forward), skip the me
 9. Check if the local latest generation is an ancestor of the remote latest generation:
    - **If yes (fast-forward possible)**:
      - Run `git merge --ff {branch}`
+     - Run `git submodule update --init` to sync submodules
      - Report: "Fast-forwarded to {branch}. Local lineage now includes {remote-latest-id}. No merge generation needed."
      - **STOP** — no merge lifecycle needed
    - **If same generation**: "Already up to date." → **STOP**
@@ -44,7 +45,8 @@ If the target branch already includes all local work (fast-forward), skip the me
     - This creates the merge generation and runs detect (01-detect.md)
 11. Execute `/reap.merge.evolve` to run the full merge lifecycle:
     - Detect → Mate → Merge → Sync → Validation → Completion
-12. The merge generation is archived upon completion
+12. Run `git submodule update --init` to sync submodules after merge
+13. The merge generation is archived upon completion
 
 ## Completion
 - Fast-forward: "Fast-forwarded to {branch}. No merge generation needed."

package/dist/templates/hooks/session-start.cjs

@@ -6,7 +6,7 @@ const gl = require('./genome-loader.cjs');
 
 const startTime = Date.now();
 let step = 0;
-const totalSteps = 6;
+const totalSteps = 7;
 
 function log(msg) {
   step++;
@@ -28,6 +28,47 @@ if (!gl.dirExists(reapDir)) {
   process.exit(0);
 }
 
+// Step 0: Install project-level command symlinks
+const fs = require('fs');
+const os = require('os');
+const userReapCommands = path.join(os.homedir(), '.reap', 'commands');
+const projectClaudeCommands = path.join(projectRoot, '.claude', 'commands');
+
+if (gl.dirExists(userReapCommands)) {
+  try {
+    fs.mkdirSync(projectClaudeCommands, { recursive: true });
+    const cmdFiles = fs.readdirSync(userReapCommands).filter(f => f.startsWith('reap.') && f.endsWith('.md'));
+    for (const file of cmdFiles) {
+      const src = path.join(userReapCommands, file);
+      const dest = path.join(projectClaudeCommands, file);
+      try {
+        const stat = fs.lstatSync(dest);
+        if (stat.isSymbolicLink()) {
+          const target = fs.readlinkSync(dest);
+          if (target === src) continue; // already correct
+          fs.unlinkSync(dest); // stale symlink
+        } else {
+          // Regular file (old redirect or original) — replace with symlink
+          fs.unlinkSync(dest);
+        }
+      } catch { /* dest doesn't exist */ }
+      fs.symlinkSync(src, dest);
+    }
+    // Ensure .gitignore excludes these symlinks
+    const gitignorePath = path.join(projectRoot, '.gitignore');
+    const gitignoreEntry = '.claude/commands/reap.*';
+    try {
+      const gitignore = fs.existsSync(gitignorePath) ? fs.readFileSync(gitignorePath, 'utf-8') : '';
+      if (!gitignore.includes(gitignoreEntry)) {
+        fs.appendFileSync(gitignorePath, `\n# REAP command symlinks (managed by session-start hook)\n${gitignoreEntry}\n`);
+      }
+    } catch { /* best effort */ }
+    process.stderr.write(`[REAP] Symlinked ${cmdFiles.length} commands to .claude/commands/\n`);
+  } catch (err) {
+    process.stderr.write(`[REAP] Warning: failed to create command symlinks: ${err.message}\n`);
+  }
+}
+
 // Step 1: Version check + Auto-update
 log('Checking for updates...');
 let autoUpdateMessage = '';

package/package.json

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