@office-ai/aioncli-core 0.26.0 → 0.30.1

package/dist/src/utils/compatibility.test.js

@@ -0,0 +1,233 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import os from 'node:os';
+import { isWindows10, isJetBrainsTerminal, supports256Colors, supportsTrueColor, getCompatibilityWarnings, WarningPriority, } from './compatibility.js';
+vi.mock('node:os', () => ({
+    default: {
+        platform: vi.fn(),
+        release: vi.fn(),
+    },
+}));
+describe('compatibility', () => {
+    const originalGetColorDepth = process.stdout.getColorDepth;
+    afterEach(() => {
+        process.stdout.getColorDepth = originalGetColorDepth;
+        vi.restoreAllMocks();
+        vi.unstubAllEnvs();
+    });
+    describe('isWindows10', () => {
+        it.each([
+            {
+                platform: 'win32',
+                release: '10.0.19041',
+                expected: true,
+                desc: 'Windows 10 (build < 22000)',
+            },
+            {
+                platform: 'win32',
+                release: '10.0.22000',
+                expected: false,
+                desc: 'Windows 11 (build >= 22000)',
+            },
+            {
+                platform: 'darwin',
+                release: '20.6.0',
+                expected: false,
+                desc: 'non-Windows platforms',
+            },
+        ])('should return $expected for $desc', ({ platform, release, expected }) => {
+            vi.mocked(os.platform).mockReturnValue(platform);
+            vi.mocked(os.release).mockReturnValue(release);
+            expect(isWindows10()).toBe(expected);
+        });
+    });
+    describe('isJetBrainsTerminal', () => {
+        it.each([
+            {
+                env: 'JetBrains-JediTerm',
+                expected: true,
+                desc: 'TERMINAL_EMULATOR is JetBrains-JediTerm',
+            },
+            { env: 'something-else', expected: false, desc: 'other terminals' },
+            { env: '', expected: false, desc: 'TERMINAL_EMULATOR is not set' },
+        ])('should return $expected when $desc', ({ env, expected }) => {
+            vi.stubEnv('TERMINAL_EMULATOR', env);
+            expect(isJetBrainsTerminal()).toBe(expected);
+        });
+    });
+    describe('supports256Colors', () => {
+        it.each([
+            {
+                depth: 8,
+                term: undefined,
+                expected: true,
+                desc: 'getColorDepth returns >= 8',
+            },
+            {
+                depth: 4,
+                term: 'xterm-256color',
+                expected: true,
+                desc: 'TERM contains 256color',
+            },
+            {
+                depth: 4,
+                term: 'xterm',
+                expected: false,
+                desc: '256 colors are not supported',
+            },
+        ])('should return $expected when $desc', ({ depth, term, expected }) => {
+            process.stdout.getColorDepth = vi.fn().mockReturnValue(depth);
+            if (term !== undefined) {
+                vi.stubEnv('TERM', term);
+            }
+            expect(supports256Colors()).toBe(expected);
+        });
+    });
+    describe('supportsTrueColor', () => {
+        it.each([
+            {
+                colorterm: 'truecolor',
+                depth: 8,
+                expected: true,
+                desc: 'COLORTERM is truecolor',
+            },
+            {
+                colorterm: '24bit',
+                depth: 8,
+                expected: true,
+                desc: 'COLORTERM is 24bit',
+            },
+            {
+                colorterm: '',
+                depth: 24,
+                expected: true,
+                desc: 'getColorDepth returns >= 24',
+            },
+            {
+                colorterm: '',
+                depth: 8,
+                expected: false,
+                desc: 'true color is not supported',
+            },
+        ])('should return $expected when $desc', ({ colorterm, depth, expected }) => {
+            vi.stubEnv('COLORTERM', colorterm);
+            process.stdout.getColorDepth = vi.fn().mockReturnValue(depth);
+            expect(supportsTrueColor()).toBe(expected);
+        });
+    });
+    describe('getCompatibilityWarnings', () => {
+        beforeEach(() => {
+            // Default to supporting true color to keep existing tests simple
+            vi.stubEnv('COLORTERM', 'truecolor');
+            process.stdout.getColorDepth = vi.fn().mockReturnValue(24);
+        });
+        it('should return Windows 10 warning when detected', () => {
+            vi.mocked(os.platform).mockReturnValue('win32');
+            vi.mocked(os.release).mockReturnValue('10.0.19041');
+            vi.stubEnv('TERMINAL_EMULATOR', '');
+            const warnings = getCompatibilityWarnings();
+            expect(warnings).toContainEqual(expect.objectContaining({
+                id: 'windows-10',
+                message: expect.stringContaining('Windows 10 detected'),
+            }));
+        });
+        it.each([
+            {
+                platform: 'darwin',
+                release: '20.6.0',
+                externalTerminal: 'iTerm2 or Ghostty',
+                desc: 'macOS',
+            },
+            {
+                platform: 'win32',
+                release: '10.0.22000',
+                externalTerminal: 'Windows Terminal',
+                desc: 'Windows',
+            }, // Valid Windows 11 release to not trigger the Windows 10 warning
+            {
+                platform: 'linux',
+                release: '5.10.0',
+                externalTerminal: 'Ghostty',
+                desc: 'Linux',
+            },
+        ])('should return JetBrains warning when detected and in alternate buffer ($desc)', ({ platform, release, externalTerminal }) => {
+            vi.mocked(os.platform).mockReturnValue(platform);
+            vi.mocked(os.release).mockReturnValue(release);
+            vi.stubEnv('TERMINAL_EMULATOR', 'JetBrains-JediTerm');
+            const warnings = getCompatibilityWarnings({ isAlternateBuffer: true });
+            expect(warnings).toContainEqual(expect.objectContaining({
+                id: 'jetbrains-terminal',
+                message: expect.stringContaining(`Warning: JetBrains mouse scrolling is unreliable. Disabling alternate buffer mode in settings or using an external terminal (e.g., ${externalTerminal}) is recommended.`),
+                priority: WarningPriority.High,
+            }));
+        });
+        it('should not return JetBrains warning when detected but NOT in alternate buffer', () => {
+            vi.mocked(os.platform).mockReturnValue('darwin');
+            vi.stubEnv('TERMINAL_EMULATOR', 'JetBrains-JediTerm');
+            const warnings = getCompatibilityWarnings({ isAlternateBuffer: false });
+            expect(warnings.find((w) => w.id === 'jetbrains-terminal')).toBeUndefined();
+        });
+        it('should return 256-color warning when 256 colors are not supported', () => {
+            vi.mocked(os.platform).mockReturnValue('linux');
+            vi.stubEnv('TERMINAL_EMULATOR', '');
+            vi.stubEnv('COLORTERM', '');
+            vi.stubEnv('TERM', 'xterm');
+            process.stdout.getColorDepth = vi.fn().mockReturnValue(4);
+            const warnings = getCompatibilityWarnings();
+            expect(warnings).toContainEqual(expect.objectContaining({
+                id: '256-color',
+                message: expect.stringContaining('256-color support not detected'),
+                priority: WarningPriority.High,
+            }));
+            // Should NOT show true-color warning if 256-color warning is shown
+            expect(warnings.find((w) => w.id === 'true-color')).toBeUndefined();
+        });
+        it('should return true color warning when 256 colors are supported but true color is not, and not Apple Terminal', () => {
+            vi.mocked(os.platform).mockReturnValue('linux');
+            vi.stubEnv('TERMINAL_EMULATOR', '');
+            vi.stubEnv('COLORTERM', '');
+            vi.stubEnv('TERM_PROGRAM', 'xterm');
+            process.stdout.getColorDepth = vi.fn().mockReturnValue(8);
+            const warnings = getCompatibilityWarnings();
+            expect(warnings).toContainEqual(expect.objectContaining({
+                id: 'true-color',
+                message: expect.stringContaining('True color (24-bit) support not detected'),
+                priority: WarningPriority.Low,
+            }));
+        });
+        it('should NOT return true color warning for Apple Terminal', () => {
+            vi.mocked(os.platform).mockReturnValue('darwin');
+            vi.stubEnv('TERMINAL_EMULATOR', '');
+            vi.stubEnv('COLORTERM', '');
+            vi.stubEnv('TERM_PROGRAM', 'Apple_Terminal');
+            process.stdout.getColorDepth = vi.fn().mockReturnValue(8);
+            const warnings = getCompatibilityWarnings();
+            expect(warnings.find((w) => w.id === 'true-color')).toBeUndefined();
+        });
+        it('should return all warnings when all are detected', () => {
+            vi.mocked(os.platform).mockReturnValue('win32');
+            vi.mocked(os.release).mockReturnValue('10.0.19041');
+            vi.stubEnv('TERMINAL_EMULATOR', 'JetBrains-JediTerm');
+            vi.stubEnv('COLORTERM', '');
+            vi.stubEnv('TERM_PROGRAM', 'xterm');
+            process.stdout.getColorDepth = vi.fn().mockReturnValue(8);
+            const warnings = getCompatibilityWarnings({ isAlternateBuffer: true });
+            expect(warnings).toHaveLength(3);
+            expect(warnings[0].message).toContain('Windows 10 detected');
+            expect(warnings[1].message).toContain('JetBrains');
+            expect(warnings[2].message).toContain('True color (24-bit) support not detected');
+        });
+        it('should return no warnings in a standard environment with true color', () => {
+            vi.mocked(os.platform).mockReturnValue('darwin');
+            vi.stubEnv('TERMINAL_EMULATOR', '');
+            vi.stubEnv('COLORTERM', 'truecolor');
+            const warnings = getCompatibilityWarnings();
+            expect(warnings).toHaveLength(0);
+        });
+    });
+});
+//# sourceMappingURL=compatibility.test.js.map

