@office-ai/aioncli-core 0.26.0 → 0.30.0

package/dist/src/config/storage.test.js

@@ -3,7 +3,10 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { describe, it, expect, vi } from 'vitest';
+import { beforeEach, describe, it, expect, vi, afterEach } from 'vitest';
+vi.unmock('./storage.js');
+vi.unmock('./projectRegistry.js');
+vi.unmock('./storageMigration.js');
 import * as os from 'node:os';
 import * as path from 'node:path';
 vi.mock('fs', async (importOriginal) => {
@@ -14,13 +17,63 @@ vi.mock('fs', async (importOriginal) => {
     };
 });
 import { Storage } from './storage.js';
-import { GEMINI_DIR } from '../utils/paths.js';
+import { GEMINI_DIR, homedir } from '../utils/paths.js';
+import { ProjectRegistry } from './projectRegistry.js';
+import { StorageMigration } from './storageMigration.js';
+const PROJECT_SLUG = 'project-slug';
+vi.mock('./projectRegistry.js');
+vi.mock('./storageMigration.js');
+describe('Storage – initialize', () => {
+    const projectRoot = '/tmp/project';
+    let storage;
+    beforeEach(() => {
+        ProjectRegistry.prototype.initialize = vi.fn().mockResolvedValue(undefined);
+        ProjectRegistry.prototype.getShortId = vi
+            .fn()
+            .mockReturnValue(PROJECT_SLUG);
+        storage = new Storage(projectRoot);
+        vi.clearAllMocks();
+        // Mock StorageMigration.migrateDirectory
+        vi.mocked(StorageMigration.migrateDirectory).mockResolvedValue(undefined);
+    });
+    it('sets up the registry and performs migration if `getProjectTempDir` is called', async () => {
+        await storage.initialize();
+        expect(storage.getProjectTempDir()).toBe(path.join(os.homedir(), GEMINI_DIR, 'tmp', PROJECT_SLUG));
+        // Verify registry initialization
+        expect(ProjectRegistry).toHaveBeenCalled();
+        expect(vi.mocked(ProjectRegistry).prototype.initialize).toHaveBeenCalled();
+        expect(vi.mocked(ProjectRegistry).prototype.getShortId).toHaveBeenCalledWith(projectRoot);
+        // Verify migration calls
+        const shortId = 'project-slug';
+        // We can't easily get the hash here without repeating logic, but we can verify it's called twice
+        expect(StorageMigration.migrateDirectory).toHaveBeenCalledTimes(2);
+        // Verify identifier is set by checking a path
+        expect(storage.getProjectTempDir()).toContain(shortId);
+    });
+});
+vi.mock('../utils/paths.js', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        homedir: vi.fn(actual.homedir),
+    };
+});
 describe('Storage – getGlobalSettingsPath', () => {
     it('returns path to ~/.gemini/settings.json', () => {
         const expected = path.join(os.homedir(), GEMINI_DIR, 'settings.json');
         expect(Storage.getGlobalSettingsPath()).toBe(expected);
     });
 });
