npm - @google/gemini-cli - Versions diffs - 0.21.0-nightly.20251209.ec9a8c7a7 → 0.21.0-nightly.20251211.8c83e1ea9 - Mend

@google/gemini-cli 0.21.0-nightly.20251209.ec9a8c7a7 → 0.21.0-nightly.20251211.8c83e1ea9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (90) hide show

package/README.md +1 -1
package/dist/google-gemini-cli-0.21.0-nightly.20251209.ec9a8c7a7.tgz +0 -0
package/dist/package.json +2 -2
package/dist/src/config/config.js +2 -3
package/dist/src/config/config.js.map +1 -1
package/dist/src/config/extension-manager.js +7 -4
package/dist/src/config/extension-manager.js.map +1 -1
package/dist/src/config/extension.test.js +33 -0
package/dist/src/config/extension.test.js.map +1 -1
package/dist/src/config/extensions/extensionSettings.js +1 -1
package/dist/src/config/extensions/extensionSettings.js.map +1 -1
package/dist/src/config/extensions/extensionSettings.test.js +27 -0
package/dist/src/config/extensions/extensionSettings.test.js.map +1 -1
package/dist/src/config/extensions/github.js +10 -3
package/dist/src/config/extensions/github.js.map +1 -1
package/dist/src/config/extensions/github.test.js +13 -0
package/dist/src/config/extensions/github.test.js.map +1 -1
package/dist/src/config/settingsSchema.d.ts +10 -1
package/dist/src/config/settingsSchema.js +11 -2
package/dist/src/config/settingsSchema.js.map +1 -1
package/dist/src/gemini.js +13 -3
package/dist/src/gemini.js.map +1 -1
package/dist/src/gemini.test.js +3 -5
package/dist/src/gemini.test.js.map +1 -1
package/dist/src/generated/git-commit.d.ts +2 -2
package/dist/src/generated/git-commit.js +2 -2
package/dist/src/nonInteractiveCli.js +1 -1
package/dist/src/nonInteractiveCli.js.map +1 -1
package/dist/src/ui/AppContainer.js +5 -2
package/dist/src/ui/AppContainer.js.map +1 -1
package/dist/src/ui/commands/aboutCommand.js +2 -3
package/dist/src/ui/commands/aboutCommand.js.map +1 -1
package/dist/src/ui/commands/aboutCommand.test.js +3 -6
package/dist/src/ui/commands/aboutCommand.test.js.map +1 -1
package/dist/src/ui/commands/bugCommand.js +2 -3
package/dist/src/ui/commands/bugCommand.js.map +1 -1
package/dist/src/ui/commands/bugCommand.test.js +3 -3
package/dist/src/ui/commands/bugCommand.test.js.map +1 -1
package/dist/src/ui/commands/mcpCommand.js +11 -0
package/dist/src/ui/commands/mcpCommand.js.map +1 -1
package/dist/src/ui/commands/mcpCommand.test.js +29 -0
package/dist/src/ui/commands/mcpCommand.test.js.map +1 -1
package/dist/src/ui/commands/restoreCommand.js +5 -29
package/dist/src/ui/commands/restoreCommand.js.map +1 -1
package/dist/src/ui/components/StatsDisplay.d.ts +1 -1
package/dist/src/ui/components/StatsDisplay.js +42 -8
package/dist/src/ui/components/StatsDisplay.js.map +1 -1
package/dist/src/ui/components/StatsDisplay.test.js +36 -1
package/dist/src/ui/components/StatsDisplay.test.js.map +1 -1
package/dist/src/ui/components/views/McpStatus.d.ts +2 -1
package/dist/src/ui/components/views/McpStatus.js +13 -3
package/dist/src/ui/components/views/McpStatus.js.map +1 -1
package/dist/src/ui/components/views/McpStatus.test.js +13 -0
package/dist/src/ui/components/views/McpStatus.test.js.map +1 -1
package/dist/src/ui/hooks/atCommandProcessor.d.ts +6 -5
package/dist/src/ui/hooks/atCommandProcessor.js +118 -16
package/dist/src/ui/hooks/atCommandProcessor.js.map +1 -1
package/dist/src/ui/hooks/atCommandProcessor.test.js +83 -0
package/dist/src/ui/hooks/atCommandProcessor.test.js.map +1 -1
package/dist/src/ui/hooks/useAtCompletion.js +50 -2
package/dist/src/ui/hooks/useAtCompletion.js.map +1 -1
package/dist/src/ui/hooks/useAtCompletion.test.js +21 -0
package/dist/src/ui/hooks/useAtCompletion.test.js.map +1 -1
package/dist/src/ui/hooks/useGeminiStream.js +13 -56
package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
package/dist/src/ui/types.d.ts +8 -0
package/dist/src/ui/types.js.map +1 -1
package/dist/src/ui/utils/clipboardUtils.d.ts +5 -0
package/dist/src/ui/utils/clipboardUtils.js +16 -8
package/dist/src/ui/utils/clipboardUtils.js.map +1 -1
package/dist/src/ui/utils/highlight.js +5 -1
package/dist/src/ui/utils/highlight.js.map +1 -1
package/dist/src/utils/sessions.js +3 -1
package/dist/src/utils/sessions.js.map +1 -1
package/dist/src/utils/sessions.test.js +1 -0
package/dist/src/utils/sessions.test.js.map +1 -1
package/dist/src/zed-integration/fileSystemService.d.ts +0 -1
package/dist/src/zed-integration/fileSystemService.js +0 -3
package/dist/src/zed-integration/fileSystemService.js.map +1 -1
package/dist/src/zed-integration/fileSystemService.test.js +0 -8
package/dist/src/zed-integration/fileSystemService.test.js.map +1 -1
package/dist/tsconfig.tsbuildinfo +1 -1
package/package.json +3 -3
package/dist/google-gemini-cli-0.21.0-nightly.20251207.025e450ac.tgz +0 -0
package/dist/src/utils/version.d.ts +0 -6
package/dist/src/utils/version.js +0 -15
package/dist/src/utils/version.js.map +0 -1
package/dist/src/utils/version.test.d.ts +0 -6
package/dist/src/utils/version.test.js +0 -39
package/dist/src/utils/version.test.js.map +0 -1

