@qduc/term2 0.1.4 → 0.1.6

package/dist/services/stream-event-processor.js

@@ -0,0 +1,344 @@
+import { extractCommandMessages } from '../utils/extract-command-messages.js';
+import { extractUsage } from '../utils/token-usage.js';
+export class StreamEventProcessor {
+    logger;
+    sessionId;
+    toolCallArgumentsById = new Map();
+    textDeltaCount = 0;
+    reasoningDeltaCount = 0;
+    lastEventType = null;
+    eventTypeCount = 0;
+    constructor({ logger, sessionId }) {
+        this.logger = logger;
+        this.sessionId = sessionId;
+    }
+    reset() {
+        this.toolCallArgumentsById.clear();
+        this.textDeltaCount = 0;
+        this.reasoningDeltaCount = 0;
+        this.lastEventType = null;
+        this.eventTypeCount = 0;
+    }
+    getToolCallArgumentsSnapshot() {
+        return new Map(this.toolCallArgumentsById);
+    }
+    restoreToolCallArguments(snapshot) {
+        this.toolCallArgumentsById.clear();
+        if (!snapshot?.size) {
+            return;
+        }
+        for (const [key, value] of snapshot.entries()) {
+            this.toolCallArgumentsById.set(key, value);
+        }
+    }
+    async *streamEvents(stream, acc, { preserveExistingToolArgs }) {
+        const toolCallArgumentsById = this.toolCallArgumentsById;
+        if (!preserveExistingToolArgs) {
+            toolCallArgumentsById.clear();
+        }
+        this.textDeltaCount = 0;
+        this.reasoningDeltaCount = 0;
+        const emitText = (delta) => {
+            if (!delta) {
+                return null;
+            }
+            acc.finalOutput += delta;
+            this.textDeltaCount++;
+            return {
+                type: 'text_delta',
+                delta,
+                fullText: acc.finalOutput,
+            };
+        };
+        const emitReasoning = (delta) => {
+            if (!delta || delta.replaceAll('\n', '') === '') {
+                return null;
+            }
+            acc.reasoningOutput += delta;
+            this.reasoningDeltaCount++;
+            return {
+                type: 'reasoning_delta',
+                delta,
+                fullText: acc.reasoningOutput,
+            };
+        };
+        for await (const event of stream) {
+            // Extract usage if present in any of the common locations
+            const usage = extractUsage(event);
+            if (usage) {
+                acc.latestUsage = usage;
+                this.logger.debug('Usage extracted from stream event', {
+                    sessionId: this.sessionId,
+                    source: 'stream_event',
+                    eventType: event?.type ?? event?.data?.type ?? 'unknown',
+                    usage,
+                });
+            }
+            // Log event type with deduplication for ordering understanding
+            const delta1 = this.#extractTextDelta(event);
+            if (delta1) {
+                const e = emitText(delta1);
+                if (e)
+                    yield e;
+            }
+            if (event?.data) {
+                const delta2 = this.#extractTextDelta(event.data);
+                if (delta2) {
+                    const e = emitText(delta2);
+                    if (e)
+                        yield e;
+                }
+            }
+            // Handle reasoning items
+            const reasoningDelta = (() => {
+                // OpenAI style
+                const data = event?.data;
+                if (data && typeof data === 'object' && data.type === 'model') {
+                    const eventDetail = data.event;
+                    if (eventDetail &&
+                        typeof eventDetail === 'object' &&
+                        eventDetail.type === 'response.reasoning_summary_text.delta') {
+                        return eventDetail.delta ?? '';
+                    }
+                }
+                // OpenRouter style
+                const choices = event?.data?.event?.choices;
+                if (!choices)
+                    return '';
+                if (Array.isArray(choices)) {
+                    return choices[0]?.delta?.reasoning ?? choices[0]?.delta?.reasoning_content ?? '';
+                }
+                if (typeof choices === 'object') {
+                    const byZero = choices['0'];
+                    const first = byZero ?? choices[Object.keys(choices)[0]];
+                    return first?.delta?.reasoning ?? first?.delta?.reasoning_content ?? '';
+                }
+                return '';
+            })();
+            if (reasoningDelta) {
+                const e = emitReasoning(reasoningDelta);
+                if (e)
+                    yield e;
+            }
+            const maybeEmitCommandMessagesFromItems = (items) => {
+                this.#attachCachedArguments(items, toolCallArgumentsById);
+                const commandMessages = extractCommandMessages(items);
+                const out = [];
+                for (const cmdMsg of commandMessages) {
+                    if (acc.emittedCommandIds.has(cmdMsg.id)) {
+                        continue;
+                    }
+                    if (cmdMsg.isApprovalRejection) {
+                        continue;
+                    }
+                    acc.emittedCommandIds.add(cmdMsg.id);
+                    out.push({ type: 'command_message', message: cmdMsg });
+                }
+                return out;
+            };
+            if (event?.type === 'run_item_stream_event') {
+                this.#captureToolCallArguments(event.item, toolCallArgumentsById);
+                // Emit tool_started event when a function_call is detected
+                const rawItem = event.item?.rawItem ?? event.item;
+                if (rawItem?.type === 'function_call') {
+                    const callId = rawItem.callId ?? rawItem.call_id ?? rawItem.tool_call_id ?? rawItem.toolCallId ?? rawItem.id;
+                    if (callId) {
+                        const toolName = rawItem.name ?? event.item?.name;
+                        const args = rawItem.arguments ?? rawItem.args ?? event.item?.arguments ?? event.item?.args;
+                        // Providers sometimes surface arguments as a JSON string.
+                        // Normalize here so downstream UI (pending/running display)
+                        // can reliably render parameters.
+                        const normalizedArgs = (() => {
+                            if (typeof args !== 'string') {
+                                return args;
+                            }
+                            const trimmed = args.trim();
+                            if (!trimmed) {
+                                return args;
+                            }
+                            try {
+                                return JSON.parse(trimmed);
+                            }
+                            catch {
+                                return args;
+                            }
+                        })();
+                        yield {
+                            type: 'tool_started',
+                            toolCallId: callId,
+                            toolName: toolName ?? 'unknown',
+                            arguments: normalizedArgs,
+                        };
+                    }
+                }
+                for (const e of maybeEmitCommandMessagesFromItems([event.item])) {
+                    yield e;
+                }
+            }
+            else if (event?.type === 'tool_call_output_item' || event?.rawItem?.type === 'function_call_output') {
+                this.#captureToolCallArguments(event, toolCallArgumentsById);
+                for (const e of maybeEmitCommandMessagesFromItems([event])) {
+                    yield e;
+                }
+            }
+        }
+        const completedResult = await stream.completed;
+        const rawResponses = Array.isArray(stream?.rawResponses) ? stream.rawResponses : [];
+        let usageFromRawResponses;
+        for (let i = rawResponses.length - 1; i >= 0; i--) {
+            const candidate = extractUsage(rawResponses[i]);
+            if (candidate) {
+                usageFromRawResponses = candidate;
+                break;
+            }
+        }
+        const finalUsage = extractUsage(completedResult) || extractUsage(stream) || usageFromRawResponses;
+        if (finalUsage) {
+            acc.latestUsage = finalUsage;
+            const usageSource = extractUsage(completedResult)
+                ? 'completed_result'
+                : extractUsage(stream)
+                    ? 'stream_object'
+                    : 'stream_raw_responses';
+            this.logger.debug('Usage extracted from stream completion', {
+                sessionId: this.sessionId,
+                source: 'stream_completed',
+                usageSource,
+                usage: finalUsage,
+            });
+        }
+        else {
+            const completedResultRecord = completedResult && typeof completedResult === 'object' && !Array.isArray(completedResult)
+                ? completedResult
+                : undefined;
+            const streamRecord = stream && typeof stream === 'object' && !Array.isArray(stream)
+                ? stream
+                : undefined;
+            this.logger.debug('No usage found in stream completion', {
+                sessionId: this.sessionId,
+                source: 'stream_completed',
+                completedResultType: completedResult === null ? 'null' : Array.isArray(completedResult) ? 'array' : typeof completedResult,
+                completedResultKeys: completedResultRecord ? Object.keys(completedResultRecord) : [],
+                streamKeys: streamRecord ? Object.keys(streamRecord) : [],
+                completedResultHasUsagePath: {
+                    usage: Boolean(completedResultRecord?.usage),
+                    usageMetadata: Boolean(completedResultRecord?.usageMetadata),
+                    usage_metadata: Boolean(completedResultRecord?.usage_metadata),
+                    responseUsage: Boolean(completedResultRecord?.response?.usage),
+                },
+            });
+        }
+        this.flushStreamEventLog();
+    }
+    flushStreamEventLog() {
+        if (this.lastEventType !== null && this.eventTypeCount > 1) {
+            this.logger.debug('Stream event summary', {
+                eventType: this.lastEventType,
+                count: this.eventTypeCount,
+            });
+        }
+        this.lastEventType = null;
+        this.eventTypeCount = 0;
+    }
+    #captureToolCallArguments(item, toolCallArgumentsById) {
+        const rawItem = item?.rawItem ?? item;
+        if (!rawItem) {
+            return;
+        }
+        if (rawItem?.type !== 'function_call') {
+            return;
+        }
+        const callId = rawItem.callId ?? rawItem.call_id ?? rawItem.tool_call_id ?? rawItem.toolCallId ?? rawItem.id;
+        if (!callId) {
+            return;
+        }
+        const args = rawItem.arguments ?? rawItem.args ?? item?.arguments ?? item?.args;
+        if (!args) {
+            return;
+        }
+        toolCallArgumentsById.set(callId, args);
+    }
+    #attachCachedArguments(items = [], toolCallArgumentsById) {
+        if (!items?.length) {
+            return;
+        }
+        for (const item of items) {
+            if (!item) {
+                continue;
+            }
+            if (item.arguments || item.args || item?.rawItem?.arguments || item?.rawItem?.args) {
+                continue;
+            }
+            const rawItem = item?.rawItem ?? item;
+            const callId = rawItem?.callId ??
+                rawItem?.call_id ??
+                rawItem?.tool_call_id ??
+                rawItem?.toolCallId ??
+                rawItem?.id ??
+                item?.callId ??
+                item?.call_id ??
+                item?.tool_call_id ??
+                item?.toolCallId ??
+                item?.id;
+            if (!callId) {
+                continue;
+            }
+            const args = toolCallArgumentsById.get(callId);
+            if (!args) {
+                continue;
+            }
+            item.arguments = args;
+        }
+    }
+    #extractTextDelta(payload) {
+        if (payload === null || payload === undefined) {
+            return null;
+        }
+        if (typeof payload === 'string') {
+            return payload || null;
+        }
+        if (typeof payload !== 'object') {
+            return null;
+        }
+        const type = typeof payload.type === 'string' ? payload.type : '';
+        const looksLikeOutput = typeof type === 'string' && type.includes('output_text');
+        const hasOutputProperties = Boolean(payload.delta ?? payload.output_text ?? payload.text ?? payload.content);
+        if (!looksLikeOutput && !hasOutputProperties) {
+            return null;
+        }
+        const deltaCandidate = payload.delta ?? payload.output_text ?? payload.text ?? payload.content;
+        const text = this.#coerceToText(deltaCandidate);
+        return text || null;
+    }
+    #coerceToText(value) {
+        if (value === null || value === undefined) {
+            return '';
+        }
+        if (typeof value === 'string') {
+            return value;
+        }
+        if (typeof value === 'number' || typeof value === 'boolean') {
+            return String(value);
+        }
+        if (Array.isArray(value)) {
+            return value
+                .map((entry) => this.#coerceToText(entry))
+                .filter(Boolean)
+                .join('');
+        }
+        if (typeof value === 'object') {
+            const record = value;
+            const candidates = ['text', 'value', 'content', 'delta'];
+            for (const field of candidates) {
+                if (field in record) {
+                    const text = this.#coerceToText(record[field]);
+                    if (text) {
+                        return text;
+                    }
+                }
+            }
+        }
+        return '';
+    }
+}
+//# sourceMappingURL=stream-event-processor.js.map

