@qduc/term2 0.9.0 → 0.9.1

package/dist/modes/companion/summarizer.js

@@ -0,0 +1,132 @@
+import OpenAI from 'openai';
+import { classifyOutputType, getSummarizationPrompt, shouldSummarize } from './output-classifier.js';
+const CACHE_TTL = 5 * 60 * 1000; // 5 minutes
+/**
+ * Summarizer for command outputs using a small, fast LLM.
+ * Caches summaries to avoid reprocessing.
+ */
+export class Summarizer {
+    #client = null;
+    #settings;
+    #logger;
+    #cache = new Map();
+    constructor(deps) {
+        this.#settings = deps.settings;
+        this.#logger = deps.logger;
+    }
+    /**
+     * Summarize command output.
+     * Returns the original output if summarization is not needed or fails.
+     */
+    async summarize(entry, detail) {
+        // Check if summarization is needed
+        if (!shouldSummarize(entry)) {
+            return entry.output;
+        }
+        // Check cache
+        const cacheKey = this.#getCacheKey(entry, detail);
+        const cached = this.#cache.get(cacheKey);
+        if (cached && Date.now() - cached.timestamp < CACHE_TTL) {
+            return cached.summary;
+        }
+        try {
+            const client = await this.#getClient();
+            const model = this.#settings.get('companion.summarizerModel') || 'gpt-4o-mini';
+            const maxTokens = this.#settings.get('companion.summarizerMaxTokens') || 500;
+            const outputType = classifyOutputType(entry);
+            const prompt = this.#buildPrompt(entry, detail, outputType);
+            const response = await client.chat.completions.create({
+                model,
+                max_tokens: maxTokens,
+                messages: [
+                    {
+                        role: 'system',
+                        content: 'You are a concise technical summarizer. Extract key information only.',
+                    },
+                    { role: 'user', content: prompt },
+                ],
+            });
+            const summary = response.choices[0]?.message?.content || entry.output;
+            // Cache result
+            this.#cache.set(cacheKey, { summary, timestamp: Date.now() });
+            return summary;
+        }
+        catch (error) {
+            this.#logger.warn('Summarization failed, using fallback', {
+                error: error instanceof Error ? error.message : String(error),
+                command: entry.command.slice(0, 50),
+            });
+            // Fallback: smart truncation
+            return this.#fallbackSummarize(entry, detail);
+        }
+    }
+    /**
+     * Clear the summary cache.
+     */
+    clearCache() {
+        this.#cache.clear();
+    }
+    /**
+     * Get or create OpenAI client.
+     */
+    async #getClient() {
+        if (this.#client) {
+            return this.#client;
+        }
+        const provider = this.#settings.get('companion.summarizerProvider') || 'openai';
+        // Use OpenAI API key from environment
+        const apiKey = process.env.OPENAI_API_KEY;
+        // For non-OpenAI providers, get baseURL from settings
+        const baseURL = provider === 'openai'
+            ? undefined
+            : this.#settings.get(`agent.${provider}.baseUrl`);
+        if (!apiKey) {
+            throw new Error('OPENAI_API_KEY not set');
+        }
+        this.#client = new OpenAI({ apiKey, baseURL });
+        return this.#client;
+    }
+    /**
+     * Build the summarization prompt.
+     */
+    #buildPrompt(entry, detail, outputType) {
+        const basePrompt = getSummarizationPrompt(outputType);
+        return `Command: ${entry.command}
+Exit code: ${entry.exitCode}
+
+Output:
+\`\`\`
+${entry.output}
+\`\`\`
+
+${detail === 'errors_only' ? getSummarizationPrompt('error_output') : basePrompt}`;
+    }
+    /**
+     * Fallback summarization without LLM.
+     */
+    #fallbackSummarize(entry, detail) {
+        const lines = entry.output.split('\n');
+        if (detail === 'errors_only') {
+            // Extract lines containing common error patterns
+            const errorPatterns = /error|fail|exception|fatal|critical|warning/i;
+            const errorLines = lines.filter(l => errorPatterns.test(l));
+            return errorLines.slice(0, 20).join('\n') || 'No obvious errors found';
+        }
+        // Default: first and last N lines
+        if (lines.length <= 30) {
+            return entry.output;
+        }
+        return [
+            ...lines.slice(0, 15),
+            `... (${lines.length - 30} lines omitted)`,
+            ...lines.slice(-15),
+        ].join('\n');
+    }
+    /**
+     * Generate cache key for an entry.
+     */
+    #getCacheKey(entry, detail) {
+        return `${entry.command}:${entry.timestamp}:${detail}`;
+    }
+}
+//# sourceMappingURL=summarizer.js.map

