@qduc/term2 0.1.0

package/dist/tools/apply-patch.js

@@ -0,0 +1,399 @@
+import { z } from 'zod';
+import { readFile, writeFile, mkdir } from 'fs/promises';
+import path from 'path';
+import { applyDiff } from '@openai/agents';
+import { resolveWorkspacePath } from './utils.js';
+import { getOutputText, safeJsonParse, normalizeToolArguments, createBaseMessage, } from './format-helpers.js';
+/**
+ * Error thrown when patch validation fails (malformed diff)
+ */
+export class PatchValidationError extends Error {
+    filePath;
+    constructor(message, filePath) {
+        super(message);
+        this.filePath = filePath;
+        this.name = 'PatchValidationError';
+    }
+}
+const applyPatchParametersSchema = z.object({
+    type: z.enum(['create_file', 'update_file']),
+    path: z.string().min(1, 'File path cannot be empty'),
+    diff: z
+        .string()
+        .describe('Unified diff content for create/update operations'),
+});
+export const formatApplyPatchCommandMessage = (item, index, _toolCallArgumentsById) => {
+    const parsedOutput = safeJsonParse(getOutputText(item));
+    const patchOutputItems = parsedOutput?.output ?? [];
+    // If JSON parsing failed or no output array, create error message
+    if (patchOutputItems.length === 0) {
+        const normalizedArgs = item?.rawItem?.arguments ?? item?.arguments;
+        const args = normalizeToolArguments(normalizedArgs) ?? {};
+        const operationType = args?.type ?? 'unknown';
+        const filePath = args?.path ?? 'unknown';
+        const command = `apply_patch ${operationType} ${filePath}`;
+        const output = getOutputText(item) || 'No output';
+        const success = false;
+        return [
+            createBaseMessage(item, index, 0, false, {
+                command,
+                output,
+                success,
+            }),
+        ];
+    }
+    // Apply patch tool can have multiple operation outputs
+    const messages = [];
+    for (const [patchIndex, patchResult] of patchOutputItems.entries()) {
+        const normalizedArgs = item?.rawItem?.arguments ?? item?.arguments;
+        const args = normalizeToolArguments(normalizedArgs) ?? {};
+        const operationType = args?.type ?? patchResult?.operation ?? 'unknown';
+        const filePath = args?.path ?? patchResult?.path ?? 'unknown';
+        const command = `apply_patch ${operationType} ${filePath}`;
+        const output = patchResult?.message ?? patchResult?.error ?? 'No output';
+        const success = patchResult?.success ?? false;
+        messages.push(createBaseMessage(item, index, patchIndex, false, {
+            command,
+            output,
+            success,
+        }));
+    }
+    return messages;
+};
+export function createApplyPatchToolDefinition(deps) {
+    const { loggingService, settingsService, executionContext } = deps;
+    return {
+        name: 'apply_patch',
+        description: 'Apply file changes using headerless V4A diff format. Supports creating, updating files.\n\n' +
+            '## CRITICAL RULES:\n' +
+            '1. Each line MUST start with exactly one character: space, +, or - (followed by the line content)\n' +
+            '2. Use @@ markers to provide context anchors when needed\n' +
+            '3. Context lines (unchanged) start with a SPACE character\n' +
+            '4. Added lines start with + character\n' +
+            '5. Removed lines start with - character\n' +
+            '6. DO NOT include line numbers or @@ -n,m +n,m @@ headers (headerless format)\n\n' +
+            '## CREATE_FILE:\n' +
+            'Every line must start with + (no context or - lines):\n' +
+            '```\n' +
+            '+line 1\n' +
+            '+line 2\n' +
+            '+line 3\n' +
+            '```\n\n' +
+            '## UPDATE_FILE:\n' +
+            'Provide context (space-prefixed lines) around changes. Include 2-3 lines of context before and after:\n' +
+            '```\n' +
+            '@@ function calculate\n' +
+            ' function calculate(x) {\n' +
+            '-  return x * 2;\n' +
+            '+  return x * 3;\n' +
+            ' }\n' +
+            '```\n\n' +
+            '## Context Anchors:\n' +
+            'Use @@ markers to help locate code in the file:\n' +
+            '- For classes: @@ class ClassName\n' +
+            '- For functions: @@ function functionName\n' +
+            '- For unique lines: @@ distinctive text from the line\n' +
+            'Stack multiple @@ for nested structures:\n' +
+            '```\n' +
+            '@@ class MyClass\n' +
+            '@@ method doSomething\n' +
+            ' def doSomething(self):\n' +
+            '-    old code\n' +
+            '+    new code\n' +
+            '```\n\n' +
+            '## Common Mistakes to Avoid:\n' +
+            '- Missing space/+/- prefix on lines\n' +
+            '- Including line numbers like "@@ -1,3 +1,4 @@"\n' +
+            '- Not providing enough context (need 2-3 lines before/after)\n' +
+            '- Context lines not starting with space character\n' +
+            '- Using tabs instead of spaces for indentation matching',
+        parameters: applyPatchParametersSchema,
+        needsApproval: async (params) => {
+            try {
+                const editMode = settingsService.get('app.editMode');
+                const { type, path: filePath, diff } = params;
+                // Validate diff syntax by attempting a dry-run (before approval)
+                if (type === 'create_file' || type === 'update_file') {
+                    try {
+                        if (type === 'create_file') {
+                            // Dry-run: apply diff to empty content for new file
+                            applyDiff('', diff);
+                        }
+                        else {
+                            // Dry-run: read existing file and test diff application
+                            const targetPath = resolveWorkspacePath(filePath);
+                            const original = await readFile(targetPath, 'utf8');
+                            applyDiff(original, diff);
+                        }
+                        loggingService.info('apply_patch validation passed', {
+                            type,
+                            path: filePath,
+                        });
+                    }
+                    catch (diffError) {
+                        // Diff validation failed - auto-approve (skip user prompt) and fail in execute
+                        // This prevents breaking the stream while still rejecting the invalid patch
+                        loggingService.error('apply_patch validation failed - will fail in execute', {
+                            type,
+                            path: filePath,
+                            error: diffError?.message || String(diffError),
+                        });
+                        // Return false to auto-approve - execute will handle the error gracefully
+                        return false;
+                    }
+                }
+                // Deletions ALWAYS require approval per policy
+                // if (type === 'delete_file') {
+                //     loggingService.security('apply_patch needsApproval: delete requires approval', {
+                //         mode,
+                //         type,
+                //         path: filePath,
+                //     });
+                //     return true;
+                // }
+                // Resolve and ensure target within workspace
+                const workspaceRoot = executionContext?.getCwd() || process.cwd();
+                let targetPath;
+                try {
+                    targetPath = resolveWorkspacePath(filePath, workspaceRoot);
+                }
+                catch (e) {
+                    // Outside workspace => require approval
+                    loggingService.security('apply_patch needsApproval: outside workspace', {
+                        editMode,
+                        type,
+                        path: filePath,
+                        error: e?.message || String(e),
+                    });
+                    return true;
+                }
+                const insideCwd = targetPath.startsWith(workspaceRoot + path.sep);
+                // In edit mode, auto-approve create/update within cwd
+                if (editMode &&
+                    insideCwd &&
+                    (type === 'create_file' || type === 'update_file')) {
+                    loggingService.security('apply_patch needsApproval: auto-approved in edit mode', {
+                        editMode,
+                        type,
+                        path: filePath,
+                        targetPath,
+                    });
+                    return false;
+                }
+                // Otherwise, require approval (default behavior)
+                loggingService.security('apply_patch needsApproval: approval required', {
+                    editMode,
+                    type,
+                    path: filePath,
+                    targetPath,
+                    insideCwd,
+                });
+                return true;
+            }
+            catch (error) {
+                loggingService.error('apply_patch needsApproval error', {
+                    error: error?.message || String(error),
+                });
+                // Fail-safe: require approval on any error
+                return true;
+            }
+        },
+        execute: async (params) => {
+            const enableFileLogging = settingsService.get('tools.logFileOperations');
+            const cwd = executionContext?.getCwd() || process.cwd();
+            const sshService = executionContext?.getSSHService();
+            const isRemote = executionContext?.isRemote() && !!sshService;
+            const readFileFn = async (p) => {
+                if (isRemote && sshService)
+                    return sshService.readFile(p);
+                return readFile(p, 'utf8');
+            };
+            const writeFileFn = async (p, c) => {
+                if (isRemote && sshService)
+                    return sshService.writeFile(p, c);
+                return writeFile(p, c, 'utf8');
+            };
+            const mkdirFn = async (p) => {
+                if (isRemote && sshService)
+                    return sshService.mkdir(p);
+                return mkdir(p, { recursive: true });
+            };
+            try {
+                const { type, path: filePath, diff } = params;
+                const targetPath = resolveWorkspacePath(filePath, cwd);
+                if (enableFileLogging) {
+                    loggingService.info(`File operation started: ${type}`, {
+                        path: filePath,
+                        targetPath,
+                    });
+                }
+                // Re-validate patch before executing
+                if (type === 'create_file' || type === 'update_file') {
+                    try {
+                        if (type === 'create_file') {
+                            // Test applying diff to empty content
+                            applyDiff('', diff);
+                        }
+                        else {
+                            // Test applying diff to existing file content
+                            const original = await readFileFn(targetPath);
+                            applyDiff(original, diff);
+                        }
+                    }
+                    catch (validationError) {
+                        loggingService.error('Patch validation failed in execute', {
+                            type,
+                            path: filePath,
+                            error: validationError?.message ||
+                                String(validationError),
+                        });
+                        return JSON.stringify({
+                            output: [
+                                {
+                                    success: false,
+                                    error: `Invalid patch: ${validationError?.message ||
+                                        String(validationError)}. Please check the file path and diff format.`,
+                                },
+                            ],
+                        });
+                    }
+                }
+                switch (type) {
+                    case 'create_file': {
+                        // Ensure parent directory exists
+                        await mkdirFn(path.dirname(targetPath));
+                        // Apply diff to empty content for new file
+                        const content = applyDiff('', diff);
+                        await writeFileFn(targetPath, content);
+                        if (enableFileLogging) {
+                            try {
+                                loggingService.info('File created', {
+                                    path: filePath,
+                                    contentLength: content.length,
+                                });
+                            }
+                            catch (error) {
+                                // Ignore logging errors to prevent operation failure
+                            }
+                        }
+                        return JSON.stringify({
+                            output: [
+                                {
+                                    success: true,
+                                    operation: 'create_file',
+                                    path: filePath,
+                                    message: `Created ${filePath}`,
+                                },
+                            ],
+                        });
+                    }
+                    case 'update_file': {
+                        // Read existing file
+                        let original;
+                        try {
+                            original = await readFileFn(targetPath);
+                        }
+                        catch (error) {
+                            if (error?.code === 'ENOENT') {
+                                if (enableFileLogging) {
+                                    loggingService.error('Cannot update missing file', {
+                                        path: filePath,
+                                        targetPath,
+                                    });
+                                }
+                                return JSON.stringify({
+                                    output: [
+                                        {
+                                            success: false,
+                                            error: `Cannot update missing file: ${filePath}`,
+                                        },
+                                    ],
+                                });
+                            }
+                            throw error;
+                        }
+                        // Apply diff to existing content
+                        const patched = applyDiff(original, diff);
+                        await writeFileFn(targetPath, patched);
+                        if (enableFileLogging) {
+                            try {
+                                loggingService.info('File updated', {
+                                    path: filePath,
+                                    originalLength: original.length,
+                                    patchedLength: patched.length,
+                                });
+                            }
+                            catch (error) {
+                                // Ignore logging errors to prevent operation failure
+                            }
+                        }
+                        return JSON.stringify({
+                            output: [
+                                {
+                                    success: true,
+                                    operation: 'update_file',
+                                    path: filePath,
+                                    message: `Updated ${filePath}`,
+                                },
+                            ],
+                        });
+                    }
+                    // case 'delete_file': {
+                    //     await rm(targetPath, {force: true});
+                    //     if (enableFileLogging) {
+                    //         try {
+                    //             loggingService.info('File deleted', {
+                    //                 path: filePath,
+                    //                 targetPath,
+                    //             });
+                    //         } catch (error) {
+                    //             // Ignore logging errors to prevent operation failure
+                    //         }
+                    //     }
+                    //     return JSON.stringify({
+                    //         output: [
+                    //             {
+                    //                 success: true,
+                    //                 operation: 'delete_file',
+                    //                 path: filePath,
+                    //                 message: `Deleted ${filePath}`,
+                    //             },
+                    //         ],
+                    //     });
+                    // }
+                    default: {
+                        return JSON.stringify({
+                            output: [
+                                {
+                                    success: false,
+                                    error: `Unknown operation type: ${type}`,
+                                },
+                            ],
+                        });
+                    }
+                }
+            }
+            catch (error) {
+                if (enableFileLogging) {
+                    loggingService.error('File operation failed', {
+                        type: params.type,
+                        path: params.path,
+                        error: error instanceof Error
+                            ? error.message
+                            : String(error),
+                    });
+                }
+                return JSON.stringify({
+                    output: [
+                        {
+                            success: false,
+                            error: error.message || String(error),
+                        },
+                    ],
+                });
+            }
+        },
+        formatCommandMessage: formatApplyPatchCommandMessage,
+    };
+}
+//# sourceMappingURL=apply-patch.js.map

