hungry-ghost-hive 0.44.0 → 0.45.0

package/src/agents/intermediate.ts

@@ -106,7 +106,7 @@ ${this.memoryState.conversationSummary || 'Starting fresh.'}`;
 
     // Update story with branch name if not set
     if (!this.story.branch_name) {
-      updateStory(this.db, this.story.id, { branchName });
+      updateStory(this.db, this.story.id, { branchName }, this.storiesDir);
     }
 
     const prompt = `Implement this story:
@@ -144,7 +144,7 @@ Begin implementation.`;
     this.log('STORY_PROGRESS_UPDATE', 'Code changes proposed', { storyId: this.story.id });
 
     // Mark as complete
-    updateStory(this.db, this.story.id, { status: 'review' });
+    updateStory(this.db, this.story.id, { status: 'review' }, this.storiesDir);
     this.log('STORY_COMPLETED', 'Implementation complete, ready for review', {
       storyId: this.story.id,
       branchName,

package/src/agents/junior.ts

@@ -111,7 +111,7 @@ ${this.memoryState.conversationSummary || 'Starting fresh.'}`;
         .substring(0, 30)}`;
 
     if (!this.story.branch_name) {
-      updateStory(this.db, this.story.id, { branchName });
+      updateStory(this.db, this.story.id, { branchName }, this.storiesDir);
     }
 
     const prompt = `I need to implement this simple story:
@@ -149,7 +149,7 @@ Please help me identify which files I need to read and modify.`;
     this.log('STORY_PROGRESS_UPDATE', 'Making code changes', { storyId: this.story.id });
 
     // Complete
-    updateStory(this.db, this.story.id, { status: 'review' });
+    updateStory(this.db, this.story.id, { status: 'review' }, this.storiesDir);
     this.log('STORY_COMPLETED', 'Implementation complete, ready for review', {
       storyId: this.story.id,
       branchName,

package/src/agents/qa.ts

@@ -98,7 +98,7 @@ ${this.memoryState.conversationSummary || 'Starting fresh.'}`;
             storyId: story.id,
           }
         );
-        updateStory(this.db, story.id, { status: 'qa_failed' });
+        updateStory(this.db, story.id, { status: 'qa_failed' }, this.storiesDir);
         this.checkAndEscalate(story);
         return;
       }
@@ -124,7 +124,7 @@ ${this.memoryState.conversationSummary || 'Starting fresh.'}`;
     if (this.qaConfig.testCommand) {
       const testsPassed = await this.runTests(story.id);
       if (!testsPassed) {
-        updateStory(this.db, story.id, { status: 'qa_failed' });
+        updateStory(this.db, story.id, { status: 'qa_failed' }, this.storiesDir);
         this.checkAndEscalate(story);
         return;
       }
@@ -199,7 +199,7 @@ ${this.memoryState.conversationSummary || 'Starting fresh.'}`;
   private async createPR(story: StoryRow): Promise<void> {
     if (!story.branch_name) {
       this.log('STORY_PR_CREATED', 'No branch name, skipping PR creation', { storyId: story.id });
-      updateStory(this.db, story.id, { status: 'pr_submitted' });
+      updateStory(this.db, story.id, { status: 'pr_submitted' }, this.storiesDir);
       return;
     }
 
@@ -250,10 +250,15 @@ ${this.memoryState.conversationSummary || 'Starting fresh.'}`;
       });
 
       // Update story
-      updateStory(this.db, story.id, {
-        prUrl,
-        status: 'pr_submitted',
-      });
+      updateStory(
+        this.db,
+        story.id,
+        {
+          prUrl,
+          status: 'pr_submitted',
+        },
+        this.storiesDir
+      );
 
       this.log('STORY_PR_CREATED', `PR created: ${prUrl}`, {
         storyId: story.id,
@@ -267,7 +272,7 @@ ${this.memoryState.conversationSummary || 'Starting fresh.'}`;
       });
 
       // Still mark as pr_submitted since QA passed
-      updateStory(this.db, story.id, { status: 'pr_submitted' });
+      updateStory(this.db, story.id, { status: 'pr_submitted' }, this.storiesDir);
     }
   }
 