package/dist/src/ui/AppContainer.js.map CHANGED Viewed

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

package/dist/src/ui/commands/aboutCommand.js CHANGED Viewed

@@ -3,11 +3,10 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { getCliVersion } from '../../utils/version.js';
 import { CommandKind } from './types.js';
 import process from 'node:process';
 import { MessageType } from '../types.js';
-import { IdeClient, UserAccountManager, debugLogger, } from '@google/gemini-cli-core';
+import { IdeClient, UserAccountManager, debugLogger, getVersion, } from '@google/gemini-cli-core';
 export const aboutCommand = {
     name: 'about',
     description: 'Show version info',
@@ -23,7 +22,7 @@ export const aboutCommand = {
             sandboxEnv = `sandbox-exec (${process.env['SEATBELT_PROFILE'] || 'unknown'})`;
         }
         const modelVersion = context.services.config?.getModel() || 'Unknown';
-        const cliVersion = await getCliVersion();
+        const cliVersion = await getVersion();
         const selectedAuthType = context.services.settings.merged.security?.auth?.selectedType || '';
         const gcpProject = process.env['GOOGLE_CLOUD_PROJECT'] || '';
         const ideClient = await getIdeClientName(context);

package/dist/src/ui/commands/aboutCommand.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"aboutCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/aboutCommand.ts"],"names":[],"mappings":"AAAA;;;;GAIG;~~AAEH~~,OAAO,EAAE,~~aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEvD,OAAO,EAAE,~~WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,WAAW,EAAyB,MAAM,aAAa,CAAC;AACjE,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,WAAW,~~GACZ~~,MAAM,yBAAyB,CAAC;AAEjC,MAAM,CAAC,MAAM,YAAY,GAAiB;IACxC,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,mBAAmB;IAChC,IAAI,EAAE,WAAW,CAAC,QAAQ;IAC1B,WAAW,EAAE,IAAI;IACjB,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;QACxB,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC;QACnC,IAAI,UAAU,GAAG,YAAY,CAAC;QAC9B,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,cAAc,EAAE,CAAC;YACxE,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC;aAAM,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,cAAc,EAAE,CAAC;YACrD,UAAU,GAAG,iBACX,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,SACrC,GAAG,CAAC;QACN,CAAC;QACD,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,SAAS,CAAC;QACtE,MAAM,UAAU,GAAG,MAAM,~~aAAa~~,EAAE,CAAC;~~QACzC~~,MAAM,gBAAgB,GACpB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,YAAY,IAAI,EAAE,CAAC;QACtE,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,IAAI,EAAE,CAAC;QAC7D,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAElD,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,EAAE,CAAC;QACpD,MAAM,aAAa,GAAG,kBAAkB,CAAC,sBAAsB,EAAE,CAAC;QAClE,WAAW,CAAC,GAAG,CAAC,+CAA+C,EAAE;YAC/D,aAAa;SACd,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,aAAa,IAAI,SAAS,CAAC;QAE7C,MAAM,SAAS,GAAiC;YAC9C,IAAI,EAAE,WAAW,CAAC,KAAK;YACvB,UAAU;YACV,SAAS;YACT,UAAU;YACV,YAAY;YACZ,gBAAgB;YAChB,UAAU;YACV,SAAS;YACT,SAAS;SACV,CAAC;QAEF,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAC5C,CAAC;CACF,CAAC;AAEF,KAAK,UAAU,gBAAgB,CAAC,OAAuB;IACrD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAE,EAAE,CAAC;QAC3C,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,WAAW,EAAE,CAAC;IAChD,OAAO,SAAS,EAAE,yBAAyB,EAAE,IAAI,EAAE,CAAC;AACtD,CAAC"}
1	+ {"version":3,"file":"aboutCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/aboutCommand.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,WAAW,EAAyB,MAAM,aAAa,CAAC;AACjE,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,WAAW,EACX,UAAU,GACX,MAAM,yBAAyB,CAAC;AAEjC,MAAM,CAAC,MAAM,YAAY,GAAiB;IACxC,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,mBAAmB;IAChC,IAAI,EAAE,WAAW,CAAC,QAAQ;IAC1B,WAAW,EAAE,IAAI;IACjB,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;QACxB,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC;QACnC,IAAI,UAAU,GAAG,YAAY,CAAC;QAC9B,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,cAAc,EAAE,CAAC;YACxE,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC;aAAM,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,cAAc,EAAE,CAAC;YACrD,UAAU,GAAG,iBACX,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,SACrC,GAAG,CAAC;QACN,CAAC;QACD,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,SAAS,CAAC;QACtE,MAAM,UAAU,GAAG,MAAM,UAAU,EAAE,CAAC;QACtC,MAAM,gBAAgB,GACpB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,YAAY,IAAI,EAAE,CAAC;QACtE,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,IAAI,EAAE,CAAC;QAC7D,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAElD,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,EAAE,CAAC;QACpD,MAAM,aAAa,GAAG,kBAAkB,CAAC,sBAAsB,EAAE,CAAC;QAClE,WAAW,CAAC,GAAG,CAAC,+CAA+C,EAAE;YAC/D,aAAa;SACd,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,aAAa,IAAI,SAAS,CAAC;QAE7C,MAAM,SAAS,GAAiC;YAC9C,IAAI,EAAE,WAAW,CAAC,KAAK;YACvB,UAAU;YACV,SAAS;YACT,UAAU;YACV,YAAY;YACZ,gBAAgB;YAChB,UAAU;YACV,SAAS;YACT,SAAS;SACV,CAAC;QAEF,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAC5C,CAAC;CACF,CAAC;AAEF,KAAK,UAAU,gBAAgB,CAAC,OAAuB;IACrD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAE,EAAE,CAAC;QAC3C,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,WAAW,EAAE,CAAC;IAChD,OAAO,SAAS,EAAE,yBAAyB,EAAE,IAAI,EAAE,CAAC;AACtD,CAAC"}

