@equinor/fusion-framework-cli-plugin-ai-base 2.0.1 → 3.0.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @equinor/fusion-framework-cli-plugin-ai-base
 
+## 3.0.0
+
+### Major Changes
+
+- ece8f42: **BREAKING:** Replace Azure API key options with Fusion service discovery options.
+
+  CLI options now use `--env`, `--token`, `--tenant-id`, `--client-id`, `--chat-model`, `--embed-model`, and `--index-name` instead of `--openai-api-key`, `--openai-instance`, `--azure-search-endpoint`, etc. The `setupFramework` function bootstraps MSAL authentication and resolves the AI service endpoint via Fusion service discovery.
+
+  Ref: https://github.com/equinor/fusion-framework/issues/1008
+
+### Patch Changes
+
+- Updated dependencies [ece8f42]
+- Updated dependencies [ece8f42]
+  - @equinor/fusion-framework-module-ai@4.0.0
+
 ## 2.0.1
 
 ### Patch Changes

package/README.md

@@ -11,10 +11,9 @@ logic from this package.
 
 ## Who should use this
 
-Authors of **new Fusion CLI AI plugins** that need the same Azure OpenAI /
-Azure Cognitive Search options and framework setup that the existing plugins
-share. If you are building a Fusion application, use the published CLI
-plugins directly.
+Authors of **new Fusion CLI AI plugins** that need the same Fusion service
+discovery options and framework setup that the existing plugins share. If you
+are building a Fusion application, use the published CLI plugins directly.
 
 ## Quick start
 
