hungry-ghost-hive 0.43.2 → 0.45.0

package/src/context-files/generator.ts

@@ -92,7 +92,8 @@ export function getAgentRoleDescription(agentType: string): string {
 /**
  * Format hive msg command examples
  */
-export function formatHiveMsgCommands(agentId?: string): string {
+export function formatHiveMsgCommands(agentId?: string, techLeadSession?: string): string {
+  const tlSession = techLeadSession || 'hive-tech-lead';
   return `
 ## Communication with Hive Team
 
@@ -103,7 +104,7 @@ Use \`hive msg\` to communicate with other team members:
 hive msg send hive-senior-<team> "Your question here"
 
 # Send a message to the tech lead
-hive msg send hive-tech-lead "Your question here"
+hive msg send ${tlSession} "Your question here"
 
 # Check your inbox
 hive msg inbox ${agentId || 'your-agent-id'}

package/src/context-files/index.test.ts

@@ -108,6 +108,7 @@ describe('context-files module', () => {
       external_subtask_id: null,
       external_provider: null,
       in_sprint: 0,
+      markdown_path: null,
       created_at: new Date().toISOString(),
       updated_at: new Date().toISOString(),
     };
@@ -205,6 +206,7 @@ describe('context-files module', () => {
         checkpoint_threshold: 14000,
         llm_timeout_ms: 1800000,
         llm_max_retries: 2,
+        chrome_enabled: 'auto',
       },
       manager: {
         fast_poll_interval: 15000,

package/src/db/client.ts

@@ -562,6 +562,12 @@ const MIGRATIONS: MigrationDefinition[] = [
       `);
     },
   },