package/dist/modes/companion/summarizer.js.map

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

package/dist/modes/companion/terminal-history.d.ts

@@ -0,0 +1,27 @@
+import { z } from 'zod';
+import type { ToolDefinition } from '../../tools/types.js';
+import type { ContextBuffer } from './context-buffer.js';
+import type { Summarizer } from './summarizer.js';
+declare const TerminalHistoryParamsSchema: z.ZodObject<{
+    index: z.ZodOptional<z.ZodNumber>;
+    lastN: z.ZodOptional<z.ZodNumber>;
+    search: z.ZodOptional<z.ZodString>;
+    detail: z.ZodEnum<{
+        summary: "summary";
+        errors_only: "errors_only";
+        full: "full";
+    }>;
+    maxLines: z.ZodOptional<z.ZodNumber>;
+}, z.core.$strip>;
+export type TerminalHistoryParams = z.infer<typeof TerminalHistoryParamsSchema>;
+interface TerminalHistoryDeps {
+    contextBuffer: ContextBuffer;
+    summarizer: Summarizer;
+}
+/**
+ * Create the terminal_history tool definition for companion mode.
+ * This tool allows the AI to query command history and outputs on-demand.
+ */
+export declare function createTerminalHistoryToolDefinition(deps: TerminalHistoryDeps): ToolDefinition<TerminalHistoryParams>;
+export {};
+//# sourceMappingURL=terminal-history.d.ts.map

package/dist/modes/companion/terminal-history.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"terminal-history.d.ts","sourceRoot":"","sources":["../../../source/modes/companion/terminal-history.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AACtB,OAAO,KAAK,EAAC,cAAc,EAAiB,MAAM,sBAAsB,CAAC;AACzE,OAAO,KAAK,EAAC,aAAa,EAAe,MAAM,qBAAqB,CAAC;AACrE,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAIhD,QAAA,MAAM,2BAA2B;;;;;;;;;;iBA2B/B,CAAC;AAEH,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,2BAA2B,CAAC,CAAC;AAShF,UAAU,mBAAmB;IACzB,aAAa,EAAE,aAAa,CAAC;IAC7B,UAAU,EAAE,UAAU,CAAC;CAC1B;AAED;;;GAGG;AACH,wBAAgB,mCAAmC,CAC/C,IAAI,EAAE,mBAAmB,GAC1B,cAAc,CAAC,qBAAqB,CAAC,CA8HvC"}

package/dist/modes/companion/terminal-history.js