@@ -45,7 +44,7 @@ import {
 const myCommand = createCommand('my-task')
   .description('Run my custom AI task');
 
-// Attach core + chat + embedding options and pre-action validation
+// Attach core auth + chat + embedding options and pre-action validation
 withOptions(myCommand, { includeChat: true, includeEmbedding: true });
 
 myCommand.action(async (options: AiOptions) => {
@@ -61,16 +60,10 @@ export const register = (program: Command) =>
 ### 3. Load a configuration file (optional)
 
 ```ts
-import {
-  loadFusionAIConfig,
-  configureFusionAI,
-} from '@equinor/fusion-framework-cli-plugin-ai-base';
+import { loadFusionAIConfig } from '@equinor/fusion-framework-cli-plugin-ai-base';
 
-// fusion-ai.config.ts
-export default configureFusionAI(async () => ({
-  apiKey: process.env.OPENAI_API_KEY,
-  deployment: 'gpt-4',
-}));
+// fusion-ai.config.ts — export a default configuration object
+export default { includes: ['./src/**/*.ts'] };
 
 // at runtime
 const config = await loadFusionAIConfig('fusion-ai.config', {
@@ -91,7 +84,7 @@ The package exposes two entry points:
 
 | Export | Kind | Description |
 |---|---|---|
-| `setupFramework` | function | Initialise the Fusion Framework with Azure OpenAI chat, embedding, and vector-store modules |
+| `setupFramework` | function | Initialise the Fusion Framework with AI module, MSAL auth, and service discovery |
 | `registerAiPlugin` | function | Register a Commander sub-command under the shared `ai` command group |
 | `loadFusionAIConfig` | function | Locate and import a `fusion-ai.config.{ts,mjs,js,json}` file |
 | `configureFusionAI` | function | Type-safe factory for writing configuration files |
@@ -116,14 +109,13 @@ without explicit flags.
 
 | Flag | Environment variable | Required | Default |
 |---|---|---|---|
-| `--openai-api-key` | `AZURE_OPENAI_API_KEY` | Yes | — |
-| `--openai-api-version` | `AZURE_OPENAI_API_VERSION` | Yes | `2024-02-15-preview` |
-| `--openai-instance` | `AZURE_OPENAI_INSTANCE_NAME` | Yes | — |
-| `--openai-chat-deployment` | `AZURE_OPENAI_CHAT_DEPLOYMENT_NAME` | When chat is enabled | — |
-| `--openai-embedding-deployment` | `AZURE_OPENAI_EMBEDDING_DEPLOYMENT_NAME` | When embedding is enabled | — |
-| `--azure-search-endpoint` | `AZURE_SEARCH_ENDPOINT` | When search is enabled | — |
-| `--azure-search-api-key` | `AZURE_SEARCH_API_KEY` | When search is enabled | — |
-| `--azure-search-index-name` | `AZURE_SEARCH_INDEX_NAME` | When search is enabled | — |
+| `--env` | `FUSION_ENV` | No | `ci` |
+| `--token` | `FUSION_TOKEN` | No | — (MSAL interactive login) |
+| `--tenant-id` | `FUSION_TENANT_ID` | No | Equinor default |
+| `--client-id` | `FUSION_CLIENT_ID` | No | Fusion CLI default |
+| `--chat-model` | `FUSION_AI_CHAT_MODEL` | When chat is enabled | `gpt-5.1-chat` |
+| `--embed-model` | `FUSION_AI_EMBED_MODEL` | When embedding is enabled | `text-embedding-3-large` |
+| `--index-name` | `FUSION_AI_INDEX_NAME` | When search is enabled | — |
 
 ## Key concepts
 
@@ -142,9 +134,9 @@ that includes the corresponding environment variable name.
 
 ### Framework bootstrap
 
-`setupFramework` creates a `ModulesConfigurator`, enables the AI module, and
-conditionally registers chat models, embedding models, and an Azure Cognitive
-Search vector store based on which options are present. The returned
+`setupFramework` creates a Fusion Framework instance with MSAL authentication,
+service discovery, and the AI module. It registers strategy-based model, embed,
+and index providers resolved through Fusion's AI service. The returned
 `FrameworkInstance` is ready for downstream use.
 
 ## Consuming plugins

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAGL,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,cAAc,EAAqB,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAGL,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,cAAc,EAA0B,MAAM,sBAAsB,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC"}

package/dist/esm/options/options.js

@@ -1,90 +1,42 @@
 import { createOption } from 'commander';
-/**
- * Commander option for the Azure OpenAI API key (`--openai-api-key`).
- *
- * @remarks
- * Required for all Azure OpenAI operations. Falls back to the
- * `AZURE_OPENAI_API_KEY` environment variable when the flag is omitted.
- */
-export const apiKeyOption = createOption('--openai-api-key <key>', 'API key for Azure OpenAI services').env('AZURE_OPENAI_API_KEY');
-/**
- * Commander option for the Azure OpenAI API version (`--openai-api-version`).
- *
- * @remarks
- * Defaults to `2024-02-15-preview`. Falls back to the
- * `AZURE_OPENAI_API_VERSION` environment variable when the flag is omitted.
- */
-export const apiVersionOption = createOption('--openai-api-version <version>', 'Azure OpenAI API version')
-    .env('AZURE_OPENAI_API_VERSION')
-    .default('2024-02-15-preview');
-/**
- * Commander option for the Azure OpenAI instance name (`--openai-instance`).
- *
- * @remarks
- * Required for constructing the Azure OpenAI service endpoint. Falls back to
- * the `AZURE_OPENAI_INSTANCE_NAME` environment variable when the flag is omitted.
- */
-export const apiInstanceOption = createOption('--openai-instance <name>', 'Azure OpenAI instance name').env('AZURE_OPENAI_INSTANCE_NAME');
-/**
- * Commander option for the Azure OpenAI chat deployment (`--openai-chat-deployment`).
- *
- * @remarks
- * Required for chat-completion operations. Falls back to the
- * `AZURE_OPENAI_CHAT_DEPLOYMENT_NAME` environment variable when the flag is omitted.
- * Only added to a command when `withOptions` is called with `includeChat: true`.
- */
-export const chatDeploymentOption = createOption('--openai-chat-deployment <name>', 'Azure OpenAI chat deployment name').env('AZURE_OPENAI_CHAT_DEPLOYMENT_NAME');
-/**
- * Commander option for the Azure OpenAI embedding deployment (`--openai-embedding-deployment`).
- *
- * @remarks
- * Required for embedding and vector-search operations. Falls back to the
- * `AZURE_OPENAI_EMBEDDING_DEPLOYMENT_NAME` environment variable when the flag is omitted.
- * Only added to a command when `withOptions` is called with `includeEmbedding: true`.
- */
-export const embeddingDeploymentOption = createOption('--openai-embedding-deployment <name>', 'Azure OpenAI embedding deployment name').env('AZURE_OPENAI_EMBEDDING_DEPLOYMENT_NAME');
-/**
- * Commander option for the Azure Cognitive Search endpoint (`--azure-search-endpoint`).
- *
- * @remarks
- * Required for vector-search operations. Falls back to the
- * `AZURE_SEARCH_ENDPOINT` environment variable when the flag is omitted.
- * Only added to a command when `withOptions` is called with `includeSearch: true`.
- */
-export const azureSearchEndpointOption = createOption('--azure-search-endpoint <url>', 'Azure Search endpoint URL').env('AZURE_SEARCH_ENDPOINT');
-/**
- * Commander option for the Azure Cognitive Search API key (`--azure-search-api-key`).
- *
- * @remarks
- * Required for authenticating with Azure Cognitive Search. Falls back to the
- * `AZURE_SEARCH_API_KEY` environment variable when the flag is omitted.
- * Only added to a command when `withOptions` is called with `includeSearch: true`.
- */
-export const azureSearchApiKeyOption = createOption('--azure-search-api-key <key>', 'Azure Search API key').env('AZURE_SEARCH_API_KEY');
-/**
- * Commander option for the Azure Cognitive Search index name (`--azure-search-index-name`).
- *
- * @remarks
- * Identifies the target search index to query or write to. Falls back to the
- * `AZURE_SEARCH_INDEX_NAME` environment variable when the flag is omitted.
- * Only added to a command when `withOptions` is called with `includeSearch: true`.
- */
-export const azureSearchIndexNameOption = createOption('--azure-search-index-name <name>', 'Azure Search index name').env('AZURE_SEARCH_INDEX_NAME');
-/**
- * All AI-related Commander option definitions as a single object.
- *
- * @remarks
- * Use this default export for convenient bulk access when you need every option.
- * For selective inclusion prefer importing the named constants directly.
- */
+// Default Fusion AAD identifiers (same defaults as the CLI's auth options)
+const DEFAULT_TENANT_ID = '3aa4a235-b6e2-48d5-9195-7fcf05b459b0';
+const DEFAULT_CLIENT_ID = 'a318b8e1-0295-4e17-98d5-35f67dfeba14';
+const DEFAULT_MODEL_CHAT = 'gpt-5.1-chat';
+const DEFAULT_MODEL_EMBED = 'text-embedding-3-large';
+/** `--env` | `FUSION_ENV` — Fusion environment for service discovery */
+export const envOption = createOption('--env <env>', 'Fusion environment for service discovery')
+    .env('FUSION_ENV')
+    .default('ci');
+/** `--token` | `FUSION_TOKEN` — explicit bearer token */
+export const tokenOption = createOption('--token <token>', 'Azure AD bearer token (skips interactive/silent MSAL auth)')
+    .env('FUSION_TOKEN')
+    .default(undefined);
+/** `--tenant-id` | `FUSION_TENANT_ID` */
+export const tenantIdOption = createOption('--tenant-id <id>', 'Azure AD tenant ID')
+    .env('FUSION_TENANT_ID')
+    .default(DEFAULT_TENANT_ID);
+/** `--client-id` | `FUSION_CLIENT_ID` */
+export const clientIdOption = createOption('--client-id <id>', 'Azure AD application client ID')
+    .env('FUSION_CLIENT_ID')
+    .default(DEFAULT_CLIENT_ID);
+/** `--chat-model` | `FUSION_AI_CHAT_MODEL` */
+export const chatModelOption = createOption('--chat-model <name>', 'Azure OpenAI chat model deployment name')
+    .env('FUSION_AI_CHAT_MODEL')
+    .default(DEFAULT_MODEL_CHAT);
+/** `--embed-model` | `FUSION_AI_EMBED_MODEL` */
+export const embedModelOption = createOption('--embed-model <name>', 'Azure OpenAI embedding model deployment name')
+    .env('FUSION_AI_EMBED_MODEL')
+    .default(DEFAULT_MODEL_EMBED);
+/** `--index-name` | `FUSION_AI_INDEX_NAME` */
+export const indexNameOption = createOption('--index-name <name>', 'Azure AI Search index name').env('FUSION_AI_INDEX_NAME');
 export default {
-    apiKeyOption,
-    apiVersionOption,
-    apiInstanceOption,
-    chatDeploymentOption,
-    embeddingDeploymentOption,
-    azureSearchEndpointOption,
-    azureSearchApiKeyOption,
-    azureSearchIndexNameOption,
+    envOption,
+    tokenOption,
+    tenantIdOption,
+    clientIdOption,
+    chatModelOption,
+    embedModelOption,
+    indexNameOption,
 };
 //# sourceMappingURL=options.js.map

package/dist/esm/options/options.js.map

@@ -1 +1 @@
-{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../src/options/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,YAAY,CACtC,wBAAwB,EACxB,mCAAmC,CACpC,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;AAE9B;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,YAAY,CAC1C,gCAAgC,EAChC,0BAA0B,CAC3B;KACE,GAAG,CAAC,0BAA0B,CAAC;KAC/B,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAEjC;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,YAAY,CAC3C,0BAA0B,EAC1B,4BAA4B,CAC7B,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;AAEpC;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,YAAY,CAC9C,iCAAiC,EACjC,mCAAmC,CACpC,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;AAE3C;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,YAAY,CACnD,sCAAsC,EACtC,wCAAwC,CACzC,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;AAEhD;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,YAAY,CACnD,+BAA+B,EAC/B,2BAA2B,CAC5B,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;AAE/B;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,YAAY,CACjD,8BAA8B,EAC9B,sBAAsB,CACvB,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;AAE9B;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,YAAY,CACpD,kCAAkC,EAClC,yBAAyB,CAC1B,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;AAEjC;;;;;;GAMG;AACH,eAAe;IACb,YAAY;IACZ,gBAAgB;IAChB,iBAAiB;IACjB,oBAAoB;IACpB,yBAAyB;IACzB,yBAAyB;IACzB,uBAAuB;IACvB,0BAA0B;CAC3B,CAAC"}
+{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../src/options/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC,2EAA2E;AAC3E,MAAM,iBAAiB,GAAG,sCAA+C,CAAC;AAC1E,MAAM,iBAAiB,GAAG,sCAA+C,CAAC;AAC1E,MAAM,kBAAkB,GAAG,cAAuB,CAAC;AACnD,MAAM,mBAAmB,GAAG,wBAAiC,CAAC;AAE9D,wEAAwE;AACxE,MAAM,CAAC,MAAM,SAAS,GAAG,YAAY,CAAC,aAAa,EAAE,0CAA0C,CAAC;KAC7F,GAAG,CAAC,YAAY,CAAC;KACjB,OAAO,CAAC,IAAI,CAAC,CAAC;AAEjB,yDAAyD;AACzD,MAAM,CAAC,MAAM,WAAW,GAAG,YAAY,CACrC,iBAAiB,EACjB,4DAA4D,CAC7D;KACE,GAAG,CAAC,cAAc,CAAC;KACnB,OAAO,CAAC,SAAS,CAAC,CAAC;AAEtB,yCAAyC;AACzC,MAAM,CAAC,MAAM,cAAc,GAAG,YAAY,CAAC,kBAAkB,EAAE,oBAAoB,CAAC;KACjF,GAAG,CAAC,kBAAkB,CAAC;KACvB,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAE9B,yCAAyC;AACzC,MAAM,CAAC,MAAM,cAAc,GAAG,YAAY,CAAC,kBAAkB,EAAE,gCAAgC,CAAC;KAC7F,GAAG,CAAC,kBAAkB,CAAC;KACvB,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAE9B,8CAA8C;AAC9C,MAAM,CAAC,MAAM,eAAe,GAAG,YAAY,CACzC,qBAAqB,EACrB,yCAAyC,CAC1C;KACE,GAAG,CAAC,sBAAsB,CAAC;KAC3B,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAE/B,gDAAgD;AAChD,MAAM,CAAC,MAAM,gBAAgB,GAAG,YAAY,CAC1C,sBAAsB,EACtB,8CAA8C,CAC/C;KACE,GAAG,CAAC,uBAAuB,CAAC;KAC5B,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAEhC,8CAA8C;AAC9C,MAAM,CAAC,MAAM,eAAe,GAAG,YAAY,CACzC,qBAAqB,EACrB,4BAA4B,CAC7B,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;AAE9B,eAAe;IACb,SAAS;IACT,WAAW;IACX,cAAc;IACd,cAAc;IACd,eAAe;IACf,gBAAgB;IAChB,eAAe;CAChB,CAAC"}

package/dist/esm/options/schema.js

@@ -1,67 +1,25 @@
-/**
- * Zod validation schema and inferred type for AI command options.
- *
- * @packageDocumentation
- */
 import z from 'zod';
 /**
- * Base Zod schema for AI-related command options.
+ * Base Zod schema for Fusion AI command options.
  *
- * This schema defines the validation rules for all AI options. Other AI plugins
- * can extend this schema to add their own command-specific options.
+ * All fields are optional — when omitted the service URL and token are
+ * resolved automatically from Fusion service discovery and MSAL auth.
  *
  * @example
  * ```ts
- * import { AiOptionsSchema } from '@equinor/fusion-framework-cli-plugin-ai-base';
- * import { z } from 'zod';
- *
- * const MyCommandOptionsSchema = AiOptionsSchema.extend({
- *   myOption: z.string(),
- * });
+ * import { AiOptionsSchema } from '@equinor/fusion-framework-cli-plugin-ai-base/command-options';
+ * const MySchema = AiOptionsSchema.extend({ extra: z.string() });
  * ```
  */
 export const AiOptionsSchema = z
     .object({
-    // Required AI options
-    openaiApiKey: z
-        .string({ message: 'Azure OpenAI API key is required and must be a non-empty string.' })
-        .min(1, 'API key must be a non-empty string.')
-        .describe('Azure OpenAI API key for authentication'),
-    openaiApiVersion: z
-        .string({ message: 'Azure OpenAI API version is required and must be a non-empty string.' })
-        .min(1, 'API version must be a non-empty string.')
-        .describe('Azure OpenAI API version'),
-    openaiInstance: z
-        .string({ message: 'Azure OpenAI instance name is required and must be a non-empty string.' })
-        .min(1, 'Instance name must be a non-empty string.')
-        .describe('Azure OpenAI instance name'),
-    // Optional AI options
-    openaiChatDeployment: z
-        .string()
-        .min(1, 'Chat deployment name must be a non-empty string.')
-        .optional()
-        .describe('Azure OpenAI chat deployment name'),
-    openaiEmbeddingDeployment: z
-        .string()
-        .min(1, 'Embedding deployment name must be a non-empty string.')
-        .optional()
-        .describe('Azure OpenAI embedding deployment name'),
-    azureSearchEndpoint: z
-        .string()
-        .url('Azure Search endpoint must be a valid URL.')
-        .min(1, 'Azure Search endpoint must be a non-empty string.')
-        .optional()
-        .describe('Azure Search endpoint URL'),
-    azureSearchApiKey: z
-        .string()
-        .min(1, 'Azure Search API key must be a non-empty string.')
-        .optional()
-        .describe('Azure Search API key'),
-    azureSearchIndexName: z
-        .string()
-        .min(1, 'Azure Search index name must be a non-empty string.')
-        .optional()
-        .describe('Azure Search index name'),
+    env: z.string().optional(),
+    token: z.string().optional(),
+    tenantId: z.string().optional(),
+    clientId: z.string().optional(),
+    chatModel: z.string().min(1).optional(),
+    embedModel: z.string().min(1).optional(),
+    indexName: z.string().min(1).optional(),
 })
-    .describe('Base AI-related command options');
+    .describe('Base Fusion AI command options');
 //# sourceMappingURL=schema.js.map

package/dist/esm/options/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/options/schema.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,CAAC,MAAM,KAAK,CAAC;AAEpB;;;;;;;;;;;;;;;GAeG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC;KAC7B,MAAM,CAAC;IACN,sBAAsB;IACtB,YAAY,EAAE,CAAC;SACZ,MAAM,CAAC,EAAE,OAAO,EAAE,kEAAkE,EAAE,CAAC;SACvF,GAAG,CAAC,CAAC,EAAE,qCAAqC,CAAC;SAC7C,QAAQ,CAAC,yCAAyC,CAAC;IACtD,gBAAgB,EAAE,CAAC;SAChB,MAAM,CAAC,EAAE,OAAO,EAAE,sEAAsE,EAAE,CAAC;SAC3F,GAAG,CAAC,CAAC,EAAE,yCAAyC,CAAC;SACjD,QAAQ,CAAC,0BAA0B,CAAC;IACvC,cAAc,EAAE,CAAC;SACd,MAAM,CAAC,EAAE,OAAO,EAAE,wEAAwE,EAAE,CAAC;SAC7F,GAAG,CAAC,CAAC,EAAE,2CAA2C,CAAC;SACnD,QAAQ,CAAC,4BAA4B,CAAC;IAEzC,sBAAsB;IACtB,oBAAoB,EAAE,CAAC;SACpB,MAAM,EAAE;SACR,GAAG,CAAC,CAAC,EAAE,kDAAkD,CAAC;SAC1D,QAAQ,EAAE;SACV,QAAQ,CAAC,mCAAmC,CAAC;IAChD,yBAAyB,EAAE,CAAC;SACzB,MAAM,EAAE;SACR,GAAG,CAAC,CAAC,EAAE,uDAAuD,CAAC;SAC/D,QAAQ,EAAE;SACV,QAAQ,CAAC,wCAAwC,CAAC;IACrD,mBAAmB,EAAE,CAAC;SACnB,MAAM,EAAE;SACR,GAAG,CAAC,4CAA4C,CAAC;SACjD,GAAG,CAAC,CAAC,EAAE,mDAAmD,CAAC;SAC3D,QAAQ,EAAE;SACV,QAAQ,CAAC,2BAA2B,CAAC;IACxC,iBAAiB,EAAE,CAAC;SACjB,MAAM,EAAE;SACR,GAAG,CAAC,CAAC,EAAE,kDAAkD,CAAC;SAC1D,QAAQ,EAAE;SACV,QAAQ,CAAC,sBAAsB,CAAC;IACnC,oBAAoB,EAAE,CAAC;SACpB,MAAM,EAAE;SACR,GAAG,CAAC,CAAC,EAAE,qDAAqD,CAAC;SAC7D,QAAQ,EAAE;SACV,QAAQ,CAAC,yBAAyB,CAAC;CACvC,CAAC;KACD,QAAQ,CAAC,iCAAiC,CAAC,CAAC"}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/options/schema.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAC;AAEpB;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC;KAC7B,MAAM,CAAC;IACN,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC1B,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC/B,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC/B,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IACvC,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IACxC,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;CACxC,CAAC;KACD,QAAQ,CAAC,gCAAgC,CAAC,CAAC"}

package/dist/esm/options/types.js

@@ -1,11 +1,2 @@
-/**
- * Hand-authored TypeScript interface for AI CLI command options.
- *
- * @remarks
- * Use {@link AiOptions} when you need a lightweight type without pulling in Zod.
- * For runtime validation prefer {@link AiOptionsSchema} from the schema module.
- *
- * @packageDocumentation
- */
 export {};
 //# sourceMappingURL=types.js.map

package/dist/esm/options/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/options/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/options/types.ts"],"names":[],"mappings":""}

package/dist/esm/options/with-options.js

@@ -1,102 +1,43 @@
 import { InvalidOptionArgumentError } from 'commander';
-import { apiInstanceOption, apiKeyOption, apiVersionOption, azureSearchApiKeyOption, azureSearchEndpointOption, azureSearchIndexNameOption, chatDeploymentOption, embeddingDeploymentOption, } from './options.js';
+import { chatModelOption, clientIdOption, embedModelOption, envOption, indexNameOption, tenantIdOption, tokenOption, } from './options.js';
 /**
- * Enhances a Commander command with AI-related options and validation.
+ * Enhances a Commander command with Fusion AI options and validation.
  *
- * This function adds Azure OpenAI and Azure Cognitive Search options to the provided
- * command, along with pre-action validation hooks to ensure required options are provided.
- * The function allows selective inclusion of chat, embedding, and search capabilities
- * based on the command's requirements.
+ * Core auth options (`--env`, `--token`, `--tenant-id`, `--client-id`) are always
+ * added.  When no explicit `--token` is provided, the framework will authenticate
+ * via MSAL and resolve the AI service endpoint from Fusion service discovery.
  *
- * Options added:
- * - Core: `openaiApiKey`, `openaiApiVersion`, `openaiInstance` (always included)
- * - Chat: `openaiChatDeployment` (if includeChat is true)
- * - Embedding: `openaiEmbeddingDeployment` (if includeEmbedding is true)
- * - Search: `azureSearchEndpoint`, `azureSearchApiKey`, `azureSearchIndexName` (if includeSearch is true)
+ * Pass flags to include optional chat, embed, or index options and make
+ * them required at runtime via the `preAction` validation hook.
  *
- * @param command - The Commander command instance to enhance with AI options
- * @param args - Optional configuration object for selective feature inclusion
- * @param args.includeEmbedding - Whether to include and require embedding deployment option (default: false)
- * @param args.includeChat - Whether to include and require chat deployment option (default: false)
- * @param args.includeSearch - Whether to include and require Azure Search options (default: false)
- * @returns The enhanced command with AI options and validation hooks attached
- * @throws {InvalidOptionArgumentError} During command execution if required options are missing or invalid
- *
- * @example
- * ```ts
- * const chatCommand = createCommand('chat')
- *   .description('Start a chat session');
- *
- * withOptions(chatCommand, { includeChat: true });
- * ```
+ * @param command - The Commander command to decorate with options.
+ * @param args - Feature flags controlling which optional options to add.
+ * @param args.includeChat - Add `--chat-model` and validate it at runtime.
+ * @param args.includeEmbedding - Add `--embed-model` and validate it at runtime.
+ * @param args.includeSearch - Add `--index-name` and validate it at runtime.
+ * @returns The decorated command.
  */
 export const withOptions = (command, args) => {
-    // Core authentication options
-    command.addOption(apiKeyOption);
-    command.addOption(apiVersionOption);
-    command.addOption(apiInstanceOption);
-    // Deployment options
-    if (args?.includeChat === true) {
-        command.addOption(chatDeploymentOption);
-    }
-    if (args?.includeEmbedding === true) {
-        command.addOption(embeddingDeploymentOption);
-    }
-    // Azure Search options
-    if (args?.includeSearch === true) {
-        command.addOption(azureSearchEndpointOption);
-        command.addOption(azureSearchApiKeyOption);
-        command.addOption(azureSearchIndexNameOption);
-    }
-    // Validation hook
+    command.addOption(envOption);
+    command.addOption(tokenOption);
+    command.addOption(tenantIdOption);
+    command.addOption(clientIdOption);
+    if (args?.includeChat)
+        command.addOption(chatModelOption);
+    if (args?.includeEmbedding)
+        command.addOption(embedModelOption);
+    if (args?.includeSearch)
+        command.addOption(indexNameOption);
     command.hook('preAction', (thisCommand) => {
-        const options = thisCommand.opts();
-        // Validate API key
-        if (!options.openaiApiKey ||
-            typeof options.openaiApiKey !== 'string' ||
-            options.openaiApiKey.trim() === '') {
-            throw new InvalidOptionArgumentError('Azure OpenAI API key is required. Provide it via --openai-api-key option or AZURE_OPENAI_API_KEY environment variable.');
-        }
-        // Validate API version
-        if (!options.openaiApiVersion || typeof options.openaiApiVersion !== 'string') {
-            throw new InvalidOptionArgumentError('API version must be a non-empty string.');
-        }
-        // Validate instance name
-        if (!options.openaiInstance ||
-            typeof options.openaiInstance !== 'string' ||
-            options.openaiInstance.trim() === '') {
-            throw new InvalidOptionArgumentError('Azure OpenAI instance name is required. Provide it via --openai-instance option or AZURE_OPENAI_INSTANCE_NAME environment variable.');
-        }
-        if (args?.includeChat === true) {
-            if (!options.openaiChatDeployment ||
-                typeof options.openaiChatDeployment !== 'string' ||
-                options.openaiChatDeployment.trim() === '') {
-                throw new InvalidOptionArgumentError('Chat deployment name is required and must be a non-empty string.');
-            }
+        const opts = thisCommand.opts();
+        if (args?.includeChat && !opts.chatModel?.trim()) {
+            throw new InvalidOptionArgumentError('Chat model name is required. Provide --chat-model or set FUSION_AI_CHAT_MODEL.');
         }
-        if (args?.includeEmbedding === true) {
-            if (!options.openaiEmbeddingDeployment ||
-                typeof options.openaiEmbeddingDeployment !== 'string' ||
-                options.openaiEmbeddingDeployment.trim() === '') {
-                throw new InvalidOptionArgumentError('Azure OpenAI embedding deployment name is required. Provide it via --openai-embedding-deployment option or AZURE_OPENAI_EMBEDDING_DEPLOYMENT_NAME environment variable.');
-            }
+        if (args?.includeEmbedding && !opts.embedModel?.trim()) {
+            throw new InvalidOptionArgumentError('Embedding model name is required. Provide --embed-model or set FUSION_AI_EMBED_MODEL.');
         }
-        if (args?.includeSearch === true) {
-            if (!options.azureSearchEndpoint ||
-                typeof options.azureSearchEndpoint !== 'string' ||
-                options.azureSearchEndpoint.trim() === '') {
-                throw new InvalidOptionArgumentError('Azure Search endpoint is required and must be a non-empty string.');
-            }
-            if (!options.azureSearchApiKey ||
-                typeof options.azureSearchApiKey !== 'string' ||
-                options.azureSearchApiKey.trim() === '') {
-                throw new InvalidOptionArgumentError('Azure Search API key is required. Provide it via --azure-search-api-key option or AZURE_SEARCH_API_KEY environment variable.');
-            }
-            if (!options.azureSearchIndexName ||
-                typeof options.azureSearchIndexName !== 'string' ||
-                options.azureSearchIndexName.trim() === '') {
-                throw new InvalidOptionArgumentError('Azure Search index name is required and must be a non-empty string.');
-            }
+        if (args?.includeSearch && !opts.indexName?.trim()) {
+            throw new InvalidOptionArgumentError('Index name is required. Provide --index-name or set FUSION_AI_INDEX_NAME.');
         }
     });
     return command;

package/dist/esm/options/with-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"with-options.js","sourceRoot":"","sources":["../../../src/options/with-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,0BAA0B,EAAE,MAAM,WAAW,CAAC;AACrE,OAAO,EACL,iBAAiB,EACjB,YAAY,EACZ,gBAAgB,EAChB,uBAAuB,EACvB,yBAAyB,EACzB,0BAA0B,EAC1B,oBAAoB,EACpB,yBAAyB,GAC1B,MAAM,cAAc,CAAC;AAEtB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,OAAgB,EAChB,IAIE,EACO,EAAE;IACX,8BAA8B;IAC9B,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IAChC,OAAO,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;IACpC,OAAO,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;IAErC,qBAAqB;IACrB,IAAI,IAAI,EAAE,WAAW,KAAK,IAAI,EAAE,CAAC;QAC/B,OAAO,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI,IAAI,EAAE,gBAAgB,KAAK,IAAI,EAAE,CAAC;QACpC,OAAO,CAAC,SAAS,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IAED,uBAAuB;IACvB,IAAI,IAAI,EAAE,aAAa,KAAK,IAAI,EAAE,CAAC;QACjC,OAAO,CAAC,SAAS,CAAC,yBAAyB,CAAC,CAAC;QAC7C,OAAO,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC;QAC3C,OAAO,CAAC,SAAS,CAAC,0BAA0B,CAAC,CAAC;IAChD,CAAC;IAED,kBAAkB;IAClB,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,EAAE;QACxC,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC;QAEnC,mBAAmB;QACnB,IACE,CAAC,OAAO,CAAC,YAAY;YACrB,OAAO,OAAO,CAAC,YAAY,KAAK,QAAQ;YACxC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,EAClC,CAAC;YACD,MAAM,IAAI,0BAA0B,CAClC,wHAAwH,CACzH,CAAC;QACJ,CAAC;QAED,uBAAuB;QACvB,IAAI,CAAC,OAAO,CAAC,gBAAgB,IAAI,OAAO,OAAO,CAAC,gBAAgB,KAAK,QAAQ,EAAE,CAAC;YAC9E,MAAM,IAAI,0BAA0B,CAAC,yCAAyC,CAAC,CAAC;QAClF,CAAC;QAED,yBAAyB;QACzB,IACE,CAAC,OAAO,CAAC,cAAc;YACvB,OAAO,OAAO,CAAC,cAAc,KAAK,QAAQ;YAC1C,OAAO,CAAC,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,EACpC,CAAC;YACD,MAAM,IAAI,0BAA0B,CAClC,qIAAqI,CACtI,CAAC;QACJ,CAAC;QAED,IAAI,IAAI,EAAE,WAAW,KAAK,IAAI,EAAE,CAAC;YAC/B,IACE,CAAC,OAAO,CAAC,oBAAoB;gBAC7B,OAAO,OAAO,CAAC,oBAAoB,KAAK,QAAQ;gBAChD,OAAO,CAAC,oBAAoB,CAAC,IAAI,EAAE,KAAK,EAAE,EAC1C,CAAC;gBACD,MAAM,IAAI,0BAA0B,CAClC,kEAAkE,CACnE,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,IAAI,EAAE,gBAAgB,KAAK,IAAI,EAAE,CAAC;YACpC,IACE,CAAC,OAAO,CAAC,yBAAyB;gBAClC,OAAO,OAAO,CAAC,yBAAyB,KAAK,QAAQ;gBACrD,OAAO,CAAC,yBAAyB,CAAC,IAAI,EAAE,KAAK,EAAE,EAC/C,CAAC;gBACD,MAAM,IAAI,0BAA0B,CAClC,yKAAyK,CAC1K,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,IAAI,EAAE,aAAa,KAAK,IAAI,EAAE,CAAC;YACjC,IACE,CAAC,OAAO,CAAC,mBAAmB;gBAC5B,OAAO,OAAO,CAAC,mBAAmB,KAAK,QAAQ;gBAC/C,OAAO,CAAC,mBAAmB,CAAC,IAAI,EAAE,KAAK,EAAE,EACzC,CAAC;gBACD,MAAM,IAAI,0BAA0B,CAClC,mEAAmE,CACpE,CAAC;YACJ,CAAC;YAED,IACE,CAAC,OAAO,CAAC,iBAAiB;gBAC1B,OAAO,OAAO,CAAC,iBAAiB,KAAK,QAAQ;gBAC7C,OAAO,CAAC,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,EACvC,CAAC;gBACD,MAAM,IAAI,0BAA0B,CAClC,8HAA8H,CAC/H,CAAC;YACJ,CAAC;YAED,IACE,CAAC,OAAO,CAAC,oBAAoB;gBAC7B,OAAO,OAAO,CAAC,oBAAoB,KAAK,QAAQ;gBAChD,OAAO,CAAC,oBAAoB,CAAC,IAAI,EAAE,KAAK,EAAE,EAC1C,CAAC;gBACD,MAAM,IAAI,0BAA0B,CAClC,qEAAqE,CACtE,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,eAAe,WAAW,CAAC"}
+{"version":3,"file":"with-options.js","sourceRoot":"","sources":["../../../src/options/with-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,0BAA0B,EAAE,MAAM,WAAW,CAAC;AACrE,OAAO,EACL,eAAe,EACf,cAAc,EACd,gBAAgB,EAChB,SAAS,EACT,eAAe,EACf,cAAc,EACd,WAAW,GACZ,MAAM,cAAc,CAAC;AAEtB;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,OAAgB,EAChB,IAIE,EACO,EAAE;IACX,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAC/B,OAAO,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAClC,OAAO,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAElC,IAAI,IAAI,EAAE,WAAW;QAAE,OAAO,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;IAC1D,IAAI,IAAI,EAAE,gBAAgB;QAAE,OAAO,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;IAChE,IAAI,IAAI,EAAE,aAAa;QAAE,OAAO,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;IAE5D,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,EAAE;QACxC,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC;QAEhC,IAAI,IAAI,EAAE,WAAW,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,EAAE,CAAC;YACjD,MAAM,IAAI,0BAA0B,CAClC,gFAAgF,CACjF,CAAC;QACJ,CAAC;QACD,IAAI,IAAI,EAAE,gBAAgB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE,CAAC;YACvD,MAAM,IAAI,0BAA0B,CAClC,uFAAuF,CACxF,CAAC;QACJ,CAAC;QACD,IAAI,IAAI,EAAE,aAAa,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,EAAE,CAAC;YACnD,MAAM,IAAI,0BAA0B,CAClC,2EAA2E,CAC5E,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,eAAe,WAAW,CAAC"}