diff --git a/packages/core/scripts/compile-windows-sandbox.js b/packages/core/scripts/compile-windows-sandbox.js index a52987c24e..0a5ce49246 100644 --- a/packages/core/scripts/compile-windows-sandbox.js +++ b/packages/core/scripts/compile-windows-sandbox.js @@ -26,15 +26,15 @@ function compileWindowsSandbox() { const srcHelperPath = path.resolve( __dirname, - '../src/services/scripts/GeminiSandbox.exe', + '../src/sandbox/windows/GeminiSandbox.exe', ); const distHelperPath = path.resolve( __dirname, - '../dist/src/services/scripts/GeminiSandbox.exe', + '../dist/src/sandbox/windows/GeminiSandbox.exe', ); const sourcePath = path.resolve( __dirname, - '../src/services/scripts/GeminiSandbox.cs', + '../src/sandbox/windows/GeminiSandbox.cs', ); if (!fs.existsSync(sourcePath)) { diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index 4a5dc9d11d..e607775345 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -126,7 +126,7 @@ export * from './services/FolderTrustDiscoveryService.js'; export * from './services/chatRecordingService.js'; export * from './services/fileSystemService.js'; export * from './services/sandboxedFileSystemService.js'; -export * from './services/windowsSandboxManager.js'; +export * from './sandbox/windows/WindowsSandboxManager.js'; export * from './services/sessionSummaryUtils.js'; export * from './services/contextManager.js'; export * from './services/trackerService.js'; diff --git a/packages/core/src/services/scripts/GeminiSandbox.cs b/packages/core/src/sandbox/windows/GeminiSandbox.cs similarity index 100% rename from packages/core/src/services/scripts/GeminiSandbox.cs rename to packages/core/src/sandbox/windows/GeminiSandbox.cs diff --git a/packages/core/src/services/windowsSandboxManager.test.ts b/packages/core/src/sandbox/windows/WindowsSandboxManager.test.ts similarity index 93% rename from packages/core/src/services/windowsSandboxManager.test.ts rename to packages/core/src/sandbox/windows/WindowsSandboxManager.test.ts index 4b430ffa85..de526e2eaf 100644 --- a/packages/core/src/services/windowsSandboxManager.test.ts +++ b/packages/core/src/sandbox/windows/WindowsSandboxManager.test.ts @@ -8,11 +8,11 @@ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; import fs from 'node:fs'; import os from 'node:os'; import path from 'node:path'; -import { WindowsSandboxManager } from './windowsSandboxManager.js'; -import type { SandboxRequest } from './sandboxManager.js'; -import { spawnAsync } from '../utils/shell-utils.js'; +import { WindowsSandboxManager } from './WindowsSandboxManager.js'; +import type { SandboxRequest } from '../../services/sandboxManager.js'; +import { spawnAsync } from '../../utils/shell-utils.js'; -vi.mock('../utils/shell-utils.js', () => ({ +vi.mock('../../utils/shell-utils.js', () => ({ spawnAsync: vi.fn(), })); diff --git a/packages/core/src/services/windowsSandboxManager.ts b/packages/core/src/sandbox/windows/WindowsSandboxManager.ts similarity index 96% rename from packages/core/src/services/windowsSandboxManager.ts rename to packages/core/src/sandbox/windows/WindowsSandboxManager.ts index e0cfb2201a..b4391c8595 100644 --- a/packages/core/src/services/windowsSandboxManager.ts +++ b/packages/core/src/sandbox/windows/WindowsSandboxManager.ts @@ -15,13 +15,13 @@ import { GOVERNANCE_FILES, type GlobalSandboxOptions, sanitizePaths, -} from './sandboxManager.js'; +} from '../../services/sandboxManager.js'; import { sanitizeEnvironment, getSecureSanitizationConfig, -} from './environmentSanitization.js'; -import { debugLogger } from '../utils/debugLogger.js'; -import { spawnAsync } from '../utils/shell-utils.js'; +} from '../../services/environmentSanitization.js'; +import { debugLogger } from '../../utils/debugLogger.js'; +import { spawnAsync } from '../../utils/shell-utils.js'; const __filename = fileURLToPath(import.meta.url); const __dirname = path.dirname(__filename); @@ -37,7 +37,7 @@ export class WindowsSandboxManager implements SandboxManager { private readonly lowIntegrityCache = new Set(); constructor(private readonly options: GlobalSandboxOptions) { - this.helperPath = path.resolve(__dirname, 'scripts', 'GeminiSandbox.exe'); + this.helperPath = path.resolve(__dirname, 'GeminiSandbox.exe'); } /** diff --git a/packages/core/src/services/sandboxManager.test.ts b/packages/core/src/services/sandboxManager.test.ts index 50760ccf1c..9b1903ef3a 100644 --- a/packages/core/src/services/sandboxManager.test.ts +++ b/packages/core/src/services/sandboxManager.test.ts @@ -10,7 +10,7 @@ import { NoopSandboxManager, sanitizePaths } from './sandboxManager.js'; import { createSandboxManager } from './sandboxManagerFactory.js'; import { LinuxSandboxManager } from '../sandbox/linux/LinuxSandboxManager.js'; import { MacOsSandboxManager } from '../sandbox/macos/MacOsSandboxManager.js'; -import { WindowsSandboxManager } from './windowsSandboxManager.js'; +import { WindowsSandboxManager } from '../sandbox/windows/WindowsSandboxManager.js'; describe('sanitizePaths', () => { it('should return undefined if no paths are provided', () => { diff --git a/packages/core/src/services/sandboxManagerFactory.ts b/packages/core/src/services/sandboxManagerFactory.ts index fa24b99f6e..669257b7b0 100644 --- a/packages/core/src/services/sandboxManagerFactory.ts +++ b/packages/core/src/services/sandboxManagerFactory.ts @@ -12,7 +12,7 @@ import { } from './sandboxManager.js'; import { LinuxSandboxManager } from '../sandbox/linux/LinuxSandboxManager.js'; import { MacOsSandboxManager } from '../sandbox/macos/MacOsSandboxManager.js'; -import { WindowsSandboxManager } from './windowsSandboxManager.js'; +import { WindowsSandboxManager } from '../sandbox/windows/WindowsSandboxManager.js'; import type { SandboxConfig } from '../config/config.js'; import { type SandboxPolicyManager } from '../policy/sandboxPolicyManager.js';