package/dist/src/utils/compatibility.test.js.map

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

package/dist/src/utils/constants.d.ts

@@ -0,0 +1,7 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export declare const REFERENCE_CONTENT_START = "--- Content from referenced files ---";
+export declare const REFERENCE_CONTENT_END = "--- End of content ---";

package/dist/src/utils/constants.js

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export const REFERENCE_CONTENT_START = '--- Content from referenced files ---';
+export const REFERENCE_CONTENT_END = '--- End of content ---';
+//# sourceMappingURL=constants.js.map

package/dist/src/utils/constants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/utils/constants.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,CAAC,MAAM,uBAAuB,GAAG,uCAAuC,CAAC;AAC/E,MAAM,CAAC,MAAM,qBAAqB,GAAG,wBAAwB,CAAC"}

package/dist/src/utils/deadlineTimer.d.ts

@@ -0,0 +1,36 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * A utility that manages a timeout and an AbortController, allowing the
+ * timeout to be paused, resumed, and dynamically extended.
+ */
+export declare class DeadlineTimer {
+    private readonly controller;
+    private timeoutId;
+    private remainingMs;
+    private lastStartedAt;
+    private isPaused;
+    constructor(timeoutMs: number, reason?: string);
+    /** The AbortSignal managed by this timer. */
+    get signal(): AbortSignal;
+    /**
+     * Pauses the timer, clearing any active timeout.
+     */
+    pause(): void;
+    /**
+     * Resumes the timer with the remaining budget.
+     */
+    resume(reason?: string): void;
+    /**
+     * Extends the current budget by the specified number of milliseconds.
+     */
+    extend(ms: number, reason?: string): void;
+    /**
+     * Aborts the signal immediately and clears any pending timers.
+     */
+    abort(reason?: unknown): void;
+    private schedule;
+}

