@automagik/genie 0.260202.1833 → 0.260203.43

package/src/term-commands/close.ts

@@ -15,10 +15,14 @@ import { $ } from 'bun';
 import { confirm } from '@inquirer/prompts';
 import * as tmux from '../lib/tmux.js';
 import * as registry from '../lib/worker-registry.js';
+import * as beadsRegistry from '../lib/beads-registry.js';
 import { WorktreeManager } from '../lib/worktree.js';
 import { join } from 'path';
 import { homedir } from 'os';
 
+// Use beads registry when enabled
+const useBeads = beadsRegistry.isBeadsRegistryEnabled();
+
 // ============================================================================
 // Types
 // ============================================================================
@@ -35,6 +39,8 @@ export interface CloseOptions {
 // ============================================================================
 
 const WORKTREE_BASE = join(homedir(), '.local', 'share', 'term', 'worktrees');
+// Worktrees are created inside the project at .genie/worktrees/<taskId>
+const WORKTREE_DIR_NAME = '.genie/worktrees';
 
 // ============================================================================
 // Helper Functions
@@ -101,8 +107,30 @@ async function mergeToMain(
 
 /**
  * Remove worktree
+ * Checks .genie/worktrees first, then bd worktree, then WorktreeManager
  */
 async function removeWorktree(taskId: string, repoPath: string): Promise<boolean> {
+  // First, check .genie/worktrees location (new location)
+  const inProjectWorktree = join(repoPath, WORKTREE_DIR_NAME, taskId);
+  try {
+    await $`git -C ${repoPath} worktree remove ${inProjectWorktree} --force`.quiet();
+    return true;
+  } catch {
+    // Worktree may not exist at this location, continue checking
+  }
+
+  // Try bd worktree when beads is enabled
+  if (useBeads) {
+    try {
+      const removed = await beadsRegistry.removeWorktree(taskId);
+      if (removed) return true;
+      // Fall through to WorktreeManager if bd worktree fails
+    } catch {
+      // Fall through
+    }
+  }
+
+  // Fallback to WorktreeManager (legacy location)
   try {
     const manager = new WorktreeManager({
       baseDir: WORKTREE_BASE,
@@ -141,8 +169,13 @@ export async function closeCommand(
   options: CloseOptions = {}
 ): Promise<void> {
   try {
-    // Find worker in registry
-    const worker = await registry.findByTask(taskId);
+    // Find worker in registry (check both during transition)
+    let worker = useBeads
+      ? await beadsRegistry.findByTask(taskId)
+      : null;
+    if (!worker) {
+      worker = await registry.findByTask(taskId);
+    }
 
     if (!worker) {
       console.log(`ℹ️  No active worker for ${taskId}. Closing issue only.`);
@@ -207,7 +240,19 @@ export async function closeCommand(
       await killWorkerPane(worker.paneId);
       console.log(`   ✅ Pane killed`);
 
-      // 5. Unregister worker
+      // 5. Unregister worker from both registries
+      if (useBeads) {
+        try {
+          // Unbind work from agent
+          await beadsRegistry.unbindWork(worker.id);
+          // Set agent state to done
+          await beadsRegistry.setAgentState(worker.id, 'done');
+          // Delete agent bead
+          await beadsRegistry.deleteAgent(worker.id);
+        } catch {
+          // Non-fatal if beads cleanup fails
+        }
+      }
       await registry.unregister(worker.id);
       console.log(`   ✅ Worker unregistered`);
     }

package/src/term-commands/create.ts

@@ -0,0 +1,95 @@
+/**
+ * Create command - Simple bd create wrapper
+ *
+ * Usage:
+ *   term create "Task title"                    - Create beads issue
+ *   term create "Task title" -d "Description"   - With description
+ *   term create "Task title" -p bd-1            - With parent/dependency
+ *
+ * Options:
+ *   -d, --description <text>  - Issue description
+ *   -p, --parent <id>         - Parent issue ID (creates dependency)
+ *   --json                    - Output as JSON
+ */
+
+import { $ } from 'bun';
+
+export interface CreateOptions {
+  description?: string;
+  parent?: string;
+  json?: boolean;
+}
+
+/**
+ * Run bd command and return result
+ */
+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() || error.message,
+      exitCode: error.exitCode || 1
+    };
+  }
+}
+
+export async function createCommand(
+  title: string,
+  options: CreateOptions = {}
+): Promise<void> {
+  // Build bd create command
+  const args = ['create', title];
+
+  if (options.description) {
+    args.push('--description', options.description);
+  }
+
+  // Run bd create
+  const { stdout, exitCode } = await runBd(args);
+
+  if (exitCode !== 0) {
+    console.error(`Failed to create issue: ${stdout}`);
+    process.exit(1);
+  }
+
+  // Extract issue ID from output
+  // bd create typically outputs something like "Created bd-123" or just the ID
+  const idMatch = stdout.match(/bd-\d+/);
+  const issueId = idMatch ? idMatch[0] : null;
+
+  if (!issueId) {
+    console.log(stdout);
+    return;
+  }
+
+  // If parent specified, add blockedBy relationship
+  if (options.parent) {
+    const { exitCode: updateExit } = await runBd([
+      'update',
+      issueId,
+      '--blocked-by',
+      options.parent,
+    ]);
+
+    if (updateExit !== 0) {
+      console.log(`Created ${issueId} (failed to set parent dependency)`);
+    }
+  }
+
+  if (options.json) {
+    // Fetch full issue details
+    const { stdout: showOutput } = await runBd(['show', issueId, '--json']);
+    console.log(showOutput);
+  } else {
+    console.log(`Created: ${issueId} - "${title}"`);
+    if (options.parent) {
+      console.log(`   Blocked by: ${options.parent}`);
+    }
+    console.log(`\nNext steps:`);
+    console.log(`   term work ${issueId}           - Start working on it`);
+    console.log(`   term spawn genie:wish -t ${issueId}  - Plan with wish skill`);
+    console.log(`   bd show ${issueId}             - View details`);
+  }
+}

package/src/term-commands/daemon.ts

@@ -0,0 +1,176 @@
+/**
+ * Daemon command - Manage beads daemon
+ *
+ * Usage:
+ *   term daemon start      - Start beads daemon (auto-commit, auto-sync)
+ *   term daemon stop       - Stop beads daemon
+ *   term daemon status     - Show daemon status
+ *   term daemon restart    - Restart daemon
+ *
+ * Options:
+ *   --auto-commit         - Enable auto-commit (default: true for start)
+ *   --auto-push           - Enable auto-push to remote
+ *   --json                - Output as JSON
+ */
+
+import * as beadsRegistry from '../lib/beads-registry.js';
+
+// ============================================================================
+// Types
+// ============================================================================
+
+export interface DaemonStartOptions {
+  autoCommit?: boolean;
+  autoPush?: boolean;
+}
+
+export interface DaemonStatusOptions {
+  json?: boolean;
+}
+
+// ============================================================================
+// Commands
+// ============================================================================
+
+/**
+ * Start the beads daemon
+ */
+export async function startCommand(options: DaemonStartOptions = {}): Promise<void> {
+  try {
+    // Check if already running
+    const status = await beadsRegistry.checkDaemonStatus();
+    if (status.running) {
+      console.log('ℹ️  Daemon is already running');
+      if (status.pid) {
+        console.log(`   PID: ${status.pid}`);
+      }
+      return;
+    }
+
+    console.log('🚀 Starting beads daemon...');
+    const started = await beadsRegistry.startDaemon({
+      autoCommit: options.autoCommit !== false, // Default to true
+      autoPush: options.autoPush,
+    });
+
+    if (started) {
+      console.log('   ✅ Daemon started');
+
+      // Show updated status
+      const newStatus = await beadsRegistry.checkDaemonStatus();
+      if (newStatus.pid) {
+        console.log(`   PID: ${newStatus.pid}`);
+      }
+      if (newStatus.autoCommit) {
+        console.log('   Auto-commit: enabled');
+      }
+      if (newStatus.autoPush) {
+        console.log('   Auto-push: enabled');
+      }
+    } else {
+      console.error('❌ Failed to start daemon');
+      console.log('   Check `bd daemon status` for details');
+      process.exit(1);
+    }
+  } catch (error: any) {
+    console.error(`❌ Error: ${error.message}`);
+    process.exit(1);
+  }
+}
+
+/**
+ * Stop the beads daemon
+ */
+export async function stopCommand(): Promise<void> {
+  try {
+    // Check if running
+    const status = await beadsRegistry.checkDaemonStatus();
+    if (!status.running) {
+      console.log('ℹ️  Daemon is not running');
+      return;
+    }
+
+    console.log('🛑 Stopping beads daemon...');
+    const stopped = await beadsRegistry.stopDaemon();
+
+    if (stopped) {
+      console.log('   ✅ Daemon stopped');
+    } else {
+      console.error('❌ Failed to stop daemon');
+      process.exit(1);
+    }
+  } catch (error: any) {
+    console.error(`❌ Error: ${error.message}`);
+    process.exit(1);
+  }
+}
+
+/**
+ * Show daemon status
+ */
+export async function statusCommand(options: DaemonStatusOptions = {}): Promise<void> {
+  try {
+    const status = await beadsRegistry.checkDaemonStatus();
+
+    if (options.json) {
+      console.log(JSON.stringify(status, null, 2));
+      return;
+    }
+
+    console.log('Beads Daemon Status');
+    console.log('───────────────────');
+    console.log(`Running: ${status.running ? '✅ yes' : '❌ no'}`);
+
+    if (status.running) {
+      if (status.pid) {
+        console.log(`PID: ${status.pid}`);
+      }
+      if (status.lastSync) {
+        console.log(`Last sync: ${status.lastSync}`);
+      }
+      if (status.autoCommit !== undefined) {
+        console.log(`Auto-commit: ${status.autoCommit ? 'enabled' : 'disabled'}`);
+      }
+      if (status.autoPush !== undefined) {
+        console.log(`Auto-push: ${status.autoPush ? 'enabled' : 'disabled'}`);
+      }
+    } else {
+      console.log('\nRun `term daemon start` to start the daemon');
+    }
+  } catch (error: any) {
+    console.error(`❌ Error: ${error.message}`);
+    process.exit(1);
+  }
+}
+
+/**
+ * Restart the beads daemon
+ */
+export async function restartCommand(options: DaemonStartOptions = {}): Promise<void> {
+  try {
+    // Check if running and stop
+    const status = await beadsRegistry.checkDaemonStatus();
+    if (status.running) {
+      console.log('🛑 Stopping beads daemon...');
+      await beadsRegistry.stopDaemon();
+      console.log('   ✅ Stopped');
+    }
+
+    // Start with new options
+    console.log('🚀 Starting beads daemon...');
+    const started = await beadsRegistry.startDaemon({
+      autoCommit: options.autoCommit !== false,
+      autoPush: options.autoPush,
+    });
+
+    if (started) {
+      console.log('   ✅ Daemon restarted');
+    } else {
+      console.error('❌ Failed to restart daemon');
+      process.exit(1);
+    }
+  } catch (error: any) {
+    console.error(`❌ Error: ${error.message}`);
+    process.exit(1);
+  }
+}

package/src/term-commands/kill.ts

@@ -9,13 +9,18 @@
  *   --keep-worktree        - Don't remove the worktree
  */
 
+import { $ } from 'bun';
 import { confirm } from '@inquirer/prompts';
 import * as tmux from '../lib/tmux.js';
 import * as registry from '../lib/worker-registry.js';
+import * as beadsRegistry from '../lib/beads-registry.js';
 import { WorktreeManager } from '../lib/worktree.js';
 import { join } from 'path';
 import { homedir } from 'os';
 
+// Use beads registry when enabled
+const useBeads = beadsRegistry.isBeadsRegistryEnabled();
+
 // ============================================================================
 // Types
 // ============================================================================
@@ -30,6 +35,8 @@ export interface KillOptions {
 // ============================================================================
 
 const WORKTREE_BASE = join(homedir(), '.local', 'share', 'term', 'worktrees');
+// Worktrees are created inside the project at .genie/worktrees/<taskId>
+const WORKTREE_DIR_NAME = '.genie/worktrees';
 
 // ============================================================================
 // Helper Functions
@@ -49,8 +56,30 @@ async function killWorkerPane(paneId: string): Promise<boolean> {
 
 /**
  * Remove worktree
+ * Checks .genie/worktrees first, then bd worktree, then WorktreeManager
  */
 async function removeWorktree(taskId: string, repoPath: string): Promise<boolean> {
+  // First, check .genie/worktrees location (new location)
+  const inProjectWorktree = join(repoPath, WORKTREE_DIR_NAME, taskId);
+  try {
+    await $`git -C ${repoPath} worktree remove ${inProjectWorktree} --force`.quiet();
+    return true;
+  } catch {
+    // Worktree may not exist at this location, continue checking
+  }
+
+  // Try bd worktree when beads is enabled
+  if (useBeads) {
+    try {
+      const removed = await beadsRegistry.removeWorktree(taskId);
+      if (removed) return true;
+      // Fall through to WorktreeManager if bd worktree fails
+    } catch {
+      // Fall through
+    }
+  }
+
+  // Fallback to WorktreeManager (legacy location)
   try {
     const manager = new WorktreeManager({
       baseDir: WORKTREE_BASE,
@@ -77,19 +106,32 @@ export async function killCommand(
   options: KillOptions = {}
 ): Promise<void> {
   try {
-    // Find worker by ID or pane
+    // Find worker by ID or pane (check both registries during transition)
     let worker = await registry.get(target);
 
+    if (!worker && useBeads) {
+      // Try beads registry
+      worker = await beadsRegistry.getWorker(target);
+    }
+
     if (!worker) {
       // Try finding by pane ID
       worker = await registry.findByPane(target);
     }
 
+    if (!worker && useBeads) {
+      worker = await beadsRegistry.findByPane(target);
+    }
+
     if (!worker) {
       // Try finding by task ID
       worker = await registry.findByTask(target);
     }
 
+    if (!worker && useBeads) {
+      worker = await beadsRegistry.findByTask(target);
+    }
+
     if (!worker) {
       console.error(`❌ Worker "${target}" not found.`);
       console.log(`   Run \`term workers\` to see active workers.`);
@@ -127,7 +169,19 @@ export async function killCommand(
       }
     }
 
-    // 3. Unregister worker
+    // 3. Unregister worker from both registries
+    if (useBeads) {
+      try {
+        // Unbind work from agent
+        await beadsRegistry.unbindWork(worker.id);
+        // Set agent state to error (killed, not done)
+        await beadsRegistry.setAgentState(worker.id, 'error');
+        // Delete agent bead
+        await beadsRegistry.deleteAgent(worker.id);
+      } catch {
+        // Non-fatal if beads cleanup fails
+      }
+    }
     await registry.unregister(worker.id);
     console.log(`   ✅ Worker unregistered`);
 

package/src/term-commands/orchestrate.ts

@@ -243,8 +243,9 @@ export async function sendMessage(
   try {
     const { paneId } = await getSessionPane(sessionName, options.pane);
 
-    // Send the message
-    await tmux.executeCommand(paneId, message, false, false);
+    // Send the message cleanly (no TMUX_MCP markers)
+    const escapedMessage = message.replace(/'/g, "'\\''");
+    await tmux.executeTmux(`send-keys -t '${paneId}' '${escapedMessage}' Enter`);
 
     if (options.noWait) {
       console.log(`✅ Message sent to session "${sessionName}"`);

package/src/term-commands/send.ts

@@ -1,6 +1,15 @@
 import * as tmux from '../lib/tmux.js';
 
-export async function sendKeysToSession(sessionName: string, keys: string): Promise<void> {
+export interface SendOptions {
+  enter?: boolean;
+  pane?: string;
+}
+
+export async function sendKeysToSession(
+  sessionName: string,
+  keys: string,
+  options: SendOptions = {}
+): Promise<void> {
   try {
     // Find session
     const session = await tmux.findSessionByName(sessionName);
@@ -9,24 +18,43 @@ export async function sendKeysToSession(sessionName: string, keys: string): Prom
       process.exit(1);
     }
 
-    // Get first window and pane
-    const windows = await tmux.listWindows(session.id);
-    if (!windows || windows.length === 0) {
-      console.error(`❌ No windows found in session "${sessionName}"`);
-      process.exit(1);
-    }
+    let paneId: string;
 
-    const panes = await tmux.listPanes(windows[0].id);
-    if (!panes || panes.length === 0) {
-      console.error(`❌ No panes found in session "${sessionName}"`);
-      process.exit(1);
+    // Use specified pane or find first pane
+    if (options.pane) {
+      paneId = options.pane.startsWith('%') ? options.pane : `%${options.pane}`;
+    } else {
+      // Get first window and pane
+      const windows = await tmux.listWindows(session.id);
+      if (!windows || windows.length === 0) {
+        console.error(`❌ No windows found in session "${sessionName}"`);
+        process.exit(1);
+      }
+
+      const panes = await tmux.listPanes(windows[0].id);
+      if (!panes || panes.length === 0) {
+        console.error(`❌ No panes found in session "${sessionName}"`);
+        process.exit(1);
+      }
+
+      paneId = panes[0].id;
     }
 
-    const paneId = panes[0].id;
+    // Default: enter is true (append Enter key)
+    const withEnter = options.enter !== false;
+
+    // Escape single quotes for shell
+    const escapedKeys = keys.replace(/'/g, "'\\''");
+
+    if (withEnter) {
+      // Send keys with Enter appended
+      await tmux.executeTmux(`send-keys -t '${paneId}' '${escapedKeys}' Enter`);
+    } else {
+      // Send raw keys without Enter
+      await tmux.executeTmux(`send-keys -t '${paneId}' '${escapedKeys}'`);
+    }
 
-    // Send keys without Enter
-    await tmux.executeCommand(paneId, keys, false, true);
-    console.log(`✅ Keys sent to session "${sessionName}"`);
+    console.log(`✅ Keys sent to session "${sessionName}"${withEnter ? ' (with Enter)' : ''}`);
   } catch (error: any) {
     console.error(`❌ Error sending keys: ${error.message}`);
     process.exit(1);