@automagik/genie 0.260202.530 → 0.260202.1833

package/src/lib/worker-registry.ts

@@ -0,0 +1,229 @@
+/**
+ * Worker Registry - Manages worker state persistence
+ *
+ * Tracks Claude workers bound to beads issues, storing state in
+ * ~/.config/term/workers.json
+ */
+
+import { mkdir, readFile, writeFile } from 'fs/promises';
+import { join, dirname } from 'path';
+import { homedir } from 'os';
+
+// ============================================================================
+// Types
+// ============================================================================
+
+export type WorkerState =
+  | 'spawning'    // Worker being created
+  | 'working'     // Actively producing output
+  | 'idle'        // At prompt, waiting for input
+  | 'permission'  // Waiting for permission approval
+  | 'question'    // Waiting for question answer
+  | 'done'        // Task completed, ready for close
+  | 'error';      // Encountered error
+
+export interface Worker {
+  /** Unique worker ID (usually matches taskId, e.g., "bd-42") */
+  id: string;
+  /** tmux pane ID (e.g., "%16") */
+  paneId: string;
+  /** tmux session name */
+  session: string;
+  /** Path to git worktree, null if using shared repo */
+  worktree: string | null;
+  /** Beads issue ID this worker is bound to */
+  taskId: string;
+  /** Task title from beads */
+  taskTitle?: string;
+  /** Associated wish slug (if from decompose) */
+  wishSlug?: string;
+  /** Execution group number within wish */
+  groupNumber?: number;
+  /** ISO timestamp when worker was started */
+  startedAt: string;
+  /** Current worker state */
+  state: WorkerState;
+  /** Last state change timestamp */
+  lastStateChange: string;
+  /** Repository path where worker operates */
+  repoPath: string;
+}
+
+export interface WorkerRegistry {
+  workers: Record<string, Worker>;
+  lastUpdated: string;
+}
+
+// ============================================================================
+// Configuration
+// ============================================================================
+
+const CONFIG_DIR = join(homedir(), '.config', 'term');
+const REGISTRY_FILE = join(CONFIG_DIR, 'workers.json');
+
+// ============================================================================
+// Private Functions
+// ============================================================================
+
+async function ensureConfigDir(): Promise<void> {
+  await mkdir(CONFIG_DIR, { recursive: true });
+}
+
+async function loadRegistry(): Promise<WorkerRegistry> {
+  try {
+    const content = await readFile(REGISTRY_FILE, 'utf-8');
+    return JSON.parse(content);
+  } catch {
+    return { workers: {}, lastUpdated: new Date().toISOString() };
+  }
+}
+
+async function saveRegistry(registry: WorkerRegistry): Promise<void> {
+  await ensureConfigDir();
+  registry.lastUpdated = new Date().toISOString();
+  await writeFile(REGISTRY_FILE, JSON.stringify(registry, null, 2));
+}
+
+// ============================================================================
+// Public API
+// ============================================================================
+
+/**
+ * Register a new worker in the registry
+ */
+export async function register(worker: Worker): Promise<void> {
+  const registry = await loadRegistry();
+  registry.workers[worker.id] = worker;
+  await saveRegistry(registry);
+}
+
+/**
+ * Unregister (remove) a worker from the registry
+ */
+export async function unregister(id: string): Promise<void> {
+  const registry = await loadRegistry();
+  delete registry.workers[id];
+  await saveRegistry(registry);
+}
+
+/**
+ * Get a worker by ID
+ */
+export async function get(id: string): Promise<Worker | null> {
+  const registry = await loadRegistry();
+  return registry.workers[id] || null;
+}
+
+/**
+ * List all workers
+ */
+export async function list(): Promise<Worker[]> {
+  const registry = await loadRegistry();
+  return Object.values(registry.workers);
+}
+
+/**
+ * Update a worker's state
+ */
+export async function updateState(id: string, state: WorkerState): Promise<void> {
+  const registry = await loadRegistry();
+  const worker = registry.workers[id];
+  if (worker) {
+    worker.state = state;
+    worker.lastStateChange = new Date().toISOString();
+    await saveRegistry(registry);
+  }
+}
+
+/**
+ * Update multiple worker fields
+ */
+export async function update(id: string, updates: Partial<Worker>): Promise<void> {
+  const registry = await loadRegistry();
+  const worker = registry.workers[id];
+  if (worker) {
+    Object.assign(worker, updates);
+    if (updates.state) {
+      worker.lastStateChange = new Date().toISOString();
+    }
+    await saveRegistry(registry);
+  }
+}
+
+/**
+ * Find worker by tmux pane ID
+ */
+export async function findByPane(paneId: string): Promise<Worker | null> {
+  const workers = await list();
+  // Normalize pane ID (with or without % prefix)
+  const normalizedPaneId = paneId.startsWith('%') ? paneId : `%${paneId}`;
+  return workers.find(w => w.paneId === normalizedPaneId) || null;
+}
+
+/**
+ * Find worker by beads task ID
+ */
+export async function findByTask(taskId: string): Promise<Worker | null> {
+  const workers = await list();
+  return workers.find(w => w.taskId === taskId) || null;
+}
+
+/**
+ * Find workers by wish slug
+ */
+export async function findByWish(wishSlug: string): Promise<Worker[]> {
+  const workers = await list();
+  return workers.filter(w => w.wishSlug === wishSlug);
+}
+
+/**
+ * Check if a worker exists for a given task
+ */
+export async function hasWorkerForTask(taskId: string): Promise<boolean> {
+  const worker = await findByTask(taskId);
+  return worker !== null;
+}
+
+/**
+ * Get workers in a specific state
+ */
+export async function getByState(state: WorkerState): Promise<Worker[]> {
+  const workers = await list();
+  return workers.filter(w => w.state === state);
+}
+
+/**
+ * Calculate elapsed time for a worker
+ */
+export function getElapsedTime(worker: Worker): { ms: number; formatted: string } {
+  const startTime = new Date(worker.startedAt).getTime();
+  const ms = Date.now() - startTime;
+
+  const minutes = Math.floor(ms / 60000);
+  const hours = Math.floor(minutes / 60);
+
+  let formatted: string;
+  if (hours > 0) {
+    formatted = `${hours}h ${minutes % 60}m`;
+  } else if (minutes > 0) {
+    formatted = `${minutes}m`;
+  } else {
+    formatted = '<1m';
+  }
+
+  return { ms, formatted };
+}
+
+/**
+ * Get the config directory path
+ */
+export function getConfigDir(): string {
+  return CONFIG_DIR;
+}
+
+/**
+ * Get the registry file path
+ */
+export function getRegistryPath(): string {
+  return REGISTRY_FILE;
+}