package/dist/services/stream-event-processor.js.map

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

package/dist/services/stream-event-processor.test.d.ts

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

package/dist/services/stream-event-processor.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"stream-event-processor.test.d.ts","sourceRoot":"","sources":["../../source/services/stream-event-processor.test.ts"],"names":[],"mappings":""}

package/dist/services/stream-event-processor.test.js

@@ -0,0 +1,117 @@
+import test from 'ava';
+import { StreamEventProcessor } from './stream-event-processor.js';
+const mockLogger = {
+    info: () => { },
+    warn: () => { },
+    error: () => { },
+    debug: () => { },
+    security: () => { },
+    setCorrelationId: () => { },
+    getCorrelationId: () => undefined,
+    clearCorrelationId: () => { },
+};
+class MockStream {
+    constructor(events, completed = undefined) {
+        this.events = events;
+        this.completed = Promise.resolve(completed);
+        this.lastResponseId = 'resp_test';
+        this.interruptions = [];
+        this.state = {};
+        this.newItems = [];
+        this.history = [];
+        this.finalOutput = '';
+    }
+    events;
+    completed;
+    lastResponseId;
+    interruptions;
+    state;
+    newItems;
+    history;
+    finalOutput;
+    async *[Symbol.asyncIterator]() {
+        for (const event of this.events) {
+            yield event;
+        }
+    }
+}
+test('StreamEventProcessor streams text and reasoning deltas with fullText', async (t) => {
+    const stream = new MockStream([
+        { type: 'response.output_text.delta', delta: 'Hello' },
+        {
+            data: {
+                type: 'model',
+                event: {
+                    choices: [
+                        {
+                            delta: {
+                                reasoning_content: 'think',
+                            },
+                        },
+                    ],
+                },
+            },
+        },
+    ]);
+    const processor = new StreamEventProcessor({ logger: mockLogger, sessionId: 's1' });
+    const acc = {
+        finalOutput: '',
+        reasoningOutput: '',
+        emittedCommandIds: new Set(),
+        latestUsage: undefined,
+    };
+    const emitted = [];
+    for await (const event of processor.streamEvents(stream, acc, { preserveExistingToolArgs: false })) {
+        emitted.push(event);
+    }
+    t.is(emitted[0].type, 'text_delta');
+    t.is(emitted[0].delta, 'Hello');
+    t.is(emitted[0].fullText, 'Hello');
+    t.is(emitted[1].type, 'reasoning_delta');
+    t.is(emitted[1].delta, 'think');
+    t.is(emitted[1].fullText, 'think');
+});
+test('StreamEventProcessor emits tool_started and command_message with cached args', async (t) => {
+    const stream = new MockStream([
+        {
+            type: 'run_item_stream_event',
+            item: {
+                rawItem: {
+                    type: 'function_call',
+                    callId: 'call-1',
+                    name: 'shell',
+                    arguments: JSON.stringify({ command: 'echo hi' }),
+                },
+            },
+        },
+        {
+            type: 'tool_call_output_item',
+            rawItem: {
+                type: 'function_call_output',
+                callId: 'call-1',
+                name: 'shell',
+                output: 'exit 0\nhi',
+            },
+        },
+    ]);
+    const processor = new StreamEventProcessor({ logger: mockLogger, sessionId: 's1' });
+    const acc = {
+        finalOutput: '',
+        reasoningOutput: '',
+        emittedCommandIds: new Set(),
+        latestUsage: undefined,
+    };
+    const emitted = [];
+    for await (const event of processor.streamEvents(stream, acc, { preserveExistingToolArgs: false })) {
+        emitted.push(event);
+    }
+    const toolStarted = emitted.find((event) => event.type === 'tool_started');
+    const commandMessage = emitted.find((event) => event.type === 'command_message');
+    t.truthy(toolStarted);
+    t.is(toolStarted.toolCallId, 'call-1');
+    t.is(toolStarted.toolName, 'shell');
+    t.deepEqual(toolStarted.arguments, { command: 'echo hi' });
+    t.truthy(commandMessage);
+    t.is(commandMessage.message.command, 'echo hi');
+});
+//# sourceMappingURL=stream-event-processor.test.js.map

