@machina.ai/cell-cli-core 1.18.4-rc1 → 1.19.4-rc2

package/dist/src/config/defaultModelConfigs.js

@@ -180,6 +180,31 @@ export const DEFAULT_MODEL_CONFIGS = {
             extends: 'gemini-2.5-flash-base',
             modelConfig: {},
         },
+        'chat-compression-3-pro': {
+            modelConfig: {
+                model: 'gemini-3-pro-preview',
+            },
+        },
+        'chat-compression-2.5-pro': {
+            modelConfig: {
+                model: 'gemini-2.5-pro',
+            },
+        },
+        'chat-compression-2.5-flash': {
+            modelConfig: {
+                model: 'gemini-2.5-flash',
+            },
+        },
+        'chat-compression-2.5-flash-lite': {
+            modelConfig: {
+                model: 'gemini-2.5-flash-lite',
+            },
+        },
+        'chat-compression-default': {
+            modelConfig: {
+                model: 'gemini-2.5-pro',
+            },
+        },
     },
 };
 //# sourceMappingURL=defaultModelConfigs.js.map

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

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

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

@@ -15,4 +15,10 @@ export declare class MessageBus extends EventEmitter {
     publish(message: Message): Promise<void>;
     subscribe<T extends Message>(type: T['type'], listener: (message: T) => void): void;
     unsubscribe<T extends Message>(type: T['type'], listener: (message: T) => void): void;
+    /**
+     * Request-response pattern: Publish a message and wait for a correlated response
+     * This enables synchronous-style communication over the async MessageBus
+     * The correlation ID is generated internally and added to the request
+     */
+    request<TRequest extends Message, TResponse extends Message>(request: Omit<TRequest, 'correlationId'>, responseType: TResponse['type'], timeoutMs?: number): Promise<TResponse>;
 }

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

@@ -3,9 +3,10 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import { randomUUID } from 'node:crypto';
 import { EventEmitter } from 'node:events';
-import { PolicyDecision } from '../policy/types.js';
-import { MessageBusType } from './types.js';
+import { PolicyDecision, getHookSource } from '../policy/types.js';
+import { MessageBusType, } from './types.js';
 import { safeJsonStringify } from '../utils/safeJsonStringify.js';
 export class MessageBus extends EventEmitter {
     policyEngine;
@@ -68,6 +69,36 @@ 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);
@@ -83,5 +114,35 @@ export class MessageBus extends EventEmitter {
     unsubscribe(type, listener) {
         this.off(type, listener);
     }
+    /**
+     * Request-response pattern: Publish a message and wait for a correlated response
+     * This enables synchronous-style communication over the async MessageBus
+     * The correlation ID is generated internally and added to the request
+     */
+    async request(request, responseType, timeoutMs = 60000) {
+        const correlationId = randomUUID();
+        return new Promise((resolve, reject) => {
+            const timeoutId = setTimeout(() => {
+                cleanup();
+                reject(new Error(`Request timed out waiting for ${responseType}`));
+            }, timeoutMs);
+            const cleanup = () => {
+                clearTimeout(timeoutId);
+                this.unsubscribe(responseType, responseHandler);
+            };
+            const responseHandler = (response) => {
+                // Check if this response matches our request
+                if ('correlationId' in response &&
+                    response.correlationId === correlationId) {
+                    cleanup();
+                    resolve(response);
+                }
+            };
+            // Subscribe to responses
+            this.subscribe(responseType, responseHandler);
+            // Publish the request with correlation ID
+            this.publish({ ...request, correlationId });
+        });
+    }
 }
 //# sourceMappingURL=message-bus.js.map

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