package/dist/src/utils/deadlineTimer.js

@@ -0,0 +1,87 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * A utility that manages a timeout and an AbortController, allowing the
+ * timeout to be paused, resumed, and dynamically extended.
+ */
+export class DeadlineTimer {
+    controller;
+    timeoutId = null;
+    remainingMs;
+    lastStartedAt;
+    isPaused = false;
+    constructor(timeoutMs, reason = 'Timeout exceeded.') {
+        this.controller = new AbortController();
+        this.remainingMs = timeoutMs;
+        this.lastStartedAt = Date.now();
+        this.schedule(timeoutMs, reason);
+    }
+    /** The AbortSignal managed by this timer. */
+    get signal() {
+        return this.controller.signal;
+    }
+    /**
+     * Pauses the timer, clearing any active timeout.
+     */
+    pause() {
+        if (this.isPaused || this.controller.signal.aborted)
+            return;
+        if (this.timeoutId) {
+            clearTimeout(this.timeoutId);
+            this.timeoutId = null;
+        }
+        const elapsed = Date.now() - this.lastStartedAt;
+        this.remainingMs = Math.max(0, this.remainingMs - elapsed);
+        this.isPaused = true;
+    }
+    /**
+     * Resumes the timer with the remaining budget.
+     */
+    resume(reason = 'Timeout exceeded.') {
+        if (!this.isPaused || this.controller.signal.aborted)
+            return;
+        this.lastStartedAt = Date.now();
+        this.schedule(this.remainingMs, reason);
+        this.isPaused = false;
+    }
+    /**
+     * Extends the current budget by the specified number of milliseconds.
+     */
+    extend(ms, reason = 'Timeout exceeded.') {
+        if (this.controller.signal.aborted)
+            return;
+        if (this.isPaused) {
+            this.remainingMs += ms;
+        }
+        else {
+            if (this.timeoutId) {
+                clearTimeout(this.timeoutId);
+            }
+            const elapsed = Date.now() - this.lastStartedAt;
+            this.remainingMs = Math.max(0, this.remainingMs - elapsed) + ms;
+            this.lastStartedAt = Date.now();
+            this.schedule(this.remainingMs, reason);
+        }
+    }
+    /**
+     * Aborts the signal immediately and clears any pending timers.
+     */
+    abort(reason) {
+        if (this.timeoutId) {
+            clearTimeout(this.timeoutId);
+            this.timeoutId = null;
+        }
+        this.isPaused = false;
+        this.controller.abort(reason);
+    }
+    schedule(ms, reason) {
+        this.timeoutId = setTimeout(() => {
+            this.timeoutId = null;
+            this.controller.abort(new Error(reason));
+        }, ms);
+    }
+}
+//# sourceMappingURL=deadlineTimer.js.map