package/src/agents/senior.ts

@@ -118,10 +118,15 @@ This will help with story estimation and implementation.`;
 
   private async implementStory(story: StoryRow): Promise<void> {
     // Update assignment
-    updateStory(this.db, story.id, {
-      assignedAgentId: this.agentId,
-      status: 'in_progress',
-    });
+    updateStory(
+      this.db,
+      story.id,
+      {
+        assignedAgentId: this.agentId,
+        status: 'in_progress',
+      },
+      this.storiesDir
+    );
     updateAgent(this.db, this.agentId, { currentStoryId: story.id });
 
     // Create feature branch
@@ -162,10 +167,15 @@ Let me know when you're ready to proceed or if you have questions.`;
     this.log('STORY_PROGRESS_UPDATE', response.substring(0, 200), { storyId: story.id });
 
     // Mark for review when done (simplified)
-    updateStory(this.db, story.id, {
-      branchName,
-      status: 'review',
-    });
+    updateStory(
+      this.db,
+      story.id,
+      {
+        branchName,
+        status: 'review',
+      },
+      this.storiesDir
+    );
 
     this.log('STORY_COMPLETED', `Implementation complete, ready for review`, {
       storyId: story.id,
@@ -176,7 +186,7 @@ Let me know when you're ready to proceed or if you have questions.`;
   private async reviewStory(story: StoryRow): Promise<void> {
     if (story.assigned_agent_id === this.agentId) {
       // Self-review, move to QA
-      updateStory(this.db, story.id, { status: 'qa' });
+      updateStory(this.db, story.id, { status: 'qa' }, this.storiesDir);
       this.log('STORY_REVIEW_REQUESTED', 'Self-implemented, moving to QA', { storyId: story.id });
       return;
     }
@@ -207,14 +217,14 @@ If issues found, describe them. If approved, confirm.`;
 
     if (hasIssues) {
       // Send back for fixes
-      updateStory(this.db, story.id, { status: 'in_progress' });
+      updateStory(this.db, story.id, { status: 'in_progress' }, this.storiesDir);
       this.log('STORY_PROGRESS_UPDATE', 'Review issues found, sent back for fixes', {
         storyId: story.id,
         review: review.substring(0, 200),
       });
     } else {
       // Approve and move to QA
-      updateStory(this.db, story.id, { status: 'qa' });
+      updateStory(this.db, story.id, { status: 'qa' }, this.storiesDir);
       this.log('STORY_REVIEW_REQUESTED', 'Review passed, moving to QA', { storyId: story.id });
     }
   }

package/src/agents/tech-lead.ts

@@ -196,23 +196,35 @@ Respond in JSON format:
     const storyIds: string[] = [];
     const storyIdMap: Record<string, string> = {};
 
+    const hiveRoot = findHiveRoot(this.workDir);
+    const storiesDir = hiveRoot ? getHivePaths(hiveRoot).storiesDir : undefined;
+
     for (const story of analysis.stories) {
       const team = this.teams.find(t => t.name === story.teamName);
 
-      const storyRow = createStory(this.db, {
-        requirementId: this.requirement!.id,
-        teamId: team?.id,
-        title: story.title,
-        description: story.description,
-        acceptanceCriteria: story.acceptanceCriteria,
-      });
+      const storyRow = createStory(
+        this.db,
+        {
+          requirementId: this.requirement!.id,
+          teamId: team?.id,
+          title: story.title,
+          description: story.description,
+          acceptanceCriteria: story.acceptanceCriteria,
+        },
+        storiesDir
+      );
 
       // Update with complexity
-      updateStory(this.db, storyRow.id, {
-        complexityScore: story.estimatedComplexity,
-        storyPoints: story.estimatedComplexity,
-        status: 'estimated',
-      });
+      updateStory(
+        this.db,
+        storyRow.id,
+        {
+          complexityScore: story.estimatedComplexity,
+          storyPoints: story.estimatedComplexity,
+          status: 'estimated',
+        },
+        storiesDir
+      );
 
       storyIds.push(storyRow.id);
       storyIdMap[story.title] = storyRow.id;

package/src/cli/commands/assign.test.ts

@@ -133,6 +133,7 @@ CREATE TABLE IF NOT EXISTS stories (
           external_subtask_id: null,
           external_provider: null,
           in_sprint: 0,
+          markdown_path: null,
           created_at: new Date().toISOString(),
           updated_at: new Date().toISOString(),
         },
@@ -161,6 +162,7 @@ CREATE TABLE IF NOT EXISTS stories (
           external_subtask_id: null,
           external_provider: null,
           in_sprint: 0,
+          markdown_path: null,
           created_at: new Date().toISOString(),
           updated_at: new Date().toISOString(),
         },
@@ -246,6 +248,7 @@ CREATE TABLE IF NOT EXISTS stories (
           external_subtask_id: null,
           external_provider: null,
           in_sprint: 0,
+          markdown_path: null,
           created_at: new Date().toISOString(),
           updated_at: new Date().toISOString(),
         },
@@ -288,6 +291,7 @@ CREATE TABLE IF NOT EXISTS stories (
           external_subtask_id: null,
           external_provider: null,
           in_sprint: 0,
+          markdown_path: null,
           created_at: new Date().toISOString(),
           updated_at: new Date().toISOString(),
         },
@@ -316,6 +320,7 @@ CREATE TABLE IF NOT EXISTS stories (
           external_subtask_id: null,
           external_provider: null,
           in_sprint: 0,
+          markdown_path: null,
           created_at: new Date().toISOString(),
           updated_at: new Date().toISOString(),
         },

package/src/cli/commands/assign.ts

@@ -18,8 +18,10 @@ export const assignCommand = new Command('assign')
   .action(async (options: { dryRun?: boolean }) => {
     // Track if we need to start the manager after DB is closed
     let shouldStartManager = false;
+    let savedHiveDir: string | undefined;
 
     await withHiveContext(async ({ root, paths, db }) => {
+      savedHiveDir = paths.hiveDir;
       const spinner = ora('Assigning stories...').start();
 
       try {
@@ -167,7 +169,7 @@ export const assignCommand = new Command('assign')
         // Determine if we should start the manager, but don't start it yet
         // Wait until after withHiveContext closes the DB to prevent race condition
         if (result.assigned > 0) {
-          shouldStartManager = !(await isManagerRunning());
+          shouldStartManager = !(await isManagerRunning(paths.hiveDir));
         }
 
         console.log();
@@ -185,7 +187,7 @@ export const assignCommand = new Command('assign')
     // This prevents the race condition where manager loads stale DB state
     if (shouldStartManager) {
       const spinner = ora('Starting manager daemon...').start();
-      const started = await startManager(60);
+      const started = await startManager(60, savedHiveDir);
       if (started) {
         spinner.succeed(chalk.green('Manager daemon started (checking every 60s)'));
       } else {

package/src/cli/commands/manager/handoff-recovery.ts

@@ -10,6 +10,7 @@ import { createLog } from '../../../db/queries/logs.js';
 import { updateRequirement } from '../../../db/queries/requirements.js';
 import { getStoriesByStatus, updateStory } from '../../../db/queries/stories.js';
 import { isTmuxSessionRunning } from '../../../tmux/manager.js';
+import { getTechLeadSessionName } from '../../../utils/instance.js';
 import {
   createManagerNudgeEnvelope,
   sendToTmuxSession,
@@ -86,14 +87,15 @@ async function nudgeTechLeadForStalledHandoff(
   estimatedCount: number
 ): Promise<boolean> {
   // Brief lock for DB read
+  const fallbackSession = getTechLeadSessionName(ctx.paths.hiveDir);
   const techLeadInfo = await ctx.withDb(async db => {
     const techLead = getTechLead(db.db);
     return techLead
       ? {
-          sessionName: techLead.tmux_session || 'hive-tech-lead',
+          sessionName: techLead.tmux_session || fallbackSession,
           cliTool: (techLead.cli_tool || 'claude') as CLITool,
         }
-      : { sessionName: 'hive-tech-lead', cliTool: 'claude' as CLITool };
+      : { sessionName: fallbackSession, cliTool: 'claude' as CLITool };
   });
 
   if (!(await isTmuxSessionRunning(techLeadInfo.sessionName))) {

package/src/cli/commands/manager/index.ts

@@ -3,7 +3,6 @@
 import chalk from 'chalk';
 import { Command } from 'commander';
 import { createHash } from 'crypto';
-import { join } from 'path';
 import { ClusterRuntime, fetchLocalClusterStatus } from '../../../cluster/runtime.js';
 import { loadConfig } from '../../../config/loader.js';
 import type { HiveConfig } from '../../../config/schema.js';
@@ -26,6 +25,7 @@ import { AgentState } from '../../../state-detectors/types.js';
 import {
   captureTmuxPane,
   getHiveSessions,
+  getManagerSession,
   isManagerRunning,
   isTmuxSessionRunning,
   killTmuxSession,
@@ -34,6 +34,7 @@ import {
 import type { WithLockFn } from '../../../utils/auto-merge.js';
 import { autoMergeApprovedPRs } from '../../../utils/auto-merge.js';
 import type { CLITool } from '../../../utils/cli-commands.js';
+import { getManagerLockPath, getTechLeadSessionName } from '../../../utils/instance.js';
 import { withHiveContext, withHiveRoot } from '../../../utils/with-hive-context.js';
 import {
   agentStates,
@@ -265,7 +266,7 @@ managerCommand
     const config = loadConfig(paths.hiveDir);
     let clusterRuntime: ClusterRuntime | null = null;
 
-    const lockPath = join(paths.hiveDir, 'manager.lock');
+    const lockPath = getManagerLockPath(paths.hiveDir);
 
     // Acquire manager lock to ensure singleton
     let releaseLock: (() => Promise<void>) | null = null;
@@ -474,10 +475,12 @@ managerCommand
   .command('status')
   .description('Check if the manager daemon is running')
   .action(async () => {
-    const running = await isManagerRunning();
+    const { paths } = withHiveRoot(c => c);
+    const managerSession = getManagerSession(paths.hiveDir);
+    const running = await isManagerRunning(paths.hiveDir);
     if (running) {
-      console.log(chalk.green('Manager daemon is running (hive-manager tmux session)'));
-      console.log(chalk.gray('To view: tmux attach -t hive-manager'));
+      console.log(chalk.green(`Manager daemon is running (${managerSession} tmux session)`));
+      console.log(chalk.gray(`To view: tmux attach -t ${managerSession}`));
       console.log(chalk.gray('To stop: hive manager stop'));
     } else {
       console.log(chalk.yellow('Manager daemon is not running'));
@@ -490,7 +493,8 @@ managerCommand
   .command('stop')
   .description('Stop the manager daemon')
   .action(async () => {
-    const stopped = await stopManagerSession();
+    const { paths: stopPaths } = withHiveRoot(c => c);
+    const stopped = await stopManagerSession(stopPaths.hiveDir);
     if (stopped) {
       console.log(chalk.green('Manager daemon stopped'));
     } else {
@@ -535,8 +539,9 @@ async function managerCheck(
       const syncResult = await clusterRuntime.sync(db.db);
       if (!clusterRuntime.isLeader()) {
         const status = clusterRuntime.getStatus();
-        if (await isTmuxSessionRunning('hive-tech-lead')) {
-          await killTmuxSession('hive-tech-lead');
+        const techLeadSession = getTechLeadSessionName(paths.hiveDir);
+        if (await isTmuxSessionRunning(techLeadSession)) {
+          await killTmuxSession(techLeadSession);
         }
         const details = [];
         if (syncResult.local_events_emitted > 0) {
@@ -648,8 +653,8 @@ async function managerCheck(
 
   // Discover active tmux sessions
   verboseLogCtx(ctx, 'Step: discover hive tmux sessions');
-  const sessions = await getHiveSessions();
-  ctx.hiveSessions = sessions.filter(s => s.name.startsWith('hive-'));
+  const sessions = await getHiveSessions(ctx.paths.hiveDir);
+  ctx.hiveSessions = sessions;
   verboseLogCtx(ctx, `Discovered ${ctx.hiveSessions.length} hive session(s)`);
   await resolveOrphanedSessionEscalations(ctx);
 
@@ -966,7 +971,7 @@ async function scanAgentSessions(ctx: ManagerCheckContext): Promise<void> {
 
   // Phase 2: Per-session processing (tmux/AI outside lock, DB writes under brief locks)
   for (const session of ctx.hiveSessions) {
-    if (session.name === 'hive-manager') continue;
+    if (session.name === getManagerSession(ctx.paths.hiveDir)) continue;
 
     const agent = ctx.agentsBySessionName.get(session.name);
 

package/src/cli/commands/manager/tech-lead-lifecycle.ts

@@ -15,6 +15,7 @@ import {
   spawnTmuxSession,
 } from '../../../tmux/manager.js';
 import type { CLITool } from '../../../utils/cli-commands.js';
+import { getTechLeadSessionName } from '../../../utils/instance.js';
 import { findHiveRoot as findHiveRootFromDir, getHivePaths } from '../../../utils/paths.js';
 import { generateTechLeadPrompt } from '../req.js';
 import { detectAgentState } from './agent-monitoring.js';
@@ -150,10 +151,12 @@ export async function restartStaleTechLead(ctx: ManagerCheckContext): Promise<vo
           activeReq.description,
           teams,
           activeReq.godmode === 1,
-          activeReq.target_branch || 'main'
+          activeReq.target_branch || 'main',
+          getTechLeadSessionName(paths.hiveDir)
         );
       }
 
+      const techLeadInbox = getTechLeadSessionName(paths.hiveDir);
       return `You are the Tech Lead of Hive, an AI development team orchestrator.
 
 You have been restarted to refresh your context. No active requirement is currently being planned.
@@ -167,7 +170,7 @@ hive status
 
 2. Check your inbox for messages from developers:
 \`\`\`bash
-hive msg inbox hive-tech-lead
+hive msg inbox ${techLeadInbox}
 \`\`\`
 
 3. If there are pending requirements, begin planning them. If all work is complete, monitor for new requirements.`;

package/src/cli/commands/msg.ts

@@ -4,6 +4,7 @@ import chalk from 'chalk';
 import { Command } from 'commander';
 import { nanoid } from 'nanoid';
 import { queryAll, queryOne, run } from '../../db/client.js';
+import { getTechLeadSessionName } from '../../utils/instance.js';
 import { withHiveContext, withReadOnlyHiveContext } from '../../utils/with-hive-context.js';
 
 interface MessageRow {
@@ -24,12 +25,12 @@ msgCommand
   .command('send <to-session> <message>')
   .description('Send a message to another agent')
   .option('-s, --subject <subject>', 'Message subject')
-  .option('-f, --from <session>', 'Your session name (defaults to hive-tech-lead)')
+  .option('-f, --from <session>', 'Your session name (defaults to tech lead session)')
   .action(
     async (toSession: string, message: string, options: { subject?: string; from?: string }) => {
-      await withHiveContext(async ({ db }) => {
+      await withHiveContext(async ({ db, paths }) => {
         const id = `msg-${nanoid(8)}`;
-        const fromSession = options.from || 'hive-tech-lead';
+        const fromSession = options.from || getTechLeadSessionName(paths.hiveDir);
 
         run(
           db.db,
@@ -53,8 +54,8 @@ msgCommand
   .description('Check inbox for messages')
   .option('--all', 'Show all messages including read')
   .action(async (session: string | undefined, options: { all?: boolean }) => {
-    await withReadOnlyHiveContext(async ({ db }) => {
-      const targetSession = session || 'hive-tech-lead';
+    await withReadOnlyHiveContext(async ({ db, paths }) => {
+      const targetSession = session || getTechLeadSessionName(paths.hiveDir);
 
       let query = `
         SELECT * FROM messages
@@ -165,8 +166,8 @@ msgCommand
   .command('outbox [session]')
   .description('Check sent messages and their replies')
   .action(async (session: string | undefined) => {
-    await withReadOnlyHiveContext(async ({ db }) => {
-      const fromSession = session || 'hive-tech-lead';
+    await withReadOnlyHiveContext(async ({ db, paths }) => {
+      const fromSession = session || getTechLeadSessionName(paths.hiveDir);
 
       const messages = queryAll<MessageRow>(
         db.db,

package/src/cli/commands/my-stories.ts

@@ -228,7 +228,7 @@ myStoriesCommand
         process.exit(1);
       }
 
-      await withHiveContext(async ({ db }) => {
+      await withHiveContext(async ({ paths, db }) => {
         const agent = requireAgentBySession(db.db, options.session);
 
         if (!agent.team_id) {
@@ -245,19 +245,28 @@ myStoriesCommand
           ? trimmedTitle
           : `Refactor: ${trimmedTitle}`;
 
-        const story = createStory(db.db, {
-          teamId: agent.team_id,
-          title: normalizedTitle,
-          description: options.description.trim(),
-          acceptanceCriteria:
-            options.criteria && options.criteria.length > 0 ? options.criteria : null,
-        });
+        const story = createStory(
+          db.db,
+          {
+            teamId: agent.team_id,
+            title: normalizedTitle,
+            description: options.description.trim(),
+            acceptanceCriteria:
+              options.criteria && options.criteria.length > 0 ? options.criteria : null,
+          },
+          paths.storiesDir
+        );
 
-        const updatedStory = updateStory(db.db, story.id, {
-          complexityScore: points,
-          storyPoints: points,
-          status,
-        });
+        const updatedStory = updateStory(
+          db.db,
+          story.id,
+          {
+            complexityScore: points,
+            storyPoints: points,
+            status,
+          },
+          paths.storiesDir
+        );
 
         createLog(db.db, {
           agentId: agent.id,

package/src/cli/commands/nuke.test.ts

@@ -23,6 +23,16 @@ vi.mock('../../utils/with-hive-context.js', () => ({
   ),
 }));
 
+vi.mock('fs', async importOriginal => {
+  const actual = await importOriginal<typeof import('fs')>();
+  return {
+    ...actual,
+    existsSync: vi.fn(() => true),
+    unlinkSync: vi.fn(),
+  };
+});
+
+import { existsSync } from 'fs';
 import { queryAll, run } from '../../db/client.js';
 import { removeWorktree } from '../../git/worktree.js';
 import { killAllHiveSessions } from '../../tmux/manager.js';
@@ -31,6 +41,7 @@ import { nukeCommand } from './nuke.js';
 describe('nuke command', () => {
   beforeEach(() => {
     vi.clearAllMocks();
+    vi.mocked(existsSync).mockReturnValue(true);
   });
 
   describe('command structure', () => {
@@ -145,6 +156,26 @@ describe('nuke command', () => {
 
       expect(killAllHiveSessions).toHaveBeenCalled();
     });
+
+    it('should skip worktree removal when path does not exist on disk', async () => {
+      vi.mocked(queryAll).mockReturnValue([{ worktree_path: 'repos/team-agent-stale' }]);
+      vi.mocked(existsSync).mockReturnValue(false);
+
+      const agentsCmd = nukeCommand.commands.find(cmd => cmd.name() === 'agents');
+      await agentsCmd?.parseAsync(['--force'], { from: 'user' });
+
+      expect(removeWorktree).not.toHaveBeenCalled();
+    });
+
+    it('should call removeWorktree when worktree path exists on disk', async () => {
+      vi.mocked(queryAll).mockReturnValue([{ worktree_path: 'repos/team-agent-abc123' }]);
+      vi.mocked(existsSync).mockReturnValue(true);
+
+      const agentsCmd = nukeCommand.commands.find(cmd => cmd.name() === 'agents');
+      await agentsCmd?.parseAsync(['--force'], { from: 'user' });
+
+      expect(removeWorktree).toHaveBeenCalledWith('/root', 'repos/team-agent-abc123');
+    });
   });
 
   describe('nuke all worktree and table cleanup', () => {

package/src/cli/commands/nuke.ts

@@ -3,7 +3,7 @@
 import chalk from 'chalk';
 import { Command } from 'commander';
 import { existsSync, unlinkSync } from 'fs';
-import { join } from 'path';
+import { join, resolve } from 'path';
 import readline from 'readline';
 import { queryAll, queryOne, run } from '../../db/client.js';
 import { removeWorktree } from '../../git/worktree.js';
@@ -101,6 +101,13 @@ async function removeAgentWorktrees(
   let removed = 0;
   for (const agent of agents) {
     if (agent.worktree_path) {
+      const fullPath = resolve(root, agent.worktree_path);
+      if (!existsSync(fullPath)) {
+        if (process.env.HIVE_DEBUG) {
+          console.log(`[debug] skipping missing worktree: ${fullPath}`);
+        }
+        continue;
+      }
       const result = removeWorktree(root, agent.worktree_path);
       if (result.success) {
         removed++;
@@ -174,7 +181,7 @@ export const nukeCommand = new Command('nuke')
       .option('--force', 'Skip confirmation')
       .action(async (options: { force?: boolean }) => {
         try {
-          await withHiveContext(async ({ db, root }) => {
+          await withHiveContext(async ({ db, root, paths }) => {
             const count = queryOne<{ count: number }>(
               db.db,
               'SELECT COUNT(*) as count FROM agents'
@@ -199,7 +206,7 @@ export const nukeCommand = new Command('nuke')
             }
 
             // Kill all hive tmux sessions first (this should always work regardless of DB state)
-            const killed = await killAllHiveSessions();
+            const killed = await killAllHiveSessions(paths.hiveDir);
             console.log(chalk.gray(`Killed ${killed} tmux sessions.`));
 
             // Remove agent worktrees from filesystem before deleting agents from DB
@@ -232,7 +239,9 @@ export const nukeCommand = new Command('nuke')
           ) {
             console.error(chalk.red(`\nDatabase is corrupted: ${message}`));
             console.log(chalk.yellow('Killing tmux sessions anyway...'));
-            const killed = await killAllHiveSessions();
+            const hiveRoot = findHiveRoot();
+            const hDir = hiveRoot ? getHivePaths(hiveRoot).hiveDir : undefined;
+            const killed = await killAllHiveSessions(hDir);
             console.log(chalk.gray(`Killed ${killed} tmux sessions.`));
             console.log(
               chalk.yellow('Agent records could not be deleted from the corrupted database.')
@@ -309,7 +318,7 @@ export const nukeCommand = new Command('nuke')
       .option('--force', 'Skip confirmation')
       .action(async (options: { force?: boolean }) => {
         try {
-          await withHiveContext(async ({ db, root }) => {
+          await withHiveContext(async ({ db, root, paths }) => {
             console.log(chalk.red('\nThis will:'));
             console.log(chalk.yellow('  - Kill all hive tmux sessions'));
             console.log(chalk.yellow('  - Remove all agent git worktrees'));
@@ -333,7 +342,7 @@ export const nukeCommand = new Command('nuke')
             }
 
             // Kill all hive tmux sessions first (always works regardless of DB state)
-            const killed = await killAllHiveSessions();
+            const killed = await killAllHiveSessions(paths.hiveDir);
             console.log(chalk.gray(`Killed ${killed} tmux sessions.`));
 
             // Remove agent worktrees from filesystem before deleting agents from DB
@@ -371,7 +380,9 @@ export const nukeCommand = new Command('nuke')
           ) {
             console.error(chalk.red(`\nDatabase is corrupted: ${message}`));
             console.log(chalk.yellow('Killing tmux sessions anyway...'));
-            const killed = await killAllHiveSessions();
+            const hiveRoot2 = findHiveRoot();
+            const hDir2 = hiveRoot2 ? getHivePaths(hiveRoot2).hiveDir : undefined;
+            const killed = await killAllHiveSessions(hDir2);
             console.log(chalk.gray(`Killed ${killed} tmux sessions.`));
             console.log(
               chalk.yellow('Data records could not be deleted from the corrupted database.')