package/dist/tools/apply-patch.js.map

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

package/dist/tools/apply-patch.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=apply-patch.test.d.ts.map

package/dist/tools/apply-patch.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"apply-patch.test.d.ts","sourceRoot":"","sources":["../../source/tools/apply-patch.test.ts"],"names":[],"mappings":""}

package/dist/tools/apply-patch.test.js

@@ -0,0 +1,155 @@
+import test from 'ava';
+import * as fs from 'fs/promises';
+import * as path from 'path';
+import * as os from 'os';
+import { createApplyPatchToolDefinition } from './apply-patch.js';
+import { createMockSettingsService } from '../services/settings-service.mock.js';
+// Helper to create a temp dir and change cwd to it
+async function withTempDir(run) {
+    const originalCwd = process.cwd;
+    const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'term2-test-'));
+    // Mock process.cwd
+    process.cwd = () => tempDir;
+    try {
+        await run(tempDir);
+    }
+    finally {
+        process.cwd = originalCwd;
+        await fs.rm(tempDir, { recursive: true, force: true });
+    }
+}
+const mockLoggingService = {
+    info: () => { },
+    warn: () => { },
+    error: () => { },
+    debug: () => { },
+    security: () => { },
+    setCorrelationId: () => { },
+    getCorrelationId: () => undefined,
+    clearCorrelationId: () => { },
+};
+function createTool(settingsService = createMockSettingsService()) {
+    return createApplyPatchToolDefinition({
+        loggingService: mockLoggingService,
+        settingsService,
+    });
+}
+test.serial('create_file: creates a new file with content', async (t) => {
+    await withTempDir(async (dir) => {
+        const tool = createTool();
+        const filePath = 'new-file.txt';
+        const diff = '@@ -0,0 +1 @@\n+Hello World';
+        const result = await tool.execute({
+            type: 'create_file',
+            path: filePath,
+            diff,
+        });
+        const parsed = JSON.parse(result);
+        t.true(parsed.output[0].success);
+        t.is(parsed.output[0].operation, 'create_file');
+        const content = await fs.readFile(path.join(dir, filePath), 'utf8');
+        t.is(content.trim(), 'Hello World');
+    });
+});
+test.serial('update_file: updates an existing file', async (t) => {
+    await withTempDir(async (dir) => {
+        const tool = createTool();
+        const filePath = 'existing.txt';
+        const absPath = path.join(dir, filePath);
+        await fs.writeFile(absPath, 'Hello\nWorld');
+        const diff = '@@ -1,2 +1,2 @@\n Hello\n-World\n+Universe';
+        const result = await tool.execute({
+            type: 'update_file',
+            path: filePath,
+            diff,
+        });
+        const parsed = JSON.parse(result);
+        t.true(parsed.output[0].success);
+        const content = await fs.readFile(absPath, 'utf8');
+        t.is(content, 'Hello\nUniverse');
+    });
+});
+// test.serial('delete_file: deletes a file', async t => {
+//     await withTempDir(async (dir) => {
+//         const filePath = 'to-delete.txt';
+//         const absPath = path.join(dir, filePath);
+//         await fs.writeFile(absPath, 'content');
+//         const result = await applyPatchToolDefinition.execute({
+//             type: 'delete_file',
+//             path: filePath,
+//             diff: '', // diff is ignored for delete
+//         });
+//         const parsed = JSON.parse(result);
+//         t.true(parsed.output[0].success);
+//         await t.throwsAsync(fs.readFile(absPath));
+//     });
+// });
+// test.serial('needsApproval: requires approval for delete_file', async t => {
+//     await withTempDir(async () => {
+//         const result = await applyPatchToolDefinition.needsApproval({
+//             type: 'delete_file',
+//             path: 'any.txt',
+//             diff: '',
+//         });
+//         t.true(result);
+//     });
+// });
+test.serial('needsApproval: requires approval for outside workspace', async (t) => {
+    await withTempDir(async () => {
+        const tool = createTool();
+        const result = await tool.needsApproval({
+            type: 'create_file',
+            path: '../outside.txt',
+            diff: '@@ -0,0 +1 @@\n+content',
+        });
+        t.true(result);
+    });
+});
+test.serial('needsApproval: auto-approves in edit mode for create/update inside cwd', async (t) => {
+    await withTempDir(async () => {
+        const tool = createTool(createMockSettingsService({ app: { editMode: true } }));
+        const result = await tool.needsApproval({
+            type: 'create_file',
+            path: 'inside.txt',
+            diff: '@@ -0,0 +1 @@\n+content',
+        });
+        t.false(result);
+    });
+});
+test.serial('needsApproval: requires approval in default mode', async (t) => {
+    await withTempDir(async () => {
+        const tool = createTool(createMockSettingsService({ app: { mode: 'default' } }));
+        const result = await tool.needsApproval({
+            type: 'create_file',
+            path: 'inside.txt',
+            diff: '@@ -0,0 +1 @@\n+content',
+        });
+        t.true(result);
+    });
+});
+test.serial('needsApproval: auto-approves invalid diffs (will fail in execute)', async (t) => {
+    await withTempDir(async () => {
+        const tool = createTool();
+        // Invalid diffs now return false (auto-approve) to avoid breaking the stream
+        const result = await tool.needsApproval({
+            type: 'create_file',
+            path: 'test.txt',
+            diff: 'garbage',
+        });
+        t.false(result);
+    });
+});
+test.serial('execute: rejects invalid diffs with proper error', async (t) => {
+    await withTempDir(async () => {
+        const tool = createTool();
+        const result = await tool.execute({
+            type: 'create_file',
+            path: 'test.txt',
+            diff: 'garbage',
+        });
+        const parsed = JSON.parse(result);
+        t.false(parsed.output[0].success);
+        t.true(parsed.output[0].error.includes('Invalid patch'));
+    });
+});
+//# sourceMappingURL=apply-patch.test.js.map