package/dist/src/utils/deadlineTimer.js.map

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

package/dist/src/utils/deadlineTimer.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

package/dist/src/utils/deadlineTimer.test.js

@@ -0,0 +1,64 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { DeadlineTimer } from './deadlineTimer.js';
+describe('DeadlineTimer', () => {
+    beforeEach(() => {
+        vi.useFakeTimers();
+    });
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+    it('should abort when timeout is reached', () => {
+        const timer = new DeadlineTimer(1000);
+        const signal = timer.signal;
+        expect(signal.aborted).toBe(false);
+        vi.advanceTimersByTime(1000);
+        expect(signal.aborted).toBe(true);
+        expect(signal.reason).toBeInstanceOf(Error);
+        expect(signal.reason.message).toBe('Timeout exceeded.');
+    });
+    it('should allow extending the deadline', () => {
+        const timer = new DeadlineTimer(1000);
+        const signal = timer.signal;
+        vi.advanceTimersByTime(500);
+        expect(signal.aborted).toBe(false);
+        timer.extend(1000); // New deadline is 1000 + 1000 = 2000 from start
+        vi.advanceTimersByTime(600); // 1100 total
+        expect(signal.aborted).toBe(false);
+        vi.advanceTimersByTime(900); // 2000 total
+        expect(signal.aborted).toBe(true);
+    });
+    it('should allow pausing and resuming the timer', () => {
+        const timer = new DeadlineTimer(1000);
+        const signal = timer.signal;
+        vi.advanceTimersByTime(500);
+        timer.pause();
+        vi.advanceTimersByTime(2000); // Wait a long time while paused
+        expect(signal.aborted).toBe(false);
+        timer.resume();
+        vi.advanceTimersByTime(400);
+        expect(signal.aborted).toBe(false);
+        vi.advanceTimersByTime(200); // Total active time 500 + 400 + 200 = 1100
+        expect(signal.aborted).toBe(true);
+    });
+    it('should abort immediately when abort() is called', () => {
+        const timer = new DeadlineTimer(1000);
+        const signal = timer.signal;
+        timer.abort('cancelled');
+        expect(signal.aborted).toBe(true);
+        expect(signal.reason).toBe('cancelled');
+    });
+    it('should not fire timeout if aborted manually', () => {
+        const timer = new DeadlineTimer(1000);
+        const signal = timer.signal;
+        timer.abort();
+        vi.advanceTimersByTime(1000);
+        // Already aborted, but shouldn't re-abort or throw
+        expect(signal.aborted).toBe(true);
+    });
+});
+//# sourceMappingURL=deadlineTimer.test.js.map