package/dist/src/ui/commands/aboutCommand.test.js CHANGED Viewed

@@ -7,9 +7,8 @@ import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
 import { aboutCommand } from './aboutCommand.js';
 import {} from './types.js';
 import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
-import * as versionUtils from '../../utils/version.js';
 import { MessageType } from '../types.js';
-import { IdeClient } from '@google/gemini-cli-core';
+import { IdeClient, getVersion } from '@google/gemini-cli-core';
 vi.mock('@google/gemini-cli-core', async (importOriginal) => {
     const actual = await importOriginal();
     return {
@@ -22,11 +21,9 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
         UserAccountManager: vi.fn().mockImplementation(() => ({
             getCachedGoogleAccount: vi.fn().mockReturnValue('test-email@example.com'),
         })),
+        getVersion: vi.fn(),
     };
 });
-vi.mock('../../utils/version.js', () => ({
-    getCliVersion: vi.fn(),
-}));
 describe('aboutCommand', () => {
     let mockContext;
     const originalPlatform = process.platform;
@@ -52,7 +49,7 @@ describe('aboutCommand', () => {
                 addItem: vi.fn(),
             },
         });
-        vi.mocked(versionUtils.getCliVersion).mockResolvedValue('test-version');
+        vi.mocked(getVersion).mockResolvedValue('test-version');
         vi.spyOn(mockContext.services.config, 'getModel').mockReturnValue('test-model');
         process.env['GOOGLE_CLOUD_PROJECT'] = 'test-gcp-project';
         Object.defineProperty(process, 'platform', {

package/dist/src/ui/commands/aboutCommand.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"aboutCommand.test.js","sourceRoot":"","sources":["../../../../src/ui/commands/aboutCommand.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAuB,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AAClF,OAAO,~~KAAK,YAAY,MAAM,wBAAwB,CAAC;AACvD,OAAO,~~EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;~~AAEpD~~,EAAE,CAAC,IAAI,CAAC,yBAAyB,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IAC1D,MAAM,MAAM,GACV,MAAM,cAAc,EAA4C,CAAC;IACnE,OAAO;QACL,GAAG,MAAM;QACT,SAAS,EAAE;YACT,WAAW,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC;gBACrC,yBAAyB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,UAAU,CAAC;aAC/D,CAAC;SACH;QACD,kBAAkB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,CAAC;YACpD,sBAAsB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,wBAAwB,CAAC;SAC1E,CAAC,CAAC;~~KACJ~~,~~CAAC;AACJ~~,~~CAAC~~,~~CAAC,CAAC;AAEH,~~EAAE,CAAC,~~IAAI,CAAC,wBAAwB,~~EAAE,~~GAAG,~~EAAE~~,CAAC,CAAC~~;~~IACvC~~,~~aAAa,EAAE,EAAE,~~CAAC~~,EAAE,EAAE~~;~~CACvB~~,CAAC,CAAC,CAAC;~~AAEJ~~,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,IAAI,WAA2B,CAAC;IAChC,MAAM,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAC1C,MAAM,WAAW,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAEvC,UAAU,CAAC,GAAG,EAAE;QACd,WAAW,GAAG,wBAAwB,CAAC;YACrC,QAAQ,EAAE;gBACR,MAAM,EAAE;oBACN,QAAQ,EAAE,EAAE,CAAC,EAAE,EAAE;oBACjB,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC;iBAC1C;gBACD,QAAQ,EAAE;oBACR,MAAM,EAAE;wBACN,QAAQ,EAAE;4BACR,IAAI,EAAE;gCACJ,YAAY,EAAE,WAAW;6BAC1B;yBACF;qBACF;iBACF;aACF;YACD,EAAE,EAAE;gBACF,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE;aACjB;SAC2B,CAAC,CAAC;QAEhC,EAAE,CAAC,MAAM,CAAC,~~YAAY~~,CAAC,~~aAAa,~~CAAC,~~CAAC,~~iBAAiB,CAAC,cAAc,CAAC,CAAC;~~QACxE~~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"}
1	+ {"version":3,"file":"aboutCommand.test.js","sourceRoot":"","sources":["../../../../src/ui/commands/aboutCommand.test.ts"],"names":[],"mappings":"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"}

package/dist/src/ui/commands/bugCommand.js CHANGED Viewed

@@ -9,8 +9,7 @@ import { CommandKind, } from './types.js';
 import { MessageType } from '../types.js';
 import { GIT_COMMIT_INFO } from '../../generated/git-commit.js';
 import { formatMemoryUsage } from '../utils/formatters.js';
-import { getCliVersion } from '../../utils/version.js';
-import { IdeClient, sessionId } from '@google/gemini-cli-core';
+import { IdeClient, sessionId, getVersion } from '@google/gemini-cli-core';
 export const bugCommand = {
     name: 'bug',
     description: 'Submit a bug report',
@@ -28,7 +27,7 @@ export const bugCommand = {
             sandboxEnv = `sandbox-exec (${process.env['SEATBELT_PROFILE'] || 'unknown'})`;
         }
         const modelVersion = config?.getModel() || 'Unknown';
-        const cliVersion = await getCliVersion();
+        const cliVersion = await getVersion();
         const memoryUsage = formatMemoryUsage(process.memoryUsage().rss);
         const ideClient = await getIdeClientName(context);
         let info = `

package/dist/src/ui/commands/bugCommand.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"bugCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/bugCommand.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAGL,WAAW,GACZ,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,~~aAAa~~,EAAE,~~MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,~~SAAS,EAAE,~~SAAS~~,EAAE,MAAM,yBAAyB,CAAC;~~AAE/D~~,MAAM,CAAC,MAAM,UAAU,GAAiB;IACtC,IAAI,EAAE,KAAK;IACX,WAAW,EAAE,qBAAqB;IAClC,IAAI,EAAE,WAAW,CAAC,QAAQ;IAC1B,WAAW,EAAE,KAAK;IAClB,MAAM,EAAE,KAAK,EAAE,OAAuB,EAAE,IAAa,EAAiB,EAAE;QACtE,MAAM,cAAc,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC3C,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC;QAEpC,MAAM,SAAS,GAAG,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3D,IAAI,UAAU,GAAG,YAAY,CAAC;QAC9B,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,cAAc,EAAE,CAAC;YACxE,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC;QACxE,CAAC;aAAM,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,cAAc,EAAE,CAAC;YACrD,UAAU,GAAG,iBACX,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,SACrC,GAAG,CAAC;QACN,CAAC;QACD,MAAM,YAAY,GAAG,MAAM,EAAE,QAAQ,EAAE,IAAI,SAAS,CAAC;QACrD,MAAM,UAAU,GAAG,MAAM,~~aAAa~~,EAAE,CAAC;~~QACzC~~,MAAM,WAAW,GAAG,iBAAiB,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,CAAC;QACjE,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAElD,IAAI,IAAI,GAAG;qBACM,UAAU;oBACX,eAAe;oBACf,SAAS;0BACH,SAAS;6BACN,UAAU;uBAChB,YAAY;sBACb,WAAW;CAChC,CAAC;QACE,IAAI,SAAS,EAAE,CAAC;YACd,IAAI,IAAI,qBAAqB,SAAS,IAAI,CAAC;QAC7C,CAAC;QAED,IAAI,YAAY,GACd,0GAA0G,CAAC;QAE7G,MAAM,kBAAkB,GAAG,MAAM,EAAE,aAAa,EAAE,CAAC;QACnD,IAAI,kBAAkB,EAAE,WAAW,EAAE,CAAC;YACpC,YAAY,GAAG,kBAAkB,CAAC,WAAW,CAAC;QAChD,CAAC;QAED,YAAY,GAAG,YAAY;aACxB,OAAO,CAAC,SAAS,EAAE,kBAAkB,CAAC,cAAc,CAAC,CAAC;aACtD,OAAO,CAAC,QAAQ,EAAE,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;QAE/C,OAAO,CAAC,EAAE,CAAC,OAAO,CAChB;YACE,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,IAAI,EAAE,8EAA8E,YAAY,EAAE;SACnG,EACD,IAAI,CAAC,GAAG,EAAE,CACX,CAAC;QAEF,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,YAAY,CAAC,CAAC;QAC3B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,YAAY,GAChB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACzD,OAAO,CAAC,EAAE,CAAC,OAAO,CAChB;gBACE,IAAI,EAAE,WAAW,CAAC,KAAK;gBACvB,IAAI,EAAE,kCAAkC,YAAY,EAAE;aACvD,EACD,IAAI,CAAC,GAAG,EAAE,CACX,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAC;AAEF,KAAK,UAAU,gBAAgB,CAAC,OAAuB;IACrD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAE,EAAE,CAAC;QAC3C,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,WAAW,EAAE,CAAC;IAChD,OAAO,SAAS,CAAC,yBAAyB,EAAE,IAAI,EAAE,CAAC;AACrD,CAAC"}
1	+ {"version":3,"file":"bugCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/bugCommand.ts"],"names":[],"mappings":"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"}

package/dist/src/ui/commands/bugCommand.test.js CHANGED Viewed

@@ -7,12 +7,11 @@ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import open from 'open';
 import { bugCommand } from './bugCommand.js';
 import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
-import { getCliVersion } from '../../utils/version.js';
+import { getVersion } from '@google/gemini-cli-core';
 import { GIT_COMMIT_INFO } from '../../generated/git-commit.js';
 import { formatMemoryUsage } from '../utils/formatters.js';
 // Mock dependencies
 vi.mock('open');
-vi.mock('../../utils/version.js');
 vi.mock('../utils/formatters.js');
 vi.mock('@google/gemini-cli-core', async (importOriginal) => {
     const actual = await importOriginal();
@@ -24,6 +23,7 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
             }),
         },
         sessionId: 'test-session-id',
+        getVersion: vi.fn(),
     };
 });
 vi.mock('node:process', () => ({
@@ -37,7 +37,7 @@ vi.mock('node:process', () => ({
 }));
 describe('bugCommand', () => {
     beforeEach(() => {
-        vi.mocked(getCliVersion).mockResolvedValue('0.1.0');
+        vi.mocked(getVersion).mockResolvedValue('0.1.0');
         vi.mocked(formatMemoryUsage).mockReturnValue('100 MB');
         vi.stubEnv('SANDBOX', 'gemini-test');
     });

package/dist/src/ui/commands/bugCommand.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"bugCommand.test.js","sourceRoot":"","sources":["../../../../src/ui/commands/bugCommand.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,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AAClF,OAAO,EAAE,~~aAAa~~,EAAE,MAAM,~~wBAAwB~~,CAAC;~~AACvD~~,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,oBAAoB;AACpB,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAChB,EAAE,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;AAClC,EAAE,CAAC,IAAI,CAAC,~~wBAAwB,CAAC,CAAC;AAClC,EAAE,CAAC,IAAI,CAAC,~~yBAAyB,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IAC1D,MAAM,MAAM,GACV,MAAM,cAAc,EAA4C,CAAC;IACnE,OAAO;QACL,GAAG,MAAM;QACT,SAAS,EAAE;YACT,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC;gBAClB,yBAAyB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,QAAQ,CAAC;aAC7D,CAAC;SACH;QACD,SAAS,EAAE,iBAAiB;~~KAC7B~~,CAAC;AACJ,CAAC,CAAC,CAAC;AACH,EAAE,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,CAAC;IAC7B,OAAO,EAAE;QACP,QAAQ,EAAE,eAAe;QACzB,OAAO,EAAE,SAAS;QAClB,+EAA+E;QAC/E,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;KAChC;CACF,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IAC1B,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,MAAM,CAAC,~~aAAa~~,CAAC,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;~~QACpD~~,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QACvD,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,aAAa,EAAE,CAAC;QACnB,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;QAC5D,MAAM,WAAW,GAAG,wBAAwB,CAAC;YAC3C,QAAQ,EAAE;gBACR,MAAM,EAAE;oBACN,QAAQ,EAAE,GAAG,EAAE,CAAC,YAAY;oBAC5B,aAAa,EAAE,GAAG,EAAE,CAAC,SAAS;oBAC9B,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI;iBACvB;aACF;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QACjE,MAAM,UAAU,CAAC,MAAM,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;QAEnD,MAAM,YAAY,GAAG;;oBAEL,eAAe;;;;;;;CAOlC,CAAC;QACE,MAAM,WAAW,GACf,2GAA2G;YAC3G,kBAAkB,CAAC,YAAY,CAAC,CAAC;QAEnC,MAAM,CAAC,IAAI,CAAC,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;QACxE,MAAM,cAAc,GAClB,kEAAkE,CAAC;QACrE,MAAM,WAAW,GAAG,wBAAwB,CAAC;YAC3C,QAAQ,EAAE;gBACR,MAAM,EAAE;oBACN,QAAQ,EAAE,GAAG,EAAE,CAAC,YAAY;oBAC5B,aAAa,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,WAAW,EAAE,cAAc,EAAE,CAAC;oBACtD,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI;iBACvB;aACF;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QACjE,MAAM,UAAU,CAAC,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;QAErD,MAAM,YAAY,GAAG;;oBAEL,eAAe;;;;;;;CAOlC,CAAC;QACE,MAAM,WAAW,GAAG,cAAc;aAC/B,OAAO,CAAC,SAAS,EAAE,kBAAkB,CAAC,cAAc,CAAC,CAAC;aACtD,OAAO,CAAC,QAAQ,EAAE,kBAAkB,CAAC,YAAY,CAAC,CAAC,CAAC;QAEvD,MAAM,CAAC,IAAI,CAAC,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1	+ {"version":3,"file":"bugCommand.test.js","sourceRoot":"","sources":["../../../../src/ui/commands/bugCommand.test.ts"],"names":[],"mappings":"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"}

package/dist/src/ui/commands/mcpCommand.js CHANGED Viewed

@@ -152,6 +152,10 @@ const listAction = async (context, showDescriptions = false, showSchema = false)
         .getAllPrompts()
         .filter((prompt) => 'serverName' in prompt &&
         serverNames.includes(prompt.serverName));
+    const resourceRegistry = config.getResourceRegistry();
+    const mcpResources = resourceRegistry
+        .getAllResources()
+        .filter((entry) => serverNames.includes(entry.serverName));
     const authStatus = {};
     const tokenStorage = new MCPOAuthTokenStorage();
     for (const serverName of serverNames) {
@@ -189,6 +193,13 @@ const listAction = async (context, showDescriptions = false, showSchema = false)
             name: prompt.name,
             description: prompt.description,
         })),
+        resources: mcpResources.map((resource) => ({
+            serverName: resource.serverName,
+            name: resource.name,
+            uri: resource.uri,
+            mimeType: resource.mimeType,
+            description: resource.description,
+        })),
         authStatus,
         blockedServers: blockedMcpServers,
         discoveryInProgress,

package/dist/src/ui/commands/mcpCommand.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"mcpCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/mcpCommand.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;~~AAKzC~~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"}
1	+ {"version":3,"file":"mcpCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/mcpCommand.ts"],"names":[],"mappings":"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"}

package/dist/src/ui/commands/mcpCommand.test.js CHANGED Viewed

@@ -56,6 +56,9 @@ describe('mcpCommand', () => {
                 getBlockedMcpServers: vi.fn(),
                 getMcpServers: vi.fn(),
             })),
+            getResourceRegistry: vi.fn().mockReturnValue({
+                getAllResources: vi.fn().mockReturnValue([]),
+            }),
         };
         mockContext = createMockCommandContext({
             services: {
@@ -95,6 +98,10 @@ describe('mcpCommand', () => {
                 server3: { command: 'cmd3' },
             };
             mockConfig.getMcpServers = vi.fn().mockReturnValue(mockMcpServers);
+            mockConfig.getMcpClientManager = vi.fn().mockReturnValue({
+                getMcpServers: vi.fn().mockReturnValue(mockMcpServers),
+                getBlockedMcpServers: vi.fn().mockReturnValue([]),
+            });
         });
         it('should display configured MCP servers with status indicators and their tools', async () => {
             // Setup getMCPServerStatus mock implementation
@@ -120,6 +127,22 @@ describe('mcpCommand', () => {
             mockConfig.getToolRegistry = vi.fn().mockReturnValue({
                 getAllTools: vi.fn().mockReturnValue(allTools),
             });
+            const resourcesByServer = {
+                server1: [
+                    {
+                        name: 'Server1 Resource',
+                        uri: 'file:///server1/resource1.txt',
+                    },
+                ],
+                server2: [],
+                server3: [],
+            };
+            mockConfig.getResourceRegistry = vi.fn().mockReturnValue({
+                getAllResources: vi.fn().mockReturnValue(Object.entries(resourcesByServer).flatMap(([serverName, resources]) => resources.map((entry) => ({
+                    serverName,
+                    ...entry,
+                })))),
+            });
             await mcpCommand.action(mockContext, '');
             expect(mockContext.ui.addItem).toHaveBeenCalledWith(expect.objectContaining({
                 type: MessageType.MCP_STATUS,
@@ -129,6 +152,12 @@ describe('mcpCommand', () => {
                     description: tool.description,
                     schema: tool.schema,
                 })),
+                resources: expect.arrayContaining([
+                    expect.objectContaining({
+                        serverName: 'server1',
+                        uri: 'file:///server1/resource1.txt',
+                    }),
+                ]),
             }), expect.any(Number));
         });
         it('should display tool descriptions when desc argument is used', async () => {

package/dist/src/ui/commands/mcpCommand.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"mcpCommand.test.js","sourceRoot":"","sources":["../../../../src/ui/commands/mcpCommand.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AAClF,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,kBAAkB,EAClB,oBAAoB,EACpB,iBAAiB,GAClB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,EAAE,CAAC,IAAI,CAAC,yBAAyB,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IAC1D,MAAM,MAAM,GACV,MAAM,cAAc,EAA4C,CAAC;IACnE,MAAM,gBAAgB,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;IACjC,OAAO;QACL,GAAG,MAAM;QACT,kBAAkB,EAAE,EAAE,CAAC,EAAE,EAAE;QAC3B,oBAAoB,EAAE,EAAE,CAAC,EAAE,EAAE;QAC7B,gBAAgB,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;YAC7B,YAAY,EAAE,gBAAgB;SAC/B,CAAC,CAAC;QACH,oBAAoB,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;YACjC,QAAQ,EAAE,EAAE,CAAC,EAAE,EAAE;YACjB,cAAc,EAAE,EAAE,CAAC,EAAE,EAAE;SACxB,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,qDAAqD;AACrD,MAAM,iBAAiB,GAAG,CACxB,IAAY,EACZ,UAAkB,EAClB,WAAoB,EACpB,EAAE,CACF,IAAI,iBAAiB,CACnB;IACE,QAAQ,EAAE,EAAE,CAAC,EAAE,EAAE;IACjB,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE;CACa,EAC5B,UAAU,EACV,IAAI,EACJ,WAAW,IAAI,mBAAmB,IAAI,EAAE,EACxC,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE,CACtC,CAAC;AAEJ,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IAC1B,IAAI,WAAwD,CAAC;IAC7D,IAAI,~~UAOH~~,CAAC;IAEF,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;QAEnB,kCAAkC;QAClC,EAAE,CAAC,aAAa,EAAE,CAAC;QAEnB,+BAA+B;QAC/B,EAAE,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,eAAe,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QACzE,EAAE,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,eAAe,CAC7C,iBAAiB,CAAC,SAAS,CAC5B,CAAC;QAEF,gDAAgD;QAChD,UAAU,GAAG;YACX,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC;gBACvC,WAAW,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC;aACzC,CAAC;YACF,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC;YAC1C,oBAAoB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC;YACjD,iBAAiB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC;gBAC3C,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC;gBAC1C,kBAAkB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC;aAChD,CAAC;YACF,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE;YACxB,mBAAmB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,CAAC;gBACrD,oBAAoB,EAAE,EAAE,CAAC,EAAE,EAAE;gBAC7B,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE;aACvB,CAAC,CAAC;~~SACJ~~,CAAC;QAEF,WAAW,GAAG,wBAAwB,CAAC;YACrC,QAAQ,EAAE;gBACR,MAAM,EAAE,UAAU;aACnB;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;QACnC,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;YAC/D,MAAM,oBAAoB,GAAG,wBAAwB,CAAC;gBACpD,QAAQ,EAAE;oBACR,MAAM,EAAE,IAAI;iBACb;aACF,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,MAAO,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC;YAElE,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;gBACrB,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,OAAO;gBACpB,OAAO,EAAE,oBAAoB;aAC9B,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;YACtE,UAAU,CAAC,eAAe,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YAEhE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,MAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;YAEzD,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;gBACrB,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,OAAO;gBACpB,OAAO,EAAE,mCAAmC;aAC7C,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE;QAC3C,UAAU,CAAC,GAAG,EAAE;YACd,MAAM,cAAc,GAAG;gBACrB,OAAO,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;gBAC5B,OAAO,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;gBAC5B,OAAO,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;aAC7B,CAAC;YAEF,UAAU,CAAC,aAAa,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;~~QACrE~~,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8EAA8E,EAAE,KAAK,IAAI,EAAE;YAC5F,+CAA+C;YAC/C,EAAE,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,kBAAkB,CAAC,CAAC,UAAU,EAAE,EAAE;gBAC9D,IAAI,UAAU,KAAK,SAAS;oBAAE,OAAO,eAAe,CAAC,SAAS,CAAC;gBAC/D,IAAI,UAAU,KAAK,SAAS;oBAAE,OAAO,eAAe,CAAC,SAAS,CAAC;gBAC/D,OAAO,eAAe,CAAC,YAAY,CAAC,CAAC,UAAU;YACjD,CAAC,CAAC,CAAC;YAEH,uEAAuE;YACvE,MAAM,gBAAgB,GAAG;gBACvB,iBAAiB,CAAC,eAAe,EAAE,SAAS,CAAC;gBAC7C,iBAAiB,CAAC,eAAe,EAAE,SAAS,CAAC;aAC9C,CAAC;YACF,MAAM,gBAAgB,GAAG,CAAC,iBAAiB,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC,CAAC;YACzE,MAAM,gBAAgB,GAAG,CAAC,iBAAiB,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC,CAAC;YAEzE,MAAM,QAAQ,GAAG;gBACf,GAAG,gBAAgB;gBACnB,GAAG,gBAAgB;gBACnB,GAAG,gBAAgB;aACpB,CAAC;YAEF,UAAU,CAAC,eAAe,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC;gBACnD,WAAW,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,QAAQ,CAAC;aAC/C,CAAC,CAAC;YAEH,MAAM,UAAU,CAAC,MAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;YAE1C,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,oBAAoB,CACjD,MAAM,CAAC,gBAAgB,CAAC;gBACtB,IAAI,EAAE,WAAW,CAAC,UAAU;gBAC5B,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oBAC7B,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,WAAW,EAAE,IAAI,CAAC,WAAW;oBAC7B,MAAM,EAAE,IAAI,CAAC,MAAM;iBACpB,CAAC,CAAC;~~aACJ~~,CAAC,EACF,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6DAA6D,EAAE,KAAK,IAAI,EAAE;YAC3E,MAAM,cAAc,GAAG,UAAU,CAAC,WAAY,CAAC,IAAI,CACjD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CACzB,CAAC;YACF,MAAM,cAAe,CAAC,MAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;YAE/C,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,oBAAoB,CACjD,MAAM,CAAC,gBAAgB,CAAC;gBACtB,IAAI,EAAE,WAAW,CAAC,UAAU;gBAC5B,gBAAgB,EAAE,IAAI;aACvB,CAAC,EACF,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8DAA8D,EAAE,KAAK,IAAI,EAAE;YAC5E,MAAM,cAAc,GAAG,UAAU,CAAC,WAAY,CAAC,IAAI,CACjD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CACzB,CAAC;YACF,MAAM,cAAe,CAAC,MAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;YAE/C,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,oBAAoB,CACjD,MAAM,CAAC,gBAAgB,CAAC;gBACtB,IAAI,EAAE,WAAW,CAAC,UAAU;gBAC5B,gBAAgB,EAAE,KAAK;aACxB,CAAC,EACF,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1	+ {"version":3,"file":"mcpCommand.test.js","sourceRoot":"","sources":["../../../../src/ui/commands/mcpCommand.test.ts"],"names":[],"mappings":"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"}

package/dist/src/ui/commands/restoreCommand.js CHANGED Viewed

@@ -6,7 +6,7 @@
 import * as fs from 'node:fs/promises';
 import path from 'node:path';
 import { z } from 'zod';
-import { performRestore, } from '@google/gemini-cli-core';
+import { formatCheckpointDisplayList, getToolCallDataSchema, getTruncatedCheckpointNames, performRestore, } from '@google/gemini-cli-core';
 import { CommandKind, } from './types.js';
 const HistoryItemSchema = z
     .object({
@@ -14,22 +14,7 @@ const HistoryItemSchema = z
     id: z.number(),
 })
     .passthrough();
-const ContentSchema = z
-    .object({
-    role: z.string().optional(),
-    parts: z.array(z.record(z.unknown())),
-})
-    .passthrough();
-const ToolCallDataSchema = z.object({
-    history: z.array(HistoryItemSchema).optional(),
-    clientHistory: z.array(ContentSchema).optional(),
-    commitHash: z.string().optional(),
-    toolCall: z.object({
-        name: z.string(),
-        args: z.record(z.unknown()),
-    }),
-    messageId: z.string().optional(),
-});
+const ToolCallDataSchema = getToolCallDataSchema(HistoryItemSchema);
 async function restoreAction(context, args) {
     const { services, ui } = context;
     const { config, git: gitService } = services;
@@ -55,15 +40,7 @@ async function restoreAction(context, args) {
                     content: 'No restorable tool calls found.',
                 };
             }
-            const truncatedFiles = jsonFiles.map((file) => {
-                const components = file.split('.');
-                if (components.length <= 1) {
-                    return file;
-                }
-                components.pop();
-                return components.join('.');
-            });
-            const fileList = truncatedFiles.join('\n');
+            const fileList = formatCheckpointDisplayList(jsonFiles);
             return {
                 type: 'message',
                 messageType: 'info',
@@ -132,9 +109,8 @@ async function completion(context, _partialArg) {
     }
     try {
         const files = await fs.readdir(checkpointDir);
-        return files
-            .filter((file) => file.endsWith('.json'))
-            .map((file) => file.replace('.json', ''));
+        const jsonFiles = files.filter((file) => file.endsWith('.json'));
+        return getTruncatedCheckpointNames(jsonFiles);
     }
     catch (_err) {
         return [];

package/dist/src/ui/commands/restoreCommand.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"restoreCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/restoreCommand.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAEL,cAAc,GAEf,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAIL,WAAW,GACZ,MAAM,YAAY,CAAC;AAIpB,MAAM,iBAAiB,GAAG,CAAC;KACxB,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;CACf,CAAC;KACD,WAAW,EAAE,CAAC;AAEjB,MAAM,aAAa,GAAG,CAAC;KACpB,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;CACtC,CAAC;KACD,WAAW,EAAE,CAAC;AAEjB,MAAM,kBAAkB,GAAG,~~CAAC~~,CAAC,~~MAAM,CAAC;IAClC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,~~iBAAiB,CAAC,CAAC~~,QAAQ,EAAE~~;~~IAC9C~~,~~aAAa,EAAE,CAAC,CAAC,~~KAAK,~~CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE;IAChD,~~UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACjC,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC;QACjB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;QAChB,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;KAC5B,CAAC;IACF,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACjC,CAAC,CAAC;AAEH,KAAK,UAAU,aAAa,CAC1B,OAAuB,EACvB,IAAY;IAEZ,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC;IACjC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,QAAQ,CAAC;IAC7C,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC;IAEpC,MAAM,aAAa,GAAG,MAAM,EAAE,OAAO,CAAC,4BAA4B,EAAE,CAAC;IAErE,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO;YACL,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,OAAO;YACpB,OAAO,EAAE,iDAAiD;SAC3D,CAAC;IACJ,CAAC;IAED,IAAI,CAAC;QACH,wDAAwD;QACxD,MAAM,EAAE,CAAC,KAAK,CAAC,aAAa,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACnD,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAC9C,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;QAEjE,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC3B,OAAO;oBACL,IAAI,EAAE,SAAS;oBACf,WAAW,EAAE,MAAM;oBACnB,OAAO,EAAE,iCAAiC;iBAC3C,CAAC;YACJ,CAAC;YACD,MAAM,cAAc,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACnC,IAAI,UAAU,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;oBAC3B,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,UAAU,CAAC,GAAG,EAAE,CAAC;gBACjB,OAAO,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC9B,CAAC,CAAC,CAAC;YACH,MAAM,QAAQ,GAAG,~~cAAc~~,CAAC,~~IAAI~~,CAAC,~~IAAI,~~CAAC~~,CAAC~~;~~YAC3C~~,OAAO;gBACL,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,MAAM;gBACnB,OAAO,EAAE,uCAAuC,QAAQ,EAAE;aAC3D,CAAC;QACJ,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,OAAO,CAAC;QAEpE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACtC,OAAO;gBACL,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,OAAO;gBACpB,OAAO,EAAE,mBAAmB,YAAY,EAAE;aAC3C,CAAC;QACJ,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;QACxD,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAClD,MAAM,WAAW,GAAG,kBAAkB,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QAEnE,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YACzB,OAAO;gBACL,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,OAAO;gBACpB,OAAO,EAAE,+BAA+B,WAAW,CAAC,KAAK,CAAC,OAAO,EAAE;aACpE,CAAC;QACJ,CAAC;QAED,+BAA+B;QAC/B,gHAAgH;QAChH,6HAA6H;QAC7H,MAAM,YAAY,GAAG,WAAW,CAAC,IAGhC,CAAC;QAEF,MAAM,YAAY,GAAG,cAAc,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QAE9D,IAAI,KAAK,EAAE,MAAM,MAAM,IAAI,YAAY,EAAE,CAAC;YACxC,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBAC9B,OAAO,CACL;oBACE,IAAI,EAAE,MAAM,CAAC,WAAW;oBACxB,IAAI,EAAE,MAAM,CAAC,OAAO;iBACrB,EACD,IAAI,CAAC,GAAG,EAAE,CACX,CAAC;YACJ,CAAC;iBAAM,IAAI,MAAM,CAAC,IAAI,KAAK,cAAc,IAAI,WAAW,EAAE,CAAC;gBACzD,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAC5B,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;oBACzB,MAAM,MAAM;wBACV,EAAE,eAAe,EAAE;wBACnB,EAAE,UAAU,CAAC,MAAM,CAAC,aAA0B,CAAC,CAAC;gBACpD,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO;YACL,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,YAAY,CAAC,QAAQ,CAAC,IAAI;YACpC,QAAQ,EAAE,YAAY,CAAC,QAAQ,CAAC,IAAI;SACrC,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO;YACL,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,OAAO;YACpB,OAAO,EAAE,4DAA4D,KAAK,EAAE;SAC7E,CAAC;IACJ,CAAC;AACH,CAAC;AAED,KAAK,UAAU,UAAU,CACvB,OAAuB,EACvB,WAAmB;IAEnB,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAC7B,MAAM,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;IAC5B,MAAM,aAAa,GAAG,MAAM,EAAE,OAAO,CAAC,4BAA4B,EAAE,CAAC;IACrE,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAC9C,~~OAAO~~,KAAK~~;aACT~~,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC~~;aACxC~~,~~GAAG,~~CAAC,~~CAAC~~,~~IAAI~~,~~EAAE,EAAE,~~CAAC,~~IAAI~~,CAAC,~~OAAO,~~CAAC~~,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC~~;~~IAC9C~~,CAAC;IAAC,OAAO,IAAI,EAAE,CAAC;QACd,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,MAAqB,EAAuB,EAAE;IAC3E,IAAI,CAAC,MAAM,EAAE,uBAAuB,EAAE,EAAE,CAAC;QACvC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO;QACL,IAAI,EAAE,SAAS;QACf,WAAW,EACT,gIAAgI;QAClI,IAAI,EAAE,WAAW,CAAC,QAAQ;QAC1B,WAAW,EAAE,IAAI;QACjB,MAAM,EAAE,aAAa;QACrB,UAAU;KACX,CAAC;AACJ,CAAC,CAAC"}
1	+ {"version":3,"file":"restoreCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/restoreCommand.ts"],"names":[],"mappings":"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"}