@zgsm/costrict-cli 0.21.0-nightly.20251213.977248e09

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

@@ -0,0 +1 @@
+{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../src/utils/commands.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAqB,MAAM,yBAAyB,CAAC;AAQ5D;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,KAAa,EACb,QAAiC,EACb,EAAE;IACtB,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAE7B,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACvD,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,oDAAoD;IAEhG,IAAI,eAAe,GAAG,QAAQ,CAAC;IAC/B,IAAI,gBAA0C,CAAC;IAC/C,IAAI,SAAS,GAAG,CAAC,CAAC;IAClB,MAAM,aAAa,GAAa,EAAE,CAAC;IAEnC,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;QAC/B,wEAAwE;QACxE,gEAAgE;QAChE,uEAAuE;QACvE,qEAAqE;QACrE,kEAAkE;QAElE,oEAAoE;QACpE,IAAI,YAAY,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QAEpE,+DAA+D;QAC/D,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,YAAY,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAC1C,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,CAC7B,CAAC;QACJ,CAAC;QAED,IAAI,YAAY,EAAE,CAAC;YACjB,gBAAgB,GAAG,YAAY,CAAC;YAChC,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACtC,SAAS,EAAE,CAAC;YACZ,IAAI,YAAY,CAAC,WAAW,EAAE,CAAC;gBAC7B,eAAe,GAAG,YAAY,CAAC,WAAW,CAAC;YAC7C,CAAC;iBAAM,CAAC;gBACN,MAAM;YACR,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM;QACR,CAAC;IACH,CAAC;IAED,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAE9C,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;AACnD,CAAC,CAAC"}

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

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

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

@@ -0,0 +1,115 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect } from 'vitest';
+import { parseSlashCommand } from './commands.js';
+import { CommandKind } from '../ui/commands/types.js';
+// Mock command structure for testing
+const mockCommands = [
+    {
+        name: 'help',
+        description: 'Show help',
+        action: async () => { },
+        kind: CommandKind.BUILT_IN,
+    },
+    {
+        name: 'commit',
+        description: 'Commit changes',
+        action: async () => { },
+        kind: CommandKind.FILE,
+    },
+    {
+        name: 'memory',
+        description: 'Manage memory',
+        altNames: ['mem'],
+        subCommands: [
+            {
+                name: 'add',
+                description: 'Add to memory',
+                action: async () => { },
+                kind: CommandKind.BUILT_IN,
+            },
+            {
+                name: 'clear',
+                description: 'Clear memory',
+                altNames: ['c'],
+                action: async () => { },
+                kind: CommandKind.BUILT_IN,
+            },
+        ],
+        kind: CommandKind.BUILT_IN,
+    },
+];
+describe('parseSlashCommand', () => {
+    it('should parse a simple command without arguments', () => {
+        const result = parseSlashCommand('/help', mockCommands);
+        expect(result.commandToExecute?.name).toBe('help');
+        expect(result.args).toBe('');
+        expect(result.canonicalPath).toEqual(['help']);
+    });
+    it('should parse a simple command with arguments', () => {
+        const result = parseSlashCommand('/commit -m "Initial commit"', mockCommands);
+        expect(result.commandToExecute?.name).toBe('commit');
+        expect(result.args).toBe('-m "Initial commit"');
+        expect(result.canonicalPath).toEqual(['commit']);
+    });
+    it('should parse a subcommand', () => {
+        const result = parseSlashCommand('/memory add', mockCommands);
+        expect(result.commandToExecute?.name).toBe('add');
+        expect(result.args).toBe('');
+        expect(result.canonicalPath).toEqual(['memory', 'add']);
+    });
+    it('should parse a subcommand with arguments', () => {
+        const result = parseSlashCommand('/memory add some important data', mockCommands);
+        expect(result.commandToExecute?.name).toBe('add');
+        expect(result.args).toBe('some important data');
+        expect(result.canonicalPath).toEqual(['memory', 'add']);
+    });
+    it('should handle a command alias', () => {
+        const result = parseSlashCommand('/mem add some data', mockCommands);
+        expect(result.commandToExecute?.name).toBe('add');
+        expect(result.args).toBe('some data');
+        expect(result.canonicalPath).toEqual(['memory', 'add']);
+    });
+    it('should handle a subcommand alias', () => {
+        const result = parseSlashCommand('/memory c', mockCommands);
+        expect(result.commandToExecute?.name).toBe('clear');
+        expect(result.args).toBe('');
+        expect(result.canonicalPath).toEqual(['memory', 'clear']);
+    });
+    it('should return undefined for an unknown command', () => {
+        const result = parseSlashCommand('/unknown', mockCommands);
+        expect(result.commandToExecute).toBeUndefined();
+        expect(result.args).toBe('unknown');
+        expect(result.canonicalPath).toEqual([]);
+    });
+    it('should return the parent command if subcommand is unknown', () => {
+        const result = parseSlashCommand('/memory unknownsub some args', mockCommands);
+        expect(result.commandToExecute?.name).toBe('memory');
+        expect(result.args).toBe('unknownsub some args');
+        expect(result.canonicalPath).toEqual(['memory']);
+    });
+    it('should handle extra whitespace', () => {
+        const result = parseSlashCommand('  /memory   add  some data  ', mockCommands);
+        expect(result.commandToExecute?.name).toBe('add');
+        expect(result.args).toBe('some data');
+        expect(result.canonicalPath).toEqual(['memory', 'add']);
+    });
+    it('should return undefined if query does not start with a slash', () => {
+        const result = parseSlashCommand('help', mockCommands);
+        expect(result.commandToExecute).toBeUndefined();
+    });
+    it('should handle an empty query', () => {
+        const result = parseSlashCommand('', mockCommands);
+        expect(result.commandToExecute).toBeUndefined();
+    });
+    it('should handle a query with only a slash', () => {
+        const result = parseSlashCommand('/', mockCommands);
+        expect(result.commandToExecute).toBeUndefined();
+        expect(result.args).toBe('');
+        expect(result.canonicalPath).toEqual([]);
+    });
+});
+//# sourceMappingURL=commands.test.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"commands.test.js","sourceRoot":"","sources":["../../../src/utils/commands.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,WAAW,EAAqB,MAAM,yBAAyB,CAAC;AAEzE,qCAAqC;AACrC,MAAM,YAAY,GAA4B;IAC5C;QACE,IAAI,EAAE,MAAM;QACZ,WAAW,EAAE,WAAW;QACxB,MAAM,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC;QACtB,IAAI,EAAE,WAAW,CAAC,QAAQ;KAC3B;IACD;QACE,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,gBAAgB;QAC7B,MAAM,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC;QACtB,IAAI,EAAE,WAAW,CAAC,IAAI;KACvB;IACD;QACE,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,eAAe;QAC5B,QAAQ,EAAE,CAAC,KAAK,CAAC;QACjB,WAAW,EAAE;YACX;gBACE,IAAI,EAAE,KAAK;gBACX,WAAW,EAAE,eAAe;gBAC5B,MAAM,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC;gBACtB,IAAI,EAAE,WAAW,CAAC,QAAQ;aAC3B;YACD;gBACE,IAAI,EAAE,OAAO;gBACb,WAAW,EAAE,cAAc;gBAC3B,QAAQ,EAAE,CAAC,GAAG,CAAC;gBACf,MAAM,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC;gBACtB,IAAI,EAAE,WAAW,CAAC,QAAQ;aAC3B;SACF;QACD,IAAI,EAAE,WAAW,CAAC,QAAQ;KAC3B;CACF,CAAC;AAEF,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACzD,MAAM,MAAM,GAAG,iBAAiB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QACxD,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACnD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7B,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACtD,MAAM,MAAM,GAAG,iBAAiB,CAC9B,6BAA6B,EAC7B,YAAY,CACb,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACrD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QAChD,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACnC,MAAM,MAAM,GAAG,iBAAiB,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;QAC9D,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAClD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7B,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAClD,MAAM,MAAM,GAAG,iBAAiB,CAC9B,iCAAiC,EACjC,YAAY,CACb,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAClD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QAChD,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACvC,MAAM,MAAM,GAAG,iBAAiB,CAAC,oBAAoB,EAAE,YAAY,CAAC,CAAC;QACrE,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAClD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACtC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC1C,MAAM,MAAM,GAAG,iBAAiB,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;QAC5D,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACpD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7B,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;QACxD,MAAM,MAAM,GAAG,iBAAiB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QAC3D,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,aAAa,EAAE,CAAC;QAChD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACpC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACnE,MAAM,MAAM,GAAG,iBAAiB,CAC9B,8BAA8B,EAC9B,YAAY,CACb,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACrD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QACjD,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACxC,MAAM,MAAM,GAAG,iBAAiB,CAC9B,8BAA8B,EAC9B,YAAY,CACb,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAClD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACtC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8DAA8D,EAAE,GAAG,EAAE;QACtE,MAAM,MAAM,GAAG,iBAAiB,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QACvD,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,aAAa,EAAE,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACtC,MAAM,MAAM,GAAG,iBAAiB,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC;QACnD,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,aAAa,EAAE,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;QACjD,MAAM,MAAM,GAAG,iBAAiB,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;QACpD,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,aAAa,EAAE,CAAC;QAChD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7B,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

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