package/dist/src/utils/deadlineTimer.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"deadlineTimer.test.js","sourceRoot":"","sources":["../../../src/utils/deadlineTimer.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,eAAe,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAC9C,MAAM,KAAK,GAAG,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC;QACtC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC5B,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAEnC,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC7B,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAC5C,MAAM,CAAE,MAAM,CAAC,MAAgB,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC7C,MAAM,KAAK,GAAG,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC;QACtC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAE5B,EAAE,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;QAC5B,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAEnC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,gDAAgD;QAEpE,EAAE,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,aAAa;QAC1C,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAEnC,EAAE,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,aAAa;QAC1C,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACrD,MAAM,KAAK,GAAG,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC;QACtC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAE5B,EAAE,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;QAC5B,KAAK,CAAC,KAAK,EAAE,CAAC;QAEd,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,gCAAgC;QAC9D,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAEnC,KAAK,CAAC,MAAM,EAAE,CAAC;QACf,EAAE,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;QAC5B,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAEnC,EAAE,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,2CAA2C;QACxE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACzD,MAAM,KAAK,GAAG,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC;QACtC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAE5B,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACzB,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACrD,MAAM,KAAK,GAAG,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC;QACtC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAE5B,KAAK,CAAC,KAAK,EAAE,CAAC;QACd,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC7B,mDAAmD;QACnD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/src/utils/editCorrector.d.ts

@@ -32,9 +32,9 @@ export interface CorrectedEditResult {
  * @returns A promise resolving to an object containing the (potentially corrected)
  *          EditToolParams (as CorrectedEditParams) and the final occurrences count.
  */
-export declare function ensureCorrectEdit(filePath: string, currentContent: string, originalParams: EditToolParams, // This is the EditToolParams from edit.ts, without \'corrected\'
-geminiClient: GeminiClient, baseLlmClient: BaseLlmClient, abortSignal: AbortSignal): Promise<CorrectedEditResult>;
-export declare function ensureCorrectFileContent(content: string, baseLlmClient: BaseLlmClient, abortSignal: AbortSignal): Promise<string>;
+export declare function ensureCorrectEdit(filePath: string, currentContent: string, originalParams: EditToolParams, // This is the EditToolParams from edit.ts, without 'corrected'
+geminiClient: GeminiClient, baseLlmClient: BaseLlmClient, abortSignal: AbortSignal, disableLLMCorrection: boolean): Promise<CorrectedEditResult>;
+export declare function ensureCorrectFileContent(content: string, baseLlmClient: BaseLlmClient, abortSignal: AbortSignal, disableLLMCorrection?: boolean): Promise<string>;
 export declare function correctOldStringMismatch(baseLlmClient: BaseLlmClient, fileContent: string, problematicSnippet: string, abortSignal: AbortSignal): Promise<string>;
 /**
  * Adjusts the new_string to align with a corrected old_string, maintaining the original intent.

package/dist/src/utils/editCorrector.js

@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { EDIT_TOOL_NAME, GREP_TOOL_NAME, READ_FILE_TOOL_NAME, READ_MANY_FILES_TOOL_NAME, WRITE_FILE_TOOL_NAME, } from '../tools/tool-names.js';
-import { LruCache } from './LruCache.js';
 import { isFunctionResponse, isFunctionCall, } from '../utils/messageInspectors.js';
 import * as fs from 'node:fs';
 import { promptIdContext } from './promptIdContext.js';
 import { debugLogger } from './debugLogger.js';
+import { LRUCache } from 'mnemonist';
+import { LlmRole } from '../telemetry/types.js';
 const CODE_CORRECTION_SYSTEM_PROMPT = `
 You are an expert code-editing assistant. Your task is to analyze a failed edit attempt and provide a corrected version of the text snippets.
 The correction should be as minimal as possible, staying very close to the original.
@@ -21,9 +22,9 @@ function getPromptId() {
 }
 const MAX_CACHE_SIZE = 50;
 // Cache for ensureCorrectEdit results
-const editCorrectionCache = new LruCache(MAX_CACHE_SIZE);
+const editCorrectionCache = new LRUCache(MAX_CACHE_SIZE);
 // Cache for ensureCorrectFileContent results
-const fileContentCorrectionCache = new LruCache(MAX_CACHE_SIZE);
+const fileContentCorrectionCache = new LRUCache(MAX_CACHE_SIZE);
 /**
  * Extracts the timestamp from the .id value, which is in format
  * <tool.name>-<timestamp>-<uuid>
@@ -109,8 +110,8 @@ async function findLastEditTimestamp(filePath, client) {
  * @returns A promise resolving to an object containing the (potentially corrected)
  *          EditToolParams (as CorrectedEditParams) and the final occurrences count.
  */
-export async function ensureCorrectEdit(filePath, currentContent, originalParams, // This is the EditToolParams from edit.ts, without \'corrected\'
-geminiClient, baseLlmClient, abortSignal) {
+export async function ensureCorrectEdit(filePath, currentContent, originalParams, // This is the EditToolParams from edit.ts, without 'corrected'
+geminiClient, baseLlmClient, abortSignal, disableLLMCorrection) {
     const cacheKey = `${currentContent}---${originalParams.old_string}---${originalParams.new_string}`;
     const cachedResult = editCorrectionCache.get(cacheKey);
     if (cachedResult) {
@@ -123,7 +124,7 @@ geminiClient, baseLlmClient, abortSignal) {
     let finalOldString = originalParams.old_string;
     let occurrences = countOccurrences(currentContent, finalOldString);
     if (occurrences === expectedReplacements) {
-        if (newStringPotentiallyEscaped) {
+        if (newStringPotentiallyEscaped && !disableLLMCorrection) {
             finalNewString = await correctNewStringEscaping(baseLlmClient, finalOldString, originalParams.new_string, abortSignal);
         }
     }
@@ -161,7 +162,7 @@ geminiClient, baseLlmClient, abortSignal) {
         occurrences = countOccurrences(currentContent, unescapedOldStringAttempt);
         if (occurrences === expectedReplacements) {
             finalOldString = unescapedOldStringAttempt;
-            if (newStringPotentiallyEscaped) {
+            if (newStringPotentiallyEscaped && !disableLLMCorrection) {
                 finalNewString = await correctNewString(baseLlmClient, originalParams.old_string, // original old
                 unescapedOldStringAttempt, // corrected old
                 originalParams.new_string, // original new (which is potentially escaped)
@@ -192,6 +193,14 @@ geminiClient, baseLlmClient, abortSignal) {
                     }
                 }
             }
+            if (disableLLMCorrection) {
+                const result = {
+                    params: { ...originalParams },
+                    occurrences: 0,
+                };
+                editCorrectionCache.set(cacheKey, result);
+                return result;
+            }
             const llmCorrectedOldString = await correctOldStringMismatch(baseLlmClient, currentContent, unescapedOldStringAttempt, abortSignal);
             const llmOldOccurrences = countOccurrences(currentContent, llmCorrectedOldString);
             if (llmOldOccurrences === expectedReplacements) {
@@ -240,7 +249,7 @@ geminiClient, baseLlmClient, abortSignal) {
     editCorrectionCache.set(cacheKey, result);
     return result;
 }
-export async function ensureCorrectFileContent(content, baseLlmClient, abortSignal) {
+export async function ensureCorrectFileContent(content, baseLlmClient, abortSignal, disableLLMCorrection = true) {
     const cachedResult = fileContentCorrectionCache.get(content);
     if (cachedResult) {
         return cachedResult;
@@ -250,6 +259,14 @@ export async function ensureCorrectFileContent(content, baseLlmClient, abortSign
         fileContentCorrectionCache.set(content, content);
         return content;
     }
+    if (disableLLMCorrection) {
+        // If we can't use LLM, we should at least use the unescaped content
+        // as it's likely better than the original if it was detected as potentially escaped.
+        // unescapeStringForGeminiBug is a heuristic, not an LLM call.
+        const unescaped = unescapeStringForGeminiBug(content);
+        fileContentCorrectionCache.set(content, unescaped);
+        return unescaped;
+    }
     const correctedContent = await correctStringEscaping(content, baseLlmClient, abortSignal);
     fileContentCorrectionCache.set(content, correctedContent);
     return correctedContent;
@@ -295,6 +312,7 @@ Return ONLY the corrected target snippet in the specified JSON format with the k
             abortSignal,
             systemInstruction: CODE_CORRECTION_SYSTEM_PROMPT,
             promptId: getPromptId(),
+            role: LlmRole.UTILITY_EDIT_CORRECTOR,
         });
         if (result &&
             typeof result['corrected_target_snippet'] === 'string' &&
@@ -366,6 +384,7 @@ Return ONLY the corrected string in the specified JSON format with the key 'corr
             abortSignal,
             systemInstruction: CODE_CORRECTION_SYSTEM_PROMPT,
             promptId: getPromptId(),
+            role: LlmRole.UTILITY_EDIT_CORRECTOR,
         });
         if (result &&
             typeof result['corrected_new_string'] === 'string' &&
@@ -424,6 +443,7 @@ Return ONLY the corrected string in the specified JSON format with the key 'corr
             abortSignal,
             systemInstruction: CODE_CORRECTION_SYSTEM_PROMPT,
             promptId: getPromptId(),
+            role: LlmRole.UTILITY_EDIT_CORRECTOR,
         });
         if (result &&
             typeof result['corrected_new_string_escaping'] === 'string' &&
@@ -477,6 +497,7 @@ Return ONLY the corrected string in the specified JSON format with the key 'corr
             abortSignal,
             systemInstruction: CODE_CORRECTION_SYSTEM_PROMPT,
             promptId: getPromptId(),
+            role: LlmRole.UTILITY_EDIT_CORRECTOR,
         });
         if (result &&
             typeof result['corrected_string_escaping'] === 'string' &&
@@ -495,12 +516,18 @@ Return ONLY the corrected string in the specified JSON format with the key 'corr
         return potentiallyProblematicString;
     }
 }
+function trimPreservingTrailingNewline(str) {
+    const trimmedEnd = str.trimEnd();
+    const trailingWhitespace = str.slice(trimmedEnd.length);
+    const trailingNewlines = trailingWhitespace.replace(/[^\r\n]/g, '');
+    return str.trim() + trailingNewlines;
+}
 function trimPairIfPossible(target, trimIfTargetTrims, currentContent, expectedReplacements) {
-    const trimmedTargetString = target.trim();
+    const trimmedTargetString = trimPreservingTrailingNewline(target);
     if (target.length !== trimmedTargetString.length) {
         const trimmedTargetOccurrences = countOccurrences(currentContent, trimmedTargetString);
         if (trimmedTargetOccurrences === expectedReplacements) {
-            const trimmedReactiveString = trimIfTargetTrims.trim();
+            const trimmedReactiveString = trimPreservingTrailingNewline(trimIfTargetTrims);
             return {
                 targetString: trimmedTargetString,
                 pair: trimmedReactiveString,