@tsuzuku/arise 1.1.0 → 1.1.1

package/index.js

@@ -1,3 +1,4 @@
+const pkg = require('./package.json');
 const { parseArgs, showUsage } = require('./lib/cli');
 const { resolveConfiguration } = require('./lib/config');
 const { executeCreate } = require('./lib/lifecycle/create');
@@ -12,7 +13,7 @@ async function run(argv = process.argv.slice(2), cwd = process.cwd()) {
   }
 
   if (flags.showVersion) {
-    console.log('arise v1.0.0');
+    console.log(`arise v${pkg.version}`);
     process.exit(0);
   }
 

package/lib/config.js

@@ -70,7 +70,56 @@ function loadConfigFile(filePath) {
 
 function resolveConfiguration(flags = {}, cwd = process.cwd()) {
   const repoRoot = git.getRepoRootDir(cwd);
-  const configFile = findConfigFile([cwd, repoRoot]);
+  const searchDirs = [];
+
+  const addSearchDir = (dir) => {
+    if (dir && !searchDirs.includes(dir)) {
+      searchDirs.push(dir);
+    }
+  };
+
+  let worktrees = [];
+  try {
+    worktrees = git.getWorktrees({ repoDir: repoRoot });
+  } catch (e) {}
+
+  // 1. Explicit directory if --dirname / -d is passed
+  if (flags.dirname) {
+    const resolvedDir = path.isAbsolute(flags.dirname)
+      ? flags.dirname
+      : path.resolve(repoRoot || cwd, flags.dirname);
+    addSearchDir(resolvedDir);
+  }
+
+  // 2. Directory for the specified branch (--branch / -b)
+  if (flags.branch) {
+    const matchingWt = worktrees.find((wt) => wt.branch === flags.branch);
+    if (matchingWt && matchingWt.path) {
+      addSearchDir(matchingWt.path);
+    }
+    const branchDir = path.resolve(repoRoot || cwd, flags.branch.replace(/\//g, '-'));
+    addSearchDir(branchDir);
+  }
+
+  // 3. Current working directory
+  addSearchDir(cwd);
+
+  // 4. Repository root directory
+  if (repoRoot) {
+    addSearchDir(repoRoot);
+  }
+
+  // 5. Fallback to existing worktrees (prioritizing primary branches like main, master, develop)
+  const primaryBranches = ['main', 'master', 'develop', 'prod', 'staging'];
+  const primaryWts = worktrees.filter((wt) => !wt.isBare && wt.branch && primaryBranches.includes(wt.branch));
+  for (const wt of primaryWts) {
+    if (wt.path) addSearchDir(wt.path);
+  }
+  for (const wt of worktrees) {
+    if (wt.path && !wt.isBare) addSearchDir(wt.path);
+  }
+
+  const configFile = findConfigFile(searchDirs);
   const fileConfig = loadConfigFile(configFile);
 
   // 1. Resolve Preset
@@ -80,7 +129,11 @@ function resolveConfiguration(flags = {}, cwd = process.cwd()) {
     preset = getPreset(presetName);
   }
   if (!preset) {
-    preset = detectPreset(cwd);
+    const detectDir = (configFile && path.dirname(configFile)) || cwd;
+    preset = detectPreset(detectDir);
+    if (preset.name === 'generic' && detectDir !== cwd) {
+      preset = detectPreset(cwd);
+    }
   }
 
   // 2. Merge Repo Settings

package/lib/git.js

@@ -7,6 +7,10 @@ function getGitPrefix(options = {}) {
     return `git --git-dir="${options.bareRepo}"`;
   }
   if (options.repoDir) {
+    const dotBare = path.join(options.repoDir, '.bare');
+    if (fs.existsSync(dotBare)) {
+      return `git --git-dir="${dotBare}"`;
+    }
     return `git -C "${options.repoDir}"`;
   }
   return 'git';
@@ -16,6 +20,10 @@ function getRepoRootDir(cwd = process.cwd(), bareRepo = null) {
   if (bareRepo && fs.existsSync(bareRepo)) {
     return bareRepo;
   }
+  const dotBare = path.join(cwd, '.bare');
+  if (fs.existsSync(dotBare)) {
+    return cwd;
+  }
   try {
     const commonDir = execSync('git rev-parse --git-common-dir', { cwd, encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }).trim();
     const absoluteCommonDir = path.isAbsolute(commonDir) ? commonDir : path.resolve(cwd, commonDir);

package/lib/lifecycle/create.js

@@ -4,6 +4,7 @@ const git = require('../git');
 const herdr = require('../herdr');
 const layout = require('../layout');
 const { createContext } = require('../context');
+const { resolveConfiguration } = require('../config');
 const { showUsage } = require('../cli');
 
 async function executeCreate(flags, config, cwd = process.cwd()) {
@@ -24,8 +25,8 @@ async function executeCreate(flags, config, cwd = process.cwd()) {
 
   // 2. Resolve Session / Workspace Name
   const baseWorkspace = flags.workspaceName || dirname.replace(/[\s.:]/g, '_');
-  const prefix = config.workspace.labelPrefix || '';
-  const sessionName = (prefix && !baseWorkspace.startsWith(prefix.trim()))
+  let prefix = config.workspace.labelPrefix || '';
+  let sessionName = (prefix && !baseWorkspace.startsWith(prefix.trim()))
     ? `${prefix}${baseWorkspace}`
     : baseWorkspace;
 
@@ -69,25 +70,32 @@ async function executeCreate(flags, config, cwd = process.cwd()) {
     }
   }
 
-  // 5. Initialize Context for Hooks
+  // 5. Re-resolve config using target worktree directory for branch-specific overrides
+  const activeConfig = resolveConfiguration(flags, worktreePathToUse);
+  prefix = activeConfig.workspace.labelPrefix || '';
+  sessionName = (prefix && !baseWorkspace.startsWith(prefix.trim()))
+    ? `${prefix}${baseWorkspace}`
+    : baseWorkspace;
+
+  // Initialize Context for Hooks
   const ctx = createContext({
     worktreePath: worktreePathToUse,
     repoRoot,
-    bareRepo: config.repo.bareRepo,
+    bareRepo: activeConfig.repo.bareRepo,
     branch,
-    source: flags.source || config.repo.defaultBaseBranch,
+    source: flags.source || activeConfig.repo.defaultBaseBranch,
     flags,
-    preset: config.preset,
-    config,
+    preset: activeConfig.preset,
+    config: activeConfig,
   });
 
   // 6. Run Preset / Config Hooks
-  if (typeof config.hooks.onSyncPrimary === 'function') {
-    await config.hooks.onSyncPrimary(ctx);
+  if (typeof activeConfig.hooks.onSyncPrimary === 'function') {
+    await activeConfig.hooks.onSyncPrimary(ctx);
   }
 
-  if (!worktreeExists && typeof config.hooks.onScaffold === 'function') {
-    await config.hooks.onScaffold(ctx);
+  if (!worktreeExists && typeof activeConfig.hooks.onScaffold === 'function') {
+    await activeConfig.hooks.onScaffold(ctx);
   }
 
   // 7. Orchestrate Herdr Workspace
@@ -105,10 +113,10 @@ async function executeCreate(flags, config, cwd = process.cwd()) {
   // 8. Render Terminal Layout
   console.log(`==> Configuring terminal panes...`);
   layout.renderLayout({
-    layout: config.layout,
+    layout: activeConfig.layout,
     rootPaneId: ws.rootPaneId,
     cwd: worktreePathToUse,
-    focusTarget: flags.focusTarget || config.workspace.defaultFocus,
+    focusTarget: flags.focusTarget || activeConfig.workspace.defaultFocus,
   });
 
   // Focus the workspace

package/lib/lifecycle/nuke.js

@@ -4,6 +4,7 @@ const { execSync } = require('child_process');
 const git = require('../git');
 const herdr = require('../herdr');
 const { createContext } = require('../context');
+const { resolveConfiguration } = require('../config');
 const { showUsage } = require('../cli');
 
 async function executeNuke(flags, config, cwd = process.cwd()) {
@@ -50,6 +51,10 @@ async function executeNuke(flags, config, cwd = process.cwd()) {
   const targetDirname = path.basename(targetWorktreePath);
   const targetSessionName = targetDirname.replace(/[\s.:]/g, '_');
 
+  const activeConfig = fs.existsSync(targetWorktreePath)
+    ? resolveConfiguration(flags, targetWorktreePath)
+    : config;
+
   let targetBranch = flags.branch;
   if (!targetBranch && existingWorktree && existingWorktree.branch) {
     targetBranch = existingWorktree.branch;
@@ -64,14 +69,14 @@ async function executeNuke(flags, config, cwd = process.cwd()) {
   }
   if (!targetBranch) {
     try {
-      const gitCmd = git.getGitPrefix({ repoDir: repoRoot, bareRepo: config.repo.bareRepo });
+      const gitCmd = git.getGitPrefix({ repoDir: repoRoot, bareRepo: activeConfig.repo.bareRepo });
       execSync(`${gitCmd} rev-parse --verify "${target}"`, { stdio: 'ignore' });
       targetBranch = target;
     } catch (e) {}
   }
 
   console.log(`\n=== Starting Worktree Nuke ===`);
-  console.log(`Active Preset:        ${config.preset ? config.preset.name : 'generic'}`);
+  console.log(`Active Preset:        ${activeConfig.preset ? activeConfig.preset.name : 'generic'}`);
   console.log(`Repository Root:      ${repoRoot}`);
   console.log(`Target Worktree Path: ${targetWorktreePath}`);
   console.log(`Associated Branch:    ${targetBranch || '(None detected)'}`);
@@ -96,16 +101,16 @@ async function executeNuke(flags, config, cwd = process.cwd()) {
   const ctx = createContext({
     worktreePath: targetWorktreePath,
     repoRoot,
-    bareRepo: config.repo.bareRepo,
+    bareRepo: activeConfig.repo.bareRepo,
     branch: targetBranch,
     flags,
-    preset: config.preset,
-    config,
+    preset: activeConfig.preset,
+    config: activeConfig,
   });
 
   // Pre-Nuke Hook
-  if (typeof config.hooks.onPreNuke === 'function') {
-    await config.hooks.onPreNuke(ctx);
+  if (typeof activeConfig.hooks.onPreNuke === 'function') {
+    await activeConfig.hooks.onPreNuke(ctx);
   }
 
   // 1. Remove Worktree & Directory
@@ -139,12 +144,12 @@ async function executeNuke(flags, config, cwd = process.cwd()) {
   // Helper for final cleanup steps (Herdr workspace close + Post-Nuke hook)
   const finishCleanup = async () => {
     // Post-Nuke Hook
-    if (typeof config.hooks.onPostNuke === 'function') {
-      await config.hooks.onPostNuke(ctx);
+    if (typeof activeConfig.hooks.onPostNuke === 'function') {
+      await activeConfig.hooks.onPostNuke(ctx);
     }
 
     // Close Herdr Workspace if running (performed last so active pane is not terminated mid-cleanup)
-    const prefix = config.workspace.labelPrefix || '';
+    const prefix = activeConfig.workspace.labelPrefix || '';
     const matchTargets = [
       targetSessionName,
       targetDirname,
@@ -165,7 +170,7 @@ async function executeNuke(flags, config, cwd = process.cwd()) {
     return;
   }
 
-  const protectedBranches = config.repo.protectedBranches || ['main', 'master', 'develop', 'prod', 'staging', 'production'];
+  const protectedBranches = activeConfig.repo.protectedBranches || ['main', 'master', 'develop', 'prod', 'staging', 'production'];
   if (targetBranch && protectedBranches.includes(targetBranch)) {
     console.warn(`\n==> WARNING: "${targetBranch}" is a protected branch. Skipping local and remote branch deletion.`);
     await finishCleanup();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsuzuku/arise",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "publishConfig": {
     "access": "public"
   },
@@ -20,7 +20,6 @@
     "index.js",
     "types.d.ts",
     "arise.schema.json",
-    "worktree.schema.json",
     "README.md"
   ],
   "engines": {

package/worktree.schema.json

@@ -1,130 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "HerdrWorktreeConfig",
-  "description": "Configuration schema for Herdr Worktree (.worktreerc.json)",
-  "type": "object",
-  "properties": {
-    "preset": {
-      "type": "string",
-      "description": "Preset name to use ('node', 'laravel', 'generic' or custom registered preset)"
-    },
-    "repo": {
-      "type": "object",
-      "description": "Repository topology and branch configuration",
-      "properties": {
-        "bareRepo": {
-          "type": ["string", "null"],
-          "description": "Path to bare git repository (e.g. '/path/to/bare/repo.git')"
-        },
-        "worktreesBase": {
-          "type": ["string", "null"],
-          "description": "Base directory where worktrees should be placed (e.g. '/path/to/worktrees')"
-        },
-        "defaultBaseBranch": {
-          "type": "string",
-          "description": "Default base branch to branch off (e.g. 'develop', 'prod', 'main')"
-        },
-        "protectedBranches": {
-          "type": "array",
-          "items": { "type": "string" },
-          "description": "Array of branch names protected against deletion during --nuke"
-        }
-      },
-      "additionalProperties": false
-    },
-    "workspace": {
-      "type": "object",
-      "description": "Herdr workspace naming, agent, and focus configuration",
-      "properties": {
-        "labelPrefix": {
-          "type": "string",
-          "description": "Prefix added to Herdr workspace labels (e.g. '[BE] ')"
-        },
-        "agent": {
-          "type": ["string", "object", "null"],
-          "description": "CLI AI agent to run in the workspace pane ('agy', 'claude', 'aider', 'copilot', 'none', or custom command object)",
-          "properties": {
-            "cmd": {
-              "type": ["string", "null"],
-              "description": "Command to execute the agent"
-            },
-            "title": {
-              "type": "string",
-              "description": "Display title for the agent pane in Herdr"
-            }
-          }
-        },
-        "defaultFocus": {
-          "type": "string",
-          "description": "Default pane to focus upon creation ('agent', 'agy', 'claude', 'vim', 'logs', 'server', 'shell')"
-        }
-      },
-      "additionalProperties": false
-    },
-    "layout": {
-      "type": "array",
-      "description": "Declarative 4-pane quadrant layout definitions",
-      "items": {
-        "type": "object",
-        "required": ["id", "title"],
-        "properties": {
-          "id": {
-            "type": "string",
-            "description": "Unique identifier for this pane within the layout"
-          },
-          "title": {
-            "type": "string",
-            "description": "Title displayed on the Herdr pane"
-          },
-          "cmd": {
-            "type": ["string", "null"],
-            "description": "Command to run when pane is opened (e.g. 'vim .', 'npm run dev', 'tail -f ...')"
-          },
-          "position": {
-            "type": "string",
-            "enum": ["root"],
-            "description": "Set to 'root' for the initial root pane"
-          },
-          "from": {
-            "type": "string",
-            "description": "ID of parent pane to split from"
-          },
-          "split": {
-            "type": "string",
-            "enum": ["right", "down"],
-            "description": "Split direction ('right' or 'down')"
-          },
-          "focus": {
-            "type": "boolean",
-            "description": "Whether this pane should receive focus by default"
-          },
-          "isAgent": {
-            "type": "boolean",
-            "description": "Whether this pane is designated as the AI CLI agent pane"
-          }
-        },
-        "additionalProperties": false
-      }
-    },
-    "scaffold": {
-      "type": "object",
-      "description": "Scaffolding options (environment files, symlinks, dependency installation, etc.)",
-      "properties": {
-        "envSource": {
-          "type": ["string", "null"],
-          "description": "Path to .env source file to copy into new worktree"
-        },
-        "symlink": {
-          "type": ["string", "null"],
-          "description": "Path to web server symlink to update to active worktree"
-        },
-        "install": {
-          "type": ["string", "boolean", "null"],
-          "description": "Command to run to install dependencies upon creation (e.g. 'npm install --legacy-peer-deps', 'pnpm install', 'composer install --no-interaction'), or false/null to skip installation."
-        }
-      },
-      "additionalProperties": true
-    }
-  },
-  "additionalProperties": false
-}