@@ -0,0 +1,142 @@
+import { z } from 'zod';
+import { shouldSummarize } from './output-classifier.js';
+import { randomUUID } from 'node:crypto';
+const TerminalHistoryParamsSchema = z.object({
+    index: z
+        .number()
+        .int()
+        .min(0)
+        .optional()
+        .describe('Specific command by index (0 = most recent)'),
+    lastN: z
+        .number()
+        .int()
+        .min(1)
+        .max(10)
+        .optional()
+        .describe('Fetch last N commands (default: 3)'),
+    search: z
+        .string()
+        .optional()
+        .describe('Search pattern for command or output text'),
+    detail: z
+        .enum(['summary', 'full', 'errors_only'])
+        .describe('Level of detail to return'),
+    maxLines: z
+        .number()
+        .int()
+        .min(1)
+        .optional()
+        .describe('Maximum output lines to return'),
+});
+/**
+ * Create the terminal_history tool definition for companion mode.
+ * This tool allows the AI to query command history and outputs on-demand.
+ */
+export function createTerminalHistoryToolDefinition(deps) {
+    const { contextBuffer, summarizer } = deps;
+    return {
+        name: 'terminal_history',
+        description: `Query the terminal command history. Use this to get details about recent commands and their outputs.
+
+Available in the command index (always visible):
+- Command text
+- Exit code (0 = success)
+- Relative time
+- Output line count
+
+Use this tool to fetch:
+- Full command output
+- Summarized output (for long outputs)
+- Errors only (filtered view)`,
+        parameters: TerminalHistoryParamsSchema,
+        // Read-only tool - never needs approval
+        needsApproval: () => false,
+        execute: async (params) => {
+            const { index, lastN = 3, search, detail, maxLines } = params;
+            // Fetch entries from buffer
+            let entries;
+            if (index !== undefined) {
+                entries = [contextBuffer.getEntry(index)];
+            }
+            else if (search) {
+                entries = contextBuffer.search(search, lastN);
+            }
+            else {
+                entries = contextBuffer.getLastN(lastN);
+            }
+            // Filter out undefined entries
+            const validEntries = entries.filter((e) => e !== undefined);
+            if (validEntries.length === 0) {
+                return JSON.stringify({
+                    success: false,
+                    error: 'No matching commands found',
+                });
+            }
+            // Process based on detail level
+            const results = await Promise.all(validEntries.map(async (entry) => {
+                let output;
+                if (detail === 'full') {
+                    output = entry.output;
+                    if (maxLines && entry.output.split('\n').length > maxLines) {
+                        const lines = entry.output.split('\n');
+                        output = [
+                            ...lines.slice(0, maxLines),
+                            `... (${lines.length - maxLines} more lines)`,
+                        ].join('\n');
+                    }
+                }
+                else if (shouldSummarize(entry)) {
+                    output = await summarizer.summarize(entry, detail);
+                }
+                else {
+                    output = entry.output;
+                }
+                return {
+                    command: entry.command,
+                    exitCode: entry.exitCode,
+                    timestamp: entry.timestamp,
+                    output,
+                };
+            }));
+            return JSON.stringify({ success: true, results });
+        },
+        formatCommandMessage: (item, index, toolCallArgumentsById) => {
+            const callId = item?.callId ||
+                item?.rawItem?.callId ||
+                item?.rawItem?.call_id;
+            const args = callId
+                ? toolCallArgumentsById.get(callId)
+                : null;
+            let output = '';
+            try {
+                const parsed = JSON.parse(item?.output || '{}');
+                if (parsed.results) {
+                    output = parsed.results
+                        .map((r) => `[${r.command}] (exit: ${r.exitCode})\n${r.output}`)
+                        .join('\n\n');
+                }
+                else if (parsed.error) {
+                    output = `Error: ${parsed.error}`;
+                }
+            }
+            catch {
+                output = item?.output || 'No results';
+            }
+            return [
+                {
+                    id: `terminal-history-${index}-${randomUUID().slice(0, 8)}`,
+                    sender: 'command',
+                    status: 'completed',
+                    command: `terminal_history(${args?.detail || 'query'})`,
+                    output,
+                    success: true,
+                    toolName: 'terminal_history',
+                    toolArgs: args,
+                    callId,
+                },
+            ];
+        },
+    };
+}
+//# sourceMappingURL=terminal-history.js.map

package/dist/modes/companion/terminal-history.js.map

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

package/dist/prompts/gpt-5.md

@@ -283,13 +283,10 @@ When using the shell, you must adhere to the following guidelines:
 
 ## Code context
 
