hungry-ghost-hive 0.48.0 → 0.49.0

package/src/utils/auto-merge.test.ts

@@ -1,7 +1,7 @@
 // Licensed under the Hungry Ghost Hive License. See LICENSE.
 
-import type { Database } from 'sql.js';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { SqliteProvider } from '../db/provider.js';
 import { createAgent, getAgentById, updateAgent } from '../db/queries/agents.js';
 import {
   createPullRequest,
@@ -32,21 +32,22 @@ import { autoMergeApprovedPRs, checkPreexistingCIFailures } from './auto-merge.j
 const mockLoadConfig = vi.mocked(loadConfig);
 
 describe('auto-merge functionality', () => {
-  let db: Database;
+  let db: SqliteProvider;
   let teamId: string;
   let storyId: string;
 
   beforeEach(async () => {
-    db = await createTestDatabase();
+    const rawDb = await createTestDatabase();
+    db = new SqliteProvider(rawDb);
 
-    const team = createTeam(db, {
+    const team = await createTeam(db, {
       repoUrl: 'https://github.com/test/repo.git',
       repoPath: '/path/to/repo',
       name: 'Test Team',
     });
     teamId = team.id;
 
-    const story = createStory(db, {
+    const story = await createStory(db, {
       title: 'Test Story',
       description: 'Test description',
       teamId,
@@ -55,13 +56,13 @@ describe('auto-merge functionality', () => {
   });
 
   describe('getApprovedPullRequests', () => {
-    it('should return empty list when no approved PRs exist', () => {
-      const approved = getApprovedPullRequests(db);
+    it('should return empty list when no approved PRs exist', async () => {
+      const approved = await getApprovedPullRequests(db);
       expect(approved).toHaveLength(0);
     });
 
-    it('should return only approved PRs, not queued or reviewing', () => {
-      const pr1 = createPullRequest(db, {
+    it('should return only approved PRs, not queued or reviewing', async () => {
+      const pr1 = await createPullRequest(db, {
         storyId,
         teamId,
         branchName: 'feature/test-1',
@@ -69,7 +70,7 @@ describe('auto-merge functionality', () => {
         githubPrUrl: 'https://github.com/test/repo/pull/111',
       });
 
-      const pr2 = createPullRequest(db, {
+      const pr2 = await createPullRequest(db, {
         storyId,
         teamId,
         branchName: 'feature/test-2',
@@ -77,59 +78,59 @@ describe('auto-merge functionality', () => {
         githubPrUrl: 'https://github.com/test/repo/pull/222',
       });
 
-      updatePullRequest(db, pr1.id, { status: 'approved' });
-      updatePullRequest(db, pr2.id, { status: 'reviewing' });
+      await updatePullRequest(db, pr1.id, { status: 'approved' });
+      await updatePullRequest(db, pr2.id, { status: 'reviewing' });
 
-      const approved = getApprovedPullRequests(db);
+      const approved = await getApprovedPullRequests(db);
 
       expect(approved).toHaveLength(1);
       expect(approved[0].id).toBe(pr1.id);
       expect(approved[0].status).toBe('approved');
     });
 
-    it('should return approved PRs in creation order (oldest first)', () => {
-      const pr1 = createPullRequest(db, {
+    it('should return approved PRs in creation order (oldest first)', async () => {
+      const pr1 = await createPullRequest(db, {
         storyId,
         teamId,
         branchName: 'feature/test-1',
         githubPrNumber: 111,
       });
 
-      const pr2 = createPullRequest(db, {
+      const pr2 = await createPullRequest(db, {
         storyId,
         teamId,
         branchName: 'feature/test-2',
         githubPrNumber: 222,
       });
 
-      updatePullRequest(db, pr1.id, { status: 'approved' });
-      updatePullRequest(db, pr2.id, { status: 'approved' });
+      await updatePullRequest(db, pr1.id, { status: 'approved' });
+      await updatePullRequest(db, pr2.id, { status: 'approved' });
 
-      const approved = getApprovedPullRequests(db);
+      const approved = await getApprovedPullRequests(db);
 
       expect(approved).toHaveLength(2);
       expect(approved[0].id).toBe(pr1.id);
       expect(approved[1].id).toBe(pr2.id);
     });
 
-    it('should require github_pr_number for merging to be possible', () => {
-      const prWithNumber = createPullRequest(db, {
+    it('should require github_pr_number for merging to be possible', async () => {
+      const prWithNumber = await createPullRequest(db, {
         storyId,
         teamId,
         branchName: 'feature/with-number',
         githubPrNumber: 333,
       });
 
-      const prWithoutNumber = createPullRequest(db, {
+      const prWithoutNumber = await createPullRequest(db, {
         storyId,
         teamId,
         branchName: 'feature/without-number',
       });
 
-      updatePullRequest(db, prWithNumber.id, { status: 'approved' });
-      updatePullRequest(db, prWithoutNumber.id, { status: 'approved' });
+      await updatePullRequest(db, prWithNumber.id, { status: 'approved' });
+      await updatePullRequest(db, prWithoutNumber.id, { status: 'approved' });
 
-      const approved = getApprovedPullRequests(db);
+      const approved = await getApprovedPullRequests(db);
 
       expect(approved).toHaveLength(2);
       expect(approved.filter(p => p.github_pr_number)).toHaveLength(1);
@@ -137,64 +138,64 @@ describe('auto-merge functionality', () => {
   });
 
   describe('agent cleanup on story merge', () => {
-    it('should allow agent currentStoryId to be cleared when story is merged', () => {
+    it('should allow agent currentStoryId to be cleared when story is merged', async () => {
       // Create an agent assigned to the story
-      const agent = createAgent(db, {
+      const agent = await createAgent(db, {
         type: 'senior',
         teamId,
         model: 'claude-sonnet-4-20250514',
       });
-      updateAgent(db, agent.id, { status: 'working', currentStoryId: storyId });
+      await updateAgent(db, agent.id, { status: 'working', currentStoryId: storyId });
 
       // Assign story to agent
-      updateStory(db, storyId, { assignedAgentId: agent.id, status: 'in_progress' });
+      await updateStory(db, storyId, { assignedAgentId: agent.id, status: 'in_progress' });
 
       // Simulate what auto-merge now does: clear agent's currentStoryId
-      const story = getStoryById(db, storyId);
+      const story = await getStoryById(db, storyId);
       expect(story?.assigned_agent_id).toBe(agent.id);
 
-      const agentBefore = getAgentById(db, agent.id);
+      const agentBefore = await getAgentById(db, agent.id);
       expect(agentBefore?.current_story_id).toBe(storyId);
       expect(agentBefore?.status).toBe('working');
 
       // Clear the agent's currentStoryId (as auto-merge now does)
-      updateAgent(db, agent.id, { currentStoryId: null, status: 'idle' });
+      await updateAgent(db, agent.id, { currentStoryId: null, status: 'idle' });
 
-      const agentAfter = getAgentById(db, agent.id);
+      const agentAfter = await getAgentById(db, agent.id);
       expect(agentAfter?.current_story_id).toBeNull();
       expect(agentAfter?.status).toBe('idle');
     });
 
-    it('should not clear agent currentStoryId if agent moved to different story', () => {
-      const agent = createAgent(db, {
+    it('should not clear agent currentStoryId if agent moved to different story', async () => {
+      const agent = await createAgent(db, {
         type: 'senior',
         teamId,
         model: 'claude-sonnet-4-20250514',
       });
 
       // Create a second story
-      const story2 = createStory(db, {
+      const story2 = await createStory(db, {
         title: 'Second Story',
         description: 'Another story',
         teamId,
       });
 
       // Agent is now working on story2, not the original storyId
-      updateAgent(db, agent.id, { status: 'working', currentStoryId: story2.id });
+      await updateAgent(db, agent.id, { status: 'working', currentStoryId: story2.id });
 
       // When the original story merges, agent's currentStoryId is story2 (different)
       // so we should NOT clear it
-      const agentCheck = getAgentById(db, agent.id);
+      const agentCheck = await getAgentById(db, agent.id);
       expect(agentCheck?.current_story_id).toBe(story2.id);
       expect(agentCheck?.current_story_id).not.toBe(storyId);
 
       // The guard condition: only clear if agent.current_story_id === storyId
       if (agentCheck?.current_story_id === storyId) {
-        updateAgent(db, agent.id, { currentStoryId: null, status: 'idle' });
+        await updateAgent(db, agent.id, { currentStoryId: null, status: 'idle' });
       }
 
       // Agent should still have story2 as current story
-      const agentAfter = getAgentById(db, agent.id);
+      const agentAfter = await getAgentById(db, agent.id);
       expect(agentAfter?.current_story_id).toBe(story2.id);
       expect(agentAfter?.status).toBe('working');
     });
@@ -207,13 +208,13 @@ describe('auto-merge functionality', () => {
 
     it('should skip auto-merge when autonomy level is partial', async () => {
       // Setup: Create an approved PR
-      const pr = createPullRequest(db, {
+      const pr = await createPullRequest(db, {
         storyId,
         teamId,
         branchName: 'feature/test',
         githubPrNumber: 123,
       });
-      updatePullRequest(db, pr.id, { status: 'approved' });
+      await updatePullRequest(db, pr.id, { status: 'approved' });
 
       // Mock config with partial autonomy
       mockLoadConfig.mockReturnValue({
@@ -228,7 +229,8 @@ describe('auto-merge functionality', () => {
 
       // Create a minimal database client wrapper
       const dbClient = {
-        db,
+        db: db.db,
+        provider: db,
         save: vi.fn(),
         close: vi.fn(),
         runMigrations: vi.fn(),
@@ -256,7 +258,8 @@ describe('auto-merge functionality', () => {
 
       // Create a minimal database client wrapper (no approved PRs)
       const dbClient = {
-        db,
+        db: db.db,
+        provider: db,
         save: vi.fn(),
         close: vi.fn(),
         runMigrations: vi.fn(),
@@ -272,13 +275,13 @@ describe('auto-merge functionality', () => {
     });
 
     it('should keep PR as queued when auto-merge is pending (PR still open after gh pr merge --auto)', async () => {
-      const pr = createPullRequest(db, {
+      const pr = await createPullRequest(db, {
         storyId,
         teamId,
         branchName: 'feature/auto-merge-pending',
         githubPrNumber: 456,
       });
-      updatePullRequest(db, pr.id, { status: 'approved' });
+      await updatePullRequest(db, pr.id, { status: 'approved' });
 
       mockLoadConfig.mockReturnValue({
         integrations: {
@@ -302,23 +305,29 @@ describe('auto-merge functionality', () => {
 
       vi.doMock('child_process', () => ({ execSync: mockExecSync }));
 
-      const dbClient = { db, save: vi.fn(), close: vi.fn(), runMigrations: vi.fn() };
+      const dbClient = {
+        db: db.db,
+        provider: db,
+        save: vi.fn(),
+        close: vi.fn(),
+        runMigrations: vi.fn(),
+      };
       const result = await autoMergeApprovedPRs('/mock/root', dbClient);
 
       // Should return 0 because the PR was not actually merged yet
       expect(result).toBe(0);
       // PR should remain 'queued' (not rolled back to 'approved' or advanced to 'merged')
-      expect(getPullRequestById(db, pr.id)?.status).toBe('queued');
+      expect((await getPullRequestById(db, pr.id))?.status).toBe('queued');
     });
 
     it('should reset stale branch PR to approved after updating behind branch', async () => {
-      const pr = createPullRequest(db, {
+      const pr = await createPullRequest(db, {
         storyId,
         teamId,
         branchName: 'feature/stale-branch',
         githubPrNumber: 789,
       });
-      updatePullRequest(db, pr.id, { status: 'approved' });
+      await updatePullRequest(db, pr.id, { status: 'approved' });
 
       mockLoadConfig.mockReturnValue({
         integrations: {
@@ -338,23 +347,29 @@ describe('auto-merge functionality', () => {
 
       vi.doMock('child_process', () => ({ execSync: mockExecSync }));
 
-      const dbClient = { db, save: vi.fn(), close: vi.fn(), runMigrations: vi.fn() };
+      const dbClient = {
+        db: db.db,
+        provider: db,
+        save: vi.fn(),
+        close: vi.fn(),
+        runMigrations: vi.fn(),
+      };
       const result = await autoMergeApprovedPRs('/mock/root', dbClient);
 
       // Should return 0 because no merge happened yet
       expect(result).toBe(0);
       // PR should be reset to 'approved' to be retried on next cycle
-      expect(getPullRequestById(db, pr.id)?.status).toBe('approved');
+      expect((await getPullRequestById(db, pr.id))?.status).toBe('approved');
     });
 
     it('should skip approved PRs marked for manual merge', async () => {
-      const pr = createPullRequest(db, {
+      const pr = await createPullRequest(db, {
         storyId,
         teamId,
         branchName: 'feature/manual-merge',
         githubPrNumber: 999,
       });
-      updatePullRequest(db, pr.id, {
+      await updatePullRequest(db, pr.id, {
         status: 'approved',
         reviewNotes: '[manual-merge-required]',
       });
@@ -370,7 +385,8 @@ describe('auto-merge functionality', () => {
       } as any);
 
       const dbClient = {
-        db,
+        db: db.db,
+        provider: db,
         save: vi.fn(),
         close: vi.fn(),
         runMigrations: vi.fn(),
@@ -378,17 +394,17 @@ describe('auto-merge functionality', () => {
 
       const result = await autoMergeApprovedPRs('/mock/root', dbClient);
       expect(result).toBe(0);
-      expect(getPullRequestById(db, pr.id)?.status).toBe('approved');
+      expect((await getPullRequestById(db, pr.id))?.status).toBe('approved');
     });
 
     it('should bypass BLOCKED status when all CI failures are pre-existing on base branch', async () => {
-      const pr = createPullRequest(db, {
+      const pr = await createPullRequest(db, {
         storyId,
         teamId,
         branchName: 'feature/preexisting-ci',
         githubPrNumber: 555,
       });
-      updatePullRequest(db, pr.id, { status: 'approved' });
+      await updatePullRequest(db, pr.id, { status: 'approved' });
 
       mockLoadConfig.mockReturnValue({
         integrations: {
@@ -424,21 +440,27 @@ describe('auto-merge functionality', () => {
 
       vi.doMock('child_process', () => ({ execSync: mockExecSync }));
 
-      const dbClient = { db, save: vi.fn(), close: vi.fn(), runMigrations: vi.fn() };
+      const dbClient = {
+        db: db.db,
+        provider: db,
+        save: vi.fn(),
+        close: vi.fn(),
+        runMigrations: vi.fn(),
+      };
       const result = await autoMergeApprovedPRs('/mock/root', dbClient);
 
       expect(result).toBe(1);
-      expect(getPullRequestById(db, pr.id)?.status).toBe('merged');
+      expect((await getPullRequestById(db, pr.id))?.status).toBe('merged');
     });
 
     it('should not bypass BLOCKED status when PR has new CI failures not on base branch', async () => {
-      const pr = createPullRequest(db, {
+      const pr = await createPullRequest(db, {
         storyId,
         teamId,
         branchName: 'feature/new-ci-failure',
         githubPrNumber: 556,
       });
-      updatePullRequest(db, pr.id, { status: 'approved' });
+      await updatePullRequest(db, pr.id, { status: 'approved' });
 
       mockLoadConfig.mockReturnValue({
         integrations: {
@@ -472,23 +494,29 @@ describe('auto-merge functionality', () => {
 
       vi.doMock('child_process', () => ({ execSync: mockExecSync }));
 
-      const dbClient = { db, save: vi.fn(), close: vi.fn(), runMigrations: vi.fn() };
+      const dbClient = {
+        db: db.db,
+        provider: db,
+        save: vi.fn(),
+        close: vi.fn(),
+        runMigrations: vi.fn(),
+      };
       const result = await autoMergeApprovedPRs('/mock/root', dbClient);
 
       // Should not merge — 'build' is a new failure
       expect(result).toBe(0);
       // PR should be reset to approved (ci_blocked outcome)
-      expect(getPullRequestById(db, pr.id)?.status).toBe('approved');
+      expect((await getPullRequestById(db, pr.id))?.status).toBe('approved');
     });
 
     it('should skip BLOCKED PR when allow_preexisting_ci_failures is false', async () => {
-      const pr = createPullRequest(db, {
+      const pr = await createPullRequest(db, {
         storyId,
         teamId,
         branchName: 'feature/ci-blocked-no-bypass',
         githubPrNumber: 557,
       });
-      updatePullRequest(db, pr.id, { status: 'approved' });
+      await updatePullRequest(db, pr.id, { status: 'approved' });
 
       mockLoadConfig.mockReturnValue({
         integrations: {
@@ -506,11 +534,17 @@ describe('auto-merge functionality', () => {
 
       vi.doMock('child_process', () => ({ execSync: mockExecSync }));
 
-      const dbClient = { db, save: vi.fn(), close: vi.fn(), runMigrations: vi.fn() };
+      const dbClient = {
+        db: db.db,
+        provider: db,
+        save: vi.fn(),
+        close: vi.fn(),
+        runMigrations: vi.fn(),
+      };
       const result = await autoMergeApprovedPRs('/mock/root', dbClient);
 
       expect(result).toBe(0);
-      expect(getPullRequestById(db, pr.id)?.status).toBe('approved');
+      expect((await getPullRequestById(db, pr.id))?.status).toBe('approved');
     });
   });