+describe('Storage - Security', () => {
+    it('falls back to tmp for gemini but returns empty for agents if the home directory cannot be determined', () => {
+        vi.mocked(homedir).mockReturnValue('');
+        // .gemini falls back for backward compatibility
+        expect(Storage.getGlobalGeminiDir()).toBe(path.join(os.tmpdir(), GEMINI_DIR));
+        // .agents returns empty to avoid insecure fallback WITHOUT throwing error
+        expect(Storage.getGlobalAgentsDir()).toBe('');
+        vi.mocked(homedir).mockReturnValue(os.homedir());
+    });
+});
 describe('Storage – additional helpers', () => {
     const projectRoot = '/tmp/project';
     const storage = new Storage(projectRoot);
@@ -60,5 +113,68 @@ describe('Storage – additional helpers', () => {
         const expected = path.join(os.homedir(), GEMINI_DIR, 'tmp', 'bin');
         expect(Storage.getGlobalBinDir()).toBe(expected);
     });
+    it('getProjectTempPlansDir returns ~/.gemini/tmp/<identifier>/plans when no sessionId is provided', async () => {
+        await storage.initialize();
+        const tempDir = storage.getProjectTempDir();
+        const expected = path.join(tempDir, 'plans');
+        expect(storage.getProjectTempPlansDir()).toBe(expected);
+    });
+    it('getProjectTempPlansDir returns ~/.gemini/tmp/<identifier>/<sessionId>/plans when sessionId is provided', async () => {
+        const sessionId = 'test-session-id';
+        const storageWithSession = new Storage(projectRoot, sessionId);
+        ProjectRegistry.prototype.getShortId = vi
+            .fn()
+            .mockReturnValue(PROJECT_SLUG);
+        await storageWithSession.initialize();
+        const tempDir = storageWithSession.getProjectTempDir();
+        const expected = path.join(tempDir, sessionId, 'plans');
+        expect(storageWithSession.getProjectTempPlansDir()).toBe(expected);
+    });
+});
+describe('Storage - System Paths', () => {
+    const originalEnv = process.env['GEMINI_CLI_SYSTEM_SETTINGS_PATH'];
+    afterEach(() => {
+        if (originalEnv !== undefined) {
+            process.env['GEMINI_CLI_SYSTEM_SETTINGS_PATH'] = originalEnv;
+        }
+        else {
+            delete process.env['GEMINI_CLI_SYSTEM_SETTINGS_PATH'];
+        }
+    });
+    it('getSystemSettingsPath returns correct path based on platform (default)', () => {
+        delete process.env['GEMINI_CLI_SYSTEM_SETTINGS_PATH'];
+        const platform = os.platform();
+        const result = Storage.getSystemSettingsPath();
+        if (platform === 'darwin') {
+            expect(result).toBe('/Library/Application Support/GeminiCli/settings.json');
+        }
+        else if (platform === 'win32') {
+            expect(result).toBe('C:\\ProgramData\\gemini-cli\\settings.json');
+        }
+        else {
+            expect(result).toBe('/etc/gemini-cli/settings.json');
+        }
+    });
+    it('getSystemSettingsPath follows GEMINI_CLI_SYSTEM_SETTINGS_PATH if set', () => {
+        const customPath = '/custom/path/settings.json';
+        process.env['GEMINI_CLI_SYSTEM_SETTINGS_PATH'] = customPath;
+        expect(Storage.getSystemSettingsPath()).toBe(customPath);
+    });
+    it('getSystemPoliciesDir returns correct path based on platform and ignores env var', () => {
+        process.env['GEMINI_CLI_SYSTEM_SETTINGS_PATH'] =
+            '/custom/path/settings.json';
+        const platform = os.platform();
+        const result = Storage.getSystemPoliciesDir();
+        expect(result).not.toContain('/custom/path');
+        if (platform === 'darwin') {
+            expect(result).toBe('/Library/Application Support/GeminiCli/policies');
+        }
+        else if (platform === 'win32') {
+            expect(result).toBe('C:\\ProgramData\\gemini-cli\\policies');
+        }
+        else {
+            expect(result).toBe('/etc/gemini-cli/policies');
+        }
+    });
 });
 //# sourceMappingURL=storage.test.js.map

package/dist/src/config/storage.test.js.map

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

package/dist/src/config/storageMigration.d.ts

@@ -0,0 +1,16 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * Migration utility to move data from old hash-based directories to new slug-based directories.
+ */
+export declare class StorageMigration {
+    /**
+     * Migrates a directory from an old path to a new path if the old one exists and the new one doesn't.
+     * @param oldPath The old directory path (hash-based).
+     * @param newPath The new directory path (slug-based).
+     */
+    static migrateDirectory(oldPath: string, newPath: string): Promise<void>;
+}

package/dist/src/config/storageMigration.js