@@ -10,7 +10,10 @@ export declare enum MessageBusType {
     TOOL_POLICY_REJECTION = "tool-policy-rejection",
     TOOL_EXECUTION_SUCCESS = "tool-execution-success",
     TOOL_EXECUTION_FAILURE = "tool-execution-failure",
-    UPDATE_POLICY = "update-policy"
+    UPDATE_POLICY = "update-policy",
+    HOOK_EXECUTION_REQUEST = "hook-execution-request",
+    HOOK_EXECUTION_RESPONSE = "hook-execution-response",
+    HOOK_POLICY_DECISION = "hook-policy-decision"
 }
 export interface ToolConfirmationRequest {
     type: MessageBusType.TOOL_CONFIRMATION_REQUEST;
@@ -46,4 +49,24 @@ export interface ToolExecutionFailure<E = Error> {
     toolCall: FunctionCall;
     error: E;
 }
-export type Message = ToolConfirmationRequest | ToolConfirmationResponse | ToolPolicyRejection | ToolExecutionSuccess | ToolExecutionFailure | UpdatePolicy;
+export interface HookExecutionRequest {
+    type: MessageBusType.HOOK_EXECUTION_REQUEST;
+    eventName: string;
+    input: Record<string, unknown>;
+    correlationId: string;
+}
+export interface HookExecutionResponse {
+    type: MessageBusType.HOOK_EXECUTION_RESPONSE;
+    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 type Message = ToolConfirmationRequest | ToolConfirmationResponse | ToolPolicyRejection | ToolExecutionSuccess | ToolExecutionFailure | UpdatePolicy | HookExecutionRequest | HookExecutionResponse | HookPolicyDecision;

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

@@ -12,5 +12,8 @@ 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 || (MessageBusType = {}));
 //# 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,cAOX;AAPD,WAAY,cAAc;IACxB,yEAAuD,CAAA;IACvD,2EAAyD,CAAA;IACzD,iEAA+C,CAAA;IAC/C,mEAAiD,CAAA;IACjD,mEAAiD,CAAA;IACjD,iDAA+B,CAAA;AACjC,CAAC,EAPW,cAAc,KAAd,cAAc,QAOzB"}
+{"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"}

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

@@ -0,0 +1,20 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type CountTokensResponse, type EmbedContentResponse, type GenerateContentResponse, type GenerateContentParameters, type CountTokensParameters, type EmbedContentParameters } from '@google/genai';
+import type { ContentGenerator } from './contentGenerator.js';
+import type { Config } from '../config/config.js';
+import type { UserTierId } from '../code_assist/types.js';
+export declare class AuthenticatedContentGenerator implements ContentGenerator {
+    private generator;
+    private config;
+    constructor(generator: ContentGenerator, config: Config);
+    generateContent(request: GenerateContentParameters, userPromptId: string): Promise<GenerateContentResponse>;
+    generateContentStream(request: GenerateContentParameters, userPromptId: string): Promise<AsyncGenerator<GenerateContentResponse>>;
+    countTokens(request: CountTokensParameters): Promise<CountTokensResponse>;
+    embedContent(request: EmbedContentParameters): Promise<EmbedContentResponse>;
+    private refreshToken;
+    get userTier(): UserTierId | undefined;
+}

package/dist/src/core/AuthenticatedContentGenerator.js

