@machina.ai/cell-cli 1.38.1-rc2 → 1.40.1-rc1

package/dist/src/commands/gemma/status.js

@@ -0,0 +1,110 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import chalk from 'chalk';
+import { DEFAULT_PORT, GEMMA_MODEL_NAME } from './constants.js';
+import { detectPlatform, getBinaryPath, isBinaryInstalled, isModelDownloaded, isServerRunning, readServerPid, isProcessRunning, resolveGemmaConfig, } from './platform.js';
+import { exitCli } from '../utils.js';
+export async function checkGemmaStatus(port) {
+    const { settingsEnabled, configuredPort } = resolveGemmaConfig(DEFAULT_PORT);
+    const effectivePort = port ?? configuredPort;
+    const binaryPath = getBinaryPath();
+    const binaryInstalled = isBinaryInstalled(binaryPath);
+    const modelDownloaded = binaryInstalled && binaryPath ? isModelDownloaded(binaryPath) : false;
+    const serverRunning = await isServerRunning(effectivePort);
+    const pid = readServerPid();
+    const serverPid = pid && isProcessRunning(pid) ? pid : null;
+    const allPassing = binaryInstalled && modelDownloaded && serverRunning && settingsEnabled;
+    return {
+        binaryInstalled,
+        binaryPath,
+        modelDownloaded,
+        serverRunning,
+        serverPid,
+        settingsEnabled,
+        port: effectivePort,
+        allPassing,
+    };
+}
+export function formatGemmaStatus(status) {
+    const check = (ok) => (ok ? chalk.green('✓') : chalk.red('✗'));
+    const lines = [
+        '',
+        chalk.bold('Gemma Local Model Routing Status'),
+        chalk.dim('─'.repeat(40)),
+        '',
+    ];
+    if (status.binaryInstalled) {
+        lines.push(`  Binary:    ${check(true)} Installed (${status.binaryPath})`);
+    }
+    else {
+        const platform = detectPlatform();
+        if (platform) {
+            lines.push(`  Binary:    ${check(false)} Not installed`);
+            lines.push(chalk.dim(`             Run: gemini gemma setup`));
+        }
+        else {
+            lines.push(`  Binary:    ${check(false)} Unsupported platform (${process.platform}-${process.arch})`);
+        }
+    }
+    if (status.modelDownloaded) {
+        lines.push(`  Model:     ${check(true)} ${GEMMA_MODEL_NAME} downloaded`);
+    }
+    else {
+        lines.push(`  Model:     ${check(false)} ${GEMMA_MODEL_NAME} not found`);
+        if (status.binaryInstalled) {
+            lines.push(chalk.dim(`             Run: ${status.binaryPath} pull ${GEMMA_MODEL_NAME}`));
+        }
+        else {
+            lines.push(chalk.dim(`             Run: gemini gemma setup`));
+        }
+    }
+    if (status.serverRunning) {
+        const pidInfo = status.serverPid ? ` (PID ${status.serverPid})` : '';
+        lines.push(`  Server:    ${check(true)} Running on port ${status.port}${pidInfo}`);
+    }
+    else {
+        lines.push(`  Server:    ${check(false)} Not running on port ${status.port}`);
+        lines.push(chalk.dim(`             Run: gemini gemma start`));
+    }
+    if (status.settingsEnabled) {
+        lines.push(`  Settings:  ${check(true)} Enabled in settings.json`);
+    }
+    else {
+        lines.push(`  Settings:  ${check(false)} Not enabled in settings.json`);
+        lines.push(chalk.dim(`             Run: gemini gemma setup (auto-configures settings)`));
+    }
+    lines.push('');
+    if (status.allPassing) {
+        lines.push(chalk.green('  Routing is active — no action needed.'));
+        lines.push('');
+        lines.push(chalk.dim('  Simple requests → Flash (fast) | Complex requests → Pro (powerful)'));
+        lines.push(chalk.dim('  This happens automatically on every request.'));
+    }
+    else {
+        lines.push(chalk.yellow('  Some checks failed. Run "gemini gemma setup" for guided installation.'));
+    }
+    lines.push('');
+    return lines.join('\n');
+}
+export const statusCommand = {
+    command: 'status',
+    describe: 'Check Gemma local model routing status',
+    builder: (yargs) => yargs.option('port', {
+        type: 'number',
+        description: 'Port to check for the LiteRT server',
+    }),
+    handler: async (argv) => {
+        let port;
+        if (argv['port'] !== undefined) {
+            port = Number(argv['port']);
+        }
+        const status = await checkGemmaStatus(port);
+        const output = formatGemmaStatus(status);
+        process.stdout.write(output);
+        await exitCli(status.allPassing ? 0 : 1);
+    },
+};
+//# sourceMappingURL=status.js.map

