@qduc/term2 0.6.1 → 0.7.1

package/dist/agent.d.ts

@@ -1,6 +1,14 @@
 import type { ToolDefinition } from './tools/types.js';
 import type { ISettingsService, ILoggingService } from './services/service-interfaces.js';
 import { ExecutionContext } from './services/execution-context.js';
+type ProjectTreeOptions = {
+    maxDepth?: number;
+    maxEntriesPerDir?: number;
+    maxTotalEntries?: number;
+    includeFiles?: boolean;
+    ignoredNames?: Set<string>;
+};
+export declare function getProjectTreeForPrompt(cwd: string, options?: ProjectTreeOptions): string;
 export declare function getEnvInfo(settingsService: ISettingsService, executionContext?: ExecutionContext, lite?: boolean): string;
 export declare function getAgentsInstructions(cwd: string): string;
 export interface AgentDefinition {
@@ -20,7 +28,7 @@ export declare const getAgentDefinition: (deps: {
     runSubagent?: (params: {
         role: string;
         task: string;
-        writeBoundary?: string[];
     }, context?: unknown, details?: unknown) => Promise<any>;
 }, model?: string) => AgentDefinition;
+export {};
 //# sourceMappingURL=agent.d.ts.map

package/dist/agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../source/agent.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAC1F,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAqBnE,wBAAgB,UAAU,CACxB,eAAe,EAAE,gBAAgB,EACjC,gBAAgB,CAAC,EAAE,gBAAgB,EACnC,IAAI,UAAQ,GACX,MAAM,CAwBR;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAUzD;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;CACf;AAcD;;GAEG;AACH,eAAO,MAAM,kBAAkB,GAC7B,MAAM;IACJ,eAAe,EAAE,gBAAgB,CAAC;IAClC,cAAc,EAAE,eAAe,CAAC;IAChC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,SAAS,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAClD,WAAW,CAAC,EAAE,CACZ,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,EAChE,OAAO,CAAC,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,KACd,OAAO,CAAC,GAAG,CAAC,CAAC;CACnB,EACD,QAAQ,MAAM,KACb,eA+LF,CAAC"}
+{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../source/agent.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAKvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAC1F,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAMnE,KAAK,kBAAkB,GAAG;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC5B,CAAC;AA+CF,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,kBAAuB,GAAG,MAAM,CAoH7F;AAED,wBAAgB,UAAU,CACxB,eAAe,EAAE,gBAAgB,EACjC,gBAAgB,CAAC,EAAE,gBAAgB,EACnC,IAAI,UAAQ,GACX,MAAM,CAwBR;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAUzD;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;CACf;AAmBD;;GAEG;AACH,eAAO,MAAM,kBAAkB,GAC7B,MAAM;IACJ,eAAe,EAAE,gBAAgB,CAAC;IAClC,cAAc,EAAE,eAAe,CAAC;IAChC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,SAAS,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAClD,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;CAC9G,EACD,QAAQ,MAAM,KACb,eAsJF,CAAC"}

package/dist/agent.js

@@ -14,22 +14,145 @@ import { registerToolFormatters } from './tools/command-message-formatters.js';
 import os from 'os';
 import fs from 'fs';
 import path from 'path';
-import { getPromptPath } from './prompts/prompt-selector.js';
+import { default as createIgnore } from 'ignore';
+import { buildPromptSpec } from './prompts/prompt-constructor.js';
 import { shouldPreferPatchEditingModel } from './lib/tool-selection-policy.js';
-import { getSearchViaShellAddendum } from './prompts/search-via-shell.js';
-import { getSubagentDelegationAddendum } from './prompts/subagent-delegation.js';
-import { getReasoningEfficiencyAddendum } from './prompts/reasoning-efficiency.js';
 const BASE_PROMPT_PATH = path.join(import.meta.dirname, './prompts');
-function getTopLevelEntries(cwd, limit = 50) {
+const ALWAYS_IGNORE = ['.git', 'node_modules', 'dist', 'build', '.next', '.turbo', 'coverage', '.cache', '.DS_Store'];
+const ALWAYS_INCLUDE = new Set([
+    'package.json',
+    'tsconfig.json',
+    'README.md',
+    'readme.md',
+    '.gitignore',
+    '.env.example',
+]);
+const SENSITIVE_PATTERNS = [/^\.env$/, /^\.env\./, /secret/i, /private/i, /credential/i, /token/i];
+function isSensitiveFile(name) {
+    return SENSITIVE_PATTERNS.some((pattern) => pattern.test(name));
+}
+function createProjectIgnore(cwd) {
+    const ig = createIgnore();
+    ig.add(ALWAYS_IGNORE);
+    const gitignorePath = path.join(cwd, '.gitignore');
     try {
-        const entries = fs.readdirSync(cwd, { withFileTypes: true });
-        const names = entries.map((e) => (e.isDirectory() ? `${e.name}/` : e.name));
-        const shown = names.slice(0, limit);
-        const more = names.length > limit ? `, ...(+${names.length - limit} more)` : '';
-        return shown.join(', ') + more;
+        if (fs.existsSync(gitignorePath)) {
+            ig.add(fs.readFileSync(gitignorePath, 'utf8'));
+        }
+    }
+    catch {
+        // If .gitignore cannot be read, continue with default ignores.
+    }
+    return {
+        ignores(relativePath, basename) {
+            const normalized = relativePath.split(path.sep).join('/');
+            if (ALWAYS_INCLUDE.has(basename)) {
+                return false;
+            }
+            return ig.ignores(normalized);
+        },
+    };
+}
+export function getProjectTreeForPrompt(cwd, options = {}) {
+    const { maxDepth = 3, maxEntriesPerDir = 50, maxTotalEntries = 250, includeFiles = true } = options;
+    let totalEntries = 0;
+    let omittedByLimit = 0;
+    const projectIgnore = createProjectIgnore(cwd);
+    function walk(dir, depth, prefix) {
+        if (depth > maxDepth || totalEntries >= maxTotalEntries)
+            return [];
+        let entries;
+        try {
+            entries = fs.readdirSync(dir, { withFileTypes: true });
+        }
+        catch (e) {
+            return [`${prefix}└─ [failed to read: ${e.message}]`];
+        }
+        const filtered = entries
+            .filter((entry) => {
+            const absolutePath = path.join(dir, entry.name);
+            const relativePath = path.relative(cwd, absolutePath).split(path.sep).join('/');
+            if (isSensitiveFile(entry.name)) {
+                return false;
+            }
+            if (projectIgnore.ignores(relativePath, entry.name)) {
+                return false;
+            }
+            if (!includeFiles && !entry.isDirectory()) {
+                return false;
+            }
+            return true;
+        })
+            .sort((a, b) => {
+            if (a.isDirectory() && !b.isDirectory())
+                return -1;
+            if (!a.isDirectory() && b.isDirectory())
+                return 1;
+            return a.name.localeCompare(b.name);
+        });
+        const shown = filtered.slice(0, maxEntriesPerDir);
+        omittedByLimit += Math.max(0, filtered.length - shown.length);
+        const lines = [];
+        const subdirs = [];
+        // BFS: render all children at this level first, then recurse into subdirs.
+        // This guarantees breadth-first budget allocation — shallower entries
+        // always take priority over deeper ones.
+        for (let index = 0; index < shown.length; index++) {
+            if (totalEntries >= maxTotalEntries) {
+                omittedByLimit += shown.length - index;
+                break;
+            }
+            const entry = shown[index];
+            totalEntries++;
+            const isLast = index === shown.length - 1;
+            const connector = isLast ? '└─ ' : '├─ ';
+            const childPrefix = prefix + (isLast ? '   ' : '│  ');
+            const displayName = entry.isDirectory() ? `${entry.name}/` : entry.name;
+            lines.push(`${prefix}${connector}${displayName}`);
+            if (entry.isDirectory()) {
+                if (depth >= maxDepth) {
+                    lines.push(`${childPrefix}└─ …`);
+                }
+                else {
+                    subdirs.push({
+                        path: path.join(dir, entry.name),
+                        depth: depth + 1,
+                        prefix: childPrefix,
+                    });
+                }
+            }
+        }
+        // Now recurse into collected subdirs (BFS step 2: children of children).
+        // Each subdir call starts a new breadth-first pass, but since they are
+        // processed after all current-level siblings are rendered, the budget
+        // naturally fills shallower levels first.
+        for (const subdir of subdirs) {
+            if (totalEntries >= maxTotalEntries)
+                break;
+            lines.push(...walk(subdir.path, subdir.depth, subdir.prefix));
+        }
+        return lines;
+    }
+    try {
+        const lines = [
+            'Project structure:',
+            '.',
+            ...walk(cwd, 1, ''),
+            '',
+            'Project structure notes:',
+            `- Root: ${cwd}`,
+            `- Max depth: ${maxDepth}`,
+            `- Max entries per directory: ${maxEntriesPerDir}`,
+            `- Max total entries: ${maxTotalEntries}`,
+            `- Ignored via defaults and .gitignore`,
+        ];
+        if (omittedByLimit > 0) {
+            lines.push(`- Omitted due to limits: ${omittedByLimit}`);
+        }
+        return lines.join('\n');
     }
     catch (e) {
-        return `failed to read: ${e.message}`;
+        return `Project structure:\n[failed to read ${cwd}: ${e.message}]`;
     }
 }
 export function getEnvInfo(settingsService, executionContext, lite = false) {
@@ -45,11 +168,11 @@ export function getEnvInfo(settingsService, executionContext, lite = false) {
     }
     // For remote sessions, we might not be able to list top-level entries efficiently or at all easily here synchronously
     // We'll skip top-level entries for now if remote, or maybe we can't get them sync.
-    // getTopLevelEntries is sync and uses fs.readdirSync. This won't work for remote.
+    // getProjectTreeForPrompt is sync and uses fs.readdirSync. This won't work for remote.
     // So if remote, we skip that part.
     let topLevel = '';
     if (!executionContext?.isRemote()) {
-        topLevel = `; top-level: ${getTopLevelEntries(cwd)}`;
+        topLevel = `; top-level: ${getProjectTreeForPrompt(cwd)}`;
     }
     return `OS: ${osType} ${osRelease} (${osPlatform}); shell: ${shellPath}; cwd: ${cwd}${topLevel}; date: ${now}`;
 }
@@ -70,7 +193,8 @@ function resolvePrompt(promptPath) {
         return fs.readFileSync(promptPath, 'utf-8').trim();
     }
     catch (e) {
-        const sourcePromptPath = path.join(import.meta.dirname, '../source/prompts', path.basename(promptPath));
+        const relativePromptPath = path.relative(BASE_PROMPT_PATH, promptPath);
+        const sourcePromptPath = path.join(import.meta.dirname, '../source/prompts', relativePromptPath.startsWith('..') ? path.basename(promptPath) : relativePromptPath);
         if (sourcePromptPath !== promptPath && fs.existsSync(sourcePromptPath)) {
             return fs.readFileSync(sourcePromptPath, 'utf-8').trim();
         }
@@ -90,72 +214,40 @@ export const getAgentDefinition = (deps, model) => {
     const mentorMode = settingsService.get('app.mentorMode');
     const liteMode = settingsService.get('app.liteMode');
     const orchestratorMode = settingsService.get('app.orchestratorMode');
-    const searchViaShell = settingsService.get('app.searchViaShell');
+    const searchViaShellSetting = settingsService.get('app.searchViaShell') ?? 'auto';
+    const searchViaShell = searchViaShellSetting === 'auto' ? shouldPreferPatchEditingModel(resolvedModel) : searchViaShellSetting === 'on';
     // Code-context tools operate on the local filesystem only; disable them for
     // remote (SSH) execution where the workspace lives on another host.
     const codeContextEnabled = !(executionContext?.isRemote() ?? false);
     const isGpt5 = !liteMode && shouldPreferPatchEditingModel(resolvedModel);
-    const promptPath = getPromptPath({
-        basePromptDir: BASE_PROMPT_PATH,
+    const promptSpec = buildPromptSpec({
         model: resolvedModel,
         liteMode,
         orchestratorMode,
+        mentorMode,
+        planMode,
+        searchViaShell,
+        codeContextEnabled,
+        runSubagentEnabled: Boolean(runSubagent),
+        executionContext,
     });
-    let prompt = resolvePrompt(promptPath);
-    if (mentorMode && !liteMode) {
-        const addonPath = path.join(BASE_PROMPT_PATH, 'mentor-addon.md');
-        try {
-            const addon = resolvePrompt(addonPath);
-            prompt = `${prompt}\n\n${addon}`;
-        }
-        catch (e) {
-            loggingService.error(`Failed to load mentor addon: ${e}`);
-        }
-    }
-    const codeContextDoc = !orchestratorMode && codeContextEnabled
-        ? liteMode
-            ? '### Code Context Tools\n\n- `read_code_outline`: inspect file structure.\n- `code_context_search`: find related files or symbol declarations. Use `read_file` before editing.'
-            : '### Code Context Tools\n\n- Use `read_code_outline` for a compact file outline.\n- Use `code_context_search` for related files or symbol declarations.\n- Use `read_file` before editing.'
-        : '';
-    if (codeContextDoc) {
-        prompt = `${prompt}\n\n${codeContextDoc}`;
-    }
-    if (!orchestratorMode && searchViaShell) {
-        try {
-            const addendum = getSearchViaShellAddendum({ executionContext });
-            prompt = `${prompt}\n\n${addendum}`;
-        }
-        catch (e) {
-            loggingService.error(`Failed to load search-via-shell addendum: ${e}`);
-        }
-    }
-    else if (!orchestratorMode) {
-        if (!isGpt5) {
-            const searchToolsDoc = liteMode
-                ? '### Search Tools\n\n- `find_files`: locate files by name or glob.\n- `grep`: search file contents.'
-                : '### Search Tools\n\n- Prefer `find_files` for locating files by name or glob.\n- Prefer `grep` for searching code content or symbols.';
-            prompt = `${prompt}\n\n${searchToolsDoc}`;
-        }
-    }
-    // Delegation guidance is injected only in orchestrator mode when runSubagent is available.
-    if (orchestratorMode && runSubagent) {
-        prompt = `${prompt}\n\n${getSubagentDelegationAddendum({ orchestratorMode })}`;
-    }
-    if (planMode) {
+    let prompt = resolvePrompt(path.join(BASE_PROMPT_PATH, promptSpec.basePromptFile));
+    for (const fragmentFile of promptSpec.fragmentFiles) {
         try {
-            const planModeInfoPath = path.join(BASE_PROMPT_PATH, 'plan-mode-info.md');
-            prompt = `${prompt}\n\n${resolvePrompt(planModeInfoPath)}`;
+            prompt = `${prompt}\n\n${resolvePrompt(path.join(BASE_PROMPT_PATH, fragmentFile))}`;
         }
         catch (e) {
-            loggingService.error(`Failed to load plan-mode-info: ${e}`);
+            loggingService.error(`Failed to load prompt fragment ${fragmentFile}: ${e}`);
         }
     }
-    const isOverThinkingModels = ['kimi', 'deepseek', 'glm', 'qwen', 'minimax', 'mimo'].some((key) => resolvedModel.toLowerCase().includes(key));
-    if (isOverThinkingModels) {
-        prompt += `\n\n${getReasoningEfficiencyAddendum()}`;
+    for (const inlineSection of promptSpec.inlineSections) {
+        prompt = `${prompt}\n\n${inlineSection}`;
     }
-    const envInfo = getEnvInfo(settingsService, executionContext, liteMode || orchestratorMode);
     const cwd = executionContext?.getCwd() || process.cwd();
+    const isLiteEnv = liteMode && !orchestratorMode && !planMode;
+    const envInfo = getEnvInfo(settingsService, executionContext, isLiteEnv);
+    const skipAgentsMd = isLiteEnv || (executionContext?.isRemote() ?? false);
+    const agentsInstructions = skipAgentsMd ? '' : getAgentsInstructions(cwd);
     if (orchestratorMode) {
         if (!runSubagent) {
             throw new Error('orchestratorMode requires runSubagent: cannot build orchestrator agent without a runSubagent implementation.');
@@ -169,7 +261,7 @@ export const getAgentDefinition = (deps, model) => {
         registerToolFormatters(tools);
         return {
             name: 'Agent',
-            instructions: `${prompt}\n\nEnvironment: ${envInfo}`,
+            instructions: `${prompt}\n\nEnvironment: ${envInfo}${agentsInstructions}`,
             tools,
             model: resolvedModel,
         };
@@ -231,9 +323,6 @@ export const getAgentDefinition = (deps, model) => {
         }
     }
     registerToolFormatters(tools);
-    // In lite mode, skip AGENTS.md loading.
-    // In remote mode, we also skip because we can't synchronously read from remote disk.
-    const agentsInstructions = liteMode || executionContext?.isRemote() ? '' : getAgentsInstructions(cwd);
     return {
         name: 'Terminal Assistant',
         instructions: `${prompt}\n\nEnvironment: ${envInfo}${agentsInstructions}`,

package/dist/agent.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent.js","sourceRoot":"","sources":["../source/agent.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agent.js","sourceRoot":"","sources":["../source/agent.ts"],"names":[],"mappings":"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"}

package/dist/agent.test.js

@@ -10,9 +10,10 @@ const mockLogger = {
     clearCorrelationId: () => { },
     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) => {
     const settingsService = createMockSettingsService({
-        'app.searchViaShell': false,
+        'app.searchViaShell': 'off',
         'agent.model': 'gpt-4o',
     });
     const definition = getAgentDefinition({
@@ -126,7 +127,7 @@ test('getAgentDefinition throws if orchestratorMode is true and runSubagent is m
 });
 test('getAgentDefinition excludes grep and find_files when searchViaShell is true', (t) => {
     const settingsService = createMockSettingsService({
-        'app.searchViaShell': true,
+        'app.searchViaShell': 'on',
         'agent.model': 'gpt-4o',
     });
     const definition = getAgentDefinition({
@@ -141,7 +142,7 @@ test('getAgentDefinition excludes grep and find_files when searchViaShell is tru
 });
 test('getAgentDefinition preserves read_file and editing tools when searchViaShell is true', (t) => {
     const settingsService = createMockSettingsService({
-        'app.searchViaShell': true,
+        'app.searchViaShell': 'on',
         'agent.model': 'gpt-4o',
     });
     const definition = getAgentDefinition({
@@ -158,7 +159,7 @@ test('getAgentDefinition preserves read_file and editing tools when searchViaShe
 });
 test('getAgentDefinition excludes grep and find_files in lite mode when searchViaShell is true', (t) => {
     const settingsService = createMockSettingsService({
-        'app.searchViaShell': true,
+        'app.searchViaShell': 'on',
         'app.liteMode': true,
         'agent.model': 'gpt-4o',
     });
@@ -176,7 +177,7 @@ test('getAgentDefinition excludes grep and find_files in lite mode when searchVi
 });
 test('getAgentDefinition for gpt-5 omits grep and find_files regardless of searchViaShell', (t) => {
     const settingsService = createMockSettingsService({
-        'app.searchViaShell': false,
+        'app.searchViaShell': 'off',
         'agent.model': 'gpt-5',
     });
     const definition = getAgentDefinition({
@@ -190,9 +191,91 @@ test('getAgentDefinition for gpt-5 omits grep and find_files regardless of searc
     t.true(toolNames.includes('code_context_search'));
     t.true(toolNames.includes('apply_patch'));
 });
+test('getAgentDefinition defaults searchViaShell to true for gpt-5 models when not explicitly configured', (t) => {
+    const settingsService = createMockSettingsService({
+        'agent.model': 'gpt-5',
+    });
+    const definition = getAgentDefinition({
+        settingsService,
+        loggingService: mockLogger,
+    });
+    t.true(definition.instructions.includes('### Searching via the shell'));
+});
+test('getAgentDefinition respects explicitly disabled searchViaShell for gpt-5 models', (t) => {
+    const settingsService = createMockSettingsService({
+        'app.searchViaShell': 'off',
+        'agent.model': 'gpt-5',
+    });
+    const definition = getAgentDefinition({
+        settingsService,
+        loggingService: mockLogger,
+    });
+    t.false(definition.instructions.includes('### Searching via the shell'));
+});
+test('getAgentDefinition does not default searchViaShell to true for non-gpt-5 models', (t) => {
+    const settingsService = createMockSettingsService({
+        'agent.model': 'gpt-4o',
+    });
+    const definition = getAgentDefinition({
+        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`'));
+});
+test('getAgentDefinition forces searchViaShell on for non-gpt-5 models when explicitly set to on', (t) => {
+    const settingsService = createMockSettingsService({
+        'app.searchViaShell': 'on',
+        'agent.model': 'gpt-4o',
+    });
+    const definition = getAgentDefinition({
+        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`'));
+});
+// test('getAgentDefinition includes GPT version-specific prompt fragments', (t) => {
+//   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'));
+//
+//   const gpt54 = getAgentDefinition({
+//     settingsService: createMockSettingsService({
+//       'agent.model': 'gpt-5.4',
+//     }),
+//     loggingService: mockLogger,
+//   });
+//   t.true(gpt54.instructions.includes('## GPT-5.4 Guidance'));
+//   t.false(gpt54.instructions.includes('## GPT-5.4 Small-Model Guidance'));
+//
+//   const gpt54Mini = getAgentDefinition({
+//     settingsService: createMockSettingsService({
+//       'agent.model': 'gpt-5.4-mini',
+//     }),
+//     loggingService: mockLogger,
+//   });
+//   t.true(gpt54Mini.instructions.includes('## GPT-5.4 Guidance'));
+//   t.true(gpt54Mini.instructions.includes('## GPT-5.4 Small-Model Guidance'));
+//
+//   const gpt53Codex = getAgentDefinition({
+//     settingsService: createMockSettingsService({
+//       'agent.model': 'gpt-5.3-codex',
+//     }),
+//     loggingService: mockLogger,
+//   });
+//   t.true(gpt53Codex.instructions.includes('## GPT-5.3 Codex Guidance'));
+// });
 test('getAgentDefinition appends search-via-shell addendum when enabled', (t) => {
     const settingsService = createMockSettingsService({
-        'app.searchViaShell': true,
+        'app.searchViaShell': 'on',
         'agent.model': 'gpt-4o',
     });
     const definition = getAgentDefinition({
@@ -203,7 +286,7 @@ test('getAgentDefinition appends search-via-shell addendum when enabled', (t) =>
 });
 test('getAgentDefinition omits dedicated search tool references from prompt when searchViaShell is true', (t) => {
     const settingsService = createMockSettingsService({
-        'app.searchViaShell': true,
+        'app.searchViaShell': 'on',
         'agent.model': 'gpt-4o',
     });
     const definition = getAgentDefinition({
@@ -215,7 +298,7 @@ test('getAgentDefinition omits dedicated search tool references from prompt when
 });
 test('getAgentDefinition dynamically includes dedicated search tool references when searchViaShell is false', (t) => {
     const settingsService = createMockSettingsService({
-        'app.searchViaShell': false,
+        'app.searchViaShell': 'off',
         'agent.model': 'gpt-4o',
     });
     const definition = getAgentDefinition({
@@ -230,7 +313,7 @@ test('getAgentDefinition dynamically includes dedicated search tool references w
 });
 test('getAgentDefinition dynamically includes code-context tool references when available', (t) => {
     const settingsService = createMockSettingsService({
-        'app.searchViaShell': true,
+        'app.searchViaShell': 'on',
         'agent.model': 'gpt-4o',
     });
     const definition = getAgentDefinition({
@@ -243,7 +326,7 @@ test('getAgentDefinition dynamically includes code-context tool references when
 });
 test('getAgentDefinition dynamically includes code-context tool references for gpt-5 models', (t) => {
     const settingsService = createMockSettingsService({
-        'app.searchViaShell': false,
+        'app.searchViaShell': 'off',
         'agent.model': 'gpt-5',
     });
     const definition = getAgentDefinition({
@@ -255,7 +338,7 @@ test('getAgentDefinition dynamically includes code-context tool references for g
 });
 test('getAgentDefinition uses fallback search prompt for remote execution', (t) => {
     const settingsService = createMockSettingsService({
-        'app.searchViaShell': true,
+        'app.searchViaShell': 'on',
         'agent.model': 'gpt-4o',
     });
     const mockExecutionContext = {
@@ -276,7 +359,7 @@ test('getAgentDefinition uses fallback search prompt for remote execution', (t)
 });
 test('getAgentDefinition excludes code-context tools in remote (SSH) execution', (t) => {
     const settingsService = createMockSettingsService({
-        'app.searchViaShell': false,
+        'app.searchViaShell': 'off',
         'agent.model': 'gpt-4o',
     });
     const mockExecutionContext = {
@@ -294,7 +377,7 @@ test('getAgentDefinition excludes code-context tools in remote (SSH) execution',
     t.false(toolNames.includes('code_context_search'));
     t.false(definition.instructions.includes('read_code_outline'));
 });
-test('getAgentDefinition conditionalizes plan mode instructions and does not filter tools based on planMode setting', (t) => {
+test('getAgentDefinition does not filter tools based on planMode setting', (t) => {
     const settingsService = createMockSettingsService({
         'agent.model': 'gpt-4o',
         'app.planMode': true,
@@ -303,7 +386,6 @@ test('getAgentDefinition conditionalizes plan mode instructions and does not fil
         settingsService,
         loggingService: mockLogger,
     });
-    t.true(definitionWithPlan.instructions.includes('restricted from making'));
     const toolsWithPlan = definitionWithPlan.tools.map((tool) => tool.name);
     t.true(toolsWithPlan.includes('create_file'));
     t.true(toolsWithPlan.includes('search_replace'));
@@ -315,9 +397,77 @@ test('getAgentDefinition conditionalizes plan mode instructions and does not fil
         settingsService: settingsServiceWithoutPlan,
         loggingService: mockLogger,
     });
-    t.false(definitionWithoutPlan.instructions.includes('restricted from making'));
     const toolsWithoutPlan = definitionWithoutPlan.tools.map((tool) => tool.name);
     t.true(toolsWithoutPlan.includes('create_file'));
     t.true(toolsWithoutPlan.includes('search_replace'));
 });
+test('getAgentDefinition includes AGENTS.md and full envInfo for orchestrator mode and plan mode', (t) => {
+    // Test Orchestrator Mode
+    const settingsOrchestrator = createMockSettingsService({
+        'agent.model': 'gpt-4o',
+        'app.orchestratorMode': true,
+    });
+    const definitionOrchestrator = getAgentDefinition({
+        settingsService: settingsOrchestrator,
+        loggingService: mockLogger,
+        runSubagent: async () => ({}),
+    });
+    t.true(definitionOrchestrator.instructions.includes('AGENTS.md contents:'));
+    t.true(definitionOrchestrator.instructions.includes('top-level:'));
+    // Test Plan Mode
+    const settingsPlan = createMockSettingsService({
+        'agent.model': 'gpt-4o',
+        'app.planMode': true,
+    });
+    const definitionPlan = getAgentDefinition({
+        settingsService: settingsPlan,
+        loggingService: mockLogger,
+    });
+    t.true(definitionPlan.instructions.includes('AGENTS.md contents:'));
+    t.true(definitionPlan.instructions.includes('top-level:'));
+});
+test('getAgentDefinition includes worktree hygiene fragment in standard, mentor, plan, and orchestrator modes', (t) => {
+    const standard = getAgentDefinition({
+        settingsService: createMockSettingsService({
+            'agent.model': 'gpt-4o',
+        }),
+        loggingService: mockLogger,
+    });
+    t.true(standard.instructions.includes(WORKTREE_HYGIENE_FRAGMENT_MARKER));
+    const mentor = getAgentDefinition({
+        settingsService: createMockSettingsService({
+            'agent.model': 'gpt-4o',
+            'app.mentorMode': true,
+        }),
+        loggingService: mockLogger,
+    });
+    t.true(mentor.instructions.includes(WORKTREE_HYGIENE_FRAGMENT_MARKER));
+    const plan = getAgentDefinition({
+        settingsService: createMockSettingsService({
+            'agent.model': 'gpt-4o',
+            'app.planMode': true,
+        }),
+        loggingService: mockLogger,
+    });
+    t.true(plan.instructions.includes(WORKTREE_HYGIENE_FRAGMENT_MARKER));
+    const orchestrator = getAgentDefinition({
+        settingsService: createMockSettingsService({
+            'agent.model': 'gpt-4o',
+            'app.orchestratorMode': true,
+        }),
+        loggingService: mockLogger,
+        runSubagent: async () => ({}),
+    });
+    t.true(orchestrator.instructions.includes(WORKTREE_HYGIENE_FRAGMENT_MARKER));
+});
+test('getAgentDefinition omits worktree hygiene fragment in lite mode', (t) => {
+    const definition = getAgentDefinition({
+        settingsService: createMockSettingsService({
+            'agent.model': 'gpt-4o',
+            'app.liteMode': true,
+        }),
+        loggingService: mockLogger,
+    });
+    t.false(definition.instructions.includes(WORKTREE_HYGIENE_FRAGMENT_MARKER));
+});
 //# sourceMappingURL=agent.test.js.map