@office-ai/aioncli-core 0.18.7 → 0.24.0

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

@@ -3,10 +3,12 @@
  * 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';
+import { debugLogger } from '../utils/debugLogger.js';
 export class MessageBus extends EventEmitter {
     policyEngine;
     debug;
@@ -31,7 +33,7 @@ export class MessageBus extends EventEmitter {
     }
     async publish(message) {
         if (this.debug) {
-            console.debug(`[MESSAGE_BUS] publish: ${safeJsonStringify(message)}`);
+            debugLogger.debug(`[MESSAGE_BUS] publish: ${safeJsonStringify(message)}`);
         }
         try {
             if (!this.isValidMessage(message)) {
@@ -68,6 +70,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 +115,36 @@ 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
+            // eslint-disable-next-line @typescript-eslint/no-floating-promises
+            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;
@@ -31,6 +34,10 @@ export interface ToolConfirmationResponse {
 export interface UpdatePolicy {
     type: MessageBusType.UPDATE_POLICY;
     toolName: string;
+    persist?: boolean;
+    argsPattern?: string;
+    commandPrefix?: string | string[];
+    mcpName?: string;
 }
 export interface ToolPolicyRejection {
     type: MessageBusType.TOOL_POLICY_REJECTION;
@@ -46,4 +53,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/baseLlmClient.d.ts

@@ -3,9 +3,10 @@
  * 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 { AuthType } from './contentGenerator.js';
 import type { ModelConfigKey } from '../services/modelConfigService.js';
 /**
  * Options for the generateJson utility function.
@@ -33,13 +34,38 @@ 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.
  */
 export declare class BaseLlmClient {
     private readonly contentGenerator;
     private readonly config;
-    constructor(contentGenerator: ContentGenerator, config: Config);
+    private readonly authType?;
+    constructor(contentGenerator: ContentGenerator, config: Config, authType?: AuthType | undefined);
     generateJson(options: GenerateJsonOptions): Promise<Record<string, unknown>>;
     /**
      * OpenAI-specific implementation using function calling instead of responseJsonSchema
@@ -47,4 +73,6 @@ export declare class BaseLlmClient {
     private generateJsonForOpenAI;
     generateEmbedding(texts: string[]): Promise<number[][]>;
     private cleanJsonResponse;
+    generateContent(options: GenerateContentOptions): Promise<GenerateContentResponse>;
+    private _generateWithRetry;
 }

package/dist/src/core/baseLlmClient.js

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { AuthType } from './contentGenerator.js';
+import { handleFallback } from '../fallback/handler.js';
 import { getResponseText } from '../utils/partUtils.js';
 import { reportError } from '../utils/errorReporting.js';
 import { getErrorMessage } from '../utils/errors.js';
@@ -11,6 +12,7 @@ import { logMalformedJsonResponse } from '../telemetry/loggers.js';
 import { MalformedJsonResponseEvent } from '../telemetry/types.js';
 import { retryWithBackoff } from '../utils/retry.js';
 import { getFunctionCalls } from '../utils/generateContentResponseUtilities.js';
+import { applyModelSelection, createAvailabilityContextProvider, } from '../availability/policyHelpers.js';
 const DEFAULT_MAX_ATTEMPTS = 5;
 /**
  * A client dedicated to stateless, utility-focused LLM calls.
@@ -18,67 +20,49 @@ const DEFAULT_MAX_ATTEMPTS = 5;
 export class BaseLlmClient {
     contentGenerator;
     config;
-    constructor(contentGenerator, config) {
+    authType;
+    constructor(contentGenerator, config, authType) {
         this.contentGenerator = contentGenerator;
         this.config = config;
+        this.authType = authType;
     }
     async generateJson(options) {
-        const { modelConfigKey, contents, schema, abortSignal, systemInstruction, promptId, maxAttempts, } = options;
+        const { schema, modelConfigKey, contents, systemInstruction, abortSignal, promptId, maxAttempts, } = options;
         // Check if using OpenAI authType
         const authType = this.config.getContentGeneratorConfig()?.authType;
-        const isOpenAI = authType === AuthType.USE_OPENAI;
-        if (isOpenAI) {
+        if (authType === AuthType.USE_OPENAI) {
             return this.generateJsonForOpenAI(options);
         }
         // Standard Gemini implementation
-        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 { model } = this.config.modelConfigService.getResolvedConfig(modelConfigKey);
+        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({
+            modelConfigKey,
+            contents,
+            abortSignal,
+            promptId,
+            maxAttempts,
+            systemInstruction,
+            additionalProperties: {
+                responseJsonSchema: schema,
+                responseMimeType: 'application/json',
+            },
+        }, shouldRetryOnContent, 'generateJson');
+        // If we are here, the content is valid (not empty and parsable).
+        return JSON.parse(this.cleanJsonResponse(getResponseText(result).trim(), model));
     }
     /**
      * OpenAI-specific implementation using function calling instead of responseJsonSchema
@@ -181,5 +165,79 @@ export class BaseLlmClient {
         }
         return text;
     }
+    async generateContent(options) {
+        const { modelConfigKey, contents, systemInstruction, abortSignal, promptId, maxAttempts, } = options;
+        const shouldRetryOnContent = (response) => {
+            const text = getResponseText(response)?.trim();
+            return !text; // Retry on empty response
+        };
+        return this._generateWithRetry({
+            modelConfigKey,
+            contents,
+            systemInstruction,
+            abortSignal,
+            promptId,
+            maxAttempts,
+        }, shouldRetryOnContent, 'generateContent');
+    }
+    async _generateWithRetry(options, shouldRetryOnContent, errorContext) {
+        const { modelConfigKey, contents, systemInstruction, abortSignal, promptId, maxAttempts, additionalProperties, } = options;
+        const { model, config: generateContentConfig, maxAttempts: availabilityMaxAttempts, } = applyModelSelection(this.config, modelConfigKey);
+        let currentModel = model;
+        let currentGenerateContentConfig = generateContentConfig;
+        // Define callback to fetch context dynamically since active model may get updated during retry loop
+        const getAvailabilityContext = createAvailabilityContextProvider(this.config, () => currentModel);
+        try {
+            const apiCall = () => {
+                // Ensure we use the current active model
+                // in case a fallback occurred in a previous attempt.
+                const activeModel = this.config.getActiveModel();
+                if (activeModel !== currentModel) {
+                    currentModel = activeModel;
+                    // Re-resolve config if model changed during retry
+                    const { generateContentConfig } = this.config.modelConfigService.getResolvedConfig({
+                        ...modelConfigKey,
+                        model: activeModel,
+                    });
+                    currentGenerateContentConfig = generateContentConfig;
+                }
+                const finalConfig = {
+                    ...currentGenerateContentConfig,
+                    ...(systemInstruction && { systemInstruction }),
+                    ...additionalProperties,
+                    abortSignal,
+                };
+                const requestParams = {
+                    model: currentModel,
+                    config: finalConfig,
+                    contents,
+                };
+                return this.contentGenerator.generateContent(requestParams, promptId);
+            };
+            return await retryWithBackoff(apiCall, {
+                shouldRetryOnContent,
+                maxAttempts: availabilityMaxAttempts ?? maxAttempts ?? DEFAULT_MAX_ATTEMPTS,
+                getAvailabilityContext,
+                onPersistent429: this.config.isInteractive()
+                    ? (authType, error) => handleFallback(this.config, currentModel, authType, error)
+                    : undefined,
+                authType: this.authType ?? this.config.getContentGeneratorConfig()?.authType,
+            });
+        }
+        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.`, contents, `${errorContext}-invalid-content`);
+            }
+            else {
+                await reportError(error, `Error generating content via API.`, 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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"}