@@ -0,0 +1,42 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import { debugLogger } from '../utils/debugLogger.js';
+/**
+ * Migration utility to move data from old hash-based directories to new slug-based directories.
+ */
+export class StorageMigration {
+    /**
+     * Migrates a directory from an old path to a new path if the old one exists and the new one doesn't.
+     * @param oldPath The old directory path (hash-based).
+     * @param newPath The new directory path (slug-based).
+     */
+    static async migrateDirectory(oldPath, newPath) {
+        try {
+            if (!fs.existsSync(oldPath)) {
+                return;
+            }
+            if (fs.existsSync(newPath)) {
+                const files = await fs.promises.readdir(newPath);
+                // If it contains more than just the .project_root file, it's not a fresh directory from ProjectRegistry
+                if (files.length > 1 ||
+                    (files.length === 1 && files[0] !== '.project_root')) {
+                    return;
+                }
+            }
+            // Ensure the parent directory of the new path exists
+            const parentDir = path.dirname(newPath);
+            await fs.promises.mkdir(parentDir, { recursive: true });
+            // Copy (safer and handles cross-device moves)
+            await fs.promises.cp(oldPath, newPath, { recursive: true });
+        }
+        catch (e) {
+            debugLogger.debug(`Storage Migration: Failed to move ${oldPath} to ${newPath}:`, e);
+        }
+    }
+}
+//# sourceMappingURL=storageMigration.js.map

package/dist/src/config/storageMigration.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"storageMigration.js","sourceRoot":"","sources":["../../../src/config/storageMigration.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD;;GAEG;AACH,MAAM,OAAO,gBAAgB;IAC3B;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAC3B,OAAe,EACf,OAAe;QAEf,IAAI,CAAC;YACH,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC5B,OAAO;YACT,CAAC;YAED,IAAI,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC3B,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBACjD,wGAAwG;gBACxG,IACE,KAAK,CAAC,MAAM,GAAG,CAAC;oBAChB,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,eAAe,CAAC,EACpD,CAAC;oBACD,OAAO;gBACT,CAAC;YACH,CAAC;YAED,qDAAqD;YACrD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACxC,MAAM,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAExD,8CAA8C;YAC9C,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9D,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,WAAW,CAAC,KAAK,CACf,qCAAqC,OAAO,OAAO,OAAO,GAAG,EAC7D,CAAC,CACF,CAAC;QACJ,CAAC;IACH,CAAC;CACF"}

package/dist/src/config/storageMigration.test.d.ts

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

package/dist/src/config/storageMigration.test.js

@@ -0,0 +1,70 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+vi.unmock('./storageMigration.js');
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import * as os from 'node:os';
+import { StorageMigration } from './storageMigration.js';
+describe('StorageMigration', () => {
+    let tempDir;
+    beforeEach(() => {
+        tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'gemini-migration-test-'));
+    });
+    afterEach(() => {
+        fs.rmSync(tempDir, { recursive: true, force: true });
+        vi.restoreAllMocks();
+    });
+    it('migrates a directory from old to new path (non-destructively)', async () => {
+        const oldPath = path.join(tempDir, 'old-hash');
+        const newPath = path.join(tempDir, 'new-slug');
+        fs.mkdirSync(oldPath);
+        fs.writeFileSync(path.join(oldPath, 'test.txt'), 'hello');
+        await StorageMigration.migrateDirectory(oldPath, newPath);
+        expect(fs.existsSync(newPath)).toBe(true);
+        expect(fs.existsSync(oldPath)).toBe(true); // Should still exist
+        expect(fs.readFileSync(path.join(newPath, 'test.txt'), 'utf8')).toBe('hello');
+    });
+    it('does nothing if old path does not exist', async () => {
+        const oldPath = path.join(tempDir, 'non-existent');
+        const newPath = path.join(tempDir, 'new-slug');
+        await StorageMigration.migrateDirectory(oldPath, newPath);
+        expect(fs.existsSync(newPath)).toBe(false);
+    });
+    it('does nothing if new path already exists', async () => {
+        const oldPath = path.join(tempDir, 'old-hash');
+        const newPath = path.join(tempDir, 'new-slug');
+        fs.mkdirSync(oldPath);
+        fs.mkdirSync(newPath);
+        fs.writeFileSync(path.join(oldPath, 'old.txt'), 'old');
+        fs.writeFileSync(path.join(newPath, 'new.txt'), 'new');
+        await StorageMigration.migrateDirectory(oldPath, newPath);
+        expect(fs.existsSync(oldPath)).toBe(true);
+        expect(fs.existsSync(path.join(newPath, 'new.txt'))).toBe(true);
+        expect(fs.existsSync(path.join(newPath, 'old.txt'))).toBe(false);
+    });
+    it('migrates even if new path contains .project_root (ProjectRegistry initialization)', async () => {
+        const oldPath = path.join(tempDir, 'old-hash');
+        const newPath = path.join(tempDir, 'new-slug');
+        fs.mkdirSync(oldPath);
+        fs.mkdirSync(newPath);
+        fs.writeFileSync(path.join(oldPath, 'history.db'), 'data');
+        fs.writeFileSync(path.join(newPath, '.project_root'), 'path');
+        await StorageMigration.migrateDirectory(oldPath, newPath);
+        expect(fs.existsSync(path.join(newPath, 'history.db'))).toBe(true);
+        expect(fs.readFileSync(path.join(newPath, 'history.db'), 'utf8')).toBe('data');
+        expect(fs.readFileSync(path.join(newPath, '.project_root'), 'utf8')).toBe('path');
+    });
+    it('creates parent directory for new path if it does not exist', async () => {
+        const oldPath = path.join(tempDir, 'old-hash');
+        const newPath = path.join(tempDir, 'sub', 'new-slug');
+        fs.mkdirSync(oldPath);
+        await StorageMigration.migrateDirectory(oldPath, newPath);
+        expect(fs.existsSync(newPath)).toBe(true);
+        expect(fs.existsSync(oldPath)).toBe(true); // Should still exist
+    });
+});
+//# sourceMappingURL=storageMigration.test.js.map

