@machina.ai/cell-cli 1.20.2-rc1 → 1.22.5-rc1

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

@@ -3,7 +3,7 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import type { MCPServerConfig, BugCommandSettings, TelemetrySettings, AuthType, HookDefinition, HookEventName } from '@google/gemini-cli-core';
+import type { MCPServerConfig, BugCommandSettings, TelemetrySettings, AuthType } from '@google/gemini-cli-core';
 import type { CustomTheme } from '../ui/themes/theme.js';
 import type { SessionRetentionSettings } from './settings.js';
 export type SettingsType = 'boolean' | 'string' | 'number' | 'array' | 'object' | 'enum';
@@ -29,6 +29,11 @@ export interface SettingCollectionDefinition {
      * For example, a JSON schema generator can use this to point to a shared definition.
      */
     ref?: string;
+    /**
+     * Optional merge strategy for dynamically added properties.
+     * Used when this collection definition is referenced via additionalProperties.
+     */
+    mergeStrategy?: MergeStrategy;
 }
 export declare enum MergeStrategy {
     REPLACE = "replace",
@@ -667,6 +672,15 @@ declare const SETTINGS_SCHEMA: {
                 readonly description: "Custom named presets for model configs. These are merged with (and override) the built-in aliases.";
                 readonly showInDialog: false;
             };
+            readonly customOverrides: {
+                readonly type: "array";
+                readonly label: "Custom Model Config Overrides";
+                readonly category: "Model";
+                readonly requiresRestart: false;
+                readonly default: [];
+                readonly description: "Custom model config overrides. These are merged with (and added to) the built-in overrides.";
+                readonly showInDialog: false;
+            };
             readonly overrides: {
                 readonly type: "array";
                 readonly label: "Model Config Overrides";
@@ -957,7 +971,7 @@ declare const SETTINGS_SCHEMA: {
                 readonly label: "Enable Message Bus Integration";
                 readonly category: "Tools";
                 readonly requiresRestart: true;
-                readonly default: false;
+                readonly default: true;
                 readonly description: string;
                 readonly showInDialog: true;
             };
@@ -1052,6 +1066,15 @@ declare const SETTINGS_SCHEMA: {
                 readonly description: "Disable YOLO mode, even if enabled by a flag.";
                 readonly showInDialog: true;
             };
+            readonly enablePermanentToolApproval: {
+                readonly type: "boolean";
+                readonly label: "Allow Permanent Tool Approval";
+                readonly category: "Security";
+                readonly requiresRestart: false;
+                readonly default: false;
+                readonly description: "Enable the \"Allow for all future sessions\" option in tool confirmation dialogs.";
+                readonly showInDialog: true;
+            };
             readonly blockGitExtensions: {
                 readonly type: "boolean";
                 readonly label: "Blocks extensions from Git";
@@ -1263,6 +1286,15 @@ declare const SETTINGS_SCHEMA: {
         readonly description: "Setting to enable experimental features";
         readonly showInDialog: false;
         readonly properties: {
+            readonly enableAgents: {
+                readonly type: "boolean";
+                readonly label: "Enable Agents";
+                readonly category: "Experimental";
+                readonly requiresRestart: true;
+                readonly default: false;
+                readonly description: "Enable local and remote subagents.";
+                readonly showInDialog: false;
+            };
             readonly extensionManagement: {
                 readonly type: "boolean";
                 readonly label: "Extension Management";
@@ -1349,7 +1381,7 @@ declare const SETTINGS_SCHEMA: {
                         readonly label: "Model";
                         readonly category: "Experimental";
                         readonly requiresRestart: true;
-                        readonly default: "gemini-2.5-pro";
+                        readonly default: "auto";
                         readonly description: "The model to use for the Codebase Investigator agent.";
                         readonly showInDialog: false;
                     };
@@ -1399,10 +1431,151 @@ declare const SETTINGS_SCHEMA: {
         readonly label: "Hooks";
         readonly category: "Advanced";
         readonly requiresRestart: false;
-        readonly default: { [K in HookEventName]?: HookDefinition[]; };
+        readonly default: {};
         readonly description: "Hook configurations for intercepting and customizing agent behavior.";
         readonly showInDialog: false;
-        readonly mergeStrategy: MergeStrategy.SHALLOW_MERGE;
+        readonly properties: {
+            readonly disabled: {
+                readonly type: "array";
+                readonly label: "Disabled Hooks";
+                readonly category: "Advanced";
+                readonly requiresRestart: false;
+                readonly default: string[];
+                readonly description: "List of hook names (commands) that should be disabled. Hooks in this list will not execute even if configured.";
+                readonly showInDialog: false;
+                readonly items: {
+                    readonly type: "string";
+                    readonly description: "Hook command name";
+                };
+                readonly mergeStrategy: MergeStrategy.UNION;
+            };
+            readonly BeforeTool: {
+                readonly type: "array";
+                readonly label: "Before Tool Hooks";
+                readonly category: "Advanced";
+                readonly requiresRestart: false;
+                readonly default: [];
+                readonly description: "Hooks that execute before tool execution. Can intercept, validate, or modify tool calls.";
+                readonly showInDialog: false;
+                readonly ref: "HookDefinitionArray";
+                readonly mergeStrategy: MergeStrategy.CONCAT;
+            };
+            readonly AfterTool: {
+                readonly type: "array";
+                readonly label: "After Tool Hooks";
+                readonly category: "Advanced";
+                readonly requiresRestart: false;
+                readonly default: [];
+                readonly description: "Hooks that execute after tool execution. Can process results, log outputs, or trigger follow-up actions.";
+                readonly showInDialog: false;
+                readonly ref: "HookDefinitionArray";
+                readonly mergeStrategy: MergeStrategy.CONCAT;
+            };
+            readonly BeforeAgent: {
+                readonly type: "array";
+                readonly label: "Before Agent Hooks";
+                readonly category: "Advanced";
+                readonly requiresRestart: false;
+                readonly default: [];
+                readonly description: "Hooks that execute before agent loop starts. Can set up context or initialize resources.";
+                readonly showInDialog: false;
+                readonly ref: "HookDefinitionArray";
+                readonly mergeStrategy: MergeStrategy.CONCAT;
+            };
+            readonly AfterAgent: {
+                readonly type: "array";
+                readonly label: "After Agent Hooks";
+                readonly category: "Advanced";
+                readonly requiresRestart: false;
+                readonly default: [];
+                readonly description: "Hooks that execute after agent loop completes. Can perform cleanup or summarize results.";
+                readonly showInDialog: false;
+                readonly ref: "HookDefinitionArray";
+                readonly mergeStrategy: MergeStrategy.CONCAT;
+            };
+            readonly Notification: {
+                readonly type: "array";
+                readonly label: "Notification Hooks";
+                readonly category: "Advanced";
+                readonly requiresRestart: false;
+                readonly default: [];
+                readonly description: "Hooks that execute on notification events (errors, warnings, info). Can log or alert on specific conditions.";
+                readonly showInDialog: false;
+                readonly ref: "HookDefinitionArray";
+                readonly mergeStrategy: MergeStrategy.CONCAT;
+            };
+            readonly SessionStart: {
+                readonly type: "array";
+                readonly label: "Session Start Hooks";
+                readonly category: "Advanced";
+                readonly requiresRestart: false;
+                readonly default: [];
+                readonly description: "Hooks that execute when a session starts. Can initialize session-specific resources or state.";
+                readonly showInDialog: false;
+                readonly ref: "HookDefinitionArray";
+                readonly mergeStrategy: MergeStrategy.CONCAT;
+            };
+            readonly SessionEnd: {
+                readonly type: "array";
+                readonly label: "Session End Hooks";
+                readonly category: "Advanced";
+                readonly requiresRestart: false;
+                readonly default: [];
+                readonly description: "Hooks that execute when a session ends. Can perform cleanup or persist session data.";
+                readonly showInDialog: false;
+                readonly ref: "HookDefinitionArray";
+                readonly mergeStrategy: MergeStrategy.CONCAT;
+            };
+            readonly PreCompress: {
+                readonly type: "array";
+                readonly label: "Pre-Compress Hooks";
+                readonly category: "Advanced";
+                readonly requiresRestart: false;
+                readonly default: [];
+                readonly description: "Hooks that execute before chat history compression. Can back up or analyze conversation before compression.";
+                readonly showInDialog: false;
+                readonly ref: "HookDefinitionArray";
+                readonly mergeStrategy: MergeStrategy.CONCAT;
+            };
+            readonly BeforeModel: {
+                readonly type: "array";
+                readonly label: "Before Model Hooks";
+                readonly category: "Advanced";
+                readonly requiresRestart: false;
+                readonly default: [];
+                readonly description: "Hooks that execute before LLM requests. Can modify prompts, inject context, or control model parameters.";
+                readonly showInDialog: false;
+                readonly ref: "HookDefinitionArray";
+                readonly mergeStrategy: MergeStrategy.CONCAT;
+            };
+            readonly AfterModel: {
+                readonly type: "array";
+                readonly label: "After Model Hooks";
+                readonly category: "Advanced";
+                readonly requiresRestart: false;
+                readonly default: [];
+                readonly description: "Hooks that execute after LLM responses. Can process outputs, extract information, or log interactions.";
+                readonly showInDialog: false;
+                readonly ref: "HookDefinitionArray";
+                readonly mergeStrategy: MergeStrategy.CONCAT;
+            };
+            readonly BeforeToolSelection: {
+                readonly type: "array";
+                readonly label: "Before Tool Selection Hooks";
+                readonly category: "Advanced";
+                readonly requiresRestart: false;
+                readonly default: [];
+                readonly description: "Hooks that execute before tool selection. Can filter or prioritize available tools dynamically.";
+                readonly showInDialog: false;
+                readonly ref: "HookDefinitionArray";
+                readonly mergeStrategy: MergeStrategy.CONCAT;
+            };
+        };
+        readonly additionalProperties: {
+            readonly type: "array";
+            readonly description: "Custom hook event arrays that contain hook definitions for user-defined events";
+            readonly mergeStrategy: MergeStrategy.CONCAT;
+        };
     };
 };
 export type SettingsSchemaType = typeof SETTINGS_SCHEMA;

package/dist/src/config/settingsSchema.js

@@ -3,7 +3,7 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES, DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD, DEFAULT_GEMINI_MODEL, DEFAULT_MODEL_CONFIGS, } from '@google/gemini-cli-core';
+import { DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES, DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD, DEFAULT_MODEL_CONFIGS, GEMINI_MODEL_ALIAS_AUTO, } from '@google/gemini-cli-core';
 import { DEFAULT_MIN_RETENTION } from '../utils/sessionCleanup.js';
 /**
  * Setting datatypes that "toggle" through a fixed list of options
@@ -634,6 +634,15 @@ const SETTINGS_SCHEMA = {
                 description: 'Custom named presets for model configs. These are merged with (and override) the built-in aliases.',
                 showInDialog: false,
             },
+            customOverrides: {
+                type: 'array',
+                label: 'Custom Model Config Overrides',
+                category: 'Model',
+                requiresRestart: false,
+                default: [],
+                description: 'Custom model config overrides. These are merged with (and added to) the built-in overrides.',
+                showInDialog: false,
+            },
             overrides: {
                 type: 'array',
                 label: 'Model Config Overrides',
@@ -942,7 +951,7 @@ const SETTINGS_SCHEMA = {
                 label: 'Enable Message Bus Integration',
                 category: 'Tools',
                 requiresRestart: true,
-                default: false,
+                default: true,
                 description: oneLine `
           Enable policy-based tool confirmation via message bus integration.
           When enabled, tools automatically respect policy engine decisions (ALLOW/DENY/ASK_USER) without requiring individual tool implementations.
@@ -1036,6 +1045,15 @@ const SETTINGS_SCHEMA = {
                 description: 'Disable YOLO mode, even if enabled by a flag.',
                 showInDialog: true,
             },
+            enablePermanentToolApproval: {
+                type: 'boolean',
+                label: 'Allow Permanent Tool Approval',
+                category: 'Security',
+                requiresRestart: false,
+                default: false,
+                description: 'Enable the "Allow for all future sessions" option in tool confirmation dialogs.',
+                showInDialog: true,
+            },
             blockGitExtensions: {
                 type: 'boolean',
                 label: 'Blocks extensions from Git',
@@ -1246,6 +1264,15 @@ const SETTINGS_SCHEMA = {
         description: 'Setting to enable experimental features',
         showInDialog: false,
         properties: {
+            enableAgents: {
+                type: 'boolean',
+                label: 'Enable Agents',
+                category: 'Experimental',
+                requiresRestart: true,
+                default: false,
+                description: 'Enable local and remote subagents.',
+                showInDialog: false,
+            },
             extensionManagement: {
                 type: 'boolean',
                 label: 'Extension Management',
@@ -1332,7 +1359,7 @@ const SETTINGS_SCHEMA = {
                         label: 'Model',
                         category: 'Experimental',
                         requiresRestart: true,
-                        default: DEFAULT_GEMINI_MODEL,
+                        default: GEMINI_MODEL_ALIAS_AUTO,
                         description: 'The model to use for the Codebase Investigator agent.',
                         showInDialog: false,
                     },
@@ -1381,7 +1408,148 @@ const SETTINGS_SCHEMA = {
         default: {},
         description: 'Hook configurations for intercepting and customizing agent behavior.',
         showInDialog: false,
-        mergeStrategy: MergeStrategy.SHALLOW_MERGE,
+        properties: {
+            disabled: {
+                type: 'array',
+                label: 'Disabled Hooks',
+                category: 'Advanced',
+                requiresRestart: false,
+                default: [],
+                description: 'List of hook names (commands) that should be disabled. Hooks in this list will not execute even if configured.',
+                showInDialog: false,
+                items: {
+                    type: 'string',
+                    description: 'Hook command name',
+                },
+                mergeStrategy: MergeStrategy.UNION,
+            },
+            BeforeTool: {
+                type: 'array',
+                label: 'Before Tool Hooks',
+                category: 'Advanced',
+                requiresRestart: false,
+                default: [],
+                description: 'Hooks that execute before tool execution. Can intercept, validate, or modify tool calls.',
+                showInDialog: false,
+                ref: 'HookDefinitionArray',
+                mergeStrategy: MergeStrategy.CONCAT,
+            },
+            AfterTool: {
+                type: 'array',
+                label: 'After Tool Hooks',
+                category: 'Advanced',
+                requiresRestart: false,
+                default: [],
+                description: 'Hooks that execute after tool execution. Can process results, log outputs, or trigger follow-up actions.',
+                showInDialog: false,
+                ref: 'HookDefinitionArray',
+                mergeStrategy: MergeStrategy.CONCAT,
+            },
+            BeforeAgent: {
+                type: 'array',
+                label: 'Before Agent Hooks',
+                category: 'Advanced',
+                requiresRestart: false,
+                default: [],
+                description: 'Hooks that execute before agent loop starts. Can set up context or initialize resources.',
+                showInDialog: false,
+                ref: 'HookDefinitionArray',
+                mergeStrategy: MergeStrategy.CONCAT,
+            },
+            AfterAgent: {
+                type: 'array',
+                label: 'After Agent Hooks',
+                category: 'Advanced',
+                requiresRestart: false,
+                default: [],
+                description: 'Hooks that execute after agent loop completes. Can perform cleanup or summarize results.',
+                showInDialog: false,
+                ref: 'HookDefinitionArray',
+                mergeStrategy: MergeStrategy.CONCAT,
+            },
+            Notification: {
+                type: 'array',
+                label: 'Notification Hooks',
+                category: 'Advanced',
+                requiresRestart: false,
+                default: [],
+                description: 'Hooks that execute on notification events (errors, warnings, info). Can log or alert on specific conditions.',
+                showInDialog: false,
+                ref: 'HookDefinitionArray',
+                mergeStrategy: MergeStrategy.CONCAT,
+            },
+            SessionStart: {
+                type: 'array',
+                label: 'Session Start Hooks',
+                category: 'Advanced',
+                requiresRestart: false,
+                default: [],
+                description: 'Hooks that execute when a session starts. Can initialize session-specific resources or state.',
+                showInDialog: false,
+                ref: 'HookDefinitionArray',
+                mergeStrategy: MergeStrategy.CONCAT,
+            },
+            SessionEnd: {
+                type: 'array',
+                label: 'Session End Hooks',
+                category: 'Advanced',
+                requiresRestart: false,
+                default: [],
+                description: 'Hooks that execute when a session ends. Can perform cleanup or persist session data.',
+                showInDialog: false,
+                ref: 'HookDefinitionArray',
+                mergeStrategy: MergeStrategy.CONCAT,
+            },
+            PreCompress: {
+                type: 'array',
+                label: 'Pre-Compress Hooks',
+                category: 'Advanced',
+                requiresRestart: false,
+                default: [],
+                description: 'Hooks that execute before chat history compression. Can back up or analyze conversation before compression.',
+                showInDialog: false,
+                ref: 'HookDefinitionArray',
+                mergeStrategy: MergeStrategy.CONCAT,
+            },
+            BeforeModel: {
+                type: 'array',
+                label: 'Before Model Hooks',
+                category: 'Advanced',
+                requiresRestart: false,
+                default: [],
+                description: 'Hooks that execute before LLM requests. Can modify prompts, inject context, or control model parameters.',
+                showInDialog: false,
+                ref: 'HookDefinitionArray',
+                mergeStrategy: MergeStrategy.CONCAT,
+            },
+            AfterModel: {
+                type: 'array',
+                label: 'After Model Hooks',
+                category: 'Advanced',
+                requiresRestart: false,
+                default: [],
+                description: 'Hooks that execute after LLM responses. Can process outputs, extract information, or log interactions.',
+                showInDialog: false,
+                ref: 'HookDefinitionArray',
+                mergeStrategy: MergeStrategy.CONCAT,
+            },
+            BeforeToolSelection: {
+                type: 'array',
+                label: 'Before Tool Selection Hooks',
+                category: 'Advanced',
+                requiresRestart: false,
+                default: [],
+                description: 'Hooks that execute before tool selection. Can filter or prioritize available tools dynamically.',
+                showInDialog: false,
+                ref: 'HookDefinitionArray',
+                mergeStrategy: MergeStrategy.CONCAT,
+            },
+        },
+        additionalProperties: {
+            type: 'array',
+            description: 'Custom hook event arrays that contain hook definitions for user-defined events',
+            mergeStrategy: MergeStrategy.CONCAT,
+        },
     },
 };
 export const SETTINGS_SCHEMA_DEFINITIONS = {
@@ -1433,6 +1601,10 @@ export const SETTINGS_SCHEMA_DEFINITIONS = {
                 type: 'boolean',
                 description: 'Marks the server as trusted. Trusted servers may gain additional capabilities.',
             },
+            managed: {
+                type: 'boolean',
+                description: 'Whether the MCP server is managed by the Cell CLI.',
+            },
             description: {
                 type: 'string',
                 description: 'Human-readable description of the server.',
@@ -1510,6 +1682,10 @@ export const SETTINGS_SCHEMA_DEFINITIONS = {
                 type: 'boolean',
                 description: 'Whether to forward telemetry to an OTLP collector.',
             },
+            useCliAuth: {
+                type: 'boolean',
+                description: 'Whether to use CLI authentication for telemetry (only for in-process exporters).',
+            },
         },
     },
     BugCommandSettings: {
@@ -1632,6 +1808,42 @@ export const SETTINGS_SCHEMA_DEFINITIONS = {
         description: 'Accepts either a boolean flag or a string command name.',
         anyOf: [{ type: 'boolean' }, { type: 'string' }],
     },
+    HookDefinitionArray: {
+        type: 'array',
+        description: 'Array of hook definition objects for a specific event.',
+        items: {
+            type: 'object',
+            description: 'Hook definition specifying matcher pattern and hook configurations.',
+            properties: {
+                matcher: {
+                    type: 'string',
+                    description: 'Pattern to match against the event context (tool name, notification type, etc.). Supports exact match, regex (/pattern/), and wildcards (*).',
+                },
+                hooks: {
+                    type: 'array',
+                    description: 'Hooks to execute when the matcher matches.',
+                    items: {
+                        type: 'object',
+                        description: 'Individual hook configuration.',
+                        properties: {
+                            type: {
+                                type: 'string',
+                                description: 'Type of hook (currently only "command" supported).',
+                            },
+                            command: {
+                                type: 'string',
+                                description: 'Shell command to execute. Receives JSON input via stdin and returns JSON output via stdout.',
+                            },
+                            timeout: {
+                                type: 'number',
+                                description: 'Timeout in milliseconds for hook execution.',
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    },
 };
 export function getSettingsSchema() {
     return SETTINGS_SCHEMA;