This commit introduces the hierarchical memory feature, allowing GEMI… (#327)

packages/server/src/config/config.test.ts

@@ -0,0 +1,155 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe, it, expect, vi, beforeEach /*, afterEach */ } from 'vitest'; // afterEach removed as it was unused
+import { Config, createServerConfig } from './config.js'; // Adjust import path
+import * as path from 'path';
+// import { ToolRegistry } from '../tools/tool-registry'; // ToolRegistry removed as it was unused
+
+// Mock dependencies that might be called during Config construction or createServerConfig
+vi.mock('../tools/tool-registry', () => {
+  const ToolRegistryMock = vi.fn();
+  ToolRegistryMock.prototype.registerTool = vi.fn();
+  ToolRegistryMock.prototype.discoverTools = vi.fn();
+  ToolRegistryMock.prototype.getAllTools = vi.fn(() => []); // Mock methods if needed
+  ToolRegistryMock.prototype.getTool = vi.fn();
+  ToolRegistryMock.prototype.getFunctionDeclarations = vi.fn(() => []);
+  return { ToolRegistry: ToolRegistryMock };
+});
+
+// Mock individual tools if their constructors are complex or have side effects
+vi.mock('../tools/ls');
+vi.mock('../tools/read-file');
+vi.mock('../tools/grep');
+vi.mock('../tools/glob');
+vi.mock('../tools/edit');
+vi.mock('../tools/shell');
+vi.mock('../tools/write-file');
+vi.mock('../tools/web-fetch');
+vi.mock('../tools/read-many-files');
+
+describe('Server Config (config.ts)', () => {
+  const API_KEY = 'server-api-key';
+  const MODEL = 'gemini-pro';
+  const SANDBOX = false;
+  const TARGET_DIR = '/path/to/target';
+  const DEBUG_MODE = false;
+  const QUESTION = 'test question';
+  const FULL_CONTEXT = false;
+  const USER_AGENT = 'ServerTestAgent/1.0';
+  const USER_MEMORY = 'Test User Memory';
+
+  beforeEach(() => {
+    // Reset mocks if necessary
+    vi.clearAllMocks();
+  });
+
+  it('Config constructor should store userMemory correctly', () => {
+    const config = new Config(
+      API_KEY,
+      MODEL,
+      SANDBOX,
+      TARGET_DIR,
+      DEBUG_MODE,
+      QUESTION,
+      FULL_CONTEXT,
+      undefined, // toolDiscoveryCommand
+      undefined, // toolCallCommand
+      undefined, // mcpServerCommand
+      USER_AGENT,
+      USER_MEMORY, // Pass memory here
+    );
+
+    expect(config.getUserMemory()).toBe(USER_MEMORY);
+    // Verify other getters if needed
+    expect(config.getApiKey()).toBe(API_KEY);
+    expect(config.getModel()).toBe(MODEL);
+    expect(config.getTargetDir()).toBe(path.resolve(TARGET_DIR)); // Check resolved path
+    expect(config.getUserAgent()).toBe(USER_AGENT);
+  });
+
+  it('Config constructor should default userMemory to empty string if not provided', () => {
+    const config = new Config(
+      API_KEY,
+      MODEL,
+      SANDBOX,
+      TARGET_DIR,
+      DEBUG_MODE,
+      QUESTION,
+      FULL_CONTEXT,
+      undefined,
+      undefined,
+      undefined,
+      USER_AGENT,
+      // No userMemory argument
+    );
+
+    expect(config.getUserMemory()).toBe('');
+  });
+
+  it('createServerConfig should pass userMemory to Config constructor', () => {
+    const config = createServerConfig(
+      API_KEY,
+      MODEL,
+      SANDBOX,
+      TARGET_DIR,
+      DEBUG_MODE,
+      QUESTION,
+      FULL_CONTEXT,
+      undefined,
+      undefined,
+      undefined,
+      USER_AGENT,
+      USER_MEMORY, // Pass memory here
+    );
+
+    // Check the result of the factory function
+    expect(config).toBeInstanceOf(Config);
+    expect(config.getUserMemory()).toBe(USER_MEMORY);
+    expect(config.getApiKey()).toBe(API_KEY);
+    expect(config.getUserAgent()).toBe(USER_AGENT);
+  });
+
+  it('createServerConfig should default userMemory if omitted', () => {
+    const config = createServerConfig(
+      API_KEY,
+      MODEL,
+      SANDBOX,
+      TARGET_DIR,
+      DEBUG_MODE,
+      QUESTION,
+      FULL_CONTEXT,
+      undefined,
+      undefined,
+      undefined,
+      USER_AGENT,
+      // No userMemory argument
+    );
+
+    expect(config).toBeInstanceOf(Config);
+    expect(config.getUserMemory()).toBe(''); // Should default to empty string
+  });
+
+  it('createServerConfig should resolve targetDir', () => {
+    const relativeDir = './relative/path';
+    const expectedResolvedDir = path.resolve(relativeDir);
+    const config = createServerConfig(
+      API_KEY,
+      MODEL,
+      SANDBOX,
+      relativeDir,
+      DEBUG_MODE,
+      QUESTION,
+      FULL_CONTEXT,
+      undefined,
+      undefined,
+      undefined,
+      USER_AGENT,
+      USER_MEMORY,
+    );
+    expect(config.getTargetDir()).toBe(expectedResolvedDir);
+  });
+});

packages/server/src/config/config.ts

@@ -36,6 +36,7 @@ export class Config {
     private readonly toolCallCommand: string | undefined,
     private readonly mcpServerCommand: string | undefined,
     private readonly userAgent: string,
+    private userMemory: string = '', // Made mutable for refresh
   ) {
     // toolRegistry still needs initialization based on the instance
     this.toolRegistry = createToolRegistry(this);
@@ -87,6 +88,15 @@ export class Config {
   getUserAgent(): string {
     return this.userAgent;
   }
+
+  // Added getter for userMemory
+  getUserMemory(): string {
+    return this.userMemory;
+  }
+
+  setUserMemory(newUserMemory: string): void {
+    this.userMemory = newUserMemory;
+  }
 }
 
 function findEnvFile(startDir: string): string | null {
@@ -129,6 +139,7 @@ export function createServerConfig(
   toolCallCommand?: string,
   mcpServerCommand?: string,
   userAgent?: string,
+  userMemory?: string, // Added userMemory parameter
 ): Config {
   return new Config(
     apiKey,
@@ -142,6 +153,7 @@ export function createServerConfig(
     toolCallCommand,
     mcpServerCommand,
     userAgent ?? 'GeminiCLI/unknown', // Default user agent
+    userMemory ?? '', // Pass userMemory, default to empty string
   );
 }