triflux 10.3.2 → 10.3.4

package/hub/team/shared.mjs

@@ -1,13 +1,13 @@
-// hub/team/shared.mjs — 팀 모듈 공유 유틸리티
-// cli.mjs, dashboard.mjs 등에서 중복되던 상수/함수를 통합
-
-// ── ANSI 색상 상수 ──
-export const AMBER = "\x1b[38;5;214m";
-export const GREEN = "\x1b[38;5;82m";
-export const RED = "\x1b[38;5;196m";
-export const GRAY = "\x1b[38;5;245m";
-export const DIM = "\x1b[2m";
-export const BOLD = "\x1b[1m";
-export const RESET = "\x1b[0m";
-export const WHITE = "\x1b[97m";
-export const YELLOW = "\x1b[33m";
+// hub/team/shared.mjs — 팀 모듈 공유 유틸리티
+// cli.mjs, dashboard.mjs 등에서 중복되던 상수/함수를 통합
+
+// ── ANSI 색상 상수 ──
+export const AMBER = "\x1b[38;5;214m";
+export const GREEN = "\x1b[38;5;82m";
+export const RED = "\x1b[38;5;196m";
+export const GRAY = "\x1b[38;5;245m";
+export const DIM = "\x1b[2m";
+export const BOLD = "\x1b[1m";
+export const RESET = "\x1b[0m";
+export const WHITE = "\x1b[97m";
+export const YELLOW = "\x1b[33m";

package/hub/team/worktree-lifecycle.mjs

@@ -4,8 +4,8 @@
 // Remote support: host option → SSH-based git operations via remote-session.mjs.
 
 import { execFile } from 'node:child_process';
-import { resolve, normalize } from 'node:path';
-import { mkdir, rm, access } from 'node:fs/promises';
+import { resolve, normalize, join } from 'node:path';
+import { mkdir, rm, access, readdir } from 'node:fs/promises';
 import { remoteGit, validateHost } from './remote-session.mjs';
 
 const SWARM_ROOT = '.codex-swarm';
@@ -92,6 +92,10 @@ export async function ensureWorktree({ slug, runId, rootDir = process.cwd(), bas
     await git(['worktree', 'add', wtDir, branchName], rootDir);
   }
 
+  // #34 L2: worktree에 복사된 .claude-plugin 제거 (하네스가 PLUGIN_ROOT를 오인하는 것 방지)
+  const pluginDir = join(wtDir, '.claude-plugin');
+  try { await rm(pluginDir, { recursive: true, force: true }); } catch { /* absent → ok */ }
+
   return { worktreePath: normPath(wtDir), branchName, remote: false };
 }
 
@@ -192,6 +196,61 @@ export async function pruneWorktree({ worktreePath, branchName, rootDir = proces
   }
 }
 
+/**
+ * #34 L3: Detect and remove orphan worktree directories.
+ * Compares .codex-swarm/wt-* directories against `git worktree list`.
+ * Directories not registered as worktrees are removed.
+ *
+ * @param {object} [opts]
+ * @param {string} [opts.rootDir=process.cwd()]
+ * @returns {Promise<string[]>} removed directory names
+ */
+export async function pruneOrphanWorktrees({ rootDir = process.cwd() } = {}) {
+  const swarmDir = resolve(rootDir, SWARM_ROOT);
+  const removed = [];
+
+  let entries;
+  try {
+    entries = await readdir(swarmDir);
+  } catch {
+    return removed; // .codex-swarm/ doesn't exist → nothing to clean
+  }
+
+  const wtDirs = entries.filter(e => e.startsWith('wt-'));
+  if (wtDirs.length === 0) return removed;
+
+  // Get registered worktree paths from git
+  let registeredPaths;
+  try {
+    const raw = await git(['worktree', 'list', '--porcelain'], rootDir);
+    registeredPaths = new Set(
+      raw.split('\n')
+        .filter(l => l.startsWith('worktree '))
+        .map(l => normPath(l.slice('worktree '.length))),
+    );
+  } catch {
+    return removed; // git worktree list failed → don't remove anything
+  }
+
+  for (const dir of wtDirs) {
+    const fullPath = resolve(swarmDir, dir);
+    const normalized = normPath(fullPath);
+    if (!registeredPaths.has(normalized)) {
+      try {
+        await rm(fullPath, { recursive: true, force: true });
+        removed.push(dir);
+      } catch { /* best-effort */ }
+    }
+  }
+
+  // Prune stale git references
+  if (removed.length > 0) {
+    try { await git(['worktree', 'prune'], rootDir); } catch { /* best-effort */ }
+  }
+
+  return removed;
+}
+
 /**
  * Fetch a remote shard's branch to the local repo via SSH.
  * Workaround for hosts that cannot push to GitHub (e.g. Ultra4).