package/src/term-commands/close.ts

@@ -0,0 +1,221 @@
+/**
+ * Close command - Close beads issue and cleanup worker
+ *
+ * Usage:
+ *   term close <bd-id>     - Close issue, cleanup worktree, kill worker
+ *
+ * Options:
+ *   --no-sync              - Skip bd sync
+ *   --keep-worktree        - Don't remove the worktree
+ *   --merge                - Merge worktree changes to main branch
+ *   -y, --yes              - Skip confirmation
+ */
+
+import { $ } from 'bun';
+import { confirm } from '@inquirer/prompts';
+import * as tmux from '../lib/tmux.js';
+import * as registry from '../lib/worker-registry.js';
+import { WorktreeManager } from '../lib/worktree.js';
+import { join } from 'path';
+import { homedir } from 'os';
+
+// ============================================================================
+// Types
+// ============================================================================
+
+export interface CloseOptions {
+  noSync?: boolean;
+  keepWorktree?: boolean;
+  merge?: boolean;
+  yes?: boolean;
+}
+
+// ============================================================================
+// Configuration
+// ============================================================================
+
+const WORKTREE_BASE = join(homedir(), '.local', 'share', 'term', 'worktrees');
+
+// ============================================================================
+// Helper Functions
+// ============================================================================
+
+/**
+ * Run bd command
+ */
+async function runBd(args: string[]): Promise<{ stdout: string; exitCode: number }> {
+  try {
+    const result = await $`bd ${args}`.quiet();
+    return { stdout: result.stdout.toString().trim(), exitCode: 0 };
+  } catch (error: any) {
+    return { stdout: error.stdout?.toString().trim() || '', exitCode: error.exitCode || 1 };
+  }
+}
+
+/**
+ * Close beads issue
+ */
+async function closeBeadsIssue(taskId: string): Promise<boolean> {
+  const { exitCode } = await runBd(['close', taskId]);
+  return exitCode === 0;
+}
+
+/**
+ * Sync beads to git
+ */
+async function syncBeads(): Promise<boolean> {
+  const { exitCode } = await runBd(['sync']);
+  return exitCode === 0;
+}
+
+/**
+ * Merge worktree branch to main
+ */
+async function mergeToMain(
+  repoPath: string,
+  branchName: string
+): Promise<boolean> {
+  try {
+    // Get current branch
+    const currentResult = await $`git -C ${repoPath} branch --show-current`.quiet();
+    const currentBranch = currentResult.stdout.toString().trim();
+
+    if (currentBranch === branchName) {
+      console.log(`⚠️  Already on branch ${branchName}. Skipping merge.`);
+      return true;
+    }
+
+    // Checkout main and merge
+    console.log(`   Switching to ${currentBranch}...`);
+    await $`git -C ${repoPath} checkout ${currentBranch}`.quiet();
+
+    console.log(`   Merging ${branchName}...`);
+    await $`git -C ${repoPath} merge ${branchName} --no-edit`.quiet();
+
+    return true;
+  } catch (error: any) {
+    console.error(`⚠️  Merge failed: ${error.message}`);
+    return false;
+  }
+}
+
+/**
+ * Remove worktree
+ */
+async function removeWorktree(taskId: string, repoPath: string): Promise<boolean> {
+  try {
+    const manager = new WorktreeManager({
+      baseDir: WORKTREE_BASE,
+      repoPath,
+    });
+
+    if (await manager.worktreeExists(taskId)) {
+      await manager.removeWorktree(taskId);
+      return true;
+    }
+    return true; // Already doesn't exist
+  } catch (error: any) {
+    console.error(`⚠️  Failed to remove worktree: ${error.message}`);
+    return false;
+  }
+}
+
+/**
+ * Kill worker pane
+ */
+async function killWorkerPane(paneId: string): Promise<boolean> {
+  try {
+    await tmux.killPane(paneId);
+    return true;
+  } catch {
+    return false; // Pane may already be gone
+  }
+}
+
+// ============================================================================
+// Main Command
+// ============================================================================
+
+export async function closeCommand(
+  taskId: string,
+  options: CloseOptions = {}
+): Promise<void> {
+  try {
+    // Find worker in registry
+    const worker = await registry.findByTask(taskId);
+
+    if (!worker) {
+      console.log(`ℹ️  No active worker for ${taskId}. Closing issue only.`);
+    }
+
+    // Confirm with user
+    if (!options.yes) {
+      const confirmed = await confirm({
+        message: `Close ${taskId}${worker ? ` and kill worker (pane ${worker.paneId})` : ''}?`,
+        default: true,
+      });
+
+      if (!confirmed) {
+        console.log('Cancelled.');
+        return;
+      }
+    }
+
+    // 1. Close beads issue
+    console.log(`📝 Closing ${taskId}...`);
+    const closed = await closeBeadsIssue(taskId);
+    if (!closed) {
+      console.error(`❌ Failed to close ${taskId}. Check \`bd show ${taskId}\`.`);
+      // Continue with cleanup anyway
+    } else {
+      console.log(`   ✅ Issue closed`);
+    }
+
+    // 2. Sync beads (unless --no-sync)
+    if (!options.noSync) {
+      console.log(`🔄 Syncing beads...`);
+      const synced = await syncBeads();
+      if (synced) {
+        console.log(`   ✅ Synced to git`);
+      } else {
+        console.log(`   ⚠️  Sync failed (non-fatal)`);
+      }
+    }
+
+    // 3. Handle worktree
+    if (worker?.worktree && !options.keepWorktree) {
+      // Merge if requested
+      if (options.merge) {
+        console.log(`🔀 Merging changes...`);
+        const merged = await mergeToMain(worker.repoPath, taskId);
+        if (merged) {
+          console.log(`   ✅ Merged to main`);
+        }
+      }
+
+      // Remove worktree
+      console.log(`🌳 Removing worktree...`);
+      const removed = await removeWorktree(taskId, worker.repoPath);
+      if (removed) {
+        console.log(`   ✅ Worktree removed`);
+      }
+    }
+
+    // 4. Kill worker pane
+    if (worker) {
+      console.log(`💀 Killing worker pane...`);
+      await killWorkerPane(worker.paneId);
+      console.log(`   ✅ Pane killed`);
+
+      // 5. Unregister worker
+      await registry.unregister(worker.id);
+      console.log(`   ✅ Worker unregistered`);
+    }
+
+    console.log(`\n✅ ${taskId} closed successfully`);
+
+  } catch (error: any) {
+    console.error(`❌ Error: ${error.message}`);
+    process.exit(1);
+  }
+}