+  {
+    name: '015-add-story-markdown-path.sql',
+    up: db => {
+      db.run('ALTER TABLE stories ADD COLUMN markdown_path TEXT');
+    },
+  },
 ];
 
 function runMigrations(db: SqlJsDatabase): void {
@@ -833,6 +839,7 @@ export interface StoryRow {
   external_subtask_id: string | null;
   external_provider: string | null;
   in_sprint: number;
+  markdown_path: string | null;
   created_at: string;
   updated_at: string;
 }

package/src/db/migrations/015-add-story-markdown-path.sql

@@ -0,0 +1,5 @@
+-- Migration 015: Add markdown_path column to stories table
+-- Stories are now stored as markdown files in .hive/stories/ directory.
+-- The DB stores the file path for reference.
+
+ALTER TABLE stories ADD COLUMN markdown_path TEXT;

package/src/db/queries/stories.ts

@@ -2,6 +2,7 @@
 
 import { nanoid } from 'nanoid';
 import type { Database } from 'sql.js';
+import { deleteStoryMarkdown, writeStoryMarkdown } from '../../utils/story-markdown.js';
 import { queryAll, queryOne, run, type StoryRow } from '../client.js';
 
 export type { StoryRow };
@@ -55,7 +56,7 @@ export interface UpdateStoryInput {
   inSprint?: boolean;
 }
 
-export function createStory(db: Database, input: CreateStoryInput): StoryRow {
+export function createStory(db: Database, input: CreateStoryInput, storiesDir?: string): StoryRow {
   const id = `STORY-${nanoid(6).toUpperCase()}`;
   const acceptanceCriteria = input.acceptanceCriteria
     ? JSON.stringify(input.acceptanceCriteria)
@@ -80,7 +81,15 @@ export function createStory(db: Database, input: CreateStoryInput): StoryRow {
     ]
   );
 
-  return getStoryById(db, id)!;
+  const story = getStoryById(db, id)!;
+
+  if (storiesDir) {
+    const markdownPath = writeStoryMarkdown(storiesDir, story);
+    run(db, 'UPDATE stories SET markdown_path = ? WHERE id = ?', [markdownPath, id]);
+    story.markdown_path = markdownPath;
+  }
+
+  return story;
 }
 
 export function getStoryById(db: Database, id: string): StoryRow | undefined {
@@ -170,7 +179,8 @@ export function getStoryPointsByTeam(db: Database, teamId: string): number {
 export function updateStory(
   db: Database,
   id: string,
-  input: UpdateStoryInput
+  input: UpdateStoryInput,
+  storiesDir?: string
 ): StoryRow | undefined {
   const updates: string[] = ['updated_at = ?'];
   const values: (string | number | null)[] = [new Date().toISOString()];
@@ -271,10 +281,24 @@ export function updateStory(
 
   values.push(id);
   run(db, `UPDATE stories SET ${updates.join(', ')} WHERE id = ?`, values);
-  return getStoryById(db, id);
+
+  const updatedStory = getStoryById(db, id);
+
+  if (storiesDir && updatedStory) {
+    const markdownPath = writeStoryMarkdown(storiesDir, updatedStory);
+    if (updatedStory.markdown_path !== markdownPath) {
+      run(db, 'UPDATE stories SET markdown_path = ? WHERE id = ?', [markdownPath, id]);
+      updatedStory.markdown_path = markdownPath;
+    }
+  }
+
+  return updatedStory;
 }
 
-export function deleteStory(db: Database, id: string): void {
+export function deleteStory(db: Database, id: string, storiesDir?: string): void {
+  if (storiesDir) {
+    deleteStoryMarkdown(storiesDir, id);
+  }
   run(db, 'DELETE FROM story_dependencies WHERE story_id = ? OR depends_on_story_id = ?', [id, id]);
   run(db, 'DELETE FROM stories WHERE id = ?', [id]);
 }

package/src/db/queries/test-helpers.ts

@@ -90,6 +90,7 @@ export async function createTestDatabase(): Promise<SqlJsDatabase> {
       external_subtask_id TEXT,
       external_provider TEXT,
       in_sprint INTEGER DEFAULT 0,
+      markdown_path TEXT,
       created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
       updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
     );

package/src/git/worktree.test.ts

@@ -7,12 +7,19 @@ vi.mock('child_process', () => ({
   execSync: vi.fn(),
 }));
 
+vi.mock('fs', () => ({
+  existsSync: vi.fn(() => true),
+}));
+
 import { execSync } from 'child_process';
+import { existsSync } from 'fs';
 
 const mockExecSync = vi.mocked(execSync);
+const mockExistsSync = vi.mocked(existsSync);
 
 beforeEach(() => {
   vi.clearAllMocks();
+  mockExistsSync.mockReturnValue(true);
 });
 
 describe('removeWorktree', () => {
@@ -81,4 +88,40 @@ describe('removeWorktree', () => {
     expect(result.success).toBe(false);
     expect(result.error).toBe('Unknown error');
   });
+
+  it('should return success without running git when worktree path does not exist on disk', () => {
+    mockExistsSync.mockReturnValue(false);
+
+    const result = removeWorktree('/root', 'repos/team-agent-stale');
+
+    expect(result.success).toBe(true);
+    expect(result.fullWorktreePath).toBe('/root/repos/team-agent-stale');
+    expect(mockExecSync).not.toHaveBeenCalled();
+  });
+
+  it('should log debug message when path missing and HIVE_DEBUG is set', () => {
+    mockExistsSync.mockReturnValue(false);
+    const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
+    process.env.HIVE_DEBUG = '1';
+
+    removeWorktree('/root', 'repos/team-agent-stale');
+
+    expect(consoleSpy).toHaveBeenCalledWith(
+      expect.stringContaining('does not exist on disk, skipping removal')
+    );
+
+    delete process.env.HIVE_DEBUG;
+    consoleSpy.mockRestore();
+  });
+
+  it('should not log when path missing and HIVE_DEBUG is not set', () => {
+    mockExistsSync.mockReturnValue(false);
+    const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
+    delete process.env.HIVE_DEBUG;
+
+    removeWorktree('/root', 'repos/team-agent-stale');
+
+    expect(consoleSpy).not.toHaveBeenCalled();
+    consoleSpy.mockRestore();
+  });
 });

package/src/git/worktree.ts

@@ -1,6 +1,7 @@
 // Licensed under the Hungry Ghost Hive License. See LICENSE.
 
 import { execSync } from 'child_process';
+import { existsSync } from 'fs';
 
 export interface RemoveWorktreeResult {
   success: boolean;
@@ -27,6 +28,15 @@ export function removeWorktree(
     return { success: true, fullWorktreePath };
   }
 
+  if (!existsSync(fullWorktreePath)) {
+    if (process.env.HIVE_DEBUG) {
+      console.log(
+        `[debug] worktree path ${fullWorktreePath} does not exist on disk, skipping removal`
+      );
+    }
+    return { success: true, fullWorktreePath };
+  }
+
   try {
     execSync(`git worktree remove "${fullWorktreePath}" --force`, {
       cwd: rootDir,

package/src/orchestrator/prompt-templates.test.ts

@@ -114,6 +114,7 @@ describe('Prompt Templates', () => {
           external_subtask_id: null,
           external_provider: null,
           in_sprint: 0,
+          markdown_path: null,
           created_at: '2024-01-01',
           updated_at: '2024-01-01',
         },
@@ -153,6 +154,7 @@ describe('Prompt Templates', () => {
           external_subtask_id: null,
           external_provider: null,
           in_sprint: 0,
+          markdown_path: null,
           created_at: '2024-01-01',
           updated_at: '2024-01-01',
         },
@@ -230,6 +232,7 @@ describe('Prompt Templates', () => {
           external_subtask_id: null,
           external_provider: null,
           in_sprint: 0,
+          markdown_path: null,
           created_at: '2024-01-01',
           updated_at: '2024-01-01',
         },
@@ -258,6 +261,7 @@ describe('Prompt Templates', () => {
           external_subtask_id: null,
           external_provider: null,
           in_sprint: 0,
+          markdown_path: null,
           created_at: '2024-01-01',
           updated_at: '2024-01-01',
         },

package/src/orchestrator/prompt-templates.ts

@@ -4,6 +4,8 @@ import type { StoryRow } from '../db/client.js';
 
 export interface AgentPromptOptions {
   includeProgressUpdates?: boolean;
+  /** The tech lead tmux session name for messaging. Defaults to 'hive-tech-lead' for backwards compatibility. */
+  techLeadSession?: string;
 }
 
 /**
@@ -60,6 +62,10 @@ function shouldIncludeProgressUpdates(options?: AgentPromptOptions): boolean {
   return options?.includeProgressUpdates ?? true;
 }
 
+function resolveTechLeadSession(options?: AgentPromptOptions): string {
+  return options?.techLeadSession || 'hive-tech-lead';
+}
+
 function repositorySection(repoPath: string, repoUrl: string): string {
   return `## Your Repository
 - Local path: ${repoPath}
@@ -231,6 +237,7 @@ export function generateSeniorPrompt(
   sessionNameOverride?: string
 ): string {
   const includeProgressUpdates = shouldIncludeProgressUpdates(options);
+  const techLeadSession = resolveTechLeadSession(options);
   const storyList = stories
     .map(s => {
       const externalInfo = s.external_subtask_key
@@ -283,7 +290,7 @@ hive pr queue
 ## Communication with Tech Lead
 If you have questions or need guidance, message the Tech Lead:
 \`\`\`bash
-hive msg send hive-tech-lead "Your question here" --from ${sessionName}
+hive msg send ${techLeadSession} "Your question here" --from ${sessionName}
 \`\`\`
 
 Check for replies:
@@ -318,6 +325,7 @@ export function generateIntermediatePrompt(
   options?: AgentPromptOptions
 ): string {
   const includeProgressUpdates = shouldIncludeProgressUpdates(options);
+  const techLeadSession = resolveTechLeadSession(options);
   const seniorSession = formatSeniorSessionName(teamName);
 
   return `You are an Intermediate Developer on Team ${teamName}.
@@ -354,7 +362,7 @@ ${prSubmissionSection(sessionName, targetBranch)}
 If you have questions, message your Senior or the Tech Lead:
 \`\`\`bash
 hive msg send ${seniorSession} "Your question" --from ${sessionName}
-hive msg send hive-tech-lead "Your question" --from ${sessionName}
+hive msg send ${techLeadSession} "Your question" --from ${sessionName}
 \`\`\`
 
 Check for replies:
@@ -389,6 +397,7 @@ export function generateJuniorPrompt(
   options?: AgentPromptOptions
 ): string {
   const includeProgressUpdates = shouldIncludeProgressUpdates(options);
+  const techLeadSession = resolveTechLeadSession(options);
   const seniorSession = formatSeniorSessionName(teamName);
 
   return `You are a Junior Developer on Team ${teamName}.
@@ -425,7 +434,7 @@ ${prSubmissionSection(sessionName, targetBranch)}
 If you have questions, message your Senior or the Tech Lead:
 \`\`\`bash
 hive msg send ${seniorSession} "Your question" --from ${sessionName}
-hive msg send hive-tech-lead "Your question" --from ${sessionName}
+hive msg send ${techLeadSession} "Your question" --from ${sessionName}
 \`\`\`
 
 Check for replies:
@@ -557,6 +566,7 @@ export function generateFeatureTestPrompt(
   options?: AgentPromptOptions
 ): string {
   const includeProgressUpdates = shouldIncludeProgressUpdates(options);
+  const techLeadSession = resolveTechLeadSession(options);
   const reportResultsSection = includeProgressUpdates
     ? `**If all tests pass:**
 \`\`\`bash
@@ -572,12 +582,12 @@ Report results directly to the Tech Lead:
 
 **If all tests pass:**
 \`\`\`bash
-hive msg send hive-tech-lead "E2E tests PASSED for ${requirementId} on ${featureBranch}. [Include test summary: X passed, 0 failed. Total time: Xs]" --from ${sessionName}
+hive msg send ${techLeadSession} "E2E tests PASSED for ${requirementId} on ${featureBranch}. [Include test summary: X passed, 0 failed. Total time: Xs]" --from ${sessionName}
 \`\`\`
 
 **If any tests fail:**
 \`\`\`bash
-hive msg send hive-tech-lead "E2E tests FAILED for ${requirementId} on ${featureBranch}. [Include failure details: X passed, Y failed. Failed tests: list. Error details: summary]" --from ${sessionName}
+hive msg send ${techLeadSession} "E2E tests FAILED for ${requirementId} on ${featureBranch}. [Include failure details: X passed, Y failed. Failed tests: list. Error details: summary]" --from ${sessionName}
 \`\`\``;
 
   return `You are a Feature Test Agent on Team ${teamName}.
@@ -631,7 +641,7 @@ ${reportResultsSection}
 ## Communication
 If you encounter issues running the tests, message the Tech Lead:
 \`\`\`bash
-hive msg send hive-tech-lead "Issue running E2E tests for ${requirementId}: [describe issue]" --from ${sessionName}
+hive msg send ${techLeadSession} "Issue running E2E tests for ${requirementId}: [describe issue]" --from ${sessionName}
 \`\`\`
 
 Check for replies:
@@ -656,8 +666,10 @@ Start by checking out the feature branch and reading the TESTING.md file.`;
 export function generateAuditorPrompt(
   sessionName: string,
   repoPath: string,
-  repoUrl: string
+  repoUrl: string,
+  options?: AgentPromptOptions
 ): string {
+  const techLeadSession = resolveTechLeadSession(options);
   return `You are a Hive Auditor Agent.
 Your tmux session: ${sessionName}
 
@@ -725,7 +737,7 @@ tmux send-keys -t <session-name> Enter
 **Other unfixable issues:** Any issue you cannot resolve with the above actions.
 - Escalate to tech lead:
 \`\`\`bash
-hive msg send hive-tech-lead "AUDITOR: <description of issue, including agent id and story id>" --from ${sessionName}
+hive msg send ${techLeadSession} "AUDITOR: <description of issue, including agent id and story id>" --from ${sessionName}
 \`\`\`
 
 ### 5. Self-terminate

package/src/orchestrator/scheduler.test.ts

@@ -945,6 +945,7 @@ describe('Scheduler Refactor Policy Test Matrix', () => {
       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/orchestrator/scheduler.ts

@@ -1,5 +1,6 @@
 // Licensed under the Hungry Ghost Hive License. See LICENSE.
 
+import { join } from 'path';
 import type { Database } from 'sql.js';
 import {
   getCliRuntimeBuilder,
@@ -45,6 +46,7 @@ import {
   spawnTmuxSession,
   startManager,
 } from '../tmux/manager.js';
+import { getTechLeadSessionName } from '../utils/instance.js';
 import * as logger from '../utils/logger.js';
 import { selectAgentWithLeastWorkload } from './agent-selector.js';
 import { getCapacityPoints, selectStoriesForCapacity } from './capacity-planner.js';
@@ -243,7 +245,12 @@ export class Scheduler {
       const activeSeniors = getAgentsByTeam(this.db, teamId).filter(
         a => a.type === 'senior' && a.status !== 'terminated'
       );
-      const seniorSessionPrefix = generateSessionName('senior', team.name);
+      const seniorSessionPrefix = generateSessionName(
+        'senior',
+        team.name,
+        undefined,
+        join(this.config.rootDir, '.hive')
+      );
       const indexedSeniorSessions = activeSeniors
         .map(senior => {
           if (!senior.tmux_session) return null;
@@ -670,7 +677,7 @@ export class Scheduler {
     `
     );
 
-    const liveSessions = await getHiveSessions();
+    const liveSessions = await getHiveSessions(join(this.config.rootDir, '.hive'));
     const liveSessionNames = new Set(liveSessions.map(s => s.name));
 
     let terminated = 0;
@@ -885,8 +892,9 @@ export class Scheduler {
   }
 
   private async ensureManagerRunning(): Promise<void> {
-    if (!(await isManagerRunning())) {
-      await startManager(DEFAULT_MANAGER_INTERVAL_SECONDS);
+    const hiveDir = join(this.config.rootDir, '.hive');
+    if (!(await isManagerRunning(hiveDir))) {
+      await startManager(DEFAULT_MANAGER_INTERVAL_SECONDS, hiveDir);
     }
   }
 
@@ -907,10 +915,11 @@ export class Scheduler {
     }
   ): Promise<AgentRow> {
     // Auditor uses a timestamp-based session name since it's ephemeral
+    const hiveDir = join(this.config.rootDir, '.hive');
     const sessionName =
       type === 'auditor'
-        ? `hive-auditor-${Date.now()}`
-        : generateSessionName(type, teamName, index);
+        ? generateSessionName('auditor', `${Date.now()}`, undefined, hiveDir)
+        : generateSessionName(type, teamName, index, hiveDir);
 
     // Prevent creating duplicate agents on same tmux session (for senior agents)
     if (type === 'senior') {
@@ -997,6 +1006,8 @@ export class Scheduler {
       // Build the initial prompt for this agent type
       const team = getTeamById(this.db, teamId);
       const includeProgressUpdates = this.shouldIncludeProgressUpdates();
+      const hiveDir = join(this.config.rootDir, '.hive');
+      const techLeadSession = getTechLeadSessionName(hiveDir);
       let prompt: string;
 
       if (type === 'senior') {
@@ -1007,7 +1018,7 @@ export class Scheduler {
           worktreePath,
           stories,
           targetBranch,
-          { includeProgressUpdates },
+          { includeProgressUpdates, techLeadSession },
           sessionName
         );
       } else if (type === 'intermediate') {
@@ -1017,7 +1028,7 @@ export class Scheduler {
           worktreePath,
           sessionName,
           targetBranch,
-          { includeProgressUpdates }
+          { includeProgressUpdates, techLeadSession }
         );
       } else if (type === 'junior') {
         prompt = generateJuniorPrompt(
@@ -1026,7 +1037,7 @@ export class Scheduler {
           worktreePath,
           sessionName,
           targetBranch,
-          { includeProgressUpdates }
+          { includeProgressUpdates, techLeadSession }
         );
       } else if (type === 'feature_test' && featureTestContext) {
         prompt = generateFeatureTestPrompt(
@@ -1037,10 +1048,12 @@ export class Scheduler {
           featureTestContext.featureBranch,
           featureTestContext.requirementId,
           featureTestContext.e2eTestsPath,
-          { includeProgressUpdates }
+          { includeProgressUpdates, techLeadSession }
         );
       } else if (type === 'auditor') {
-        prompt = generateAuditorPrompt(sessionName, worktreePath, team?.repo_url || '');
+        prompt = generateAuditorPrompt(sessionName, worktreePath, team?.repo_url || '', {
+          techLeadSession,
+        });
       } else {
         prompt = generateQAPrompt(
           teamName,
@@ -1052,7 +1065,15 @@ export class Scheduler {
       }
 
       // Build CLI command using the configured runtime
-      const commandArgs = getCliRuntimeBuilder(cliTool).buildSpawnCommand(runtimeModel, safetyMode);
+      const chromeEnabled =
+        this.config.hiveConfig?.agents?.chrome_enabled === true && cliTool === 'claude';
+      const commandArgs = getCliRuntimeBuilder(cliTool).buildSpawnCommand(
+        runtimeModel,
+        safetyMode,
+        {
+          chrome: chromeEnabled,
+        }
+      );
 
       // Pass the prompt as initialPrompt so it's included as a CLI positional
       // argument via $(cat ...). This delivers the full multi-line prompt

package/src/tmux/manager.ts

@@ -4,6 +4,11 @@ import { execa } from 'execa';
 import { chmodSync, existsSync, mkdirSync, writeFileSync } from 'fs';
 import { tmpdir } from 'os';
 import { dirname, isAbsolute, join, resolve } from 'path';
+import {
+  buildInstanceSessionName,
+  getInstancePrefix,
+  getManagerSessionName,
+} from '../utils/instance.js';
 
 // --- Named constants (extracted from inline magic numbers) ---
 
@@ -162,8 +167,12 @@ export async function listTmuxSessions(): Promise<TmuxSession[]> {
   }
 }
 
-export async function getHiveSessions(): Promise<TmuxSession[]> {
+export async function getHiveSessions(hiveDir?: string): Promise<TmuxSession[]> {
   const sessions = await listTmuxSessions();
+  if (hiveDir) {
+    const prefix = getInstancePrefix(hiveDir);
+    return sessions.filter(s => s.name.startsWith(prefix));
+  }
   return sessions.filter(s => s.name.startsWith('hive-'));
 }
 
@@ -235,8 +244,8 @@ export async function killTmuxSession(sessionName: string): Promise<void> {
   }
 }
 
-export async function killAllHiveSessions(): Promise<number> {
-  const sessions = await getHiveSessions();
+export async function killAllHiveSessions(hiveDir?: string): Promise<number> {
+  const sessions = await getHiveSessions(hiveDir);
   let killed = 0;
 
   for (const session of sessions) {
@@ -513,7 +522,15 @@ export async function autoApprovePermission(
   return false;
 }
 
-export function generateSessionName(agentType: string, teamName?: string, index?: number): string {
+export function generateSessionName(
+  agentType: string,
+  teamName?: string,
+  index?: number,
+  hiveDir?: string
+): string {
+  if (hiveDir) {
+    return buildInstanceSessionName(hiveDir, agentType, teamName, index);
+  }
   let name = `hive-${agentType}`;
   if (teamName) {
     name += `-${teamName}`;
@@ -526,12 +543,23 @@ export function generateSessionName(agentType: string, teamName?: string, index?
 
 const MANAGER_SESSION = 'hive-manager';
 
-export async function isManagerRunning(): Promise<boolean> {
-  return isTmuxSessionRunning(MANAGER_SESSION);
+export function getManagerSession(hiveDir?: string): string {
+  if (hiveDir) {
+    return getManagerSessionName(hiveDir);
+  }
+  return MANAGER_SESSION;
+}
+
+export async function isManagerRunning(hiveDir?: string): Promise<boolean> {
+  return isTmuxSessionRunning(getManagerSession(hiveDir));
 }
 
-export async function startManager(interval = DEFAULT_MANAGER_INTERVAL): Promise<boolean> {
-  if (await isManagerRunning()) {
+export async function startManager(
+  interval = DEFAULT_MANAGER_INTERVAL,
+  hiveDir?: string
+): Promise<boolean> {
+  const session = getManagerSession(hiveDir);
+  if (await isTmuxSessionRunning(session)) {
     return false; // Already running
   }
 
@@ -539,22 +567,23 @@ export async function startManager(interval = DEFAULT_MANAGER_INTERVAL): Promise
   const sessionEnv = buildTmuxSessionEnv(workDir);
 
   // Start the manager in a detached tmux session
-  await execa('tmux', ['new-session', '-d', '-s', MANAGER_SESSION, '-c', workDir], {
+  await execa('tmux', ['new-session', '-d', '-s', session, '-c', workDir], {
     env: sessionEnv,
   });
 
   // Send the manager command
   const managerCommand = `${buildHiveInvokeCommand()} manager start -i ${interval}`;
-  await execa('tmux', ['send-keys', '-t', MANAGER_SESSION, managerCommand, 'Enter']);
+  await execa('tmux', ['send-keys', '-t', session, managerCommand, 'Enter']);
 
   return true;
 }
 
-export async function stopManager(): Promise<boolean> {
-  if (!(await isManagerRunning())) {
+export async function stopManager(hiveDir?: string): Promise<boolean> {
+  const session = getManagerSession(hiveDir);
+  if (!(await isTmuxSessionRunning(session))) {
     return false; // Not running
   }
 
-  await killTmuxSession(MANAGER_SESSION);
+  await killTmuxSession(session);
   return true;
 }