package/dist/src/config/storageMigration.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"storageMigration.test.js","sourceRoot":"","sources":["../../../src/config/storageMigration.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAEzE,EAAE,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC;AAEnC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,IAAI,OAAe,CAAC;IAEpB,UAAU,CAAC,GAAG,EAAE;QACd,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,wBAAwB,CAAC,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACrD,EAAE,CAAC,eAAe,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+DAA+D,EAAE,KAAK,IAAI,EAAE;QAC7E,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAC/C,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACtB,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,EAAE,OAAO,CAAC,CAAC;QAE1D,MAAM,gBAAgB,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAE1D,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1C,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,qBAAqB;QAChE,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAClE,OAAO,CACR,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;QACvD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QACnD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAE/C,MAAM,gBAAgB,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAE1D,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;QACvD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAC/C,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACtB,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACtB,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,KAAK,CAAC,CAAC;QACvD,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,KAAK,CAAC,CAAC;QAEvD,MAAM,gBAAgB,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAE1D,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1C,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChE,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mFAAmF,EAAE,KAAK,IAAI,EAAE;QACjG,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAC/C,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACtB,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACtB,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,EAAE,MAAM,CAAC,CAAC;QAC3D,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,EAAE,MAAM,CAAC,CAAC;QAE9D,MAAM,gBAAgB,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAE1D,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnE,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CACpE,MAAM,CACP,CAAC;QACF,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CACvE,MAAM,CACP,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4DAA4D,EAAE,KAAK,IAAI,EAAE;QAC1E,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QACtD,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAEtB,MAAM,gBAAgB,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAE1D,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1C,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,qBAAqB;IAClE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/src/confirmation-bus/message-bus.js

@@ -5,8 +5,8 @@
  */
 import { randomUUID } from 'node:crypto';
 import { EventEmitter } from 'node:events';
-import { PolicyDecision, getHookSource } from '../policy/types.js';
-import { MessageBusType, } from './types.js';
+import { PolicyDecision } from '../policy/types.js';
+import { MessageBusType } from './types.js';
 import { safeJsonStringify } from '../utils/safeJsonStringify.js';
 import { debugLogger } from '../utils/debugLogger.js';
 export class MessageBus extends EventEmitter {
@@ -70,36 +70,6 @@ export class MessageBus extends EventEmitter {
                         throw new Error(`Unknown policy decision: ${decision}`);
                 }
             }
-            else if (message.type === MessageBusType.HOOK_EXECUTION_REQUEST) {
-                // Handle hook execution requests through policy evaluation
-                const hookRequest = message;
-                const decision = await this.policyEngine.checkHook(hookRequest);
-                // Map decision to allow/deny for observability (ASK_USER treated as deny for hooks)
-                const effectiveDecision = decision === PolicyDecision.ALLOW ? 'allow' : 'deny';
-                // Emit policy decision for observability
-                this.emitMessage({
-                    type: MessageBusType.HOOK_POLICY_DECISION,
-                    eventName: hookRequest.eventName,
-                    hookSource: getHookSource(hookRequest.input),
-                    decision: effectiveDecision,
-                    reason: decision !== PolicyDecision.ALLOW
-                        ? 'Hook execution denied by policy'
-                        : undefined,
-                });
-                // If allowed, emit the request for hook system to handle
-                if (decision === PolicyDecision.ALLOW) {
-                    this.emitMessage(message);
-                }
-                else {
-                    // If denied or ASK_USER, emit error response (hooks don't support interactive confirmation)
-                    this.emitMessage({
-                        type: MessageBusType.HOOK_EXECUTION_RESPONSE,
-                        correlationId: hookRequest.correlationId,
-                        success: false,
-                        error: new Error('Hook execution denied by policy'),
-                    });
-                }
-            }
             else {
                 // For all other message types, just emit them
                 this.emitMessage(message);
@@ -142,7 +112,7 @@ export class MessageBus extends EventEmitter {
             // Subscribe to responses
             this.subscribe(responseType, responseHandler);
             // Publish the request with correlation ID
-            // eslint-disable-next-line @typescript-eslint/no-floating-promises
+            // eslint-disable-next-line @typescript-eslint/no-floating-promises, @typescript-eslint/no-unsafe-type-assertion
             this.publish({ ...request, correlationId });
         });
     }