package/dist/src/commands/gemma/status.js.map

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

package/dist/src/commands/gemma/stop.d.ts

@@ -0,0 +1,9 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { CommandModule } from 'yargs';
+export type StopServerResult = 'stopped' | 'not-running' | 'unexpected-process' | 'failed';
+export declare function stopServer(expectedPort?: number): Promise<StopServerResult>;
+export declare const stopCommand: CommandModule;

package/dist/src/commands/gemma/stop.js

@@ -0,0 +1,110 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import fs from 'node:fs';
+import chalk from 'chalk';
+import { debugLogger } from '@google/gemini-cli-core';
+import { exitCli } from '../utils.js';
+import { DEFAULT_PORT, getPidFilePath } from './constants.js';
+import { getBinaryPath, isExpectedLiteRtServerProcess, isProcessRunning, isServerRunning, readServerPid, readServerProcessInfo, resolveGemmaConfig, } from './platform.js';
+export async function stopServer(expectedPort) {
+    const processInfo = readServerProcessInfo();
+    const pidPath = getPidFilePath();
+    if (!processInfo) {
+        return 'not-running';
+    }
+    const { pid } = processInfo;
+    if (!isProcessRunning(pid)) {
+        debugLogger.log(`Stale PID file found (PID ${pid} is not running), removing ${pidPath}`);
+        try {
+            fs.unlinkSync(pidPath);
+        }
+        catch {
+            // ignore
+        }
+        return 'not-running';
+    }
+    const binaryPath = processInfo.binaryPath ?? getBinaryPath();
+    const port = processInfo.port ?? expectedPort;
+    if (!isExpectedLiteRtServerProcess(pid, { binaryPath, port })) {
+        debugLogger.warn(`Refusing to stop PID ${pid} because it does not match the expected LiteRT server process.`);
+        return 'unexpected-process';
+    }
+    try {
+        process.kill(pid, 'SIGTERM');
+    }
+    catch {
+        return 'failed';
+    }
+    await new Promise((resolve) => setTimeout(resolve, 1000));
+    if (isProcessRunning(pid)) {
+        try {
+            process.kill(pid, 'SIGKILL');
+        }
+        catch {
+            // ignore
+        }
+        await new Promise((resolve) => setTimeout(resolve, 500));
+        if (isProcessRunning(pid)) {
+            return 'failed';
+        }
+    }
+    try {
+        fs.unlinkSync(pidPath);
+    }
+    catch {
+        // ignore
+    }
+    return 'stopped';
+}
+export const stopCommand = {
+    command: 'stop',
+    describe: 'Stop the LiteRT-LM server',
+    builder: (yargs) => yargs.option('port', {
+        type: 'number',
+        description: 'Port where the LiteRT server is running',
+    }),
+    handler: async (argv) => {
+        let port;
+        if (argv['port'] !== undefined) {
+            port = Number(argv['port']);
+        }
+        if (!port) {
+            const { configuredPort } = resolveGemmaConfig(DEFAULT_PORT);
+            port = configuredPort;
+        }
+        const processInfo = readServerProcessInfo();
+        const pid = processInfo?.pid ?? readServerPid();
+        if (pid !== null && isProcessRunning(pid)) {
+            debugLogger.log(`Stopping LiteRT server (PID ${pid})...`);
+            const result = await stopServer(port);
+            if (result === 'stopped') {
+                debugLogger.log(chalk.green('LiteRT server stopped.'));
+                await exitCli(0);
+            }
+            else if (result === 'unexpected-process') {
+                debugLogger.error(chalk.red(`Refusing to stop PID ${pid} because it does not match the expected LiteRT server process.`));
+                debugLogger.error(chalk.dim('Remove the stale pid file after verifying the process, or stop the process manually.'));
+                await exitCli(1);
+            }
+            else {
+                debugLogger.error(chalk.red('Failed to stop LiteRT server.'));
+                await exitCli(1);
+            }
+            return;
+        }
+        const running = await isServerRunning(port);
+        if (running) {
+            debugLogger.log(chalk.yellow(`A server is responding on port ${port}, but it was not started by "gemini gemma start".`));
+            debugLogger.log(chalk.dim('If you started it manually, stop it from the terminal where it is running.'));
+            await exitCli(1);
+        }
+        else {
+            debugLogger.log('No LiteRT server is currently running.');
+            await exitCli(0);
+        }
+    },
+};
+//# sourceMappingURL=stop.js.map