package/dist/tools/apply-patch.test.js.map

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

package/dist/tools/ask-mentor.d.ts

@@ -0,0 +1,11 @@
+import { z } from 'zod';
+import type { ToolDefinition, CommandMessage } from './types.js';
+declare const askMentorSchema: z.ZodObject<{
+    question: z.ZodString;
+    context: z.ZodNullable<z.ZodString>;
+}, z.core.$strip>;
+export type AskMentorParams = z.infer<typeof askMentorSchema>;
+export declare const formatAskMentorCommandMessage: (item: any, index: number, toolCallArgumentsById: Map<string, unknown>) => CommandMessage[];
+export declare const createAskMentorToolDefinition: (askMentor: (question: string) => Promise<string>) => ToolDefinition<AskMentorParams>;
+export {};
+//# sourceMappingURL=ask-mentor.d.ts.map

package/dist/tools/ask-mentor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ask-mentor.d.ts","sourceRoot":"","sources":["../../source/tools/ask-mentor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AACtB,OAAO,KAAK,EAAC,cAAc,EAAE,cAAc,EAAC,MAAM,YAAY,CAAC;AAQ/D,QAAA,MAAM,eAAe;;;iBAMnB,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAE9D,eAAO,MAAM,6BAA6B,GACtC,MAAM,GAAG,EACT,OAAO,MAAM,EACb,uBAAuB,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,KAC5C,cAAc,EA0BhB,CAAC;AAEF,eAAO,MAAM,6BAA6B,GACtC,WAAW,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,KACjD,cAAc,CAAC,eAAe,CAkB/B,CAAC"}

