bonzai-burn 1.0.8 → 1.0.10

package/README.md

@@ -12,10 +12,10 @@ Requires: [Claude Code CLI](https://github.com/anthropics/claude-code)
 
 ## Usage
 
-### 1. Run cleanup
+### 1. Run burn
 
 ```bash
-npx btrim
+npx bburn
 ```
 
 Creates `bonzai/specs.md` on first run. Edit it to define your cleanup rules.
@@ -26,11 +26,11 @@ Creates `bonzai/specs.md` on first run. Edit it to define your cleanup rules.
 git diff main
 ```
 
-### 3. Keep or discard
+### 3. Accept or discard
 
 ```bash
-# Keep
-git checkout main && git merge bonzai-burn
+# Accept
+baccept
 
 # Discard
 brevert

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "bonzai-burn",
-  "version": "1.0.8",
-  "description": "Git branch-based cleanup tool with btrim and brevert commands",
+  "version": "1.0.10",
+  "description": "Git branch-based cleanup tool with bburn, baccept, and brevert commands",
   "type": "module",
   "main": "src/index.js",
   "bin": {
     "bonzai-burn": "./src/index.js",
-    "btrim": "./src/btrim.js",
+    "bburn": "./src/bburn.js",
+    "baccept": "./src/baccept.js",
     "brevert": "./src/brevert.js"
   },
   "keywords": [
@@ -20,6 +21,6 @@
   },
   "files": [
     "src",
-    "bonzai"
+    "payload-bonzai"
   ]
 }

package/{bonzai → payload-bonzai}/config.json

@@ -1,4 +1,4 @@
 {
   "headlessClaude": true,
-  "autoModeration": false
+  "autoBurn": false
 }

package/payload-bonzai/specs.md

@@ -0,0 +1,9 @@
+# Bonzai Specs
+
+Define your cleanup requirements below. bburn will follow these instructions.
+
+## Requirements:
+- Remove unused imports and variables
+- Split any folder with over 10 items into smaller, compartmentalized folders.
+- Remove all console log statements
+- Split any folder with over 100 lines into smaller files

package/src/baccept.js

@@ -0,0 +1,62 @@
+#!/usr/bin/env node
+import { execSync } from 'child_process';
+
+function exec(command) {
+  return execSync(command, { encoding: 'utf-8', stdio: 'pipe' }).trim();
+}
+
+function execVisible(command) {
+  execSync(command, { stdio: 'inherit' });
+}
+
+async function accept() {
+  try {
+    // Get saved metadata
+    let originalBranch;
+    let burnBranch;
+    let madeWipCommit;
+
+    try {
+      originalBranch = exec('git config bonzai.originalBranch');
+      burnBranch = exec('git config bonzai.burnBranch');
+      madeWipCommit = exec('git config bonzai.madeWipCommit') === 'true';
+    } catch {
+      console.error('❌ No burn to accept');
+      console.error('Run bburn first');
+      process.exit(1);
+    }
+
+    console.log(`✅ Accepting burn changes...`);
+    console.log(`   Merging: ${burnBranch} → ${originalBranch}\n`);
+
+    // Checkout original branch
+    execVisible(`git checkout ${originalBranch}`);
+
+    // Merge burn branch into original
+    execVisible(`git merge ${burnBranch} -m "Accept bonzai burn from ${burnBranch}"`);
+
+    // Delete burn branch
+    execVisible(`git branch -D ${burnBranch}`);
+
+    // If we made a WIP commit, we need to handle it
+    // The merge already includes the burn changes on top of the WIP commit
+    // So we can optionally squash or leave as-is
+    if (madeWipCommit) {
+      console.log('\n💡 Note: Your pre-burn WIP commit was preserved in the history.');
+    }
+
+    // Clean up metadata
+    exec('git config --unset bonzai.originalBranch');
+    exec('git config --unset bonzai.burnBranch');
+    exec('git config --unset bonzai.madeWipCommit');
+
+    console.log(`\n✓ Burn accepted and merged`);
+    console.log(`Now on: ${originalBranch}\n`);
+
+  } catch (error) {
+    console.error('❌ Accept failed:', error.message);
+    process.exit(1);
+  }
+}
+
+accept();

package/src/{btrim.js → bburn.js}

@@ -12,8 +12,8 @@ const BONZAI_DIR = 'bonzai';
 const SPECS_FILE = 'specs.md';
 const CONFIG_FILE = 'config.json';
 