package/dist/src/commands/gemma/stop.js.map

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

package/dist/src/commands/gemma/stop.test.d.ts

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

package/dist/src/commands/gemma/stop.test.js

@@ -0,0 +1,89 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import fs from 'node:fs';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+const mockGetBinaryPath = vi.hoisted(() => vi.fn());
+const mockIsExpectedLiteRtServerProcess = vi.hoisted(() => vi.fn());
+const mockIsProcessRunning = vi.hoisted(() => vi.fn());
+const mockIsServerRunning = vi.hoisted(() => vi.fn());
+const mockReadServerPid = vi.hoisted(() => vi.fn());
+const mockReadServerProcessInfo = vi.hoisted(() => vi.fn());
+const mockResolveGemmaConfig = vi.hoisted(() => vi.fn());
+vi.mock('@google/gemini-cli-core', async (importOriginal) => {
+    const { mockCoreDebugLogger } = await import('../../test-utils/mockDebugLogger.js');
+    return mockCoreDebugLogger(await importOriginal(), {
+        stripAnsi: false,
+    });
+});
+vi.mock('./constants.js', () => ({
+    DEFAULT_PORT: 9379,
+    getPidFilePath: vi.fn(() => '/tmp/litert-server.pid'),
+}));
+vi.mock('./platform.js', () => ({
+    getBinaryPath: mockGetBinaryPath,
+    isExpectedLiteRtServerProcess: mockIsExpectedLiteRtServerProcess,
+    isProcessRunning: mockIsProcessRunning,
+    isServerRunning: mockIsServerRunning,
+    readServerPid: mockReadServerPid,
+    readServerProcessInfo: mockReadServerProcessInfo,
+    resolveGemmaConfig: mockResolveGemmaConfig,
+}));
+vi.mock('../utils.js', () => ({
+    exitCli: vi.fn(),
+}));
+import { stopServer } from './stop.js';
+describe('gemma stop command', () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+        vi.useFakeTimers();
+        mockGetBinaryPath.mockReturnValue('/custom/lit');
+        mockResolveGemmaConfig.mockReturnValue({ configuredPort: 9379 });
+    });
+    afterEach(() => {
+        vi.useRealTimers();
+        vi.restoreAllMocks();
+    });
+    it('refuses to signal a pid that does not match the expected LiteRT server', async () => {
+        mockReadServerProcessInfo.mockReturnValue({
+            pid: 1234,
+            binaryPath: '/custom/lit',
+            port: 8123,
+        });
+        mockIsProcessRunning.mockReturnValue(true);
+        mockIsExpectedLiteRtServerProcess.mockReturnValue(false);
+        const killSpy = vi.spyOn(process, 'kill').mockImplementation(() => true);
+        await expect(stopServer(8123)).resolves.toBe('unexpected-process');
+        expect(killSpy).not.toHaveBeenCalled();
+    });
+    it('stops the verified LiteRT server and removes the pid file', async () => {
+        mockReadServerProcessInfo.mockReturnValue({
+            pid: 1234,
+            binaryPath: '/custom/lit',
+            port: 8123,
+        });
+        mockIsProcessRunning.mockReturnValueOnce(true).mockReturnValueOnce(false);
+        mockIsExpectedLiteRtServerProcess.mockReturnValue(true);
+        const unlinkSpy = vi.spyOn(fs, 'unlinkSync').mockImplementation(() => { });
+        const killSpy = vi.spyOn(process, 'kill').mockImplementation(() => true);
+        const stopPromise = stopServer(8123);
+        await vi.runAllTimersAsync();
+        await expect(stopPromise).resolves.toBe('stopped');
+        expect(killSpy).toHaveBeenCalledWith(1234, 'SIGTERM');
+        expect(unlinkSpy).toHaveBeenCalledWith('/tmp/litert-server.pid');
+    });
+    it('cleans up a stale pid file when the recorded process is no longer running', async () => {
+        mockReadServerProcessInfo.mockReturnValue({
+            pid: 1234,
+            binaryPath: '/custom/lit',
+            port: 8123,
+        });
+        mockIsProcessRunning.mockReturnValue(false);
+        const unlinkSpy = vi.spyOn(fs, 'unlinkSync').mockImplementation(() => { });
+        await expect(stopServer(8123)).resolves.toBe('not-running');
+        expect(unlinkSpy).toHaveBeenCalledWith('/tmp/litert-server.pid');
+    });
+});
+//# sourceMappingURL=stop.test.js.map