-When exploring the codebase, use these tools as a progression from broad to deep:
-
-1. **`code_context_search`** — find related files (`query_type: related`) or symbol declarations (`query_type: symbol`). Use instead of broad shell searches.
-2. **`read_code_outline`** — preview a file's imports, exports, and declarations before deciding whether to read it in full.
-3. **`read_file`** — read the full body when you need the actual logic or are about to edit.
-
-Start with context search to locate files, outline to scan candidates, then full read on what matters. Skip steps when the file is small or already known.
+- **`code_context_search`** `query_type: related` — find files structurally related to a known file (importers, dependencies, test counterpart).
+- **`code_context_search`** `query_type: symbol` — find declaration sites for a named symbol.
+- **`read_code_outline`** — inspect a file's imports, exports, and declarations with line numbers without reading the full body.
+- **`cat -n <file>`** / **`sed -n '<start>,<end>p' <file>`** — read file contents; use `rg` for targeted content searches.
 
 ## apply_patch
 

package/dist/prompts/prompt-constructor.d.ts

@@ -8,6 +8,7 @@ export type PromptConstructorOptions = {
     searchViaShell?: boolean;
     codeContextEnabled?: boolean;
     runSubagentEnabled?: boolean;
+    sandboxEnabled?: boolean;
     executionContext?: ExecutionContext;
 };
 export type PromptSpec = {

package/dist/prompts/prompt-constructor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompt-constructor.d.ts","sourceRoot":"","sources":["../../source/prompts/prompt-constructor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAOzE,MAAM,MAAM,wBAAwB,GAAG;IACrC,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC;IAClB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B,CAAC;AAIF,wBAAgB,eAAe,CAAC,OAAO,EAAE,wBAAwB,GAAG,UAAU,CAqD7E"}
+{"version":3,"file":"prompt-constructor.d.ts","sourceRoot":"","sources":["../../source/prompts/prompt-constructor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAMzE,MAAM,MAAM,wBAAwB,GAAG;IACrC,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC;IAClB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B,CAAC;AAEF,wBAAgB,eAAe,CAAC,OAAO,EAAE,wBAAwB,GAAG,UAAU,CAgD7E"}

package/dist/prompts/prompt-constructor.js

@@ -1,62 +1,36 @@
-import { shouldPreferPatchEditingModel } from '../lib/tool-selection-policy.js';
-// import { getReasoningEfficiencyAddendum } from './reasoning-efficiency.js';
+import { selectPromptProfile } from './prompt-profiles.js';
 import { getSearchViaShellAddendum } from './search-via-shell.js';
 import { getSubagentDelegationAddendum } from './subagent-delegation.js';
-import { selectPromptProfile } from './prompt-profiles.js';
-import { ASK_USER_DECLINE_RESULT } from '../tools/agent/ask-user-constants.js';
-// const GPT_OVER_THINKING_MODEL_KEYS = ['kimi', 'deepseek', 'glm', 'qwen', 'minimax', 'mimo'];
+import { getShellSandboxAddendum } from './shell-sandbox.js';
 export function buildPromptSpec(options) {
-    const { model, liteMode, orchestratorMode, mentorMode, searchViaShell, codeContextEnabled, runSubagentEnabled, executionContext, } = options;
-    // const normalizedModel = model.trim().toLowerCase();
+    const { model, liteMode, orchestratorMode = false, mentorMode = false, searchViaShell = false, runSubagentEnabled = false, sandboxEnabled = true, executionContext, } = options;
     const profile = selectPromptProfile({ model, liteMode, orchestratorMode });
     const fragmentFiles = [...(profile.fragmentFiles ?? [])];
     const inlineSections = [];
-    if (!liteMode) {
+    const isRegularMode = !liteMode;
+    const isAgentMode = !orchestratorMode;
+    if (isRegularMode) {
         fragmentFiles.push('worktree-hygiene.md');
     }
-    if (mentorMode && !liteMode) {
-        fragmentFiles.push('mentor-addon.md');
+    if (sandboxEnabled) {
+        inlineSections.push(getShellSandboxAddendum());
     }
-    if (!orchestratorMode && codeContextEnabled) {
-        inlineSections.push(getCodeContextSection({ liteMode }));
+    if (mentorMode && isRegularMode) {
+        fragmentFiles.push('mentor-addon.md');
     }
-    if (!orchestratorMode && searchViaShell) {
+    if (isAgentMode && searchViaShell) {
         inlineSections.push(getSearchViaShellAddendum({ executionContext }));
     }
-    else if (!orchestratorMode && (liteMode || !shouldPreferPatchEditingModel(model))) {
-        inlineSections.push(getDedicatedSearchToolsSection({ liteMode }));
-    }
     if (orchestratorMode && runSubagentEnabled) {
         inlineSections.push(getSubagentDelegationAddendum({ orchestratorMode }));
     }
-    if (!liteMode && !orchestratorMode) {
+    if (isRegularMode && isAgentMode) {
         fragmentFiles.push('plan-mode-info.md');
     }
-    // if (GPT_OVER_THINKING_MODEL_KEYS.some((key) => normalizedModel.includes(key))) {
-    //   inlineSections.push(getReasoningEfficiencyAddendum());
-    // }
-    inlineSections.push(getAskUserAddendum());
     return {
         basePromptFile: profile.basePromptFile,
         fragmentFiles,
         inlineSections,
     };
 }
-function getCodeContextSection({ liteMode }) {
-    return 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.';
-}
-function getDedicatedSearchToolsSection({ liteMode }) {
-    return liteMode
-        ? '### Search Tools\n\n- `glob`: locate files by name or glob.\n- `grep`: search file contents.'
-        : '### Search Tools\n\n- Prefer `glob` for locating files by name or glob.\n- Prefer `grep` for searching code content or symbols.';
-}
-function getAskUserAddendum() {
-    return `### ask_user Tool Guidance
-
-- Use the \`ask_user\` tool when the user's request is short, vague, or ambiguous, or when an architecture or product-behavior decision needs to be made.
-- Provide concise options whenever possible; the first option should be the recommended (default) choice.
-- If the tool result is \`${ASK_USER_DECLINE_RESULT}\`, proceed using the safest reasonable default and state the assumption in your final response.`;
-}
 //# sourceMappingURL=prompt-constructor.js.map

package/dist/prompts/prompt-constructor.js.map

@@ -1 +1 @@
-{"version":3,"file":"prompt-constructor.js","sourceRoot":"","sources":["../../source/prompts/prompt-constructor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,MAAM,iCAAiC,CAAC;AAEhF,8EAA8E;AAC9E,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAoB/E,+FAA+F;AAE/F,MAAM,UAAU,eAAe,CAAC,OAAiC;IAC/D,MAAM,EACJ,KAAK,EACL,QAAQ,EACR,gBAAgB,EAChB,UAAU,EACV,cAAc,EACd,kBAAkB,EAClB,kBAAkB,EAClB,gBAAgB,GACjB,GAAG,OAAO,CAAC;IACZ,sDAAsD;IACtD,MAAM,OAAO,GAAG,mBAAmB,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAC3E,MAAM,aAAa,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,CAAC;IACzD,MAAM,cAAc,GAAa,EAAE,CAAC;IAEpC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,aAAa,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,UAAU,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC5B,aAAa,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACxC,CAAC;IAED,IAAI,CAAC,gBAAgB,IAAI,kBAAkB,EAAE,CAAC;QAC5C,cAAc,CAAC,IAAI,CAAC,qBAAqB,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,IAAI,CAAC,gBAAgB,IAAI,cAAc,EAAE,CAAC;QACxC,cAAc,CAAC,IAAI,CAAC,yBAAyB,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC;IACvE,CAAC;SAAM,IAAI,CAAC,gBAAgB,IAAI,CAAC,QAAQ,IAAI,CAAC,6BAA6B,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QACpF,cAAc,CAAC,IAAI,CAAC,8BAA8B,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IACpE,CAAC;IAED,IAAI,gBAAgB,IAAI,kBAAkB,EAAE,CAAC;QAC3C,cAAc,CAAC,IAAI,CAAC,6BAA6B,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC;IAC3E,CAAC;IAED,IAAI,CAAC,QAAQ,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACnC,aAAa,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAC1C,CAAC;IAED,mFAAmF;IACnF,2DAA2D;IAC3D,IAAI;IAEJ,cAAc,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;IAE1C,OAAO;QACL,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,aAAa;QACb,cAAc;KACf,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAAC,EAAE,QAAQ,EAAyB;IAChE,OAAO,QAAQ;QACb,CAAC,CAAC,+KAA+K;QACjL,CAAC,CAAC,2LAA2L,CAAC;AAClM,CAAC;AAED,SAAS,8BAA8B,CAAC,EAAE,QAAQ,EAAyB;IACzE,OAAO,QAAQ;QACb,CAAC,CAAC,8FAA8F;QAChG,CAAC,CAAC,iIAAiI,CAAC;AACxI,CAAC;AAED,SAAS,kBAAkB;IACzB,OAAO;;;;4BAImB,uBAAuB,kGAAkG,CAAC;AACtJ,CAAC"}
+{"version":3,"file":"prompt-constructor.js","sourceRoot":"","sources":["../../source/prompts/prompt-constructor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAqB7D,MAAM,UAAU,eAAe,CAAC,OAAiC;IAC/D,MAAM,EACJ,KAAK,EACL,QAAQ,EACR,gBAAgB,GAAG,KAAK,EACxB,UAAU,GAAG,KAAK,EAClB,cAAc,GAAG,KAAK,EACtB,kBAAkB,GAAG,KAAK,EAC1B,cAAc,GAAG,IAAI,EACrB,gBAAgB,GACjB,GAAG,OAAO,CAAC;IAEZ,MAAM,OAAO,GAAG,mBAAmB,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAC3E,MAAM,aAAa,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,CAAC;IACzD,MAAM,cAAc,GAAa,EAAE,CAAC;IAEpC,MAAM,aAAa,GAAG,CAAC,QAAQ,CAAC;IAChC,MAAM,WAAW,GAAG,CAAC,gBAAgB,CAAC;IAEtC,IAAI,aAAa,EAAE,CAAC;QAClB,aAAa,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,cAAc,EAAE,CAAC;QACnB,cAAc,CAAC,IAAI,CAAC,uBAAuB,EAAE,CAAC,CAAC;IACjD,CAAC;IAED,IAAI,UAAU,IAAI,aAAa,EAAE,CAAC;QAChC,aAAa,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACxC,CAAC;IAED,IAAI,WAAW,IAAI,cAAc,EAAE,CAAC;QAClC,cAAc,CAAC,IAAI,CAAC,yBAAyB,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC;IACvE,CAAC;IAED,IAAI,gBAAgB,IAAI,kBAAkB,EAAE,CAAC;QAC3C,cAAc,CAAC,IAAI,CAAC,6BAA6B,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC;IAC3E,CAAC;IAED,IAAI,aAAa,IAAI,WAAW,EAAE,CAAC;QACjC,aAAa,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAC1C,CAAC;IAED,OAAO;QACL,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,aAAa;QACb,cAAc;KACf,CAAC;AACJ,CAAC"}

package/dist/prompts/prompt-constructor.test.ts

@@ -11,22 +11,6 @@ it('buildPromptSpec preserves mode precedence for base prompts', () => {
   expect(buildPromptSpec({ model: 'gpt-4o', liteMode: false }).basePromptFile).toBe('simple_v3.md');
 });
 
-it('buildPromptSpec includes ask_user guidance in all modes', () => {
-  const standard = buildPromptSpec({ model: 'gpt-4o', liteMode: false });
-  expect(standard.inlineSections.some((s) => s.includes('ask_user'))).toBe(true);
-
-  const lite = buildPromptSpec({ model: 'gpt-4o', liteMode: true });
-  expect(lite.inlineSections.some((s) => s.includes('ask_user'))).toBe(true);
-
-  const orchestrator = buildPromptSpec({
-    model: 'gpt-4o',
-    liteMode: false,
-    orchestratorMode: true,
-    runSubagentEnabled: true,
-  });
-  expect(orchestrator.inlineSections.some((s) => s.includes('ask_user'))).toBe(true);
-});
-
 // it('buildPromptSpec adds GPT version fragments without changing the base GPT prompt fallback', () => {
 //   const gpt55 = buildPromptSpec({ model: 'gpt-5.5-2026-04-23', liteMode: false });
 //   expect(gpt55.basePromptFile).toBe('gpt-5-modern.md');
@@ -61,6 +45,8 @@ it('buildPromptSpec composes file fragments in stable order', () => {
   });
 
   expect(spec.fragmentFiles).toEqual(['worktree-hygiene.md', 'mentor-addon.md', 'plan-mode-info.md']);
+
+  expect(spec.inlineSections).toContainEqual(expect.stringContaining('## Shell Sandbox'));
 });
 
 it('buildPromptSpec always includes plan-mode-info in standard mode to keep system prompt cache-stable', () => {
@@ -76,25 +62,6 @@ it('buildPromptSpec excludes plan-mode-info in lite and orchestrator modes', ()
   expect(orchestrator.fragmentFiles.includes('plan-mode-info.md')).toBe(false);
 });
 
-it('buildPromptSpec includes code context inline section when enabled and not orchestrator', () => {
-  const standard = buildPromptSpec({
-    model: 'gpt-4o',
-    liteMode: false,
-    codeContextEnabled: true,
-    searchViaShell: false,
-  });
-  expect(standard.inlineSections.length > 0).toBe(true);
-  expect(standard.inlineSections.some((s) => s.includes('Code Context'))).toBe(true);
-
-  const gpt5 = buildPromptSpec({
-    model: 'gpt-5.5',
-    liteMode: false,
-    codeContextEnabled: true,
-    searchViaShell: false,
-  });
-  expect(gpt5.inlineSections.some((s) => s.includes('Code Context'))).toBe(true);
-});
-
 it('buildPromptSpec includes subagent delegation for orchestrator mode', () => {
   const orchestrator = buildPromptSpec({
     model: 'gpt-5.5',
@@ -117,5 +84,17 @@ it('buildPromptSpec uses lite base and skips worktree-hygiene fragment in lite m
   });
   expect(lite.basePromptFile).toBe('lite.md');
   expect(lite.fragmentFiles.includes('worktree-hygiene.md')).toBe(false);
-  expect(lite.inlineSections.some((s) => s.includes('Search Tools'))).toBe(true);
+  // Shell sandbox is added inline in lite mode (sandbox enabled by default).
+  expect(lite.inlineSections.length).toBe(1);
+  expect(lite.inlineSections[0]).toContain('## Shell Sandbox');
+});
+
+it('buildPromptSpec excludes shell-sandbox when sandbox is disabled', () => {
+  const spec = buildPromptSpec({
+    model: 'gpt-4o',
+    liteMode: false,
+    sandboxEnabled: false,
+  });
+  expect(spec.inlineSections.some((s) => s.includes('## Shell Sandbox'))).toBe(false);
+  expect(spec.fragmentFiles.includes('worktree-hygiene.md')).toBe(true);
 });

package/dist/prompts/prompt-constructor.ts

@@ -1,10 +1,8 @@
-import { shouldPreferPatchEditingModel } from '../lib/tool-selection-policy.js';
 import type { ExecutionContext } from '../services/execution-context.js';
-// import { getReasoningEfficiencyAddendum } from './reasoning-efficiency.js';
+import { selectPromptProfile } from './prompt-profiles.js';
 import { getSearchViaShellAddendum } from './search-via-shell.js';
 import { getSubagentDelegationAddendum } from './subagent-delegation.js';
-import { selectPromptProfile } from './prompt-profiles.js';
-import { ASK_USER_DECLINE_RESULT } from '../tools/agent/ask-user-constants.js';
+import { getShellSandboxAddendum } from './shell-sandbox.js';
 
 export type PromptConstructorOptions = {
   model: string;
@@ -15,6 +13,7 @@ export type PromptConstructorOptions = {
   searchViaShell?: boolean;
   codeContextEnabled?: boolean;
   runSubagentEnabled?: boolean;
+  sandboxEnabled?: boolean;
   executionContext?: ExecutionContext;
 };
 
@@ -24,79 +23,52 @@ export type PromptSpec = {
   inlineSections: string[];
 };
 
-// const GPT_OVER_THINKING_MODEL_KEYS = ['kimi', 'deepseek', 'glm', 'qwen', 'minimax', 'mimo'];
-
 export function buildPromptSpec(options: PromptConstructorOptions): PromptSpec {
   const {
     model,
     liteMode,
-    orchestratorMode,
-    mentorMode,
-    searchViaShell,
-    codeContextEnabled,
-    runSubagentEnabled,
+    orchestratorMode = false,
+    mentorMode = false,
+    searchViaShell = false,
+    runSubagentEnabled = false,
+    sandboxEnabled = true,
     executionContext,
   } = options;
-  // const normalizedModel = model.trim().toLowerCase();
+
   const profile = selectPromptProfile({ model, liteMode, orchestratorMode });
   const fragmentFiles = [...(profile.fragmentFiles ?? [])];
   const inlineSections: string[] = [];
 
-  if (!liteMode) {
+  const isRegularMode = !liteMode;
+  const isAgentMode = !orchestratorMode;
+
+  if (isRegularMode) {
     fragmentFiles.push('worktree-hygiene.md');
   }
 
-  if (mentorMode && !liteMode) {
-    fragmentFiles.push('mentor-addon.md');
+  if (sandboxEnabled) {
+    inlineSections.push(getShellSandboxAddendum());
   }
 
-  if (!orchestratorMode && codeContextEnabled) {
-    inlineSections.push(getCodeContextSection({ liteMode }));
+  if (mentorMode && isRegularMode) {
+    fragmentFiles.push('mentor-addon.md');
   }
 
-  if (!orchestratorMode && searchViaShell) {
+  if (isAgentMode && searchViaShell) {
     inlineSections.push(getSearchViaShellAddendum({ executionContext }));
-  } else if (!orchestratorMode && (liteMode || !shouldPreferPatchEditingModel(model))) {
-    inlineSections.push(getDedicatedSearchToolsSection({ liteMode }));
   }
 
   if (orchestratorMode && runSubagentEnabled) {
     inlineSections.push(getSubagentDelegationAddendum({ orchestratorMode }));
   }
 
-  if (!liteMode && !orchestratorMode) {
+  if (isRegularMode && isAgentMode) {
     fragmentFiles.push('plan-mode-info.md');
   }
 
-  // if (GPT_OVER_THINKING_MODEL_KEYS.some((key) => normalizedModel.includes(key))) {
-  //   inlineSections.push(getReasoningEfficiencyAddendum());
-  // }
-
-  inlineSections.push(getAskUserAddendum());
-
   return {
     basePromptFile: profile.basePromptFile,
     fragmentFiles,
     inlineSections,
   };
 }
-
-function getCodeContextSection({ liteMode }: { liteMode: boolean }): string {
-  return 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.';
-}
-
-function getDedicatedSearchToolsSection({ liteMode }: { liteMode: boolean }): string {
-  return liteMode
-    ? '### Search Tools\n\n- `glob`: locate files by name or glob.\n- `grep`: search file contents.'
-    : '### Search Tools\n\n- Prefer `glob` for locating files by name or glob.\n- Prefer `grep` for searching code content or symbols.';
-}
-
-function getAskUserAddendum(): string {
-  return `### ask_user Tool Guidance
-
-- Use the \`ask_user\` tool when the user's request is short, vague, or ambiguous, or when an architecture or product-behavior decision needs to be made.
-- Provide concise options whenever possible; the first option should be the recommended (default) choice.
-- If the tool result is \`${ASK_USER_DECLINE_RESULT}\`, proceed using the safest reasonable default and state the assumption in your final response.`;
-}

package/dist/prompts/shell-sandbox.d.ts

@@ -0,0 +1,2 @@
+export declare function getShellSandboxAddendum(): string;
+//# sourceMappingURL=shell-sandbox.d.ts.map

package/dist/prompts/shell-sandbox.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shell-sandbox.d.ts","sourceRoot":"","sources":["../../source/prompts/shell-sandbox.ts"],"names":[],"mappings":"AAEA,wBAAgB,uBAAuB,IAAI,MAAM,CA0BhD"}