package/src/term-commands/exec.ts

@@ -1,6 +1,16 @@
 import * as tmux from '../lib/tmux.js';
+import { getTerminalConfig } from '../lib/genie-config.js';
 
-export async function executeInSession(target: string, command: string): Promise<void> {
+export interface ExecOptions {
+  quiet?: boolean;
+  timeout?: number;
+}
+
+export async function executeInSession(
+  target: string,
+  command: string,
+  options: ExecOptions = {}
+): Promise<void> {
   // Parse target: "session:window" or just "session"
   const [sessionName, windowName] = target.includes(':')
     ? target.split(':')
@@ -10,7 +20,9 @@ export async function executeInSession(target: string, command: string): Promise
     // Find or create session
     let session = await tmux.findSessionByName(sessionName);
     if (!session) {
-      console.error(`Session "${sessionName}" not found, creating...`);
+      if (!options.quiet) {
+        console.error(`Session "${sessionName}" not found, creating...`);
+      }
       session = await tmux.createSession(sessionName);
       if (!session) {
         console.error(`Failed to create session "${sessionName}"`);
@@ -22,7 +34,9 @@ export async function executeInSession(target: string, command: string): Promise
     let windows = await tmux.listWindows(session.id);
     let targetWindow = windows.find(w => w.name === windowName);
     if (!targetWindow) {
-      console.error(`Window "${windowName}" not found, creating...`);
+      if (!options.quiet) {
+        console.error(`Window "${windowName}" not found, creating...`);
+      }
       targetWindow = await tmux.createWindow(session.id, windowName);
       if (!targetWindow) {
         console.error(`Failed to create window "${windowName}"`);
@@ -37,11 +51,19 @@ export async function executeInSession(target: string, command: string): Promise
       process.exit(1);
     }
 
+    // Use config default if no timeout specified
+    const termConfig = getTerminalConfig();
+    const timeout = options.timeout ?? termConfig.execTimeout;
+
     // Run command synchronously using wait-for (no polling, no ugly markers)
-    const { output, exitCode } = await tmux.runCommandSync(panes[0].id, command);
+    const { output, exitCode } = await tmux.runCommandSync(
+      panes[0].id,
+      command,
+      timeout
+    );
 
-    // Output the result
-    if (output) {
+    // Output the result (unless quiet mode)
+    if (output && !options.quiet) {
       console.log(output);
     }
 

package/src/term-commands/kill.ts

@@ -0,0 +1,143 @@
+/**
+ * Kill command - Force kill a worker
+ *
+ * Usage:
+ *   term kill <worker>     - Kill worker by ID or pane
+ *
+ * Options:
+ *   -y, --yes              - Skip confirmation
+ *   --keep-worktree        - Don't remove the worktree
+ */
+
+import { confirm } from '@inquirer/prompts';
+import * as tmux from '../lib/tmux.js';
+import * as registry from '../lib/worker-registry.js';
+import { WorktreeManager } from '../lib/worktree.js';
+import { join } from 'path';
+import { homedir } from 'os';
+
+// ============================================================================
+// Types
+// ============================================================================
+
+export interface KillOptions {
+  yes?: boolean;
+  keepWorktree?: boolean;
+}
+
+// ============================================================================
+// Configuration
+// ============================================================================
+
+const WORKTREE_BASE = join(homedir(), '.local', 'share', 'term', 'worktrees');
+
+// ============================================================================
+// Helper Functions
+// ============================================================================
+
+/**
+ * Kill worker pane
+ */
+async function killWorkerPane(paneId: string): Promise<boolean> {
+  try {
+    await tmux.killPane(paneId);
+    return true;
+  } catch {
+    return false; // Pane may already be gone
+  }
+}
+
+/**
+ * Remove worktree
+ */
+async function removeWorktree(taskId: string, repoPath: string): Promise<boolean> {
+  try {
+    const manager = new WorktreeManager({
+      baseDir: WORKTREE_BASE,
+      repoPath,
+    });
+
+    if (await manager.worktreeExists(taskId)) {
+      await manager.removeWorktree(taskId);
+      return true;
+    }
+    return true; // Already doesn't exist
+  } catch (error: any) {
+    console.error(`⚠️  Failed to remove worktree: ${error.message}`);
+    return false;
+  }
+}
+
+// ============================================================================
+// Main Command
+// ============================================================================
+
+export async function killCommand(
+  target: string,
+  options: KillOptions = {}
+): Promise<void> {
+  try {
+    // Find worker by ID or pane
+    let worker = await registry.get(target);
+
+    if (!worker) {
+      // Try finding by pane ID
+      worker = await registry.findByPane(target);
+    }
+
+    if (!worker) {
+      // Try finding by task ID
+      worker = await registry.findByTask(target);
+    }
+
+    if (!worker) {
+      console.error(`❌ Worker "${target}" not found.`);
+      console.log(`   Run \`term workers\` to see active workers.`);
+      process.exit(1);
+    }
+
+    // Confirm with user
+    if (!options.yes) {
+      const confirmed = await confirm({
+        message: `Kill worker ${worker.id} (pane ${worker.paneId})?`,
+        default: true,
+      });
+
+      if (!confirmed) {
+        console.log('Cancelled.');
+        return;
+      }
+    }
+
+    // 1. Kill worker pane
+    console.log(`💀 Killing worker pane ${worker.paneId}...`);
+    const killed = await killWorkerPane(worker.paneId);
+    if (killed) {
+      console.log(`   ✅ Pane killed`);
+    } else {
+      console.log(`   ℹ️  Pane already gone`);
+    }
+
+    // 2. Remove worktree (unless --keep-worktree)
+    if (worker.worktree && !options.keepWorktree) {
+      console.log(`🌳 Removing worktree...`);
+      const removed = await removeWorktree(worker.taskId, worker.repoPath);
+      if (removed) {
+        console.log(`   ✅ Worktree removed`);
+      }
+    }
+
+    // 3. Unregister worker
+    await registry.unregister(worker.id);
+    console.log(`   ✅ Worker unregistered`);
+
+    // 4. Note about task status
+    console.log(`\n⚠️  Task ${worker.taskId} is still in_progress in beads.`);
+    console.log(`   Run \`bd update ${worker.taskId} --status open\` to reopen,`);
+    console.log(`   or \`term work ${worker.taskId}\` to start a new worker.`);
+
+  } catch (error: any) {
+    console.error(`❌ Error: ${error.message}`);
+    process.exit(1);
+  }
+}