package/dist/src/commands/gemma/stop.test.js.map

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

package/dist/src/commands/gemma.d.ts

@@ -0,0 +1,7 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { CommandModule } from 'yargs';
+export declare const gemmaCommand: CommandModule;

package/dist/src/commands/gemma.js

@@ -0,0 +1,30 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { initializeOutputListenersAndFlush } from '../gemini.js';
+import { defer } from '../deferred.js';
+import { setupCommand } from './gemma/setup.js';
+import { startCommand } from './gemma/start.js';
+import { stopCommand } from './gemma/stop.js';
+import { statusCommand } from './gemma/status.js';
+import { logsCommand } from './gemma/logs.js';
+export const gemmaCommand = {
+    command: 'gemma',
+    describe: 'Manage local Gemma model routing',
+    builder: (yargs) => yargs
+        .middleware((argv) => {
+        initializeOutputListenersAndFlush();
+        argv['isCommand'] = true;
+    })
+        .command(defer(setupCommand, 'gemma'))
+        .command(defer(startCommand, 'gemma'))
+        .command(defer(stopCommand, 'gemma'))
+        .command(defer(statusCommand, 'gemma'))
+        .command(defer(logsCommand, 'gemma'))
+        .demandCommand(1, 'You need at least one command before continuing.')
+        .version(false),
+    handler: () => { },
+};
+//# sourceMappingURL=gemma.js.map

package/dist/src/commands/gemma.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"gemma.js","sourceRoot":"","sources":["../../../src/commands/gemma.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,iCAAiC,EAAE,MAAM,cAAc,CAAC;AACjE,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,MAAM,CAAC,MAAM,YAAY,GAAkB;IACzC,OAAO,EAAE,OAAO;IAChB,QAAQ,EAAE,kCAAkC;IAC5C,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE,CACvB,KAAK;SACF,UAAU,CAAC,CAAC,IAAI,EAAE,EAAE;QACnB,iCAAiC,EAAE,CAAC;QACpC,IAAI,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC;IAC3B,CAAC,CAAC;SACD,OAAO,CAAC,KAAK,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;SACrC,OAAO,CAAC,KAAK,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;SACrC,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;SACpC,OAAO,CAAC,KAAK,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;SACtC,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;SACpC,aAAa,CAAC,CAAC,EAAE,kDAAkD,CAAC;SACpE,OAAO,CAAC,KAAK,CAAC;IACnB,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC;CAClB,CAAC"}

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