package/dist/tools/ask-mentor.js

@@ -0,0 +1,52 @@
+import { z } from 'zod';
+import { getOutputText, normalizeToolArguments, createBaseMessage, getCallIdFromItem, } from './format-helpers.js';
+const askMentorSchema = z.object({
+    question: z.string().describe('The question to ask the mentor.'),
+    context: z
+        .string()
+        .nullable()
+        .describe('Additional context for the question.'),
+});
+export const formatAskMentorCommandMessage = (item, index, toolCallArgumentsById) => {
+    const callId = getCallIdFromItem(item);
+    const fallbackArgs = callId && toolCallArgumentsById.has(callId)
+        ? toolCallArgumentsById.get(callId)
+        : null;
+    const normalizedArgs = item?.rawItem?.arguments ?? item?.arguments;
+    const args = normalizeToolArguments(normalizedArgs) ??
+        normalizeToolArguments(fallbackArgs) ??
+        {};
+    const question = args?.question ?? 'Unknown question';
+    const command = `ask_mentor: ${question}`;
+    const output = getOutputText(item) || 'No response from mentor';
+    const success = !output.startsWith('Failed to ask mentor:');
+    return [
+        createBaseMessage(item, index, 0, false, {
+            command,
+            output,
+            success,
+            toolName: 'ask_mentor',
+            toolArgs: args,
+        }),
+    ];
+};
+export const createAskMentorToolDefinition = (askMentor) => ({
+    name: 'ask_mentor',
+    description: 'Ask a mentor (a smarter model) for advice or clarification on a problem. The mentor does not see your thinking, files you have read, or conversation context - you must fully explain the situation in your question.',
+    parameters: askMentorSchema,
+    needsApproval: () => false,
+    execute: async ({ question, context }) => {
+        const prompt = context
+            ? `Context:\n${context}\n\nQuestion:\n${question}`
+            : question;
+        try {
+            const answer = await askMentor(prompt);
+            return answer;
+        }
+        catch (error) {
+            return `Failed to ask mentor: ${error.message}. Ensure mentor model is configured in settings.`;
+        }
+    },
+    formatCommandMessage: formatAskMentorCommandMessage,
+});
+//# sourceMappingURL=ask-mentor.js.map