package/dist/services/stream-event-processor.test.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"apply-patch.d.ts","sourceRoot":"","sources":["../../source/tools/apply-patch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAKtB,OAAO,KAAK,EAAC,cAAc,EAAE,cAAc,EAAC,MAAM,YAAY,CAAC;AAC/D,OAAO,KAAK,EACR,eAAe,EACf,gBAAgB,EACnB,MAAM,mCAAmC,CAAC;AAO3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEpE;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,KAAK;IACP,QAAQ,EAAE,MAAM;gBAAxC,OAAO,EAAE,MAAM,EAAS,QAAQ,EAAE,MAAM;CAIvD;AAED,QAAA,MAAM,0BAA0B;;;;;;;iBAM9B,CAAC;AAEH,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAE9E,eAAO,MAAM,8BAA8B,GACvC,MAAM,GAAG,EACT,OAAO,MAAM,EACb,wBAAwB,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,KAC7C,cAAc,EA8ChB,CAAC;AAEF,wBAAgB,8BAA8B,CAAC,IAAI,EAAE;IACjD,cAAc,EAAE,eAAe,CAAC;IAChC,eAAe,EAAE,gBAAgB,CAAC;IAClC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACvC,GAAG,cAAc,CAAC,oBAAoB,CAAC,CAyXvC"}
+{"version":3,"file":"apply-patch.d.ts","sourceRoot":"","sources":["../../source/tools/apply-patch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAE3F,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEpE;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,KAAK;IACT,QAAQ,EAAE,MAAM;gBAAxC,OAAO,EAAE,MAAM,EAAS,QAAQ,EAAE,MAAM;CAIrD;AAED,QAAA,MAAM,0BAA0B;;;;;;;iBAI9B,CAAC;AAEH,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAE9E,eAAO,MAAM,8BAA8B,GACzC,MAAM,GAAG,EACT,OAAO,MAAM,EACb,wBAAwB,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,KAC3C,cAAc,EA4ChB,CAAC;AAEF,wBAAgB,8BAA8B,CAAC,IAAI,EAAE;IACnD,cAAc,EAAE,eAAe,CAAC;IAChC,eAAe,EAAE,gBAAgB,CAAC;IAClC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,GAAG,cAAc,CAAC,oBAAoB,CAAC,CAkXvC"}

package/dist/tools/apply-patch.js

@@ -3,7 +3,7 @@ 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';
+import { getOutputText, safeJsonParse, normalizeToolArguments, createBaseMessage } from './format-helpers.js';
 /**
  * Error thrown when patch validation fails (malformed diff)
  */
@@ -18,9 +18,7 @@ export class PatchValidationError extends Error {
 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'),
+    diff: z.string().describe('Unified diff content for create/update operations'),
 });
 export const formatApplyPatchCommandMessage = (item, index, _toolCallArgumentsById) => {
     const parsedOutput = safeJsonParse(getOutputText(item));
@@ -112,6 +110,25 @@ export function createApplyPatchToolDefinition(deps) {
             try {
                 const editMode = settingsService.get('app.editMode');
                 const { type, path: filePath, diff } = params;
+                const workspaceRoot = executionContext?.getCwd() || process.cwd();
+                const sshService = executionContext?.getSSHService();
+                const isRemote = executionContext?.isRemote() && !!sshService;
+                // Resolve and ensure target within workspace before any validation.
+                // This prevents validation from running against a mismatched 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;
+                }
                 // Validate diff syntax by attempting a dry-run (before approval)
                 if (type === 'create_file' || type === 'update_file') {
                     try {
@@ -120,9 +137,10 @@ export function createApplyPatchToolDefinition(deps) {
                             applyDiff('', diff);
                         }
                         else {
-                            // Dry-run: read existing file and test diff application
-                            const targetPath = resolveWorkspacePath(filePath);
-                            const original = await readFile(targetPath, 'utf8');
+                            // Dry-run: read existing file and test diff application.
+                            // Read failures are environment/file-state issues, not
+                            // deterministic patch syntax failures.
+                            const original = isRemote && sshService ? await sshService.readFile(targetPath) : await readFile(targetPath, 'utf8');
                             applyDiff(original, diff);
                         }
                         loggingService.info('apply_patch validation passed', {
@@ -131,8 +149,22 @@ export function createApplyPatchToolDefinition(deps) {
                         });
                     }
                     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
+                        // Keep fast UX for deterministic patch-format errors, but
+                        // require approval for environment/file-state failures.
+                        const fileAccessFailure = typeof diffError?.code === 'string' ||
+                            ['enoent', 'not found', 'no such file', 'permission denied', 'eacces', 'eperm', 'is a directory'].some((token) => String(diffError?.message || '')
+                                .toLowerCase()
+                                .includes(token));
+                        if (fileAccessFailure) {
+                            loggingService.warn('apply_patch prevalidation could not confirm patch due to file/context issue', {
+                                type,
+                                path: filePath,
+                                error: diffError?.message || String(diffError),
+                            });
+                            return true;
+                        }
+                        // Diff-format validation failed - auto-approve and let execute
+                        // return a structured error without bothering the user.
                         loggingService.error('apply_patch validation failed - will fail in execute', {
                             type,
                             path: filePath,
@@ -151,27 +183,9 @@ export function createApplyPatchToolDefinition(deps) {
                 //     });
                 //     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')) {
+                if (editMode && insideCwd && (type === 'create_file' || type === 'update_file')) {
                     loggingService.security('apply_patch needsApproval: auto-approved in edit mode', {
                         editMode,
                         type,
@@ -244,15 +258,13 @@ export function createApplyPatchToolDefinition(deps) {
                         loggingService.error('Patch validation failed in execute', {
                             type,
                             path: filePath,
-                            error: validationError?.message ||
-                                String(validationError),
+                            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.`,
+                                    error: `Invalid patch: ${validationError?.message || String(validationError)}. Please check the file path and diff format.`,
                                 },
                             ],
                         });
@@ -378,9 +390,7 @@ export function createApplyPatchToolDefinition(deps) {
                     loggingService.error('File operation failed', {
                         type: params.type,
                         path: params.path,
-                        error: error instanceof Error
-                            ? error.message
-                            : String(error),
+                        error: error instanceof Error ? error.message : String(error),
                     });
                 }
                 return JSON.stringify({