@google/gemini-cli-a2a-server 0.24.0-preview.3 → 0.25.0-preview.0
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.
- package/dist/a2a-server.mjs +29431 -10474
- package/dist/src/commands/command-registry.d.ts +2 -2
- package/dist/src/commands/command-registry.js +7 -1
- package/dist/src/commands/command-registry.js.map +1 -1
- package/dist/src/commands/command-registry.test.js +36 -20
- package/dist/src/commands/command-registry.test.js.map +1 -1
- package/dist/src/commands/memory.d.ts +34 -0
- package/dist/src/commands/memory.js +82 -0
- package/dist/src/commands/memory.js.map +1 -0
- package/dist/src/commands/memory.test.d.ts +6 -0
- package/dist/src/commands/memory.test.js +158 -0
- package/dist/src/commands/memory.test.js.map +1 -0
- package/dist/src/config/config.js +8 -4
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/extension.js +2 -3
- package/dist/src/config/extension.js.map +1 -1
- package/dist/src/config/settings.js +1 -2
- package/dist/src/config/settings.js.map +1 -1
- package/dist/src/config/settings.test.js +14 -7
- package/dist/src/config/settings.test.js.map +1 -1
- package/dist/src/persistence/gcs.js +1 -1
- package/dist/src/persistence/gcs.js.map +1 -1
- package/dist/src/utils/testing_utils.js +10 -1
- package/dist/src/utils/testing_utils.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
|
@@ -4,12 +4,12 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import type { Command } from './types.js';
|
|
7
|
-
declare class CommandRegistry {
|
|
7
|
+
export declare class CommandRegistry {
|
|
8
8
|
private readonly commands;
|
|
9
9
|
constructor();
|
|
10
|
+
initialize(): void;
|
|
10
11
|
register(command: Command): void;
|
|
11
12
|
get(commandName: string): Command | undefined;
|
|
12
13
|
getAllCommands(): Command[];
|
|
13
14
|
}
|
|
14
15
|
export declare const commandRegistry: CommandRegistry;
|
|
15
|
-
export {};
|
|
@@ -3,16 +3,22 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
+
import { MemoryCommand } from './memory.js';
|
|
6
7
|
import { debugLogger } from '@google/gemini-cli-core';
|
|
7
8
|
import { ExtensionsCommand } from './extensions.js';
|
|
8
9
|
import { InitCommand } from './init.js';
|
|
9
10
|
import { RestoreCommand } from './restore.js';
|
|
10
|
-
class CommandRegistry {
|
|
11
|
+
export class CommandRegistry {
|
|
11
12
|
commands = new Map();
|
|
12
13
|
constructor() {
|
|
14
|
+
this.initialize();
|
|
15
|
+
}
|
|
16
|
+
initialize() {
|
|
17
|
+
this.commands.clear();
|
|
13
18
|
this.register(new ExtensionsCommand());
|
|
14
19
|
this.register(new RestoreCommand());
|
|
15
20
|
this.register(new InitCommand());
|
|
21
|
+
this.register(new MemoryCommand());
|
|
16
22
|
}
|
|
17
23
|
register(command) {
|
|
18
24
|
if (this.commands.has(command.name)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-registry.js","sourceRoot":"","sources":["../../../src/commands/command-registry.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAG9C,MAAM,eAAe;
|
|
1
|
+
{"version":3,"file":"command-registry.js","sourceRoot":"","sources":["../../../src/commands/command-registry.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAG9C,MAAM,OAAO,eAAe;IACT,QAAQ,GAAG,IAAI,GAAG,EAAmB,CAAC;IAEvD;QACE,IAAI,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC;IAED,UAAU;QACR,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACtB,IAAI,CAAC,QAAQ,CAAC,IAAI,iBAAiB,EAAE,CAAC,CAAC;QACvC,IAAI,CAAC,QAAQ,CAAC,IAAI,cAAc,EAAE,CAAC,CAAC;QACpC,IAAI,CAAC,QAAQ,CAAC,IAAI,WAAW,EAAE,CAAC,CAAC;QACjC,IAAI,CAAC,QAAQ,CAAC,IAAI,aAAa,EAAE,CAAC,CAAC;IACrC,CAAC;IAED,QAAQ,CAAC,OAAgB;QACvB,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACpC,WAAW,CAAC,IAAI,CAAC,WAAW,OAAO,CAAC,IAAI,gCAAgC,CAAC,CAAC;YAC1E,OAAO;QACT,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEzC,KAAK,MAAM,UAAU,IAAI,OAAO,CAAC,WAAW,IAAI,EAAE,EAAE,CAAC;YACnD,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC5B,CAAC;IACH,CAAC;IAED,GAAG,CAAC,WAAmB;QACrB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACxC,CAAC;IAED,cAAc;QACZ,OAAO,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;IACrC,CAAC;CACF;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC"}
|
|
@@ -4,45 +4,63 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
7
|
-
|
|
8
|
-
const
|
|
7
|
+
const { mockExtensionsCommand, mockListExtensionsCommand, mockExtensionsCommandInstance, mockListExtensionsCommandInstance, } = vi.hoisted(() => {
|
|
8
|
+
const listInstance = {
|
|
9
9
|
name: 'extensions list',
|
|
10
10
|
description: 'Lists all installed extensions.',
|
|
11
11
|
execute: vi.fn(),
|
|
12
12
|
};
|
|
13
|
-
const
|
|
14
|
-
const mockExtensionsCommandInstance = {
|
|
13
|
+
const extInstance = {
|
|
15
14
|
name: 'extensions',
|
|
16
15
|
description: 'Manage extensions.',
|
|
17
16
|
execute: vi.fn(),
|
|
18
|
-
subCommands: [
|
|
17
|
+
subCommands: [listInstance],
|
|
18
|
+
};
|
|
19
|
+
return {
|
|
20
|
+
mockListExtensionsCommandInstance: listInstance,
|
|
21
|
+
mockExtensionsCommandInstance: extInstance,
|
|
22
|
+
mockExtensionsCommand: vi.fn(() => extInstance),
|
|
23
|
+
mockListExtensionsCommand: vi.fn(() => listInstance),
|
|
19
24
|
};
|
|
20
|
-
|
|
25
|
+
});
|
|
26
|
+
vi.mock('./extensions.js', () => ({
|
|
27
|
+
ExtensionsCommand: mockExtensionsCommand,
|
|
28
|
+
ListExtensionsCommand: mockListExtensionsCommand,
|
|
29
|
+
}));
|
|
30
|
+
vi.mock('./init.js', () => ({
|
|
31
|
+
InitCommand: vi.fn(() => ({
|
|
32
|
+
name: 'init',
|
|
33
|
+
description: 'Initializes the server.',
|
|
34
|
+
execute: vi.fn(),
|
|
35
|
+
})),
|
|
36
|
+
}));
|
|
37
|
+
vi.mock('./restore.js', () => ({
|
|
38
|
+
RestoreCommand: vi.fn(() => ({
|
|
39
|
+
name: 'restore',
|
|
40
|
+
description: 'Restores the server.',
|
|
41
|
+
execute: vi.fn(),
|
|
42
|
+
})),
|
|
43
|
+
}));
|
|
44
|
+
import { commandRegistry } from './command-registry.js';
|
|
45
|
+
describe('CommandRegistry', () => {
|
|
21
46
|
beforeEach(async () => {
|
|
22
|
-
vi.
|
|
23
|
-
|
|
24
|
-
ExtensionsCommand: mockExtensionsCommand,
|
|
25
|
-
ListExtensionsCommand: mockListExtensionsCommand,
|
|
26
|
-
}));
|
|
47
|
+
vi.clearAllMocks();
|
|
48
|
+
commandRegistry.initialize();
|
|
27
49
|
});
|
|
28
50
|
it('should register ExtensionsCommand on initialization', async () => {
|
|
29
|
-
const { commandRegistry } = await import('./command-registry.js');
|
|
30
51
|
expect(mockExtensionsCommand).toHaveBeenCalled();
|
|
31
52
|
const command = commandRegistry.get('extensions');
|
|
32
53
|
expect(command).toBe(mockExtensionsCommandInstance);
|
|
33
|
-
});
|
|
54
|
+
}, 20000);
|
|
34
55
|
it('should register sub commands on initialization', async () => {
|
|
35
|
-
const { commandRegistry } = await import('./command-registry.js');
|
|
36
56
|
const command = commandRegistry.get('extensions list');
|
|
37
57
|
expect(command).toBe(mockListExtensionsCommandInstance);
|
|
38
58
|
});
|
|
39
59
|
it('get() should return undefined for a non-existent command', async () => {
|
|
40
|
-
const { commandRegistry } = await import('./command-registry.js');
|
|
41
60
|
const command = commandRegistry.get('non-existent');
|
|
42
61
|
expect(command).toBeUndefined();
|
|
43
62
|
});
|
|
44
63
|
it('register() should register a new command', async () => {
|
|
45
|
-
const { commandRegistry } = await import('./command-registry.js');
|
|
46
64
|
const mockCommand = {
|
|
47
65
|
name: 'test-command',
|
|
48
66
|
description: '',
|
|
@@ -53,7 +71,6 @@ describe('CommandRegistry', () => {
|
|
|
53
71
|
expect(command).toBe(mockCommand);
|
|
54
72
|
});
|
|
55
73
|
it('register() should register a nested command', async () => {
|
|
56
|
-
const { commandRegistry } = await import('./command-registry.js');
|
|
57
74
|
const mockSubSubCommand = {
|
|
58
75
|
name: 'test-command-sub-sub',
|
|
59
76
|
description: '',
|
|
@@ -80,8 +97,8 @@ describe('CommandRegistry', () => {
|
|
|
80
97
|
expect(subSubCommand).toBe(mockSubSubCommand);
|
|
81
98
|
});
|
|
82
99
|
it('register() should not enter an infinite loop with a cyclic command', async () => {
|
|
83
|
-
const
|
|
84
|
-
const
|
|
100
|
+
const { debugLogger } = await import('@google/gemini-cli-core');
|
|
101
|
+
const warnSpy = vi.spyOn(debugLogger, 'warn').mockImplementation(() => { });
|
|
85
102
|
const mockCommand = {
|
|
86
103
|
name: 'cyclic-command',
|
|
87
104
|
description: '',
|
|
@@ -92,7 +109,6 @@ describe('CommandRegistry', () => {
|
|
|
92
109
|
commandRegistry.register(mockCommand);
|
|
93
110
|
expect(commandRegistry.get('cyclic-command')).toBe(mockCommand);
|
|
94
111
|
expect(warnSpy).toHaveBeenCalledWith('Command cyclic-command already registered. Skipping.');
|
|
95
|
-
// If the test finishes, it means we didn't get into an infinite loop.
|
|
96
112
|
warnSpy.mockRestore();
|
|
97
113
|
});
|
|
98
114
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-registry.test.js","sourceRoot":"","sources":["../../../src/commands/command-registry.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAG9D,
|
|
1
|
+
{"version":3,"file":"command-registry.test.js","sourceRoot":"","sources":["../../../src/commands/command-registry.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import type { Command, CommandContext, CommandExecutionResponse } from './types.js';
|
|
7
|
+
export declare class MemoryCommand implements Command {
|
|
8
|
+
readonly name = "memory";
|
|
9
|
+
readonly description = "Manage memory.";
|
|
10
|
+
readonly subCommands: (ShowMemoryCommand | RefreshMemoryCommand | ListMemoryCommand | AddMemoryCommand)[];
|
|
11
|
+
readonly topLevel = true;
|
|
12
|
+
readonly requiresWorkspace = true;
|
|
13
|
+
execute(context: CommandContext, _: string[]): Promise<CommandExecutionResponse>;
|
|
14
|
+
}
|
|
15
|
+
export declare class ShowMemoryCommand implements Command {
|
|
16
|
+
readonly name = "memory show";
|
|
17
|
+
readonly description = "Shows the current memory contents.";
|
|
18
|
+
execute(context: CommandContext, _: string[]): Promise<CommandExecutionResponse>;
|
|
19
|
+
}
|
|
20
|
+
export declare class RefreshMemoryCommand implements Command {
|
|
21
|
+
readonly name = "memory refresh";
|
|
22
|
+
readonly description = "Refreshes the memory from the source.";
|
|
23
|
+
execute(context: CommandContext, _: string[]): Promise<CommandExecutionResponse>;
|
|
24
|
+
}
|
|
25
|
+
export declare class ListMemoryCommand implements Command {
|
|
26
|
+
readonly name = "memory list";
|
|
27
|
+
readonly description = "Lists the paths of the GEMINI.md files in use.";
|
|
28
|
+
execute(context: CommandContext, _: string[]): Promise<CommandExecutionResponse>;
|
|
29
|
+
}
|
|
30
|
+
export declare class AddMemoryCommand implements Command {
|
|
31
|
+
readonly name = "memory add";
|
|
32
|
+
readonly description = "Add content to the memory.";
|
|
33
|
+
execute(context: CommandContext, args: string[]): Promise<CommandExecutionResponse>;
|
|
34
|
+
}
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { addMemory, listMemoryFiles, refreshMemory, showMemory, } from '@google/gemini-cli-core';
|
|
7
|
+
const DEFAULT_SANITIZATION_CONFIG = {
|
|
8
|
+
allowedEnvironmentVariables: [],
|
|
9
|
+
blockedEnvironmentVariables: [],
|
|
10
|
+
enableEnvironmentVariableRedaction: false,
|
|
11
|
+
};
|
|
12
|
+
export class MemoryCommand {
|
|
13
|
+
name = 'memory';
|
|
14
|
+
description = 'Manage memory.';
|
|
15
|
+
subCommands = [
|
|
16
|
+
new ShowMemoryCommand(),
|
|
17
|
+
new RefreshMemoryCommand(),
|
|
18
|
+
new ListMemoryCommand(),
|
|
19
|
+
new AddMemoryCommand(),
|
|
20
|
+
];
|
|
21
|
+
topLevel = true;
|
|
22
|
+
requiresWorkspace = true;
|
|
23
|
+
async execute(context, _) {
|
|
24
|
+
return new ShowMemoryCommand().execute(context, _);
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
export class ShowMemoryCommand {
|
|
28
|
+
name = 'memory show';
|
|
29
|
+
description = 'Shows the current memory contents.';
|
|
30
|
+
async execute(context, _) {
|
|
31
|
+
const result = showMemory(context.config);
|
|
32
|
+
return { name: this.name, data: result.content };
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
export class RefreshMemoryCommand {
|
|
36
|
+
name = 'memory refresh';
|
|
37
|
+
description = 'Refreshes the memory from the source.';
|
|
38
|
+
async execute(context, _) {
|
|
39
|
+
const result = await refreshMemory(context.config);
|
|
40
|
+
return { name: this.name, data: result.content };
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
export class ListMemoryCommand {
|
|
44
|
+
name = 'memory list';
|
|
45
|
+
description = 'Lists the paths of the GEMINI.md files in use.';
|
|
46
|
+
async execute(context, _) {
|
|
47
|
+
const result = listMemoryFiles(context.config);
|
|
48
|
+
return { name: this.name, data: result.content };
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
export class AddMemoryCommand {
|
|
52
|
+
name = 'memory add';
|
|
53
|
+
description = 'Add content to the memory.';
|
|
54
|
+
async execute(context, args) {
|
|
55
|
+
const textToAdd = args.join(' ').trim();
|
|
56
|
+
const result = addMemory(textToAdd);
|
|
57
|
+
if (result.type === 'message') {
|
|
58
|
+
return { name: this.name, data: result.content };
|
|
59
|
+
}
|
|
60
|
+
const toolRegistry = context.config.getToolRegistry();
|
|
61
|
+
const tool = toolRegistry.getTool(result.toolName);
|
|
62
|
+
if (tool) {
|
|
63
|
+
const abortController = new AbortController();
|
|
64
|
+
const signal = abortController.signal;
|
|
65
|
+
await tool.buildAndExecute(result.toolArgs, signal, undefined, {
|
|
66
|
+
sanitizationConfig: DEFAULT_SANITIZATION_CONFIG,
|
|
67
|
+
});
|
|
68
|
+
await refreshMemory(context.config);
|
|
69
|
+
return {
|
|
70
|
+
name: this.name,
|
|
71
|
+
data: `Added memory: "${textToAdd}"`,
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
else {
|
|
75
|
+
return {
|
|
76
|
+
name: this.name,
|
|
77
|
+
data: `Error: Tool ${result.toolName} not found.`,
|
|
78
|
+
};
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
//# sourceMappingURL=memory.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../../src/commands/memory.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,158 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { addMemory, listMemoryFiles, refreshMemory, showMemory, } from '@google/gemini-cli-core';
|
|
7
|
+
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
|
8
|
+
import { AddMemoryCommand, ListMemoryCommand, MemoryCommand, RefreshMemoryCommand, ShowMemoryCommand, } from './memory.js';
|
|
9
|
+
// Mock the core functions
|
|
10
|
+
vi.mock('@google/gemini-cli-core', async (importOriginal) => {
|
|
11
|
+
const actual = await importOriginal();
|
|
12
|
+
return {
|
|
13
|
+
...actual,
|
|
14
|
+
showMemory: vi.fn(),
|
|
15
|
+
refreshMemory: vi.fn(),
|
|
16
|
+
listMemoryFiles: vi.fn(),
|
|
17
|
+
addMemory: vi.fn(),
|
|
18
|
+
};
|
|
19
|
+
});
|
|
20
|
+
const mockShowMemory = vi.mocked(showMemory);
|
|
21
|
+
const mockRefreshMemory = vi.mocked(refreshMemory);
|
|
22
|
+
const mockListMemoryFiles = vi.mocked(listMemoryFiles);
|
|
23
|
+
const mockAddMemory = vi.mocked(addMemory);
|
|
24
|
+
describe('a2a-server memory commands', () => {
|
|
25
|
+
let mockContext;
|
|
26
|
+
let mockConfig;
|
|
27
|
+
let mockToolRegistry;
|
|
28
|
+
let mockSaveMemoryTool;
|
|
29
|
+
beforeEach(() => {
|
|
30
|
+
mockSaveMemoryTool = {
|
|
31
|
+
name: 'save_memory',
|
|
32
|
+
description: 'Saves memory',
|
|
33
|
+
buildAndExecute: vi.fn().mockResolvedValue(undefined),
|
|
34
|
+
};
|
|
35
|
+
mockToolRegistry = {
|
|
36
|
+
getTool: vi.fn(),
|
|
37
|
+
};
|
|
38
|
+
mockConfig = {
|
|
39
|
+
getToolRegistry: vi.fn().mockReturnValue(mockToolRegistry),
|
|
40
|
+
};
|
|
41
|
+
mockContext = {
|
|
42
|
+
config: mockConfig,
|
|
43
|
+
};
|
|
44
|
+
vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockSaveMemoryTool);
|
|
45
|
+
});
|
|
46
|
+
describe('MemoryCommand', () => {
|
|
47
|
+
it('delegates to ShowMemoryCommand', async () => {
|
|
48
|
+
const command = new MemoryCommand();
|
|
49
|
+
mockShowMemory.mockReturnValue({
|
|
50
|
+
type: 'message',
|
|
51
|
+
messageType: 'info',
|
|
52
|
+
content: 'showing memory',
|
|
53
|
+
});
|
|
54
|
+
const response = await command.execute(mockContext, []);
|
|
55
|
+
expect(response.data).toBe('showing memory');
|
|
56
|
+
expect(mockShowMemory).toHaveBeenCalledWith(mockContext.config);
|
|
57
|
+
});
|
|
58
|
+
});
|
|
59
|
+
describe('ShowMemoryCommand', () => {
|
|
60
|
+
it('executes showMemory and returns the content', async () => {
|
|
61
|
+
const command = new ShowMemoryCommand();
|
|
62
|
+
mockShowMemory.mockReturnValue({
|
|
63
|
+
type: 'message',
|
|
64
|
+
messageType: 'info',
|
|
65
|
+
content: 'test memory content',
|
|
66
|
+
});
|
|
67
|
+
const response = await command.execute(mockContext, []);
|
|
68
|
+
expect(mockShowMemory).toHaveBeenCalledWith(mockContext.config);
|
|
69
|
+
expect(response.name).toBe('memory show');
|
|
70
|
+
expect(response.data).toBe('test memory content');
|
|
71
|
+
});
|
|
72
|
+
});
|
|
73
|
+
describe('RefreshMemoryCommand', () => {
|
|
74
|
+
it('executes refreshMemory and returns the content', async () => {
|
|
75
|
+
const command = new RefreshMemoryCommand();
|
|
76
|
+
mockRefreshMemory.mockResolvedValue({
|
|
77
|
+
type: 'message',
|
|
78
|
+
messageType: 'info',
|
|
79
|
+
content: 'memory refreshed',
|
|
80
|
+
});
|
|
81
|
+
const response = await command.execute(mockContext, []);
|
|
82
|
+
expect(mockRefreshMemory).toHaveBeenCalledWith(mockContext.config);
|
|
83
|
+
expect(response.name).toBe('memory refresh');
|
|
84
|
+
expect(response.data).toBe('memory refreshed');
|
|
85
|
+
});
|
|
86
|
+
});
|
|
87
|
+
describe('ListMemoryCommand', () => {
|
|
88
|
+
it('executes listMemoryFiles and returns the content', async () => {
|
|
89
|
+
const command = new ListMemoryCommand();
|
|
90
|
+
mockListMemoryFiles.mockReturnValue({
|
|
91
|
+
type: 'message',
|
|
92
|
+
messageType: 'info',
|
|
93
|
+
content: 'file1.md\nfile2.md',
|
|
94
|
+
});
|
|
95
|
+
const response = await command.execute(mockContext, []);
|
|
96
|
+
expect(mockListMemoryFiles).toHaveBeenCalledWith(mockContext.config);
|
|
97
|
+
expect(response.name).toBe('memory list');
|
|
98
|
+
expect(response.data).toBe('file1.md\nfile2.md');
|
|
99
|
+
});
|
|
100
|
+
});
|
|
101
|
+
describe('AddMemoryCommand', () => {
|
|
102
|
+
it('returns message content if addMemory returns a message', async () => {
|
|
103
|
+
const command = new AddMemoryCommand();
|
|
104
|
+
mockAddMemory.mockReturnValue({
|
|
105
|
+
type: 'message',
|
|
106
|
+
messageType: 'error',
|
|
107
|
+
content: 'error message',
|
|
108
|
+
});
|
|
109
|
+
const response = await command.execute(mockContext, []);
|
|
110
|
+
expect(mockAddMemory).toHaveBeenCalledWith('');
|
|
111
|
+
expect(response.name).toBe('memory add');
|
|
112
|
+
expect(response.data).toBe('error message');
|
|
113
|
+
});
|
|
114
|
+
it('executes the save_memory tool if found', async () => {
|
|
115
|
+
const command = new AddMemoryCommand();
|
|
116
|
+
const fact = 'this is a new fact';
|
|
117
|
+
mockAddMemory.mockReturnValue({
|
|
118
|
+
type: 'tool',
|
|
119
|
+
toolName: 'save_memory',
|
|
120
|
+
toolArgs: { fact },
|
|
121
|
+
});
|
|
122
|
+
const response = await command.execute(mockContext, [
|
|
123
|
+
'this',
|
|
124
|
+
'is',
|
|
125
|
+
'a',
|
|
126
|
+
'new',
|
|
127
|
+
'fact',
|
|
128
|
+
]);
|
|
129
|
+
expect(mockAddMemory).toHaveBeenCalledWith(fact);
|
|
130
|
+
expect(mockConfig.getToolRegistry).toHaveBeenCalled();
|
|
131
|
+
expect(mockToolRegistry.getTool).toHaveBeenCalledWith('save_memory');
|
|
132
|
+
expect(mockSaveMemoryTool.buildAndExecute).toHaveBeenCalledWith({ fact }, expect.any(AbortSignal), undefined, {
|
|
133
|
+
sanitizationConfig: {
|
|
134
|
+
allowedEnvironmentVariables: [],
|
|
135
|
+
blockedEnvironmentVariables: [],
|
|
136
|
+
enableEnvironmentVariableRedaction: false,
|
|
137
|
+
},
|
|
138
|
+
});
|
|
139
|
+
expect(mockRefreshMemory).toHaveBeenCalledWith(mockContext.config);
|
|
140
|
+
expect(response.name).toBe('memory add');
|
|
141
|
+
expect(response.data).toBe(`Added memory: "${fact}"`);
|
|
142
|
+
});
|
|
143
|
+
it('returns an error if the tool is not found', async () => {
|
|
144
|
+
const command = new AddMemoryCommand();
|
|
145
|
+
const fact = 'another fact';
|
|
146
|
+
mockAddMemory.mockReturnValue({
|
|
147
|
+
type: 'tool',
|
|
148
|
+
toolName: 'save_memory',
|
|
149
|
+
toolArgs: { fact },
|
|
150
|
+
});
|
|
151
|
+
vi.mocked(mockToolRegistry.getTool).mockReturnValue(undefined);
|
|
152
|
+
const response = await command.execute(mockContext, ['another', 'fact']);
|
|
153
|
+
expect(response.name).toBe('memory add');
|
|
154
|
+
expect(response.data).toBe('Error: Tool save_memory not found.');
|
|
155
|
+
});
|
|
156
|
+
});
|
|
157
|
+
});
|
|
158
|
+
//# sourceMappingURL=memory.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"memory.test.js","sourceRoot":"","sources":["../../../src/commands/memory.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,14 +5,15 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import * as fs from 'node:fs';
|
|
7
7
|
import * as path from 'node:path';
|
|
8
|
-
import { homedir } from 'node:os';
|
|
9
8
|
import * as dotenv from 'dotenv';
|
|
10
|
-
import { AuthType, Config, FileDiscoveryService, ApprovalMode, loadServerHierarchicalMemory, GEMINI_DIR, DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_GEMINI_MODEL, startupProfiler, PREVIEW_GEMINI_MODEL, } from '@google/gemini-cli-core';
|
|
9
|
+
import { AuthType, Config, FileDiscoveryService, ApprovalMode, loadServerHierarchicalMemory, GEMINI_DIR, DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_GEMINI_MODEL, startupProfiler, PREVIEW_GEMINI_MODEL, homedir, } from '@google/gemini-cli-core';
|
|
11
10
|
import { logger } from '../utils/logger.js';
|
|
12
11
|
import { CoderAgentEvent } from '../types.js';
|
|
13
12
|
export async function loadConfig(settings, extensionLoader, taskId) {
|
|
14
13
|
const workspaceDir = process.cwd();
|
|
15
14
|
const adcFilePath = process.env['GOOGLE_APPLICATION_CREDENTIALS'];
|
|
15
|
+
const folderTrust = settings.folderTrust === true ||
|
|
16
|
+
process.env['GEMINI_FOLDER_TRUST'] === 'true';
|
|
16
17
|
const configParams = {
|
|
17
18
|
sessionId: taskId,
|
|
18
19
|
model: settings.general?.previewFeatures
|
|
@@ -44,18 +45,21 @@ export async function loadConfig(settings, extensionLoader, taskId) {
|
|
|
44
45
|
enableRecursiveFileSearch: settings.fileFiltering?.enableRecursiveFileSearch,
|
|
45
46
|
},
|
|
46
47
|
ideMode: false,
|
|
47
|
-
folderTrust
|
|
48
|
+
folderTrust,
|
|
49
|
+
trustedFolder: true,
|
|
48
50
|
extensionLoader,
|
|
49
51
|
checkpointing: process.env['CHECKPOINTING']
|
|
50
52
|
? process.env['CHECKPOINTING'] === 'true'
|
|
51
53
|
: settings.checkpointing?.enabled,
|
|
52
54
|
previewFeatures: settings.general?.previewFeatures,
|
|
53
55
|
interactive: true,
|
|
56
|
+
enableInteractiveShell: true,
|
|
54
57
|
};
|
|
55
58
|
const fileService = new FileDiscoveryService(workspaceDir);
|
|
56
|
-
const { memoryContent, fileCount } = await loadServerHierarchicalMemory(workspaceDir, [workspaceDir], false, fileService, extensionLoader,
|
|
59
|
+
const { memoryContent, fileCount, filePaths } = await loadServerHierarchicalMemory(workspaceDir, [workspaceDir], false, fileService, extensionLoader, folderTrust);
|
|
57
60
|
configParams.userMemory = memoryContent;
|
|
58
61
|
configParams.geminiMdFileCount = fileCount;
|
|
62
|
+
configParams.geminiMdFilePaths = filePaths;
|
|
59
63
|
const config = new Config({
|
|
60
64
|
...configParams,
|
|
61
65
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/config/config.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/config/config.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAGjC,OAAO,EACL,QAAQ,EACR,MAAM,EAEN,oBAAoB,EACpB,YAAY,EACZ,4BAA4B,EAC5B,UAAU,EACV,8BAA8B,EAC9B,oBAAoB,EAEpB,eAAe,EACf,oBAAoB,EACpB,OAAO,GACR,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,OAAO,EAAsB,eAAe,EAAE,MAAM,aAAa,CAAC;AAElE,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,QAAkB,EAClB,eAAgC,EAChC,MAAc;IAEd,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IACnC,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;IAElE,MAAM,WAAW,GACf,QAAQ,CAAC,WAAW,KAAK,IAAI;QAC7B,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,KAAK,MAAM,CAAC;IAEhD,MAAM,YAAY,GAAqB;QACrC,SAAS,EAAE,MAAM;QACjB,KAAK,EAAE,QAAQ,CAAC,OAAO,EAAE,eAAe;YACtC,CAAC,CAAC,oBAAoB;YACtB,CAAC,CAAC,oBAAoB;QACxB,cAAc,EAAE,8BAA8B;QAC9C,OAAO,EAAE,SAAS,EAAE,wDAAwD;QAC5E,SAAS,EAAE,YAAY,EAAE,gDAAgD;QACzE,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,MAAM,IAAI,KAAK;QACnD,QAAQ,EAAE,EAAE,EAAE,4CAA4C;QAE1D,SAAS,EAAE,QAAQ,CAAC,SAAS,IAAI,SAAS;QAC1C,YAAY,EAAE,QAAQ,CAAC,YAAY,IAAI,SAAS;QAChD,eAAe,EAAE,QAAQ,CAAC,eAAe,IAAI,KAAK;QAClD,YAAY,EACV,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,KAAK,MAAM;YACxC,CAAC,CAAC,YAAY,CAAC,IAAI;YACnB,CAAC,CAAC,YAAY,CAAC,OAAO;QAC1B,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,GAAG,EAAE,YAAY;QACjB,SAAS,EAAE;YACT,OAAO,EAAE,QAAQ,CAAC,SAAS,EAAE,OAAO;YACpC,MAAM,EAAE,QAAQ,CAAC,SAAS,EAAE,MAAyB;YACrD,YAAY,EACV,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC;gBAC1C,QAAQ,CAAC,SAAS,EAAE,YAAY;YAClC,UAAU,EAAE,QAAQ,CAAC,SAAS,EAAE,UAAU;SAC3C;QACD,oCAAoC;QACpC,aAAa,EAAE;YACb,gBAAgB,EAAE,QAAQ,CAAC,aAAa,EAAE,gBAAgB;YAC1D,yBAAyB,EACvB,QAAQ,CAAC,aAAa,EAAE,yBAAyB;SACpD;QACD,OAAO,EAAE,KAAK;QACd,WAAW;QACX,aAAa,EAAE,IAAI;QACnB,eAAe;QACf,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YACzC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,MAAM;YACzC,CAAC,CAAC,QAAQ,CAAC,aAAa,EAAE,OAAO;QACnC,eAAe,EAAE,QAAQ,CAAC,OAAO,EAAE,eAAe;QAClD,WAAW,EAAE,IAAI;QACjB,sBAAsB,EAAE,IAAI;KAC7B,CAAC;IAEF,MAAM,WAAW,GAAG,IAAI,oBAAoB,CAAC,YAAY,CAAC,CAAC;IAC3D,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,SAAS,EAAE,GAC3C,MAAM,4BAA4B,CAChC,YAAY,EACZ,CAAC,YAAY,CAAC,EACd,KAAK,EACL,WAAW,EACX,eAAe,EACf,WAAW,CACZ,CAAC;IACJ,YAAY,CAAC,UAAU,GAAG,aAAa,CAAC;IACxC,YAAY,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAC3C,YAAY,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAC3C,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC;QACxB,GAAG,YAAY;KAChB,CAAC,CAAC;IACH,sEAAsE;IACtE,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;IAC1B,eAAe,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAE9B,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;QAC5B,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;QACzC,IAAI,CAAC;YACH,IAAI,WAAW,EAAE,CAAC;gBAChB,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,CAAC,KAAK,CACV,oGAAoG,WAAW,WAAW,CAAC,EAAE,CAC9H,CAAC;QACJ,CAAC;QACD,MAAM,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;QACrD,MAAM,CAAC,IAAI,CACT,kCAAkC,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,EAAE,CACxE,CAAC;IACJ,CAAC;SAAM,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACzC,MAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;QAC7C,MAAM,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAChD,CAAC;SAAM,CAAC;QACN,MAAM,YAAY,GAChB,0FAA0F,CAAC;QAC7F,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;IAChC,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,aAAwC;IACnE,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAClC,MAAM,SAAS,GACb,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC;QACzC,CAAC,aAAa,EAAE,IAAI,KAAK,eAAe,CAAC,uBAAuB;YAC9D,CAAC,CAAC,aAAa,CAAC,aAAa;YAC7B,CAAC,CAAC,SAAS,CAAC,CAAC;IAEjB,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,MAAM,CAAC,IAAI,CACT,sDAAsD,SAAS,EAAE,CAClE,CAAC;IAEF,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC7C,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAC5B,OAAO,YAAY,CAAC;IACtB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,CAAC,KAAK,CACV,wDAAwD,CAAC,+BAA+B,CACzF,CAAC;QACF,OAAO,WAAW,CAAC;IACrB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,eAAe;IAC7B,MAAM,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/C,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IACvD,CAAC;AACH,CAAC;AAED,SAAS,WAAW,CAAC,QAAgB;IACnC,IAAI,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxC,OAAO,IAAI,EAAE,CAAC;QACZ,+CAA+C;QAC/C,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;QAChE,IAAI,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;YACjC,OAAO,aAAa,CAAC;QACvB,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAC9C,IAAI,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3B,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC3C,IAAI,SAAS,KAAK,UAAU,IAAI,CAAC,SAAS,EAAE,CAAC;YAC3C,2EAA2E;YAC3E,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;YACvE,IAAI,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBACrC,OAAO,iBAAiB,CAAC;YAC3B,CAAC;YACD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;YACjD,IAAI,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC/B,OAAO,WAAW,CAAC;YACrB,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,UAAU,GAAG,SAAS,CAAC;IACzB,CAAC;AACH,CAAC"}
|
|
@@ -4,10 +4,9 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
// Copied exactly from packages/cli/src/config/extension.ts, last PR #1026
|
|
7
|
-
import { GEMINI_DIR, } from '@google/gemini-cli-core';
|
|
7
|
+
import { GEMINI_DIR, homedir, } from '@google/gemini-cli-core';
|
|
8
8
|
import * as fs from 'node:fs';
|
|
9
9
|
import * as path from 'node:path';
|
|
10
|
-
import * as os from 'node:os';
|
|
11
10
|
import { logger } from '../utils/logger.js';
|
|
12
11
|
export const EXTENSIONS_DIRECTORY_NAME = path.join(GEMINI_DIR, 'extensions');
|
|
13
12
|
export const EXTENSIONS_CONFIG_FILENAME = 'gemini-extension.json';
|
|
@@ -15,7 +14,7 @@ export const INSTALL_METADATA_FILENAME = '.gemini-extension-install.json';
|
|
|
15
14
|
export function loadExtensions(workspaceDir) {
|
|
16
15
|
const allExtensions = [
|
|
17
16
|
...loadExtensionsFromDir(workspaceDir),
|
|
18
|
-
...loadExtensionsFromDir(
|
|
17
|
+
...loadExtensionsFromDir(homedir()),
|
|
19
18
|
];
|
|
20
19
|
const uniqueExtensions = [];
|
|
21
20
|
const seenNames = new Set();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extension.js","sourceRoot":"","sources":["../../../src/config/extension.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,0EAA0E;AAE1E,OAAO,EACL,UAAU,
|
|
1
|
+
{"version":3,"file":"extension.js","sourceRoot":"","sources":["../../../src/config/extension.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,8 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import * as fs from 'node:fs';
|
|
7
7
|
import * as path from 'node:path';
|
|
8
|
-
import { homedir } from '
|
|
9
|
-
import { debugLogger, GEMINI_DIR, getErrorMessage, } from '@google/gemini-cli-core';
|
|
8
|
+
import { debugLogger, GEMINI_DIR, getErrorMessage, homedir, } from '@google/gemini-cli-core';
|
|
10
9
|
import stripJsonComments from 'strip-json-comments';
|
|
11
10
|
export const USER_SETTINGS_DIR = path.join(homedir(), GEMINI_DIR);
|
|
12
11
|
export const USER_SETTINGS_PATH = path.join(USER_SETTINGS_DIR, 'settings.json');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../src/config/settings.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../src/config/settings.ts"],"names":[],"mappings":"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"}
|