-// Template folder in the package
-const TEMPLATE_DIR = join(__dirname, '..', 'bonzai');
+// Template folder in the package (ships as payload-bonzai, copied as bonzai)
+const TEMPLATE_DIR = join(__dirname, '..', 'payload-bonzai');
 
 function initializeBonzai() {
   const bonzaiPath = join(process.cwd(), BONZAI_DIR);
@@ -36,7 +36,7 @@ function initializeBonzai() {
   if (!fs.existsSync(configPath)) {
     fs.copyFileSync(join(TEMPLATE_DIR, CONFIG_FILE), configPath);
     console.log(`⚙️  Created ${BONZAI_DIR}/${CONFIG_FILE}`);
-    console.log(`\n⚠️  Please edit ${BONZAI_DIR}/${SPECS_FILE} to define your cleanup rules before running btrim.\n`);
+    console.log(`\n⚠️  Please edit ${BONZAI_DIR}/${SPECS_FILE} to define your cleanup rules before running bburn.\n`);
     process.exit(0);
   }
 }
@@ -233,7 +233,7 @@ async function burn() {
   try {
     // Initialize bonzai folder and specs.md on first execution
     initializeBonzai();
-    
+
     // Ensure bonzai directory and specs file exist
     const { specsPath, configPath } = ensureBonzaiDir();
     const specs = loadSpecs(specsPath);
@@ -304,7 +304,7 @@ async function burn() {
 
     console.log(`\n✅ Changes applied on: ${burnBranch}`);
     console.log(`📊 Full diff: git diff ${originalBranch}`);
-    console.log(`\n✓ Keep changes: git checkout ${originalBranch} && git merge ${burnBranch}`);
+    console.log(`\n✓ Keep changes: baccept`);
     console.log(`✗ Discard: brevert\n`);
 
   } catch (error) {

package/src/brevert.js

@@ -22,7 +22,7 @@ async function revert() {
       madeWipCommit = exec('git config bonzai.madeWipCommit') === 'true';
     } catch {
       console.error('❌ No burn to revert');
-      console.error('Run btrim first');
+      console.error('Run bburn first');
       process.exit(1);
     }
 

package/src/index.js

@@ -1,24 +1,17 @@
 #!/usr/bin/env node
-import { existsSync, mkdirSync, writeFileSync } from 'fs';
-import { join } from 'path';
+import { existsSync, mkdirSync, copyFileSync } from 'fs';
+import { join, dirname } from 'path';
+import { fileURLToPath } from 'url';
 
-const BONZAI_DIR = 'bonzai';
-const SPECS_FILE = 'specs.md';
-
-const DEFAULT_SPECS = `# Bonzai Specs
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
 
-Define your cleanup requirements below. btrim will follow these instructions.
-
-## Example:
-- Remove unused imports
-- Delete files matching pattern "*.tmp"
-- Clean up console.log statements
-`;
+const BONZAI_DIR = 'bonzai';
+const TEMPLATE_DIR = join(__dirname, '..', 'payload-bonzai');
 
 function init() {
   const currentDir = process.cwd();
   const bonzaiPath = join(currentDir, BONZAI_DIR);
-  const specsPath = join(bonzaiPath, SPECS_FILE);
 
   if (existsSync(bonzaiPath)) {
     console.log(`📁 ${BONZAI_DIR}/ already exists`);
@@ -26,10 +19,11 @@ function init() {
   }
 
   mkdirSync(bonzaiPath, { recursive: true });
-  writeFileSync(specsPath, DEFAULT_SPECS);
-  console.log(`📁 Created ${BONZAI_DIR}/ folder with specs.md`);
+  copyFileSync(join(TEMPLATE_DIR, 'specs.md'), join(bonzaiPath, 'specs.md'));
+  copyFileSync(join(TEMPLATE_DIR, 'config.json'), join(bonzaiPath, 'config.json'));
+  console.log(`📁 Created ${BONZAI_DIR}/ folder with specs.md and config.json`);
   console.log(`📝 Edit ${BONZAI_DIR}/specs.md to define your cleanup rules`);
-  console.log(`🔥 Run 'btrim' to start a cleanup session`);
+  console.log(`🔥 Run 'bburn' to start a burn session`);
 }
 
 init();

package/bonzai/specs.md

@@ -1,8 +0,0 @@
-# Bonzai Specs
-
-Define your cleanup requirements below. btrim will follow these instructions.
-
-## Requirements:
-- Remove unused imports
-- Delete files matching pattern "*.tmp"
-- Clean up console.log statements