@@ -38,6 +38,7 @@ export interface CliArgs {
     startupMessages?: string[];
     rawOutput: boolean | undefined;
     acceptRawOutputRisk: boolean | undefined;
+    skipTrust: boolean | undefined;
     isCommand: boolean | undefined;
 }
 /**

package/dist/src/config/config.js

@@ -12,11 +12,13 @@ import { mcpCommand } from '../commands/mcp.js';
 import { extensionsCommand } from '../commands/extensions.js';
 import { skillsCommand } from '../commands/skills.js';
 import { hooksCommand } from '../commands/hooks.js';
-import { setGeminiMdFilename as setServerGeminiMdFilename, getCurrentGeminiMdFilename, ApprovalMode, DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_FILE_FILTERING_OPTIONS, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, FileDiscoveryService, resolveTelemetrySettings, FatalConfigError, getPty, debugLogger, loadServerHierarchicalMemory, ASK_USER_TOOL_NAME, getVersion, PREVIEW_GEMINI_MODEL_AUTO, coreEvents, GEMINI_MODEL_ALIAS_AUTO, getAdminErrorMessage, isHeadlessMode, Config, resolveToRealPath, applyAdminAllowlist, applyRequiredServers, getAdminBlockedMcpServersMessage, getProjectRootForWorktree, isGeminiWorktree, detectIdeFromEnv, generalistProfile, } from '@google/gemini-cli-core';
+import { gemmaCommand } from '../commands/gemma.js';
+import { setGeminiMdFilename as setServerGeminiMdFilename, getCurrentGeminiMdFilename, ApprovalMode, DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_FILE_FILTERING_OPTIONS, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, FileDiscoveryService, resolveTelemetrySettings, FatalConfigError, getErrorMessage, getPty, debugLogger, loadServerHierarchicalMemory, ASK_USER_TOOL_NAME, getVersion, PREVIEW_GEMINI_MODEL_AUTO, coreEvents, GEMINI_MODEL_ALIAS_AUTO, getAdminErrorMessage, isHeadlessMode, Config, resolveToRealPath, applyAdminAllowlist, applyRequiredServers, getAdminBlockedMcpServersMessage, getProjectRootForWorktree, isGeminiWorktree, detectIdeFromEnv, generalistProfile, } from '@google/gemini-cli-core';
 import { AuthProviderKeycloak } from '@machina.ai/auth-keycloak';
 import { saveModelChange, loadSettings, isWorktreeEnabled, } from './settings.js';
 import { loadSandboxConfig } from './sandboxConfig.js';
 import { resolvePath } from '../utils/resolvePath.js';
+import { isRecord } from '../utils/settingsUtils.js';
 import { RESUME_LATEST } from '../utils/sessionUtils.js';
 import { isWorkspaceTrusted } from './trustedFolders.js';
 import { createPolicyEngineConfig, resolveWorkspacePolicyState, } from './policy.js';
@@ -87,6 +89,7 @@ export async function parseArguments(settings) {
             extensionsCommand,
             skillsCommand,
             hooksCommand,
+            gemmaCommand,
         ];
         const subcommands = commandModules.flatMap((mod) => {
             const names = [];
@@ -158,6 +161,7 @@ export async function parseArguments(settings) {
     yargsInstance.command(extensionsCommand);
     yargsInstance.command(skillsCommand);
     yargsInstance.command(hooksCommand);
+    yargsInstance.command(gemmaCommand);
     yargsInstance
         .command('$0 [query..]', 'Launch Cell CLI', (yargsInstance) => yargsInstance
         .positional('query', {
@@ -180,6 +184,11 @@ export async function parseArguments(settings) {
         type: 'string',
         nargs: 1,
         description: 'Execute the provided prompt and continue in interactive mode',
+    })
+        .option('skip-trust', {
+        type: 'boolean',
+        description: 'Trust the current workspace for this session.',
+        default: false,
     })
         .option('worktree', {
         alias: 'w',
@@ -337,10 +346,17 @@ export async function parseArguments(settings) {
     yargsInstance.wrap(yargsInstance.terminalWidth());
     let result;
     try {
-        result = await yargsInstance.parse();
+        const parsed = await yargsInstance.parse();
+        if (!isRecord(parsed)) {
+            throw new Error('Failed to parse arguments');
+        }
+        result = parsed;
+        if (result['skip-trust']) {
+            process.env['CELL_CLI_TRUST_WORKSPACE'] = 'true';
+        }
     }
     catch (e) {
-        const msg = e instanceof Error ? e.message : String(e);
+        const msg = getErrorMessage(e);
         debugLogger.error(msg);
         yargsInstance.showHelp();
         await runExitCleanup();
@@ -352,11 +368,14 @@ export async function parseArguments(settings) {
         process.exit(0);
     }
     // Normalize query args: handle both quoted "@path file" and unquoted @path file
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-    const queryArg = result.query;
-    const q = Array.isArray(queryArg)
-        ? queryArg.join(' ')
-        : queryArg;
+    const queryArg = result['query'];
+    let q;
+    if (Array.isArray(queryArg)) {
+        q = queryArg.join(' ');
+    }
+    else if (typeof queryArg === 'string') {
+        q = queryArg;
+    }
     // -p/--prompt forces non-interactive mode; positional args default to interactive in TTY
     if (q && !result['prompt']) {
         if (!isHeadlessMode()) {
@@ -406,7 +425,7 @@ export async function loadCliConfig(settings, sessionId, argv, options = {}) {
         process.env['VITEST'] === 'true'
         ? false
         : (settings.security?.folderTrust?.enabled ?? false);
-    const trustedFolder = isWorkspaceTrusted(settings, cwd, undefined, {
+    const trustedFolder = isWorkspaceTrusted(settings, cwd, {
         prompt: argv.prompt,
         query: argv.query,
     })?.isTrusted ?? false;
@@ -448,7 +467,7 @@ export async function loadCliConfig(settings, sessionId, argv, options = {}) {
                 return resolveToRealPath(trimmedPath) !== realCwd;
             }
             catch (e) {
-                debugLogger.debug(`[IDE] Skipping inaccessible workspace folder: ${trimmedPath} (${e instanceof Error ? e.message : String(e)})`);
+                debugLogger.debug(`[IDE] Skipping inaccessible workspace folder: ${trimmedPath} (${getErrorMessage(e)})`);
                 return false;
             }
         });
@@ -468,7 +487,7 @@ export async function loadCliConfig(settings, sessionId, argv, options = {}) {
     const extensionPlanSettings = extensionManager
         .getExtensions()
         .find((ext) => ext.isActive && ext.plan?.directory)?.plan;
-    const experimentalJitContext = settings.experimental.jitContext;
+    const experimentalJitContext = settings.experimental.jitContext ?? true;
     let extensionRegistryURI = process.env['CELL_CLI_EXTENSION_REGISTRY_URI'] ??
         (trustedFolder ? settings.experimental?.extensionRegistryURI : undefined);
     if (extensionRegistryURI && !extensionRegistryURI.startsWith('http')) {
@@ -753,11 +772,13 @@ export async function loadCliConfig(settings, sessionId, argv, options = {}) {
         enableEventDrivenScheduler: true,
         skillsSupport: settings.skills?.enabled ?? true,
         disabledSkills: settings.skills?.disabled,
-        experimentalJitContext: settings.experimental?.jitContext,
-        experimentalMemoryManager: settings.experimental?.memoryManager,
+        experimentalJitContext,
+        experimentalMemoryV2: settings.experimental?.memoryV2,
+        experimentalAutoMemory: settings.experimental?.autoMemory,
         contextManagement,
         modelSteering: settings.experimental?.modelSteering,
-        topicUpdateNarration: settings.experimental?.topicUpdateNarration,
+        topicUpdateNarration: settings.general?.topicUpdateNarration ??
+            settings.experimental?.topicUpdateNarration,
         noBrowser: !!process.env['NO_BROWSER'],
         summarizeToolOutput: settings.model?.summarizeToolOutput,
         ideMode,
@@ -790,6 +811,7 @@ export async function loadCliConfig(settings, sessionId, argv, options = {}) {
         recordResponses: argv.recordResponses,
         retryFetchErrors: settings.general?.retryFetchErrors,
         billing: settings.billing,
+        vertexAiRouting: settings.billing?.vertexAi,
         maxAttempts: settings.general?.maxAttempts,
         ptyInfo: ptyInfo?.name,
         disableLLMCorrection: settings.tools?.disableLLMCorrection,
@@ -847,7 +869,7 @@ async function resolveWorktreeSettings(cwd) {
         worktreeBaseSha = stdout.trim();
     }
     catch (e) {
-        debugLogger.debug(`Failed to resolve worktree base SHA at ${worktreePath}: ${e instanceof Error ? e.message : String(e)}`);
+        debugLogger.debug(`Failed to resolve worktree base SHA at ${worktreePath}: ${getErrorMessage(e)}`);
     }
     if (!worktreeBaseSha) {
         return undefined;