package/dist/src/confirmation-bus/message-bus.js.map

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

package/dist/src/confirmation-bus/types.d.ts

@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { type FunctionCall } from '@google/genai';
+import type { ToolConfirmationOutcome, ToolConfirmationPayload } from '../tools/tools.js';
+import type { ToolCall } from '../scheduler/types.js';
 export declare enum MessageBusType {
     TOOL_CONFIRMATION_REQUEST = "tool-confirmation-request",
     TOOL_CONFIRMATION_RESPONSE = "tool-confirmation-response",
@@ -11,26 +13,84 @@ export declare enum MessageBusType {
     TOOL_EXECUTION_SUCCESS = "tool-execution-success",
     TOOL_EXECUTION_FAILURE = "tool-execution-failure",
     UPDATE_POLICY = "update-policy",
-    HOOK_EXECUTION_REQUEST = "hook-execution-request",
-    HOOK_EXECUTION_RESPONSE = "hook-execution-response",
-    HOOK_POLICY_DECISION = "hook-policy-decision"
+    TOOL_CALLS_UPDATE = "tool-calls-update",
+    ASK_USER_REQUEST = "ask-user-request",
+    ASK_USER_RESPONSE = "ask-user-response"
+}
+export interface ToolCallsUpdateMessage {
+    type: MessageBusType.TOOL_CALLS_UPDATE;
+    toolCalls: ToolCall[];
+    schedulerId: string;
 }
 export interface ToolConfirmationRequest {
     type: MessageBusType.TOOL_CONFIRMATION_REQUEST;
     toolCall: FunctionCall;
     correlationId: string;
     serverName?: string;
+    /**
+     * Optional rich details for the confirmation UI (diffs, counts, etc.)
+     */
+    details?: SerializableConfirmationDetails;
 }
 export interface ToolConfirmationResponse {
     type: MessageBusType.TOOL_CONFIRMATION_RESPONSE;
     correlationId: string;
     confirmed: boolean;
+    /**
+     * The specific outcome selected by the user.
+     *
+     * TODO: Make required after migration.
+     */
+    outcome?: ToolConfirmationOutcome;
+    /**
+     * Optional payload (e.g., modified content for 'modify_with_editor').
+     */
+    payload?: ToolConfirmationPayload;
     /**
      * When true, indicates that policy decision was ASK_USER and the tool should
      * show its legacy confirmation UI instead of auto-proceeding.
      */
     requiresUserConfirmation?: boolean;
 }
+/**
+ * Data-only versions of ToolCallConfirmationDetails for bus transmission.
+ */
+export type SerializableConfirmationDetails = {
+    type: 'info';
+    title: string;
+    prompt: string;
+    urls?: string[];
+} | {
+    type: 'edit';
+    title: string;
+    fileName: string;
+    filePath: string;
+    fileDiff: string;
+    originalContent: string | null;
+    newContent: string;
+    isModifying?: boolean;
+} | {
+    type: 'exec';
+    title: string;
+    command: string;
+    rootCommand: string;
+    rootCommands: string[];
+    commands?: string[];
+} | {
+    type: 'mcp';
+    title: string;
+    serverName: string;
+    toolName: string;
+    toolDisplayName: string;
+} | {
+    type: 'ask_user';
+    title: string;
+    questions: Question[];
+} | {
+    type: 'exit_plan_mode';
+    title: string;
+    planPath: string;
+};
 export interface UpdatePolicy {
     type: MessageBusType.UPDATE_POLICY;
     toolName: string;
@@ -53,24 +113,39 @@ export interface ToolExecutionFailure<E = Error> {
     toolCall: FunctionCall;
     error: E;
 }
-export interface HookExecutionRequest {
-    type: MessageBusType.HOOK_EXECUTION_REQUEST;
-    eventName: string;
-    input: Record<string, unknown>;
-    correlationId: string;
+export interface QuestionOption {
+    label: string;
+    description: string;
 }
-export interface HookExecutionResponse {
-    type: MessageBusType.HOOK_EXECUTION_RESPONSE;
+export declare enum QuestionType {
+    CHOICE = "choice",
+    TEXT = "text",
+    YESNO = "yesno"
+}
+export interface Question {
+    question: string;
+    header: string;
+    /** Question type: 'choice' renders selectable options, 'text' renders free-form input, 'yesno' renders a binary Yes/No choice. */
+    type: QuestionType;
+    /** Selectable choices. REQUIRED when type='choice'. IGNORED for 'text' and 'yesno'. */
+    options?: QuestionOption[];
+    /** Allow multiple selections. Only applies when type='choice'. */
+    multiSelect?: boolean;
+    /** Placeholder hint text. For type='text', shown in the input field. For type='choice', shown in the "Other" custom input. */
+    placeholder?: string;
+}
+export interface AskUserRequest {
+    type: MessageBusType.ASK_USER_REQUEST;
+    questions: Question[];
     correlationId: string;
-    success: boolean;
-    output?: Record<string, unknown>;
-    error?: Error;
 }
-export interface HookPolicyDecision {
-    type: MessageBusType.HOOK_POLICY_DECISION;
-    eventName: string;
-    hookSource: 'project' | 'user' | 'system' | 'extension';
-    decision: 'allow' | 'deny';
-    reason?: string;
+export interface AskUserResponse {
+    type: MessageBusType.ASK_USER_RESPONSE;
+    correlationId: string;
+    answers: {
+        [questionIndex: string]: string;
+    };
+    /** When true, indicates the user cancelled the dialog without submitting answers */
+    cancelled?: boolean;
 }
-export type Message = ToolConfirmationRequest | ToolConfirmationResponse | ToolPolicyRejection | ToolExecutionSuccess | ToolExecutionFailure | UpdatePolicy | HookExecutionRequest | HookExecutionResponse | HookPolicyDecision;
+export type Message = ToolConfirmationRequest | ToolConfirmationResponse | ToolPolicyRejection | ToolExecutionSuccess | ToolExecutionFailure | UpdatePolicy | AskUserRequest | AskUserResponse | ToolCallsUpdateMessage;

package/dist/src/confirmation-bus/types.js

@@ -12,8 +12,14 @@ export var MessageBusType;
     MessageBusType["TOOL_EXECUTION_SUCCESS"] = "tool-execution-success";
     MessageBusType["TOOL_EXECUTION_FAILURE"] = "tool-execution-failure";
     MessageBusType["UPDATE_POLICY"] = "update-policy";
-    MessageBusType["HOOK_EXECUTION_REQUEST"] = "hook-execution-request";
-    MessageBusType["HOOK_EXECUTION_RESPONSE"] = "hook-execution-response";
-    MessageBusType["HOOK_POLICY_DECISION"] = "hook-policy-decision";
+    MessageBusType["TOOL_CALLS_UPDATE"] = "tool-calls-update";
+    MessageBusType["ASK_USER_REQUEST"] = "ask-user-request";
+    MessageBusType["ASK_USER_RESPONSE"] = "ask-user-response";
 })(MessageBusType || (MessageBusType = {}));
+export var QuestionType;
+(function (QuestionType) {
+    QuestionType["CHOICE"] = "choice";
+    QuestionType["TEXT"] = "text";
+    QuestionType["YESNO"] = "yesno";
+})(QuestionType || (QuestionType = {}));
 //# sourceMappingURL=types.js.map

package/dist/src/confirmation-bus/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/confirmation-bus/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAqB,MAAM,eAAe,CAAC;AAElD,MAAM,CAAN,IAAY,cAUX;AAVD,WAAY,cAAc;IACxB,yEAAuD,CAAA;IACvD,2EAAyD,CAAA;IACzD,iEAA+C,CAAA;IAC/C,mEAAiD,CAAA;IACjD,mEAAiD,CAAA;IACjD,iDAA+B,CAAA;IAC/B,mEAAiD,CAAA;IACjD,qEAAmD,CAAA;IACnD,+DAA6C,CAAA;AAC/C,CAAC,EAVW,cAAc,KAAd,cAAc,QAUzB"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/confirmation-bus/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAqB,MAAM,eAAe,CAAC;AAOlD,MAAM,CAAN,IAAY,cAUX;AAVD,WAAY,cAAc;IACxB,yEAAuD,CAAA;IACvD,2EAAyD,CAAA;IACzD,iEAA+C,CAAA;IAC/C,mEAAiD,CAAA;IACjD,mEAAiD,CAAA;IACjD,iDAA+B,CAAA;IAC/B,yDAAuC,CAAA;IACvC,uDAAqC,CAAA;IACrC,yDAAuC,CAAA;AACzC,CAAC,EAVW,cAAc,KAAd,cAAc,QAUzB;AAqHD,MAAM,CAAN,IAAY,YAIX;AAJD,WAAY,YAAY;IACtB,iCAAiB,CAAA;IACjB,6BAAa,CAAA;IACb,+BAAe,CAAA;AACjB,CAAC,EAJW,YAAY,KAAZ,YAAY,QAIvB"}

package/dist/src/core/anthropicContentGenerator.d.ts

@@ -6,6 +6,7 @@
 import type { CountTokensResponse, GenerateContentParameters, CountTokensParameters, EmbedContentResponse, EmbedContentParameters } from '@google/genai';
 import { GenerateContentResponse } from '@google/genai';
 import type { ContentGenerator } from './contentGenerator.js';
+import type { LlmRole } from '../telemetry/llmRole.js';
 import Anthropic from '@anthropic-ai/sdk';
 import type { Config } from '../config/config.js';
 export declare class AnthropicContentGenerator implements ContentGenerator {
@@ -13,8 +14,8 @@ export declare class AnthropicContentGenerator implements ContentGenerator {
     private model;
     private config;
     constructor(apiKey: string, model: string, config: Config);
-    generateContent(request: GenerateContentParameters, _userPromptId: string): Promise<GenerateContentResponse>;
-    generateContentStream(request: GenerateContentParameters, userPromptId: string): Promise<AsyncGenerator<GenerateContentResponse>>;
+    generateContent(request: GenerateContentParameters, _userPromptId: string, _role?: LlmRole): Promise<GenerateContentResponse>;
+    generateContentStream(request: GenerateContentParameters, userPromptId: string, _role?: LlmRole): Promise<AsyncGenerator<GenerateContentResponse>>;
     countTokens(request: CountTokensParameters): Promise<CountTokensResponse>;
     embedContent(_request: EmbedContentParameters): Promise<EmbedContentResponse>;
     private convertToAnthropicFormat;

package/dist/src/core/anthropicContentGenerator.js

@@ -38,7 +38,7 @@ export class AnthropicContentGenerator {
             maxRetries: timeoutConfig.maxRetries,
         });
     }
-    async generateContent(request, _userPromptId) {
+    async generateContent(request, _userPromptId, _role) {
         const { systemMessage, messages } = this.convertToAnthropicFormat(request);
         try {
             const samplingParams = this.buildSamplingParameters(request);
@@ -62,7 +62,7 @@ export class AnthropicContentGenerator {
             throw error;
         }
     }
-    async generateContentStream(request, userPromptId) {
+    async generateContentStream(request, userPromptId, _role) {
         // For now, use non-streaming API and wrap in generator
         // This ensures compatibility while we can improve streaming later
         const self = this;