@@ -0,0 +1,9 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * Updates a JSON file while preserving comments and formatting.
+ */
+export declare function updateSettingsFilePreservingFormat(filePath: string, updates: Record<string, unknown>): void;

package/dist/src/utils/commentJson.js

@@ -0,0 +1,130 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as fs from 'node:fs';
+import { parse, stringify } from 'comment-json';
+import { coreEvents } from '@google/gemini-cli-core';
+/**
+ * Updates a JSON file while preserving comments and formatting.
+ */
+export function updateSettingsFilePreservingFormat(filePath, updates) {
+    if (!fs.existsSync(filePath)) {
+        fs.writeFileSync(filePath, JSON.stringify(updates, null, 2), 'utf-8');
+        return;
+    }
+    const originalContent = fs.readFileSync(filePath, 'utf-8');
+    let parsed;
+    try {
+        parsed = parse(originalContent);
+    }
+    catch (error) {
+        coreEvents.emitFeedback('error', 'Error parsing settings file. Please check the JSON syntax.', error);
+        return;
+    }
+    const updatedStructure = applyUpdates(parsed, updates);
+    const updatedContent = stringify(updatedStructure, null, 2);
+    fs.writeFileSync(filePath, updatedContent, 'utf-8');
+}
+/**
+ * When deleting a property from a comment-json parsed object, relocate any
+ * leading/trailing comments that were attached to that property so they are not lost.
+ *
+ * This function re-attaches comments to the next sibling's leading comments if
+ * available, otherwise to the previous sibling's trailing comments, otherwise
+ * to the container's leading/trailing comments.
+ */
+function preserveCommentsOnPropertyDeletion(container, propName) {
+    const target = container;
+    const beforeSym = Symbol.for(`before:${propName}`);
+    const afterSym = Symbol.for(`after:${propName}`);
+    const beforeComments = target[beforeSym];
+    const afterComments = target[afterSym];
+    if (!beforeComments && !afterComments)
+        return;
+    const keys = Object.getOwnPropertyNames(container);
+    const idx = keys.indexOf(propName);
+    const nextKey = idx >= 0 && idx + 1 < keys.length ? keys[idx + 1] : undefined;
+    const prevKey = idx > 0 ? keys[idx - 1] : undefined;
+    function appendToSymbol(destSym, comments) {
+        if (!comments || comments.length === 0)
+            return;
+        const existing = target[destSym];
+        target[destSym] = Array.isArray(existing)
+            ? existing.concat(comments)
+            : comments;
+    }
+    if (beforeComments && beforeComments.length > 0) {
+        if (nextKey) {
+            appendToSymbol(Symbol.for(`before:${nextKey}`), beforeComments);
+        }
+        else if (prevKey) {
+            appendToSymbol(Symbol.for(`after:${prevKey}`), beforeComments);
+        }
+        else {
+            appendToSymbol(Symbol.for('before'), beforeComments);
+        }
+        delete target[beforeSym];
+    }
+    if (afterComments && afterComments.length > 0) {
+        if (nextKey) {
+            appendToSymbol(Symbol.for(`before:${nextKey}`), afterComments);
+        }
+        else if (prevKey) {
+            appendToSymbol(Symbol.for(`after:${prevKey}`), afterComments);
+        }
+        else {
+            appendToSymbol(Symbol.for('after'), afterComments);
+        }
+        delete target[afterSym];
+    }
+}
+/**
+ * Applies sync-by-omission semantics: synchronizes base to match desired.
+ * - Adds/updates keys from desired
+ * - Removes keys from base that are not in desired
+ * - Recursively applies to nested objects
+ * - Preserves comments when deleting keys
+ */
+function applyKeyDiff(base, desired) {
+    for (const existingKey of Object.getOwnPropertyNames(base)) {
+        if (!Object.prototype.hasOwnProperty.call(desired, existingKey)) {
+            preserveCommentsOnPropertyDeletion(base, existingKey);
+            delete base[existingKey];
+        }
+    }
+    for (const nextKey of Object.getOwnPropertyNames(desired)) {
+        const nextVal = desired[nextKey];
+        const baseVal = base[nextKey];
+        const isObj = typeof nextVal === 'object' &&
+            nextVal !== null &&
+            !Array.isArray(nextVal);
+        const isBaseObj = typeof baseVal === 'object' &&
+            baseVal !== null &&
+            !Array.isArray(baseVal);
+        const isArr = Array.isArray(nextVal);
+        const isBaseArr = Array.isArray(baseVal);
+        if (isObj && isBaseObj) {
+            applyKeyDiff(baseVal, nextVal);
+        }
+        else if (isArr && isBaseArr) {
+            // In-place mutate arrays to preserve array-level comments on CommentArray
+            const baseArr = baseVal;
+            const desiredArr = nextVal;
+            baseArr.length = 0;
+            for (const el of desiredArr) {
+                baseArr.push(el);
+            }
+        }
+        else {
+            base[nextKey] = nextVal;
+        }
+    }
+}
+function applyUpdates(current, updates) {
+    // Apply sync-by-omission semantics consistently at all levels
+    applyKeyDiff(current, updates);
+    return current;
+}
+//# sourceMappingURL=commentJson.js.map

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

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

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

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

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

