@tsuzuku/arise 1.1.0 → 1.2.0

package/lib/config.js

@@ -53,12 +53,19 @@ function findConfigFile(searchDirs = []) {
   return null;
 }
 
+function stripJsonComments(str) {
+  return str
+    .replace(/\/\*[\s\S]*?\*\//g, '')
+    .replace(/\/\/.*$/gm, '')
+    .trim();
+}
+
 function loadConfigFile(filePath) {
   if (!filePath) return {};
   try {
     if (filePath.endsWith('.json') || filePath.endsWith('.worktreerc') || filePath.endsWith('.ariserc')) {
       const content = fs.readFileSync(filePath, 'utf8');
-      return JSON.parse(content);
+      return JSON.parse(stripJsonComments(content));
     } else {
       return require(path.resolve(filePath));
     }
@@ -68,9 +75,67 @@ function loadConfigFile(filePath) {
   }
 }
 
-function resolveConfiguration(flags = {}, cwd = process.cwd()) {
-  const repoRoot = git.getRepoRootDir(cwd);
-  const configFile = findConfigFile([cwd, repoRoot]);
+function resolveConfiguration(flags = {}, cwd = process.cwd(), callerCwd = null) {
+  const repoRoot = git.getRepoRootDir(cwd) || (callerCwd ? git.getRepoRootDir(callerCwd) : null);
+  const isBare = git.isBareRepo(repoRoot);
+  const searchDirs = [];
+
+  const addSearchDir = (dir) => {
+    if (dir && !searchDirs.includes(dir)) {
+      searchDirs.push(dir);
+    }
+  };
+
+  let worktrees = [];
+  try {
+    worktrees = git.getWorktrees({ repoDir: repoRoot, bareRepo: isBare ? repoRoot : null });
+  } 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. Target working directory
+  addSearchDir(cwd);
+
+  // 4. Fallback working directory (caller working directory)
+  if (callerCwd) {
+    addSearchDir(callerCwd);
+  }
+
+  // 5. Repository root directory
+  if (repoRoot) {
+    addSearchDir(repoRoot);
+    if (isBare) {
+      addSearchDir(path.dirname(repoRoot));
+    }
+  }
+
+  // 6. 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,12 +145,16 @@ 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
   const repoConfig = {
-    bareRepo: (fileConfig.repo && fileConfig.repo.bareRepo) || (preset.repo && preset.repo.bareRepo) || null,
+    bareRepo: (fileConfig.repo && fileConfig.repo.bareRepo) || (preset.repo && preset.repo.bareRepo) || (isBare ? repoRoot : null),
     worktreesBase: (fileConfig.repo && fileConfig.repo.worktreesBase) || (preset.repo && preset.repo.worktreesBase) || null,
     defaultBaseBranch: (fileConfig.repo && fileConfig.repo.defaultBaseBranch) || (preset.repo && preset.repo.defaultBaseBranch) || 'develop',
     protectedBranches: (fileConfig.repo && fileConfig.repo.protectedBranches) || (preset.repo && preset.repo.protectedBranches) || ['main', 'master', 'develop', 'prod', 'staging'],

package/lib/git.js

@@ -2,11 +2,39 @@ const fs = require('fs');
 const path = require('path');
 const { execSync } = require('child_process');
 
+function isBareRepo(repoPath) {
+  if (!repoPath || !fs.existsSync(repoPath)) return false;
+  try {
+    const isBare = execSync(`git --git-dir="${repoPath}" rev-parse --is-bare-repository`, { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }).trim();
+    return isBare === 'true';
+  } catch (e) {
+    return false;
+  }
+}
+
+function getLocalBranches(options = {}) {
+  const gitCmd = getGitPrefix(options);
+  try {
+    const output = execSync(`${gitCmd} branch --format="%(refname:short)"`, { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }).trim();
+    if (!output) return [];
+    return output.split('\n').map(b => b.trim()).filter(Boolean);
+  } catch (err) {
+    return [];
+  }
+}
+
 function getGitPrefix(options = {}) {
   if (options.bareRepo) {
     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}"`;
+    }
+    if (isBareRepo(options.repoDir)) {
+      return `git --git-dir="${options.repoDir}"`;
+    }
     return `git -C "${options.repoDir}"`;
   }
   return 'git';
@@ -16,9 +44,16 @@ 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);
+    if (isBareRepo(absoluteCommonDir)) {
+      return absoluteCommonDir;
+    }
     return path.dirname(absoluteCommonDir);
   } catch (err) {
     return cwd;
@@ -278,4 +313,6 @@ module.exports = {
   pruneWorktrees,
   deleteLocalBranch,
   deleteRemoteBranch,
+  getLocalBranches,
+  isBareRepo,
 };

package/lib/herdr.js

@@ -176,15 +176,50 @@ function runInPane(paneId, command) {
   }
 }
 
-function closeWorkspacesMatching(matchTargets = []) {
-  const targets = matchTargets.filter(Boolean);
-  if (!targets.length) return;
+function listPanes() {
+  try {
+    const listOutput = execSync('herdr pane list', { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }).trim();
+    const data = parseJsonFromOutput(listOutput);
+    return (data && data.result && data.result.panes) || [];
+  } catch (err) {
+    return [];
+  }
+}
+
+function closeWorkspacesForWorktree(worktreePath, matchTargets = []) {
+  const matchedWorkspaceIds = new Set();
+  const normalizedPath = worktreePath ? path.resolve(worktreePath) : null;
 
+  // 1. Path-based matching via herdr pane list (highest fidelity, immune to prefix/label changes)
+  if (normalizedPath) {
+    const panes = listPanes();
+    for (const pane of panes) {
+      if (pane.workspace_id) {
+        const paneCwd = pane.cwd ? path.resolve(pane.cwd) : null;
+        const fgCwd = pane.foreground_cwd ? path.resolve(pane.foreground_cwd) : null;
+        if (
+          (paneCwd && (paneCwd === normalizedPath || paneCwd.startsWith(normalizedPath + path.sep))) ||
+          (fgCwd && (fgCwd === normalizedPath || fgCwd.startsWith(normalizedPath + path.sep)))
+        ) {
+          matchedWorkspaceIds.add(pane.workspace_id);
+        }
+      }
+    }
+  }
+
+  // 2. Exact label matching if matchTargets are provided
+  const targets = (Array.isArray(matchTargets) ? matchTargets : [matchTargets]).filter(Boolean);
   const workspaces = listWorkspaces();
-  const matchingWorkspaces = workspaces.filter(w => targets.includes(w.label));
+  if (targets.length > 0) {
+    for (const ws of workspaces) {
+      if (ws.label && targets.includes(ws.label)) {
+        matchedWorkspaceIds.add(ws.workspace_id);
+      }
+    }
+  }
 
-  for (const ws of matchingWorkspaces) {
-    if (ws.workspace_id) {
+  for (const ws of workspaces) {
+    if (matchedWorkspaceIds.has(ws.workspace_id)) {
       console.log(`Closing Herdr workspace "${ws.label}" (ID: ${ws.workspace_id}) and terminating panes...`);
       closeWorkspace(ws.workspace_id);
       console.log(`Herdr workspace "${ws.label}" closed.`);
@@ -192,6 +227,10 @@ function closeWorkspacesMatching(matchTargets = []) {
   }
 }
 
+function closeWorkspacesMatching(matchTargets = [], worktreePath = null) {
+  return closeWorkspacesForWorktree(worktreePath, matchTargets);
+}
+
 function attachOrSwitchSession(sessionName) {
   if (process.env.HERDR_ENV === '1') {
     console.log(`Already inside herdr. Workspace "${sessionName}" created and focused!`);
@@ -206,6 +245,7 @@ module.exports = {
   getRecommendedInstallCommand,
   ensureHerdrInstalled,
   listWorkspaces,
+  listPanes,
   createWorkspace,
   closeWorkspace,
   focusWorkspace,
@@ -213,5 +253,6 @@ module.exports = {
   renamePane,
   runInPane,
   closeWorkspacesMatching,
+  closeWorkspacesForWorktree,
   attachOrSwitchSession,
 };