@@ -0,0 +1,115 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { GoogleGenAI, } from '@google/genai';
+import { AuthProviderKeycloak } from '@machina.ai/auth-keycloak';
+import { LoggingContentGenerator } from './loggingContentGenerator.js';
+function isAuthError(e) {
+    // Case 1: The error itself is an object with a `code` property (like GaxiosError)
+    if (e && typeof e === 'object' && 'code' in e) {
+        const error = e;
+        if (error.code === 401 || error.code === '401') {
+            return true;
+        }
+    }
+    // Case 2: The error is an `Error` instance with a JSON message.
+    if (e instanceof Error) {
+        try {
+            const parsed = JSON.parse(e.message);
+            const error = parsed.error || parsed;
+            if (error.code === 401 || error.status === 'UNAUTHENTICATED') {
+                return true;
+            }
+        }
+        catch {
+            // Not a JSON message, fall back to simple string check
+            return e.message.includes('401');
+        }
+    }
+    return false;
+}
+export class AuthenticatedContentGenerator {
+    generator;
+    config;
+    constructor(generator, config) {
+        this.generator = generator;
+        this.config = config;
+    }
+    async generateContent(request, userPromptId) {
+        try {
+            return await this.generator.generateContent(request, userPromptId);
+        }
+        catch (e) {
+            if (isAuthError(e)) {
+                await this.refreshToken();
+                return await this.generator.generateContent(request, userPromptId);
+            }
+            throw e;
+        }
+    }
+    async generateContentStream(request, userPromptId) {
+        try {
+            return await this.generator.generateContentStream(request, userPromptId);
+        }
+        catch (e) {
+            if (isAuthError(e)) {
+                await this.refreshToken();
+                return await this.generator.generateContentStream(request, userPromptId);
+            }
+            throw e;
+        }
+    }
+    async countTokens(request) {
+        try {
+            return await this.generator.countTokens(request);
+        }
+        catch (e) {
+            if (isAuthError(e)) {
+                await this.refreshToken();
+                return await this.generator.countTokens(request);
+            }
+            throw e;
+        }
+    }
+    async embedContent(request) {
+        try {
+            return await this.generator.embedContent(request);
+        }
+        catch (e) {
+            if (isAuthError(e)) {
+                await this.refreshToken();
+                return await this.generator.embedContent(request);
+            }
+            throw e;
+        }
+    }
+    async refreshToken() {
+        const provider = new AuthProviderKeycloak();
+        // First, try to refresh silently.
+        let token = await provider.forceRefreshToken();
+        // If silent refresh fails, try the full authentication flow which may be interactive.
+        if (!token) {
+            token = await provider.getToken();
+        }
+        // If we still don't have a token, then we must fail.
+        if (!token) {
+            throw new Error('Authentication failed. Unable to get a new token.');
+        }
+        // Re-create the underlying generator with the new token to avoid recursive wrapping.
+        const httpOptions = {};
+        if (token) {
+            httpOptions.headers = { Authorization: `Bearer ${token}` };
+        }
+        const googleGenAI = new GoogleGenAI({
+            apiKey: 'dummy',
+            httpOptions,
+        });
+        this.generator = new LoggingContentGenerator(googleGenAI.models, this.config);
+    }
+    get userTier() {
+        return this.generator.userTier;
+    }
+}
+//# sourceMappingURL=AuthenticatedContentGenerator.js.map

package/dist/src/core/AuthenticatedContentGenerator.js.map

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

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

@@ -3,7 +3,7 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import type { Content, Part } from '@google/genai';
+import type { Content, Part, GenerateContentResponse } from '@google/genai';
 import type { Config } from '../config/config.js';
 import type { ContentGenerator } from './contentGenerator.js';
 import type { ModelConfigKey } from '../services/modelConfigService.js';
@@ -33,6 +33,30 @@ export interface GenerateJsonOptions {
      */
     maxAttempts?: number;
 }
+/**
+ * Options for the generateContent utility function.
+ */
+export interface GenerateContentOptions {
+    /** The desired model config. */
+    modelConfigKey: ModelConfigKey;
+    /** The input prompt or history. */
+    contents: Content[];
+    /**
+     * Task-specific system instructions.
+     * If omitted, no system instruction is sent.
+     */
+    systemInstruction?: string | Part | Part[] | Content;
+    /** Signal for cancellation. */
+    abortSignal: AbortSignal;
+    /**
+     * A unique ID for the prompt, used for logging/telemetry correlation.
+     */
+    promptId: string;
+    /**
+     * The maximum number of attempts for the request.
+     */
+    maxAttempts?: number;
+}
 /**
  * A client dedicated to stateless, utility-focused LLM calls.
  */
@@ -43,4 +67,6 @@ export declare class BaseLlmClient {
     generateJson(options: GenerateJsonOptions): Promise<Record<string, unknown>>;
     generateEmbedding(texts: string[]): Promise<number[][]>;
     private cleanJsonResponse;
+    generateContent(options: GenerateContentOptions): Promise<GenerateContentResponse>;
+    private _generateWithRetry;
 }

package/dist/src/core/baseLlmClient.js

