@qduc/term2 0.7.2 → 0.8.0

package/dist/agent.test.js

@@ -1,6 +1,6 @@
-import test from 'ava';
+import { it, expect } from 'vitest';
 import { getAgentDefinition } from './agent.js';
-import { createMockSettingsService } from './services/settings-service.mock.js';
+import { createMockSettingsService } from './services/settings/settings-service.mock.js';
 const mockLogger = {
     debug: () => { },
     info: () => { },
@@ -11,7 +11,7 @@ const mockLogger = {
     getCorrelationId: () => undefined,
 };
 const WORKTREE_HYGIENE_FRAGMENT_MARKER = 'Before making any code changes, inspect the repo worktree.';
-test('getAgentDefinition includes grep and find_files when searchViaShell is false', (t) => {
+it('getAgentDefinition includes grep and find_files when searchViaShell is false', () => {
     const settingsService = createMockSettingsService({
         'app.searchViaShell': 'off',
         'agent.model': 'gpt-4o',
@@ -21,12 +21,48 @@ test('getAgentDefinition includes grep and find_files when searchViaShell is fal
         loggingService: mockLogger,
     });
     const toolNames = definition.tools.map((tool) => tool.name);
-    t.true(toolNames.includes('grep'));
-    t.true(toolNames.includes('find_files'));
-    t.true(toolNames.includes('read_code_outline'));
-    t.true(toolNames.includes('code_context_search'));
+    expect(toolNames.includes('grep')).toBe(true);
+    expect(toolNames.includes('find_files')).toBe(true);
+    expect(toolNames.includes('read_code_outline')).toBe(true);
+    expect(toolNames.includes('code_context_search')).toBe(true);
 });
-test('getAgentDefinition injects delegation guidance in orchestrator mode when runSubagent is provided', (t) => {
+it('getAgentDefinition includes ask_user in standard mode when getAskUserAnswer is provided', () => {
+    const definition = getAgentDefinition({
+        settingsService: createMockSettingsService({ 'agent.model': 'gpt-4o' }),
+        loggingService: mockLogger,
+        getAskUserAnswer: () => 'test answer',
+    });
+    const toolNames = definition.tools.map((tool) => tool.name);
+    expect(toolNames.includes('ask_user')).toBe(true);
+});
+it('getAgentDefinition includes ask_user in lite mode when getAskUserAnswer is provided', () => {
+    const definition = getAgentDefinition({
+        settingsService: createMockSettingsService({ 'agent.model': 'gpt-4o', 'app.liteMode': true }),
+        loggingService: mockLogger,
+        getAskUserAnswer: () => 'test answer',
+    });
+    const toolNames = definition.tools.map((tool) => tool.name);
+    expect(toolNames.includes('ask_user')).toBe(true);
+});
+it('getAgentDefinition includes ask_user in orchestrator mode when getAskUserAnswer is provided', () => {
+    const definition = getAgentDefinition({
+        settingsService: createMockSettingsService({ 'agent.model': 'gpt-4o', 'app.orchestratorMode': true }),
+        loggingService: mockLogger,
+        runSubagent: async () => 'test',
+        getAskUserAnswer: () => 'test answer',
+    });
+    const toolNames = definition.tools.map((tool) => tool.name);
+    expect(toolNames.includes('ask_user')).toBe(true);
+});
+it('getAgentDefinition omits ask_user when getAskUserAnswer is absent', () => {
+    const definition = getAgentDefinition({
+        settingsService: createMockSettingsService({ 'agent.model': 'gpt-4o' }),
+        loggingService: mockLogger,
+    });
+    const toolNames = definition.tools.map((tool) => tool.name);
+    expect(toolNames.includes('ask_user')).toBe(false);
+});
+it('getAgentDefinition injects delegation guidance in orchestrator mode when runSubagent is provided', () => {
     const settingsService = createMockSettingsService({
         'agent.model': 'gpt-4o',
         'app.orchestratorMode': true,
@@ -36,10 +72,10 @@ test('getAgentDefinition injects delegation guidance in orchestrator mode when r
         loggingService: mockLogger,
         runSubagent: async () => ({}),
     });
-    t.true(definition.tools.map((tool) => tool.name).includes('run_subagent'));
-    t.true(definition.instructions.includes('### Delegating to subagents'));
+    expect(definition.tools.map((tool) => tool.name).includes('run_subagent')).toBe(true);
+    expect(definition.instructions.includes('### Delegating to subagents')).toBe(true);
 });
-test('getAgentDefinition omits delegation guidance in standard mode even if runSubagent is provided', (t) => {
+it('getAgentDefinition omits delegation guidance in standard mode even if runSubagent is provided', () => {
     const settingsService = createMockSettingsService({
         'agent.model': 'gpt-4o',
     });
@@ -48,10 +84,10 @@ test('getAgentDefinition omits delegation guidance in standard mode even if runS
         loggingService: mockLogger,
         runSubagent: async () => ({}),
     });
-    t.true(definition.tools.map((tool) => tool.name).includes('run_subagent'));
-    t.false(definition.instructions.includes('### Delegating to subagents'));
+    expect(definition.tools.map((tool) => tool.name).includes('run_subagent')).toBe(true);
+    expect(definition.instructions.includes('### Delegating to subagents')).toBe(false);
 });
-test('getAgentDefinition omits delegation guidance when runSubagent is absent', (t) => {
+it('getAgentDefinition omits delegation guidance when runSubagent is absent', () => {
     const settingsService = createMockSettingsService({
         'agent.model': 'gpt-4o',
     });
@@ -59,10 +95,10 @@ test('getAgentDefinition omits delegation guidance when runSubagent is absent',
         settingsService,
         loggingService: mockLogger,
     });
-    t.false(definition.tools.map((tool) => tool.name).includes('run_subagent'));
-    t.false(definition.instructions.includes('### Delegating to subagents'));
+    expect(definition.tools.map((tool) => tool.name).includes('run_subagent')).toBe(false);
+    expect(definition.instructions.includes('### Delegating to subagents')).toBe(false);
 });
-test('getAgentDefinition omits delegation guidance in lite mode', (t) => {
+it('getAgentDefinition omits delegation guidance in lite mode', () => {
     const settingsService = createMockSettingsService({
         'app.liteMode': true,
         'agent.model': 'gpt-4o',
@@ -72,10 +108,10 @@ test('getAgentDefinition omits delegation guidance in lite mode', (t) => {
         loggingService: mockLogger,
         runSubagent: async () => ({}),
     });
-    t.false(definition.tools.map((tool) => tool.name).includes('run_subagent'));
-    t.false(definition.instructions.includes('### Delegating to subagents'));
+    expect(definition.tools.map((tool) => tool.name).includes('run_subagent')).toBe(false);
+    expect(definition.instructions.includes('### Delegating to subagents')).toBe(false);
 });
-test('getAgentDefinition in orchestrator mode exposes run_subagent, shell, read_file, and grep', (t) => {
+it('getAgentDefinition in orchestrator mode exposes run_subagent, shell, read_file, and grep', () => {
     const settingsService = createMockSettingsService({
         'app.orchestratorMode': true,
         'agent.model': 'gpt-5',
@@ -85,9 +121,9 @@ test('getAgentDefinition in orchestrator mode exposes run_subagent, shell, read_
         loggingService: mockLogger,
         runSubagent: async () => ({}),
     });
-    t.deepEqual(definition.tools.map((tool) => tool.name), ['run_subagent', 'shell', 'read_file', 'grep']);
+    expect(definition.tools.map((tool) => tool.name)).toEqual(['run_subagent', 'shell', 'read_file', 'grep']);
 });
-test('getAgentDefinition in orchestrator mode requires delegated tool work', (t) => {
+it('getAgentDefinition in orchestrator mode requires delegated tool work', () => {
     const settingsService = createMockSettingsService({
         'app.orchestratorMode': true,
         'agent.model': 'gpt-5',
@@ -97,13 +133,13 @@ test('getAgentDefinition in orchestrator mode requires delegated tool work', (t)
         loggingService: mockLogger,
         runSubagent: async () => ({}),
     });
-    t.true(definition.instructions.includes('Orchestrator mode'));
-    t.true(definition.instructions.includes('must delegate'));
-    t.false(definition.instructions.includes('Use `read_code_outline`'));
+    expect(definition.instructions.includes('Orchestrator mode')).toBe(true);
+    expect(definition.instructions.includes('Delegate workspace inspection')).toBe(true);
+    expect(definition.instructions.includes('Use `read_code_outline`')).toBe(false);
     // Verify non-orchestrator direct-tool guidance is absent from orchestrator instructions
-    t.false(definition.instructions.includes('Prefer `read_file` for reading file contents.'));
+    expect(definition.instructions.includes('Prefer `read_file` for reading file contents.')).toBe(false);
 });
-test('getAgentDefinition in orchestrator mode exposes run_subagent, shell, read_file, and grep for non-gpt-5 model', (t) => {
+it('getAgentDefinition in orchestrator mode exposes run_subagent, shell, read_file, and grep for non-gpt-5 model', () => {
     const settingsService = createMockSettingsService({
         'app.orchestratorMode': true,
         'agent.model': 'gpt-4o',
@@ -113,19 +149,19 @@ test('getAgentDefinition in orchestrator mode exposes run_subagent, shell, read_
         loggingService: mockLogger,
         runSubagent: async () => ({}),
     });
-    t.deepEqual(definition.tools.map((tool) => tool.name), ['run_subagent', 'shell', 'read_file', 'grep']);
+    expect(definition.tools.map((tool) => tool.name)).toEqual(['run_subagent', 'shell', 'read_file', 'grep']);
 });
-test('getAgentDefinition throws if orchestratorMode is true and runSubagent is missing', (t) => {
+it('getAgentDefinition throws if orchestratorMode is true and runSubagent is missing', () => {
     const settingsService = createMockSettingsService({
         'app.orchestratorMode': true,
         'agent.model': 'gpt-4o',
     });
-    t.throws(() => getAgentDefinition({
+    expect(() => getAgentDefinition({
         settingsService,
         loggingService: mockLogger,
-    }), { instanceOf: Error, message: /orchestratorMode.*runSubagent|runSubagent.*orchestratorMode/i });
+    })).toThrow(/orchestratorMode.*runSubagent|runSubagent.*orchestratorMode/i);
 });
-test('getAgentDefinition excludes grep and find_files when searchViaShell is true', (t) => {
+it('getAgentDefinition excludes grep and find_files when searchViaShell is true', () => {
     const settingsService = createMockSettingsService({
         'app.searchViaShell': 'on',
         'agent.model': 'gpt-4o',
@@ -135,12 +171,12 @@ test('getAgentDefinition excludes grep and find_files when searchViaShell is tru
         loggingService: mockLogger,
     });
     const toolNames = definition.tools.map((tool) => tool.name);
-    t.false(toolNames.includes('grep'));
-    t.false(toolNames.includes('find_files'));
-    t.true(toolNames.includes('read_code_outline'));
-    t.true(toolNames.includes('code_context_search'));
+    expect(toolNames.includes('grep')).toBe(false);
+    expect(toolNames.includes('find_files')).toBe(false);
+    expect(toolNames.includes('read_code_outline')).toBe(true);
+    expect(toolNames.includes('code_context_search')).toBe(true);
 });
-test('getAgentDefinition preserves read_file and editing tools when searchViaShell is true', (t) => {
+it('getAgentDefinition preserves read_file and editing tools when searchViaShell is true', () => {
     const settingsService = createMockSettingsService({
         'app.searchViaShell': 'on',
         'agent.model': 'gpt-4o',
@@ -150,14 +186,14 @@ test('getAgentDefinition preserves read_file and editing tools when searchViaShe
         loggingService: mockLogger,
     });
     const toolNames = definition.tools.map((tool) => tool.name);
-    t.true(toolNames.includes('read_file'));
-    t.true(toolNames.includes('read_code_outline'));
-    t.true(toolNames.includes('code_context_search'));
-    t.true(toolNames.includes('search_replace'));
-    t.true(toolNames.includes('create_file'));
-    t.true(toolNames.includes('shell'));
-});
-test('getAgentDefinition excludes grep and find_files in lite mode when searchViaShell is true', (t) => {
+    expect(toolNames.includes('read_file')).toBe(true);
+    expect(toolNames.includes('read_code_outline')).toBe(true);
+    expect(toolNames.includes('code_context_search')).toBe(true);
+    expect(toolNames.includes('search_replace')).toBe(true);
+    expect(toolNames.includes('create_file')).toBe(true);
+    expect(toolNames.includes('shell')).toBe(true);
+});
+it('getAgentDefinition excludes grep and find_files in lite mode when searchViaShell is true', () => {
     const settingsService = createMockSettingsService({
         'app.searchViaShell': 'on',
         'app.liteMode': true,
@@ -168,14 +204,14 @@ test('getAgentDefinition excludes grep and find_files in lite mode when searchVi
         loggingService: mockLogger,
     });
     const toolNames = definition.tools.map((tool) => tool.name);
-    t.false(toolNames.includes('grep'));
-    t.false(toolNames.includes('find_files'));
-    t.true(toolNames.includes('read_code_outline'));
-    t.true(toolNames.includes('code_context_search'));
-    t.true(toolNames.includes('read_file'));
-    t.false(toolNames.includes('search_replace'));
-});
-test('getAgentDefinition for gpt-5 omits grep and find_files regardless of searchViaShell', (t) => {
+    expect(toolNames.includes('grep')).toBe(false);
+    expect(toolNames.includes('find_files')).toBe(false);
+    expect(toolNames.includes('read_code_outline')).toBe(true);
+    expect(toolNames.includes('code_context_search')).toBe(true);
+    expect(toolNames.includes('read_file')).toBe(true);
+    expect(toolNames.includes('search_replace')).toBe(false);
+});
+it('getAgentDefinition for gpt-5 omits grep and find_files regardless of searchViaShell', () => {
     const settingsService = createMockSettingsService({
         'app.searchViaShell': 'off',
         'agent.model': 'gpt-5',
@@ -185,13 +221,13 @@ test('getAgentDefinition for gpt-5 omits grep and find_files regardless of searc
         loggingService: mockLogger,
     });
     const toolNames = definition.tools.map((tool) => tool.name);
-    t.false(toolNames.includes('grep'));
-    t.false(toolNames.includes('find_files'));
-    t.true(toolNames.includes('read_code_outline'));
-    t.true(toolNames.includes('code_context_search'));
-    t.true(toolNames.includes('apply_patch'));
+    expect(toolNames.includes('grep')).toBe(false);
+    expect(toolNames.includes('find_files')).toBe(false);
+    expect(toolNames.includes('read_code_outline')).toBe(true);
+    expect(toolNames.includes('code_context_search')).toBe(true);
+    expect(toolNames.includes('apply_patch')).toBe(true);
 });
-test('getAgentDefinition defaults searchViaShell to true for gpt-5 models when not explicitly configured', (t) => {
+it('getAgentDefinition defaults searchViaShell to true for gpt-5 models when not explicitly configured', () => {
     const settingsService = createMockSettingsService({
         'agent.model': 'gpt-5',
     });
@@ -199,9 +235,9 @@ test('getAgentDefinition defaults searchViaShell to true for gpt-5 models when n
         settingsService,
         loggingService: mockLogger,
     });
-    t.true(definition.instructions.includes('### Searching via the shell'));
+    expect(definition.instructions.includes('### Searching via the shell')).toBe(true);
 });
-test('getAgentDefinition respects explicitly disabled searchViaShell for gpt-5 models', (t) => {
+it('getAgentDefinition respects explicitly disabled searchViaShell for gpt-5 models', () => {
     const settingsService = createMockSettingsService({
         'app.searchViaShell': 'off',
         'agent.model': 'gpt-5',
@@ -210,9 +246,9 @@ test('getAgentDefinition respects explicitly disabled searchViaShell for gpt-5 m
         settingsService,
         loggingService: mockLogger,
     });
-    t.false(definition.instructions.includes('### Searching via the shell'));
+    expect(definition.instructions.includes('### Searching via the shell')).toBe(false);
 });
-test('getAgentDefinition does not default searchViaShell to true for non-gpt-5 models', (t) => {
+it('getAgentDefinition does not default searchViaShell to true for non-gpt-5 models', () => {
     const settingsService = createMockSettingsService({
         'agent.model': 'gpt-4o',
     });
@@ -220,11 +256,11 @@ test('getAgentDefinition does not default searchViaShell to true for non-gpt-5 m
         settingsService,
         loggingService: mockLogger,
     });
-    t.false(definition.instructions.includes('### Searching via the shell'));
-    t.true(definition.instructions.includes('`find_files`'));
-    t.true(definition.instructions.includes('`grep`'));
+    expect(definition.instructions.includes('### Searching via the shell')).toBe(false);
+    expect(definition.instructions.includes('`find_files`')).toBe(true);
+    expect(definition.instructions.includes('`grep`')).toBe(true);
 });
-test('getAgentDefinition forces searchViaShell on for non-gpt-5 models when explicitly set to on', (t) => {
+it('getAgentDefinition forces searchViaShell on for non-gpt-5 models when explicitly set to on', () => {
     const settingsService = createMockSettingsService({
         'app.searchViaShell': 'on',
         'agent.model': 'gpt-4o',
@@ -233,19 +269,19 @@ test('getAgentDefinition forces searchViaShell on for non-gpt-5 models when expl
         settingsService,
         loggingService: mockLogger,
     });
-    t.true(definition.instructions.includes('### Searching via the shell'));
-    t.false(definition.instructions.includes('`find_files`'));
-    t.false(definition.instructions.includes('`grep`'));
+    expect(definition.instructions.includes('### Searching via the shell')).toBe(true);
+    expect(definition.instructions.includes('`find_files`')).toBe(false);
+    expect(definition.instructions.includes('`grep`')).toBe(false);
 });
-// test('getAgentDefinition includes GPT version-specific prompt fragments', (t) => {
+// it('getAgentDefinition includes GPT version-specific prompt fragments', () => {
 //   const gpt55 = getAgentDefinition({
 //     settingsService: createMockSettingsService({
 //       'agent.model': 'gpt-5.5-2026-04-23',
 //     }),
 //     loggingService: mockLogger,
 //   });
-//   t.true(gpt55.instructions.includes('## GPT-5.5 Guidance'));
-//   t.true(gpt55.instructions.includes('outcome-first behavior'));
+//   expect(gpt55.instructions.includes('## GPT-5.5 Guidance')).toBe(true);
+//   expect(gpt55.instructions.includes('outcome-first behavior')).toBe(true);
 //
 //   const gpt54 = getAgentDefinition({
 //     settingsService: createMockSettingsService({
@@ -253,8 +289,8 @@ test('getAgentDefinition forces searchViaShell on for non-gpt-5 models when expl
 //     }),
 //     loggingService: mockLogger,
 //   });
-//   t.true(gpt54.instructions.includes('## GPT-5.4 Guidance'));
-//   t.false(gpt54.instructions.includes('## GPT-5.4 Small-Model Guidance'));
+//   expect(gpt54.instructions.includes('## GPT-5.4 Guidance')).toBe(true);
+//   expect(gpt54.instructions.includes('## GPT-5.4 Small-Model Guidance')).toBe(false);
 //
 //   const gpt54Mini = getAgentDefinition({
 //     settingsService: createMockSettingsService({
@@ -262,8 +298,8 @@ test('getAgentDefinition forces searchViaShell on for non-gpt-5 models when expl
 //     }),
 //     loggingService: mockLogger,
 //   });
-//   t.true(gpt54Mini.instructions.includes('## GPT-5.4 Guidance'));
-//   t.true(gpt54Mini.instructions.includes('## GPT-5.4 Small-Model Guidance'));
+//   expect(gpt54Mini.instructions.includes('## GPT-5.4 Guidance')).toBe(true);
+//   expect(gpt54Mini.instructions.includes('## GPT-5.4 Small-Model Guidance')).toBe(true);
 //
 //   const gpt53Codex = getAgentDefinition({
 //     settingsService: createMockSettingsService({
@@ -271,9 +307,9 @@ test('getAgentDefinition forces searchViaShell on for non-gpt-5 models when expl
 //     }),
 //     loggingService: mockLogger,
 //   });
-//   t.true(gpt53Codex.instructions.includes('## GPT-5.3 Codex Guidance'));
+//   expect(gpt53Codex.instructions.includes('## GPT-5.3 Codex Guidance')).toBe(true);
 // });
-test('getAgentDefinition appends search-via-shell addendum when enabled', (t) => {
+it('getAgentDefinition appends search-via-shell addendum when enabled', () => {
     const settingsService = createMockSettingsService({
         'app.searchViaShell': 'on',
         'agent.model': 'gpt-4o',
@@ -282,9 +318,9 @@ test('getAgentDefinition appends search-via-shell addendum when enabled', (t) =>
         settingsService,
         loggingService: mockLogger,
     });
-    t.true(definition.instructions.includes('### Searching via the shell'));
+    expect(definition.instructions.includes('### Searching via the shell')).toBe(true);
 });
-test('getAgentDefinition omits dedicated search tool references from prompt when searchViaShell is true', (t) => {
+it('getAgentDefinition omits dedicated search tool references from prompt when searchViaShell is true', () => {
     const settingsService = createMockSettingsService({
         'app.searchViaShell': 'on',
         'agent.model': 'gpt-4o',
@@ -293,10 +329,10 @@ test('getAgentDefinition omits dedicated search tool references from prompt when
         settingsService,
         loggingService: mockLogger,
     });
-    t.false(definition.instructions.includes('`find_files`'));
-    t.false(definition.instructions.includes('`grep`'));
+    expect(definition.instructions.includes('`find_files`')).toBe(false);
+    expect(definition.instructions.includes('`grep`')).toBe(false);
 });
-test('getAgentDefinition dynamically includes dedicated search tool references when searchViaShell is false', (t) => {
+it('getAgentDefinition dynamically includes dedicated search tool references when searchViaShell is false', () => {
     const settingsService = createMockSettingsService({
         'app.searchViaShell': 'off',
         'agent.model': 'gpt-4o',
@@ -305,13 +341,13 @@ test('getAgentDefinition dynamically includes dedicated search tool references w
         settingsService,
         loggingService: mockLogger,
     });
-    t.true(definition.instructions.includes('`find_files`'));
-    t.true(definition.instructions.includes('`grep`'));
-    t.true(definition.instructions.includes('read_code_outline'));
-    t.true(definition.instructions.includes('code_context_search'));
-    t.true(definition.instructions.includes('read_file'));
+    expect(definition.instructions.includes('`find_files`')).toBe(true);
+    expect(definition.instructions.includes('`grep`')).toBe(true);
+    expect(definition.instructions.includes('read_code_outline')).toBe(true);
+    expect(definition.instructions.includes('code_context_search')).toBe(true);
+    expect(definition.instructions.includes('read_file')).toBe(true);
 });
-test('getAgentDefinition dynamically includes code-context tool references when available', (t) => {
+it('getAgentDefinition dynamically includes code-context tool references when available', () => {
     const settingsService = createMockSettingsService({
         'app.searchViaShell': 'on',
         'agent.model': 'gpt-4o',
@@ -320,11 +356,11 @@ test('getAgentDefinition dynamically includes code-context tool references when
         settingsService,
         loggingService: mockLogger,
     });
-    t.true(definition.instructions.includes('read_code_outline'));
-    t.true(definition.instructions.includes('code_context_search'));
-    t.true(definition.instructions.includes('read_file'));
+    expect(definition.instructions.includes('read_code_outline')).toBe(true);
+    expect(definition.instructions.includes('code_context_search')).toBe(true);
+    expect(definition.instructions.includes('read_file')).toBe(true);
 });
-test('getAgentDefinition dynamically includes code-context tool references for gpt-5 models', (t) => {
+it('getAgentDefinition dynamically includes code-context tool references for gpt-5 models', () => {
     const settingsService = createMockSettingsService({
         'app.searchViaShell': 'off',
         'agent.model': 'gpt-5',
@@ -333,10 +369,10 @@ test('getAgentDefinition dynamically includes code-context tool references for g
         settingsService,
         loggingService: mockLogger,
     });
-    t.true(definition.instructions.includes('read_code_outline'));
-    t.true(definition.instructions.includes('code_context_search'));
+    expect(definition.instructions.includes('read_code_outline')).toBe(true);
+    expect(definition.instructions.includes('code_context_search')).toBe(true);
 });
-test('getAgentDefinition uses fallback search prompt for remote execution', (t) => {
+it('getAgentDefinition uses fallback search prompt for remote execution', () => {
     const settingsService = createMockSettingsService({
         'app.searchViaShell': 'on',
         'agent.model': 'gpt-4o',
@@ -352,12 +388,12 @@ test('getAgentDefinition uses fallback search prompt for remote execution', (t)
         executionContext: mockExecutionContext,
     });
     // Remote should always fallback to grep/find instructions
-    t.true(definition.instructions.includes('`grep`'));
-    t.true(definition.instructions.includes('`find`'));
-    t.false(definition.instructions.includes('`rg`'));
-    t.false(definition.instructions.includes('`fd`'));
+    expect(definition.instructions.includes('`grep`')).toBe(true);
+    expect(definition.instructions.includes('`find`')).toBe(true);
+    expect(definition.instructions.includes('`rg`')).toBe(false);
+    expect(definition.instructions.includes('`fd`')).toBe(false);
 });
-test('getAgentDefinition excludes code-context tools in remote (SSH) execution', (t) => {
+it('getAgentDefinition excludes code-context tools in remote (SSH) execution', () => {
     const settingsService = createMockSettingsService({
         'app.searchViaShell': 'off',
         'agent.model': 'gpt-4o',
@@ -373,11 +409,11 @@ test('getAgentDefinition excludes code-context tools in remote (SSH) execution',
         executionContext: mockExecutionContext,
     });
     const toolNames = definition.tools.map((tool) => tool.name);
-    t.false(toolNames.includes('read_code_outline'));
-    t.false(toolNames.includes('code_context_search'));
-    t.false(definition.instructions.includes('read_code_outline'));
+    expect(toolNames.includes('read_code_outline')).toBe(false);
+    expect(toolNames.includes('code_context_search')).toBe(false);
+    expect(definition.instructions.includes('read_code_outline')).toBe(false);
 });
-test('getAgentDefinition does not filter tools based on planMode setting', (t) => {
+it('getAgentDefinition does not filter tools based on planMode setting', () => {
     const settingsService = createMockSettingsService({
         'agent.model': 'gpt-4o',
         'app.planMode': true,
@@ -387,8 +423,8 @@ test('getAgentDefinition does not filter tools based on planMode setting', (t) =
         loggingService: mockLogger,
     });
     const toolsWithPlan = definitionWithPlan.tools.map((tool) => tool.name);
-    t.true(toolsWithPlan.includes('create_file'));
-    t.true(toolsWithPlan.includes('search_replace'));
+    expect(toolsWithPlan.includes('create_file')).toBe(true);
+    expect(toolsWithPlan.includes('search_replace')).toBe(true);
     const settingsServiceWithoutPlan = createMockSettingsService({
         'agent.model': 'gpt-4o',
         'app.planMode': false,
@@ -398,10 +434,10 @@ test('getAgentDefinition does not filter tools based on planMode setting', (t) =
         loggingService: mockLogger,
     });
     const toolsWithoutPlan = definitionWithoutPlan.tools.map((tool) => tool.name);
-    t.true(toolsWithoutPlan.includes('create_file'));
-    t.true(toolsWithoutPlan.includes('search_replace'));
+    expect(toolsWithoutPlan.includes('create_file')).toBe(true);
+    expect(toolsWithoutPlan.includes('search_replace')).toBe(true);
 });
-test('getAgentDefinition includes AGENTS.md and full envInfo for orchestrator mode and plan mode', (t) => {
+it('getAgentDefinition includes AGENTS.md and full envInfo for orchestrator mode and plan mode', () => {
     // Test Orchestrator Mode
     const settingsOrchestrator = createMockSettingsService({
         'agent.model': 'gpt-4o',
@@ -412,8 +448,8 @@ test('getAgentDefinition includes AGENTS.md and full envInfo for orchestrator mo
         loggingService: mockLogger,
         runSubagent: async () => ({}),
     });
-    t.true(definitionOrchestrator.instructions.includes('AGENTS.md contents:'));
-    t.true(definitionOrchestrator.instructions.includes('top-level:'));
+    expect(definitionOrchestrator.instructions.includes('AGENTS.md contents:')).toBe(true);
+    expect(definitionOrchestrator.instructions.includes('Project structure:')).toBe(true);
     // Test Plan Mode
     const settingsPlan = createMockSettingsService({
         'agent.model': 'gpt-4o',
@@ -423,17 +459,17 @@ test('getAgentDefinition includes AGENTS.md and full envInfo for orchestrator mo
         settingsService: settingsPlan,
         loggingService: mockLogger,
     });
-    t.true(definitionPlan.instructions.includes('AGENTS.md contents:'));
-    t.true(definitionPlan.instructions.includes('top-level:'));
+    expect(definitionPlan.instructions.includes('AGENTS.md contents:')).toBe(true);
+    expect(definitionPlan.instructions.includes('Project structure:')).toBe(true);
 });
-test('getAgentDefinition includes worktree hygiene fragment in standard, mentor, plan, and orchestrator modes', (t) => {
+it('getAgentDefinition includes worktree hygiene fragment in standard, mentor, plan, and orchestrator modes', () => {
     const standard = getAgentDefinition({
         settingsService: createMockSettingsService({
             'agent.model': 'gpt-4o',
         }),
         loggingService: mockLogger,
     });
-    t.true(standard.instructions.includes(WORKTREE_HYGIENE_FRAGMENT_MARKER));
+    expect(standard.instructions.includes(WORKTREE_HYGIENE_FRAGMENT_MARKER)).toBe(true);
     const mentor = getAgentDefinition({
         settingsService: createMockSettingsService({
             'agent.model': 'gpt-4o',
@@ -441,7 +477,7 @@ test('getAgentDefinition includes worktree hygiene fragment in standard, mentor,
         }),
         loggingService: mockLogger,
     });
-    t.true(mentor.instructions.includes(WORKTREE_HYGIENE_FRAGMENT_MARKER));
+    expect(mentor.instructions.includes(WORKTREE_HYGIENE_FRAGMENT_MARKER)).toBe(true);
     const plan = getAgentDefinition({
         settingsService: createMockSettingsService({
             'agent.model': 'gpt-4o',
@@ -449,7 +485,7 @@ test('getAgentDefinition includes worktree hygiene fragment in standard, mentor,
         }),
         loggingService: mockLogger,
     });
-    t.true(plan.instructions.includes(WORKTREE_HYGIENE_FRAGMENT_MARKER));
+    expect(plan.instructions.includes(WORKTREE_HYGIENE_FRAGMENT_MARKER)).toBe(true);
     const orchestrator = getAgentDefinition({
         settingsService: createMockSettingsService({
             'agent.model': 'gpt-4o',
@@ -458,9 +494,9 @@ test('getAgentDefinition includes worktree hygiene fragment in standard, mentor,
         loggingService: mockLogger,
         runSubagent: async () => ({}),
     });
-    t.true(orchestrator.instructions.includes(WORKTREE_HYGIENE_FRAGMENT_MARKER));
+    expect(orchestrator.instructions.includes(WORKTREE_HYGIENE_FRAGMENT_MARKER)).toBe(true);
 });
-test('getAgentDefinition omits worktree hygiene fragment in lite mode', (t) => {
+it('getAgentDefinition omits worktree hygiene fragment in lite mode', () => {
     const definition = getAgentDefinition({
         settingsService: createMockSettingsService({
             'agent.model': 'gpt-4o',
@@ -468,6 +504,43 @@ test('getAgentDefinition omits worktree hygiene fragment in lite mode', (t) => {
         }),
         loggingService: mockLogger,
     });
-    t.false(definition.instructions.includes(WORKTREE_HYGIENE_FRAGMENT_MARKER));
+    expect(definition.instructions.includes(WORKTREE_HYGIENE_FRAGMENT_MARKER)).toBe(false);
+});
+it('getAgentDefinition registers activate_skill tool and includes catalog when skills exist', () => {
+    const mockSkillsService = {
+        getAvailableSkillsForModel: () => [
+            {
+                name: 'test-skill',
+                description: 'Test skill description',
+                location: '/path/to/SKILL.md',
+                isProjectLevel: true,
+                body: 'Body',
+                rawContent: 'Raw',
+            },
+        ],
+        getSkillCatalog: () => '<available_skills>Mock Catalog</available_skills>',
+    };
+    const definition = getAgentDefinition({
+        settingsService: createMockSettingsService({ 'agent.model': 'gpt-4o' }),
+        loggingService: mockLogger,
+        skillsService: mockSkillsService,
+    });
+    const toolNames = definition.tools.map((tool) => tool.name);
+    expect(toolNames.includes('activate_skill')).toBe(true);
+    expect(definition.instructions.includes('<available_skills>Mock Catalog</available_skills>')).toBe(true);
+});
+it('getAgentDefinition omits activate_skill tool and catalog when skills do not exist', () => {
+    const mockSkillsService = {
+        getAvailableSkillsForModel: () => [],
+        getSkillCatalog: () => '',
+    };
+    const definition = getAgentDefinition({
+        settingsService: createMockSettingsService({ 'agent.model': 'gpt-4o' }),
+        loggingService: mockLogger,
+        skillsService: mockSkillsService,
+    });
+    const toolNames = definition.tools.map((tool) => tool.name);
+    expect(toolNames.includes('activate_skill')).toBe(false);
+    expect(definition.instructions.includes('<available_skills>')).toBe(false);
 });
 //# sourceMappingURL=agent.test.js.map