@ai-devkit/agent-manager 0.13.0 → 0.15.0

package/src/__tests__/adapters/OpenCodeAdapter.test.ts

@@ -2,28 +2,30 @@
  * Tests for OpenCodeAdapter
  */
 
+import type { MockedFunction } from 'vitest';
 import * as fs from 'fs';
 import * as path from 'path';
-import { beforeEach, afterEach, describe, expect, it, jest } from '@jest/globals';
-import { OpenCodeAdapter } from '../../adapters/OpenCodeAdapter';
-import type { ProcessInfo } from '../../adapters/AgentAdapter';
-import { AgentStatus } from '../../adapters/AgentAdapter';
-import { listAgentProcesses, enrichProcesses } from '../../utils/process';
-import { generateAgentName } from '../../utils/matching';
-
-jest.mock('../../utils/process', () => ({
-    listAgentProcesses: jest.fn(),
-    enrichProcesses: jest.fn(),
+
+import { OpenCodeAdapter } from '../../adapters/OpenCodeAdapter.js';
+import type { ProcessInfo } from '../../adapters/AgentAdapter.js';
+import { AgentStatus } from '../../adapters/AgentAdapter.js';
+import { listAgentProcesses, enrichProcesses } from '../../utils/process.js';
+import { generateAgentName } from '../../utils/matching.js';
+import * as os from 'os';
+
+vi.mock('../../utils/process.js', () => ({
+    listAgentProcesses: vi.fn(),
+    enrichProcesses: vi.fn(),
 }));
 
-jest.mock('../../utils/matching', () => ({
-    generateAgentName: jest.fn(),
-    matchProcessesToSessions: jest.fn(),
+vi.mock('../../utils/matching.js', () => ({
+    generateAgentName: vi.fn(),
+    matchProcessesToSessions: vi.fn(),
 }));
 
-const mockedListAgentProcesses = listAgentProcesses as jest.MockedFunction<typeof listAgentProcesses>;
-const mockedEnrichProcesses = enrichProcesses as jest.MockedFunction<typeof enrichProcesses>;
-const mockedGenerateAgentName = generateAgentName as jest.MockedFunction<typeof generateAgentName>;
+const mockedListAgentProcesses = listAgentProcesses as MockedFunction<typeof listAgentProcesses>;
+const mockedEnrichProcesses = enrichProcesses as MockedFunction<typeof enrichProcesses>;
+const mockedGenerateAgentName = generateAgentName as MockedFunction<typeof generateAgentName>;
 
 function makeDb(queries: {
     session?: Array<{ id: string; directory: string; time_created: number }>;
@@ -85,11 +87,11 @@ function makeDb(queries: {
         return { all: () => [], get: () => undefined };
     };
 
-    return { prepare: prepareImpl, close: jest.fn() };
+    return { prepare: prepareImpl, close: vi.fn() };
 }
 
 function makeDbConstructor(db: ReturnType<typeof makeDb>) {
-    return jest.fn().mockReturnValue(db);
+    return vi.fn().mockReturnValue(db);
 }
 
 describe('OpenCodeAdapter', () => {
@@ -110,7 +112,7 @@ describe('OpenCodeAdapter', () => {
             return `${folder}-${pid}`;
         });
 
-        tmpDir = fs.mkdtempSync(path.join(require('os').tmpdir(), 'opencode-test-'));
+        tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'opencode-test-'));
         dbPath = path.join(tmpDir, 'opencode.db');
         (adapter as any).dbPath = dbPath;
         (adapter as any).db = null;
@@ -118,7 +120,7 @@ describe('OpenCodeAdapter', () => {
 
     afterEach(() => {
         fs.rmSync(tmpDir, { recursive: true, force: true });
-        jest.restoreAllMocks();
+        vi.restoreAllMocks();
     });
 
     describe('type', () => {
@@ -193,7 +195,7 @@ describe('OpenCodeAdapter', () => {
 
             fs.writeFileSync(dbPath, ''); // file exists but empty → sqlite throws
             const db = makeDb({ session: [] }); // no matching session
-            jest.mock('better-sqlite3', () => makeDbConstructor(db));
+            vi.doMock('better-sqlite3', () => makeDbConstructor(db));
             (adapter as any).db = db;
 
             const agents = await adapter.detectAgents();

package/src/__tests__/terminal/TtyWriter.test.ts

@@ -1,18 +1,19 @@
-import { describe, it, expect, jest, beforeEach } from '@jest/globals';
-import { TtyWriter } from '../../terminal/TtyWriter';
-import { TerminalType } from '../../terminal/TerminalFocusManager';
-import type { TerminalLocation } from '../../terminal/TerminalFocusManager';
+import type { Mock } from 'vitest';
+
+import { TtyWriter } from '../../terminal/TtyWriter.js';
+import { TerminalType } from '../../terminal/TerminalFocusManager.js';
+import type { TerminalLocation } from '../../terminal/TerminalFocusManager.js';
 import { execFile } from 'child_process';
 
-jest.mock('child_process', () => {
-    const actual = jest.requireActual<typeof import('child_process')>('child_process');
+vi.mock('child_process', async () => {
+    const actual = await vi.importActual<typeof import('child_process')>('child_process');
     return {
         ...actual,
-        execFile: jest.fn(),
+        execFile: vi.fn(),
     };
 });
 
-const mockedExecFile = execFile as unknown as jest.Mock;
+const mockedExecFile = execFile as unknown as Mock;
 
 function mockExecFileSuccess(stdout = '') {
     mockedExecFile.mockImplementation((...args: unknown[]) => {
@@ -30,7 +31,7 @@ function mockExecFileError(message: string) {
 
 describe('TtyWriter', () => {
     beforeEach(() => {
-        jest.clearAllMocks();
+        vi.clearAllMocks();
     });
 
     describe('tmux', () => {

package/src/__tests__/utils/ClaudeSessionParser.test.ts

@@ -3,11 +3,11 @@
  * harness-injected XML tags from conversation content.
  */
 
-import { describe, it, expect, beforeEach, afterEach } from '@jest/globals';
+
 import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
-import { ClaudeSessionParser } from '../../utils/ClaudeSessionParser';
+import { ClaudeSessionParser } from '../../utils/ClaudeSessionParser.js';
 
 interface JsonlEntry {
     type: 'user' | 'assistant' | 'system';

package/src/__tests__/utils/matching.test.ts

@@ -2,10 +2,10 @@
  * Tests for utils/matching.ts
  */
 
-import { describe, it, expect } from '@jest/globals';
-import { matchProcessesToSessions, generateAgentName } from '../../utils/matching';
-import type { ProcessInfo } from '../../adapters/AgentAdapter';
-import type { SessionFile } from '../../utils/session';
+
+import { matchProcessesToSessions, generateAgentName } from '../../utils/matching.js';
+import type { ProcessInfo } from '../../adapters/AgentAdapter.js';
+import type { SessionFile } from '../../utils/session.js';
 
 function makeProcess(overrides: Partial<ProcessInfo> & { pid: number }): ProcessInfo {
     return {

package/src/__tests__/utils/process.test.ts

@@ -2,20 +2,21 @@
  * Tests for new functions in utils/process.ts
  */
 
-import { describe, it, expect, jest, beforeEach } from '@jest/globals';
+import type { MockedFunction } from 'vitest';
+
 import { execFileSync } from 'child_process';
 import {
     listAgentProcesses,
     batchGetProcessCwds,
     batchGetProcessStartTimes,
     enrichProcesses,
-} from '../../utils/process';
+} from '../../utils/process.js';
 
-jest.mock('child_process', () => ({
-    execFileSync: jest.fn(),
+vi.mock('child_process', () => ({
+    execFileSync: vi.fn(),
 }));
 
-const mockedExecFileSync = execFileSync as jest.MockedFunction<typeof execFileSync>;
+const mockedExecFileSync = execFileSync as MockedFunction<typeof execFileSync>;
 
 describe('listAgentProcesses', () => {
     beforeEach(() => {

package/src/__tests__/utils/session.test.ts

@@ -2,17 +2,18 @@
  * Tests for utils/session.ts
  */
 
-import { describe, it, expect, jest, beforeEach } from '@jest/globals';
+import type { MockedFunction } from 'vitest';
+
 import * as fs from 'fs';
-import { batchGetSessionFileBirthtimes } from '../../utils/session';
+import { batchGetSessionFileBirthtimes } from '../../utils/session.js';
 
-jest.mock('fs', () => ({
-    readdirSync: jest.fn(),
-    statSync: jest.fn(),
+vi.mock('fs', () => ({
+    readdirSync: vi.fn(),
+    statSync: vi.fn(),
 }));
 
-const mockedReaddirSync = fs.readdirSync as jest.MockedFunction<typeof fs.readdirSync>;
-const mockedStatSync = fs.statSync as jest.MockedFunction<typeof fs.statSync>;
+const mockedReaddirSync = fs.readdirSync as MockedFunction<typeof fs.readdirSync>;
+const mockedStatSync = fs.statSync as MockedFunction<typeof fs.statSync>;
 
 describe('batchGetSessionFileBirthtimes', () => {
     beforeEach(() => {

package/src/adapters/ClaudeCodeAdapter.ts

@@ -7,14 +7,14 @@ import type {
     ConversationMessage,
     SessionSummary,
     ListSessionsOptions,
-} from './AgentAdapter';
-import { AgentStatus } from './AgentAdapter';
-import { listAgentProcesses, enrichProcesses } from '../utils/process';
-import { batchGetSessionFileBirthtimes, isDirectory, listJsonl, safeReaddir, safeStat } from '../utils/session';
-import type { SessionFile } from '../utils/session';
-import { matchProcessesToSessions, generateAgentName } from '../utils/matching';
-import { ClaudeSessionParser } from '../utils/ClaudeSessionParser';
-import type { ClaudeSession } from '../utils/ClaudeSessionParser';
+} from './AgentAdapter.js';
+import { AgentStatus } from './AgentAdapter.js';
+import { listAgentProcesses, enrichProcesses } from '../utils/process.js';
+import { batchGetSessionFileBirthtimes, isDirectory, listJsonl, safeReaddir, safeStat } from '../utils/session.js';
+import type { SessionFile } from '../utils/session.js';
+import { matchProcessesToSessions, generateAgentName } from '../utils/matching.js';
+import { ClaudeSessionParser } from '../utils/ClaudeSessionParser.js';
+import type { ClaudeSession } from '../utils/ClaudeSessionParser.js';
 
 /**
  * Entry in ~/.claude/sessions/<pid>.json written by Claude Code.

package/src/adapters/CodexAdapter.ts

@@ -19,12 +19,12 @@ import type {
     ConversationMessage,
     SessionSummary,
     ListSessionsOptions,
-} from './AgentAdapter';
-import { AgentStatus } from './AgentAdapter';
-import { listAgentProcesses, enrichProcesses } from '../utils/process';
-import { batchGetSessionFileBirthtimes, isDirectory, safeReadFile, safeReaddir, safeStat } from '../utils/session';
-import type { SessionFile } from '../utils/session';
-import { matchProcessesToSessions, generateAgentName } from '../utils/matching';
+} from './AgentAdapter.js';
+import { AgentStatus } from './AgentAdapter.js';
+import { listAgentProcesses, enrichProcesses } from '../utils/process.js';
+import { batchGetSessionFileBirthtimes, isDirectory, safeReadFile, safeReaddir, safeStat } from '../utils/session.js';
+import type { SessionFile } from '../utils/session.js';
+import { matchProcessesToSessions, generateAgentName } from '../utils/matching.js';
 
 interface CodexEventEntry {
     timestamp?: string;

package/src/adapters/GeminiCliAdapter.ts

@@ -20,12 +20,12 @@ import type {
     ConversationMessage,
     SessionSummary,
     ListSessionsOptions,
-} from './AgentAdapter';
-import { AgentStatus } from './AgentAdapter';
-import { listAgentProcesses, enrichProcesses } from '../utils/process';
-import { isDirectory, safeReadFile, safeReaddir, safeStat } from '../utils/session';
-import type { SessionFile } from '../utils/session';
-import { matchProcessesToSessions, generateAgentName } from '../utils/matching';
+} from './AgentAdapter.js';
+import { AgentStatus } from './AgentAdapter.js';
+import { listAgentProcesses, enrichProcesses } from '../utils/process.js';
+import { isDirectory, safeReadFile, safeReaddir, safeStat } from '../utils/session.js';
+import type { SessionFile } from '../utils/session.js';
+import { matchProcessesToSessions, generateAgentName } from '../utils/matching.js';
 
 /**
  * A single Gemini CLI message content part. Mirrors the `{text?: string}`

package/src/adapters/OpenCodeAdapter.ts

@@ -21,10 +21,10 @@ import type {
     ConversationMessage,
     SessionSummary,
     ListSessionsOptions,
-} from './AgentAdapter';
-import { AgentStatus } from './AgentAdapter';
-import { listAgentProcesses, enrichProcesses } from '../utils/process';
-import { generateAgentName } from '../utils/matching';
+} from './AgentAdapter.js';
+import { AgentStatus } from './AgentAdapter.js';
+import { listAgentProcesses, enrichProcesses } from '../utils/process.js';
+import { generateAgentName } from '../utils/matching.js';
 
 const SESSION_REF_SEP = '::';
 

package/src/adapters/index.ts

@@ -1,6 +1,6 @@
-export { ClaudeCodeAdapter } from './ClaudeCodeAdapter';
-export { CodexAdapter } from './CodexAdapter';
-export { GeminiCliAdapter } from './GeminiCliAdapter';
-export { OpenCodeAdapter } from './OpenCodeAdapter';
-export { AgentStatus } from './AgentAdapter';
-export type { AgentAdapter, AgentType, AgentInfo, ProcessInfo } from './AgentAdapter';
+export { ClaudeCodeAdapter } from './ClaudeCodeAdapter.js';
+export { CodexAdapter } from './CodexAdapter.js';
+export { GeminiCliAdapter } from './GeminiCliAdapter.js';
+export { OpenCodeAdapter } from './OpenCodeAdapter.js';
+export { AgentStatus } from './AgentAdapter.js';
+export type { AgentAdapter, AgentType, AgentInfo, ProcessInfo } from './AgentAdapter.js';

package/src/index.ts

@@ -1,10 +1,10 @@
-export { AgentManager } from './AgentManager';
+export { AgentManager } from './AgentManager.js';
 
-export { ClaudeCodeAdapter } from './adapters/ClaudeCodeAdapter';
-export { CodexAdapter } from './adapters/CodexAdapter';
-export { GeminiCliAdapter } from './adapters/GeminiCliAdapter';
-export { OpenCodeAdapter } from './adapters/OpenCodeAdapter';
-export { AgentStatus } from './adapters/AgentAdapter';
+export { ClaudeCodeAdapter } from './adapters/ClaudeCodeAdapter.js';
+export { CodexAdapter } from './adapters/CodexAdapter.js';
+export { GeminiCliAdapter } from './adapters/GeminiCliAdapter.js';
+export { OpenCodeAdapter } from './adapters/OpenCodeAdapter.js';
+export { AgentStatus } from './adapters/AgentAdapter.js';
 export type {
     AgentAdapter,
     AgentType,
@@ -13,10 +13,12 @@ export type {
     ConversationMessage,
     SessionSummary,
     ListSessionsOptions,
-} from './adapters/AgentAdapter';
+} from './adapters/AgentAdapter.js';
 
-export { TerminalFocusManager, TerminalType } from './terminal/TerminalFocusManager';
-export type { TerminalLocation } from './terminal/TerminalFocusManager';
-export { TtyWriter } from './terminal/TtyWriter';
+export { TerminalFocusManager, TerminalType } from './terminal/TerminalFocusManager.js';
+export type { TerminalLocation } from './terminal/TerminalFocusManager.js';
+export { TtyWriter } from './terminal/TtyWriter.js';
 
-export { getProcessTty } from './utils/process';
+export { getProcessTty } from './utils/process.js';
+export type { AgentSortKey } from './utils/sortAgents.js';
+export type { ListAgentsOptions } from './AgentManager.js';

package/src/terminal/TerminalFocusManager.ts

@@ -1,7 +1,7 @@
 import { execFile } from 'child_process';
 import { promisify } from 'util';
-import { getProcessTty } from '../utils/process';
-import { escapeAppleScript } from '../utils/applescript';
+import { getProcessTty } from '../utils/process.js';
+import { escapeAppleScript } from '../utils/applescript.js';
 
 const execFileAsync = promisify(execFile);
 

package/src/terminal/TtyWriter.ts

@@ -1,8 +1,8 @@
 import { execFile } from 'child_process';
 import { promisify } from 'util';
-import type { TerminalLocation } from './TerminalFocusManager';
-import { TerminalType } from './TerminalFocusManager';
-import { escapeAppleScript } from '../utils/applescript';
+import type { TerminalLocation } from './TerminalFocusManager.js';
+import { TerminalType } from './TerminalFocusManager.js';
+import { escapeAppleScript } from '../utils/applescript.js';
 
 const execFileAsync = promisify(execFile);
 

package/src/terminal/index.ts

@@ -1,4 +1,4 @@
-export { TerminalFocusManager } from './TerminalFocusManager';
-export { TerminalType } from './TerminalFocusManager';
-export type { TerminalLocation } from './TerminalFocusManager';
-export { TtyWriter } from './TtyWriter';
+export { TerminalFocusManager } from './TerminalFocusManager.js';
+export { TerminalType } from './TerminalFocusManager.js';
+export type { TerminalLocation } from './TerminalFocusManager.js';
+export { TtyWriter } from './TtyWriter.js';

package/src/utils/ClaudeSessionParser.ts

@@ -1,7 +1,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
-import type { ConversationMessage } from '../adapters/AgentAdapter';
-import { AgentStatus } from '../adapters/AgentAdapter';
+import type { ConversationMessage } from '../adapters/AgentAdapter.js';
+import { AgentStatus } from '../adapters/AgentAdapter.js';
 
 /**
  * Content block within a Claude Code JSONL message entry.

package/src/utils/index.ts

@@ -1,6 +1,6 @@
-export { listAgentProcesses, batchGetProcessCwds, batchGetProcessStartTimes, enrichProcesses } from './process';
-export { getProcessTty } from './process';
-export { batchGetSessionFileBirthtimes } from './session';
-export type { SessionFile } from './session';
-export { matchProcessesToSessions, generateAgentName } from './matching';
-export type { MatchResult } from './matching';
+export { listAgentProcesses, batchGetProcessCwds, batchGetProcessStartTimes, enrichProcesses } from './process.js';
+export { getProcessTty } from './process.js';
+export { batchGetSessionFileBirthtimes } from './session.js';
+export type { SessionFile } from './session.js';
+export { matchProcessesToSessions, generateAgentName } from './matching.js';
+export type { MatchResult } from './matching.js';

package/src/utils/matching.ts

@@ -6,8 +6,8 @@
  */
 
 import * as path from 'path';
-import type { ProcessInfo } from '../adapters/AgentAdapter';
-import type { SessionFile } from './session';
+import type { ProcessInfo } from '../adapters/AgentAdapter.js';
+import type { SessionFile } from './session.js';
 
 /** Maximum allowed delta between process start time and session file birth time. */
 const TOLERANCE_MS = 3 * 60 * 1000; // 3 minutes

package/src/utils/process.ts

@@ -7,7 +7,7 @@
 
 import * as path from 'path';
 import { execFileSync } from 'child_process';
-import type { ProcessInfo } from '../adapters/AgentAdapter';
+import type { ProcessInfo } from '../adapters/AgentAdapter.js';
 
 /**
  * List running processes matching an agent executable name.

package/src/utils/sortAgents.ts

@@ -0,0 +1,52 @@
+import { AgentStatus, type AgentInfo } from '../adapters/AgentAdapter.js';
+
+export type AgentSortKey = 'name' | 'status' | 'pid' | 'lastActive';
+
+const STATUS_PRIORITY: Record<AgentStatus, number> = {
+    [AgentStatus.WAITING]: 0,
+    [AgentStatus.RUNNING]: 1,
+    [AgentStatus.IDLE]: 2,
+    [AgentStatus.UNKNOWN]: 3,
+};
+
+function compareByName(a: AgentInfo, b: AgentInfo): number {
+    return a.name.localeCompare(b.name);
+}
+
+function compareByStatus(a: AgentInfo, b: AgentInfo): number {
+    const pa = STATUS_PRIORITY[a.status] ?? 999;
+    const pb = STATUS_PRIORITY[b.status] ?? 999;
+    if (pa !== pb) return pa - pb;
+    return compareByName(a, b);
+}
+
+function compareByPid(a: AgentInfo, b: AgentInfo): number {
+    if (a.pid !== b.pid) return a.pid - b.pid;
+    return compareByName(a, b);
+}
+
+function compareByLastActive(a: AgentInfo, b: AgentInfo): number {
+    const ta = a.lastActive instanceof Date ? a.lastActive.getTime() : new Date(a.lastActive).getTime();
+    const tb = b.lastActive instanceof Date ? b.lastActive.getTime() : new Date(b.lastActive).getTime();
+    if (tb !== ta) return tb - ta; // most recent first
+    return compareByName(a, b);
+}
+
+export function sortAgents(agents: AgentInfo[], by: AgentSortKey): AgentInfo[] {
+    const copy = agents.slice();
+    switch (by) {
+        case 'name':
+            copy.sort(compareByName);
+            break;
+        case 'status':
+            copy.sort(compareByStatus);
+            break;
+        case 'pid':
+            copy.sort(compareByPid);
+            break;
+        case 'lastActive':
+            copy.sort(compareByLastActive);
+            break;
+    }
+    return copy;
+}

package/tsconfig.json

@@ -1,8 +1,8 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "module": "commonjs",
-    "moduleResolution": "node",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
     "rootDir": "./src",
     "outDir": "./dist"
   },

package/vitest.config.ts

@@ -0,0 +1,20 @@
+import { defineConfig } from 'vitest/config';
+
+export default defineConfig({
+    test: {
+        globals: true,
+        environment: 'node',
+        include: ['src/**/__tests__/**/*.test.ts'],
+        coverage: {
+            provider: 'v8',
+            include: ['src/**/*.ts'],
+            exclude: ['src/index.ts', 'src/**/*.d.ts'],
+            thresholds: {
+                branches: 70,
+                functions: 70,
+                lines: 70,
+                statements: 70,
+            },
+        },
+    },
+});

package/jest.config.js

@@ -1,21 +0,0 @@
-module.exports = {
-  preset: 'ts-jest',
-  testEnvironment: 'node',
-  roots: ['<rootDir>/src'],
-  testMatch: ['**/__tests__/**/*.test.ts', '**/?(*.)+(spec|test).ts'],
-  collectCoverageFrom: [
-    'src/**/*.{ts,js}',
-    '!src/**/*.d.ts',
-    '!src/index.ts'
-  ],
-  coverageDirectory: 'coverage',
-  coverageReporters: ['text', 'lcov', 'html'],
-  coverageThreshold: {
-    global: {
-      branches: 80,
-      functions: 80,
-      lines: 80,
-      statements: 80
-    }
-  }
-};