@@ -21,55 +21,35 @@ export class BaseLlmClient {
         this.config = config;
     }
     async generateJson(options) {
-        const { modelConfigKey, contents, schema, abortSignal, systemInstruction, promptId, maxAttempts, } = options;
+        const { schema, modelConfigKey, contents, systemInstruction, abortSignal, promptId, maxAttempts, } = options;
         const { model, generateContentConfig } = this.config.modelConfigService.getResolvedConfig(modelConfigKey);
-        const requestConfig = {
-            abortSignal,
-            ...generateContentConfig,
-            ...(systemInstruction && { systemInstruction }),
-            responseJsonSchema: schema,
-            responseMimeType: 'application/json',
-        };
-        try {
-            const apiCall = () => this.contentGenerator.generateContent({
-                model,
-                config: requestConfig,
-                contents,
-            }, promptId);
-            const shouldRetryOnContent = (response) => {
-                const text = getResponseText(response)?.trim();
-                if (!text) {
-                    return true; // Retry on empty response
-                }
-                try {
-                    JSON.parse(this.cleanJsonResponse(text, model));
-                    return false;
-                }
-                catch (_e) {
-                    return true;
-                }
-            };
-            const result = await retryWithBackoff(apiCall, {
-                shouldRetryOnContent,
-                maxAttempts: maxAttempts ?? DEFAULT_MAX_ATTEMPTS,
-            });
-            // If we are here, the content is valid (not empty and parsable).
-            return JSON.parse(this.cleanJsonResponse(getResponseText(result).trim(), model));
-        }
-        catch (error) {
-            if (abortSignal.aborted) {
-                throw error;
+        const shouldRetryOnContent = (response) => {
+            const text = getResponseText(response)?.trim();
+            if (!text) {
+                return true; // Retry on empty response
             }
-            // Check if the error is from exhausting retries, and report accordingly.
-            if (error instanceof Error &&
-                error.message.includes('Retry attempts exhausted')) {
-                await reportError(error, 'API returned invalid content (empty or unparsable JSON) after all retries.', contents, 'generateJson-invalid-content');
+            try {
+                // We don't use the result, just check if it's valid JSON
+                JSON.parse(this.cleanJsonResponse(text, model));
+                return false; // It's valid, don't retry
             }
-            else {
-                await reportError(error, 'Error generating JSON content via API.', contents, 'generateJson-api');
+            catch (_e) {
+                return true; // It's not valid, retry
             }
-            throw new Error(`Failed to generate JSON content: ${getErrorMessage(error)}`);
-        }
+        };
+        const result = await this._generateWithRetry({
+            model,
+            contents,
+            config: {
+                ...generateContentConfig,
+                ...(systemInstruction && { systemInstruction }),
+                responseJsonSchema: schema,
+                responseMimeType: 'application/json',
+                abortSignal,
+            },
+        }, promptId, maxAttempts, shouldRetryOnContent, 'generateJson');
+        // If we are here, the content is valid (not empty and parsable).
+        return JSON.parse(this.cleanJsonResponse(getResponseText(result).trim(), model));
     }
     async generateEmbedding(texts) {
         if (!texts || texts.length === 0) {
@@ -104,5 +84,46 @@ export class BaseLlmClient {
         }
         return text;
     }
+    async generateContent(options) {
+        const { modelConfigKey, contents, systemInstruction, abortSignal, promptId, maxAttempts, } = options;
+        const { model, generateContentConfig } = this.config.modelConfigService.getResolvedConfig(modelConfigKey);
+        const shouldRetryOnContent = (response) => {
+            const text = getResponseText(response)?.trim();
+            return !text; // Retry on empty response
+        };
+        return this._generateWithRetry({
+            model,
+            contents,
+            config: {
+                ...generateContentConfig,
+                ...(systemInstruction && { systemInstruction }),
+                abortSignal,
+            },
+        }, promptId, maxAttempts, shouldRetryOnContent, 'generateContent');
+    }
+    async _generateWithRetry(requestParams, promptId, maxAttempts, shouldRetryOnContent, errorContext) {
+        const abortSignal = requestParams.config?.abortSignal;
+        try {
+            const apiCall = () => this.contentGenerator.generateContent(requestParams, promptId);
+            return await retryWithBackoff(apiCall, {
+                shouldRetryOnContent,
+                maxAttempts: maxAttempts ?? DEFAULT_MAX_ATTEMPTS,
+            });
+        }
+        catch (error) {
+            if (abortSignal?.aborted) {
+                throw error;
+            }
+            // Check if the error is from exhausting retries, and report accordingly.
+            if (error instanceof Error &&
+                error.message.includes('Retry attempts exhausted')) {
+                await reportError(error, `API returned invalid content after all retries.`, requestParams.contents, `${errorContext}-invalid-content`);
+            }
+            else {
+                await reportError(error, `Error generating content via API.`, requestParams.contents, `${errorContext}-api`);
+            }
+            throw new Error(`Failed to generate content: ${getErrorMessage(error)}`);
+        }
+    }
 }
 //# sourceMappingURL=baseLlmClient.js.map

package/dist/src/core/baseLlmClient.js.map

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