@@ -0,0 +1,308 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import * as os from 'node:os';
+import { updateSettingsFilePreservingFormat } from './commentJson.js';
+import { coreEvents } from '@google/gemini-cli-core';
+vi.mock('@google/gemini-cli-core', () => ({
+    coreEvents: {
+        emitFeedback: vi.fn(),
+    },
+}));
+describe('commentJson', () => {
+    let tempDir;
+    let testFilePath;
+    beforeEach(() => {
+        // Create a temporary directory for test files
+        tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'preserve-format-test-'));
+        testFilePath = path.join(tempDir, 'settings.json');
+    });
+    afterEach(() => {
+        // Clean up temporary directory
+        if (fs.existsSync(tempDir)) {
+            fs.rmSync(tempDir, { recursive: true, force: true });
+        }
+    });
+    describe('updateSettingsFilePreservingFormat', () => {
+        it('should preserve comments when updating settings', () => {
+            const originalContent = `{
+        // Model configuration
+        "model": "gemini-2.5-pro",
+        "ui": {
+          // Theme setting
+          "theme": "dark"
+        }
+      }`;
+            fs.writeFileSync(testFilePath, originalContent, 'utf-8');
+            updateSettingsFilePreservingFormat(testFilePath, {
+                model: 'gemini-2.5-flash',
+                ui: {
+                    theme: 'dark',
+                },
+            });
+            const updatedContent = fs.readFileSync(testFilePath, 'utf-8');
+            expect(updatedContent).toContain('// Model configuration');
+            expect(updatedContent).toContain('// Theme setting');
+            expect(updatedContent).toContain('"model": "gemini-2.5-flash"');
+            expect(updatedContent).toContain('"theme": "dark"');
+        });
+        it('should handle nested object updates', () => {
+            const originalContent = `{
+        "ui": {
+          "theme": "dark",
+          "showLineNumbers": true
+        }
+      }`;
+            fs.writeFileSync(testFilePath, originalContent, 'utf-8');
+            updateSettingsFilePreservingFormat(testFilePath, {
+                ui: {
+                    theme: 'light',
+                    showLineNumbers: true,
+                },
+            });
+            const updatedContent = fs.readFileSync(testFilePath, 'utf-8');
+            expect(updatedContent).toContain('"theme": "light"');
+            expect(updatedContent).toContain('"showLineNumbers": true');
+        });
+        it('should add new fields while preserving existing structure', () => {
+            const originalContent = `{
+        // Existing config
+        "model": "gemini-2.5-pro"
+      }`;
+            fs.writeFileSync(testFilePath, originalContent, 'utf-8');
+            updateSettingsFilePreservingFormat(testFilePath, {
+                model: 'gemini-2.5-pro',
+                newField: 'newValue',
+            });
+            const updatedContent = fs.readFileSync(testFilePath, 'utf-8');
+            expect(updatedContent).toContain('// Existing config');
+            expect(updatedContent).toContain('"newField": "newValue"');
+        });
+        it('should create file if it does not exist', () => {
+            updateSettingsFilePreservingFormat(testFilePath, {
+                model: 'gemini-2.5-pro',
+            });
+            expect(fs.existsSync(testFilePath)).toBe(true);
+            const content = fs.readFileSync(testFilePath, 'utf-8');
+            expect(content).toContain('"model": "gemini-2.5-pro"');
+        });
+        it('should handle complex real-world scenario', () => {
+            const complexContent = `{
+        // Settings
+        "model": "gemini-2.5-pro",
+        "mcpServers": {
+          // Active server
+          "context7": {
+            "headers": {
+              "API_KEY": "test-key" // API key
+            }
+          }
+        }
+      }`;
+            fs.writeFileSync(testFilePath, complexContent, 'utf-8');
+            updateSettingsFilePreservingFormat(testFilePath, {
+                model: 'gemini-2.5-flash',
+                mcpServers: {
+                    context7: {
+                        headers: {
+                            API_KEY: 'new-test-key',
+                        },
+                    },
+                },
+                newSection: {
+                    setting: 'value',
+                },
+            });
+            const updatedContent = fs.readFileSync(testFilePath, 'utf-8');
+            // Verify comments preserved
+            expect(updatedContent).toContain('// Settings');
+            expect(updatedContent).toContain('// Active server');
+            expect(updatedContent).toContain('// API key');
+            // Verify updates applied
+            expect(updatedContent).toContain('"model": "gemini-2.5-flash"');
+            expect(updatedContent).toContain('"newSection"');
+            expect(updatedContent).toContain('"API_KEY": "new-test-key"');
+        });
+        it('should handle corrupted JSON files gracefully', () => {
+            const corruptedContent = `{
+        "model": "gemini-2.5-pro",
+        "ui": {
+          "theme": "dark"
+        // Missing closing brace
+      `;
+            fs.writeFileSync(testFilePath, corruptedContent, 'utf-8');
+            expect(() => {
+                updateSettingsFilePreservingFormat(testFilePath, {
+                    model: 'gemini-2.5-flash',
+                });
+            }).not.toThrow();
+            expect(coreEvents.emitFeedback).toHaveBeenCalledWith('error', 'Error parsing settings file. Please check the JSON syntax.', expect.any(Error));
+            const unchangedContent = fs.readFileSync(testFilePath, 'utf-8');
+            expect(unchangedContent).toBe(corruptedContent);
+        });
+        it('should handle array updates while preserving comments', () => {
+            const originalContent = `{
+        // Server configurations
+        "servers": [
+          // First server
+          "server1",
+          "server2" // Second server
+        ]
+      }`;
+            fs.writeFileSync(testFilePath, originalContent, 'utf-8');
+            updateSettingsFilePreservingFormat(testFilePath, {
+                servers: ['server1', 'server3'],
+            });
+            const updatedContent = fs.readFileSync(testFilePath, 'utf-8');
+            expect(updatedContent).toContain('// Server configurations');
+            expect(updatedContent).toContain('"server1"');
+            expect(updatedContent).toContain('"server3"');
+            expect(updatedContent).not.toContain('"server2"');
+        });
+        it('should sync nested objects, removing omitted fields', () => {
+            const originalContent = `{
+        // Configuration
+        "model": "gemini-2.5-pro",
+        "ui": {
+          "theme": "dark",
+          "existingSetting": "value"
+        },
+        "preservedField": "keep me"
+      }`;
+            fs.writeFileSync(testFilePath, originalContent, 'utf-8');
+            updateSettingsFilePreservingFormat(testFilePath, {
+                model: 'gemini-2.5-flash',
+                ui: {
+                    theme: 'light',
+                },
+                preservedField: 'keep me',
+            });
+            const updatedContent = fs.readFileSync(testFilePath, 'utf-8');
+            expect(updatedContent).toContain('// Configuration');
+            expect(updatedContent).toContain('"model": "gemini-2.5-flash"');
+            expect(updatedContent).toContain('"theme": "light"');
+            expect(updatedContent).not.toContain('"existingSetting": "value"');
+            expect(updatedContent).toContain('"preservedField": "keep me"');
+        });
+        it('should handle mcpServers field deletion properly', () => {
+            const originalContent = `{
+        "model": "gemini-2.5-pro",
+        "mcpServers": {
+          // Server to keep
+          "context7": {
+            "command": "node",
+            "args": ["server.js"]
+          },
+          // Server to remove
+          "oldServer": {
+            "command": "old",
+            "args": ["old.js"]
+          }
+        }
+      }`;
+            fs.writeFileSync(testFilePath, originalContent, 'utf-8');
+            updateSettingsFilePreservingFormat(testFilePath, {
+                model: 'gemini-2.5-pro',
+                mcpServers: {
+                    context7: {
+                        command: 'node',
+                        args: ['server.js'],
+                    },
+                },
+            });
+            const updatedContent = fs.readFileSync(testFilePath, 'utf-8');
+            expect(updatedContent).toContain('// Server to keep');
+            expect(updatedContent).toContain('"context7"');
+            expect(updatedContent).not.toContain('"oldServer"');
+            // The comment for the removed server should still be preserved
+            expect(updatedContent).toContain('// Server to remove');
+        });
+        it('preserves sibling-level commented-out blocks when removing another key', () => {
+            const originalContent = `{
+        "mcpServers": {
+          // "sleep": {
+          //   "command": "node",
+          //   "args": [
+          //     "/Users/testUser/test-mcp-server/sleep-mcp/build/index.js"
+          //   ],
+          //   "timeout": 300000
+          // },
+          "playwright": {
+            "command": "npx",
+            "args": [
+              "@playwright/mcp@latest",
+              "--headless",
+              "--isolated"
+            ]
+          }
+        }
+      }`;
+            fs.writeFileSync(testFilePath, originalContent, 'utf-8');
+            updateSettingsFilePreservingFormat(testFilePath, {
+                mcpServers: {},
+            });
+            const updatedContent = fs.readFileSync(testFilePath, 'utf-8');
+            expect(updatedContent).toContain('// "sleep": {');
+            expect(updatedContent).toContain('"mcpServers"');
+            expect(updatedContent).not.toContain('"playwright"');
+        });
+        it('should handle type conversion from object to array', () => {
+            const originalContent = `{
+        "data": {
+          "key": "value"
+        }
+      }`;
+            fs.writeFileSync(testFilePath, originalContent, 'utf-8');
+            updateSettingsFilePreservingFormat(testFilePath, {
+                data: ['item1', 'item2'],
+            });
+            const updatedContent = fs.readFileSync(testFilePath, 'utf-8');
+            expect(updatedContent).toContain('"data": [');
+            expect(updatedContent).toContain('"item1"');
+            expect(updatedContent).toContain('"item2"');
+        });
+        it('should remove both nested and non-nested objects when omitted', () => {
+            const originalContent = `{
+        // Top-level config
+        "topLevelObject": {
+          "field1": "value1",
+          "field2": "value2"
+        },
+        // Parent object
+        "parent": {
+          "nestedObject": {
+            "nestedField1": "value1",
+            "nestedField2": "value2"
+          },
+          "keepThis": "value"
+        },
+        // This should be preserved
+        "preservedObject": {
+          "data": "keep"
+        }
+      }`;
+            fs.writeFileSync(testFilePath, originalContent, 'utf-8');
+            updateSettingsFilePreservingFormat(testFilePath, {
+                parent: {
+                    keepThis: 'value',
+                },
+                preservedObject: {
+                    data: 'keep',
+                },
+            });
+            const updatedContent = fs.readFileSync(testFilePath, 'utf-8');
+            expect(updatedContent).not.toContain('"topLevelObject"');
+            expect(updatedContent).not.toContain('"nestedObject"');
+            expect(updatedContent).toContain('"keepThis": "value"');
+            expect(updatedContent).toContain('"preservedObject"');
+            expect(updatedContent).toContain('"data": "keep"');
+            expect(updatedContent).toContain('// This should be preserved');
+        });
+    });
+});
+//# sourceMappingURL=commentJson.test.js.map

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

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

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

@@ -0,0 +1,9 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { MergeStrategy } from '../config/settingsSchema.js';
+export type Mergeable = string | number | boolean | null | undefined | object | Mergeable[];
+export type MergeableObject = Record<string, Mergeable>;
+export declare function customDeepMerge(getMergeStrategyForPath: (path: string[]) => MergeStrategy | undefined, ...sources: MergeableObject[]): MergeableObject;