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

package/dist/types/options/options.d.ts

@@ -1,24 +1,27 @@
 /** `--env` | `FUSION_ENV` — Fusion environment for service discovery */
-export declare const envOption: import("commander").Option;
+export declare const envOption: import("node_modules/commander/typings/index.js").Option;
 /** `--token` | `FUSION_TOKEN` — explicit bearer token */
-export declare const tokenOption: import("commander").Option;
+export declare const tokenOption: import("node_modules/commander/typings/index.js").Option;
 /** `--tenant-id` | `FUSION_TENANT_ID` */
-export declare const tenantIdOption: import("commander").Option;
+export declare const tenantIdOption: import("node_modules/commander/typings/index.js").Option;
 /** `--client-id` | `FUSION_CLIENT_ID` */
-export declare const clientIdOption: import("commander").Option;
+export declare const clientIdOption: import("node_modules/commander/typings/index.js").Option;
 /** `--chat-model` | `FUSION_AI_CHAT_MODEL` */
-export declare const chatModelOption: import("commander").Option;
+export declare const chatModelOption: import("node_modules/commander/typings/index.js").Option;
 /** `--embed-model` | `FUSION_AI_EMBED_MODEL` */
-export declare const embedModelOption: import("commander").Option;
+export declare const embedModelOption: import("node_modules/commander/typings/index.js").Option;
 /** `--index-name` | `FUSION_AI_INDEX_NAME` */
-export declare const indexNameOption: import("commander").Option;
+export declare const indexNameOption: import("node_modules/commander/typings/index.js").Option;
+/** `-d, --debug` | `RUNNER_DEBUG` — enable verbose logging */
+export declare const debugOption: import("node_modules/commander/typings/index.js").Option;
 declare const _default: {
-    envOption: import("commander").Option;
-    tokenOption: import("commander").Option;
-    tenantIdOption: import("commander").Option;
-    clientIdOption: import("commander").Option;
-    chatModelOption: import("commander").Option;
-    embedModelOption: import("commander").Option;
-    indexNameOption: import("commander").Option;
+    envOption: import("node_modules/commander/typings/index.js").Option;
+    tokenOption: import("node_modules/commander/typings/index.js").Option;
+    tenantIdOption: import("node_modules/commander/typings/index.js").Option;
+    clientIdOption: import("node_modules/commander/typings/index.js").Option;
+    chatModelOption: import("node_modules/commander/typings/index.js").Option;
+    embedModelOption: import("node_modules/commander/typings/index.js").Option;
+    indexNameOption: import("node_modules/commander/typings/index.js").Option;
+    debugOption: import("node_modules/commander/typings/index.js").Option;
 };
 export default _default;

package/dist/types/options/schema.d.ts

@@ -19,5 +19,6 @@ export declare const AiOptionsSchema: z.ZodObject<{
     chatModel: z.ZodOptional<z.ZodString>;
     embedModel: z.ZodOptional<z.ZodString>;
     indexName: z.ZodOptional<z.ZodString>;
+    debug: z.ZodDefault<z.z.ZodCoercedBoolean<unknown>>;
 }, z.z.core.$strip>;
 export type AiOptionsType = z.infer<typeof AiOptionsSchema>;

package/dist/types/options/types.d.ts

@@ -19,4 +19,6 @@ export interface AiOptions {
     embedModel?: string;
     /** Azure AI Search index name. Required for vector search / indexing operations. */
     indexName?: string;
+    /** Enable debug mode for verbose logging. */
+    debug?: boolean;
 }

package/dist/types/setup-framework.d.ts

@@ -6,10 +6,10 @@ export type FrameworkInstance = FusionFramework<[AIModule]>;
 /**
  * Creates a Fusion Framework instance with the AI module enabled.
  *
- * Initialises the Fusion Framework with service discovery and MSAL auth,
- * resolves the `'ai'` service endpoint, and pre-caches a bearer token.
- * If MSAL has no cached credentials, the CLI's interactive `auth login`
- * flow is spawned automatically before retrying.
+ * Uses Azure Identity's `DefaultAzureCredential` by default, which resolves
+ * credentials from the environment (OIDC, managed identity, Azure CLI, etc.).
+ * When an explicit token is provided via `--token` or `FUSION_TOKEN`, that
+ * token is used directly instead.
  *
  * @param options - CLI options resolved by {@link withOptions}.
  * @returns A fully initialised framework instance with the AI module.

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const version = "3.0.0";
+export declare const version = "4.0.1";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/fusion-framework-cli-plugin-ai-base",
-  "version": "3.0.0",
+  "version": "4.0.1",
   "description": "Base AI plugin package for Fusion Framework CLI",
   "type": "module",
   "main": "dist/esm/index.js",
@@ -44,18 +44,18 @@
   },
   "dependencies": {
     "commander": "^14.0.1",
-    "zod": "^4.3.6",
+    "zod": "^4.4.3",
+    "@equinor/fusion-framework-module-ai": "4.0.0",
     "@equinor/fusion-framework-module": "6.0.0",
-    "@equinor/fusion-imports": "2.0.0",
-    "@equinor/fusion-framework-module-ai": "4.0.0"
+    "@equinor/fusion-imports": "2.0.0"
   },
   "peerDependencies": {
-    "@equinor/fusion-framework-cli": "^14.2.7"
+    "@equinor/fusion-framework-cli": "^15.0.2"
   },
   "devDependencies": {
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "vitest": "^4.1.0",
-    "@equinor/fusion-framework-cli": "^14.2.7"
+    "@equinor/fusion-framework-cli": "^15.0.2"
   },
   "scripts": {
     "build": "tsc -b",

package/src/options/options.ts

@@ -51,6 +51,11 @@ export const indexNameOption = createOption(
   'Azure AI Search index name',
 ).env('FUSION_AI_INDEX_NAME');
 
+/** `-d, --debug` | `RUNNER_DEBUG` — enable verbose logging */
+export const debugOption = createOption('-d, --debug', 'Enable debug mode for verbose logging')
+  .env('RUNNER_DEBUG')
+  .default(false);
+
 export default {
   envOption,
   tokenOption,
@@ -59,4 +64,5 @@ export default {
   chatModelOption,
   embedModelOption,
   indexNameOption,
+  debugOption,
 };

package/src/options/schema.ts

@@ -21,6 +21,7 @@ export const AiOptionsSchema = z
     chatModel: z.string().min(1).optional(),
     embedModel: z.string().min(1).optional(),
     indexName: z.string().min(1).optional(),
+    debug: z.coerce.boolean().default(false),
   })
   .describe('Base Fusion AI command options');
 

package/src/options/types.ts

@@ -19,4 +19,6 @@ export interface AiOptions {
   embedModel?: string;
   /** Azure AI Search index name. Required for vector search / indexing operations. */
   indexName?: string;
+  /** Enable debug mode for verbose logging. */
+  debug?: boolean;
 }

package/src/options/with-options.ts

@@ -2,6 +2,7 @@ import { type Command, InvalidOptionArgumentError } from 'commander';
 import {
   chatModelOption,
   clientIdOption,
+  debugOption,
   embedModelOption,
   envOption,
   indexNameOption,
@@ -38,6 +39,7 @@ export const withOptions = (
   command.addOption(tokenOption);
   command.addOption(tenantIdOption);
   command.addOption(clientIdOption);
+  command.addOption(debugOption);
 
   if (args?.includeChat) command.addOption(chatModelOption);
   if (args?.includeEmbedding) command.addOption(embedModelOption);

package/src/setup-framework.ts

@@ -5,59 +5,42 @@ import { initializeFramework, FusionEnv } from '@equinor/fusion-framework-cli/bi
 import type { FusionFrameworkSettings, FusionFramework } from '@equinor/fusion-framework-cli/bin';
 import type { AiOptions } from './options/index.js';
 
-import { execFileSync } from 'node:child_process';
-
 /** Initialized framework instance with the AI module. */
 export type FrameworkInstance = FusionFramework<[AIModule]>;
 
-/**
- * Check whether an error (possibly wrapped in a cause chain) is an
- * authentication-related failure that may be recoverable via interactive login.
- *
- * @internal
- */
-const isAuthError = (error: unknown): boolean => {
-  let current: unknown = error;
-  while (current) {
-    if (current instanceof Error) {
-      if (
-        current.name === 'NoAccountsError' ||
-        current.name === 'SilentTokenAcquisitionError' ||
-        current.message.includes('No accounts found')
-      ) {
-        return true;
-      }
-    }
-    current = (current as { cause?: unknown }).cause;
-  }
-  return false;
-};
-
 /**
  * Creates a Fusion Framework instance with the AI module enabled.
  *
- * Initialises the Fusion Framework with service discovery and MSAL auth,
- * resolves the `'ai'` service endpoint, and pre-caches a bearer token.
- * If MSAL has no cached credentials, the CLI's interactive `auth login`
- * flow is spawned automatically before retrying.
+ * Uses Azure Identity's `DefaultAzureCredential` by default, which resolves
+ * credentials from the environment (OIDC, managed identity, Azure CLI, etc.).
+ * When an explicit token is provided via `--token` or `FUSION_TOKEN`, that
+ * token is used directly instead.
  *
  * @param options - CLI options resolved by {@link withOptions}.
  * @returns A fully initialised framework instance with the AI module.
  * @throws {Error} When authentication fails after the interactive retry.
  */
 export const setupFramework = async (options: AiOptions): Promise<FusionFramework<[AIModule]>> => {
-  // Service-discovery mode: resolve URL + scopes from Fusion service registry
+  const debug = options.debug ?? false;
+
+  // Auth strategy:
+  // 1. Explicit token (--token / FUSION_TOKEN) → direct token passthrough
+  // 2. Everything else → Azure Identity (DefaultAzureCredential)
   const auth: FusionFrameworkSettings['auth'] = options.token
     ? { token: options.token }
-    : {
-        tenantId: options.tenantId ?? '3aa4a235-b6e2-48d5-9195-7fcf05b459b0',
-        clientId: options.clientId ?? 'a318b8e1-0295-4e17-98d5-35f67dfeba14',
-      };
+    : { defaultCredential: true };
 
   const env = (options.env as FusionEnv) ?? FusionEnv.ContinuesIntegration;
 
+  if (debug) {
+    console.debug('[debug] Environment:', env);
+    console.debug('[debug] Auth mode:', options.token ? 'static-token' : 'azure-identity');
+  }
+
   /** Initialise the framework, resolve the AI service, and pre-cache tokens. */
   const initAndSetup = async (): Promise<FusionFramework<[AIModule]>> => {
+    if (debug) console.debug('[debug] Initializing framework with AI module…');
+
     const framework = await initializeFramework<[AIModule]>({ env, auth }, (configurator) => {
       enableAI(configurator);
     });
@@ -67,36 +50,22 @@ export const setupFramework = async (options: AiOptions): Promise<FusionFramewor
     const service = await framework.serviceDiscovery.resolveService('ai');
     const scopes = service.scopes ?? service.defaultScopes ?? [];
 
+    if (debug) {
+      console.debug('[debug] AI service URL:', service.uri);
+      console.debug('[debug] AI service scopes:', scopes);
+    }
+
     // Pre-cache a token for the AI service scopes so strategy callbacks
     // don't attempt (and fail) a silent acquisition later.
     const token = await framework.auth.acquireAccessToken({ request: { scopes } });
     if (!token) throw new Error('Failed to acquire access token for the AI service.');
 
+    if (debug) console.debug('[debug] Token acquired successfully');
+
     return framework;
   };
 
-  try {
-    return await initAndSetup();
-  } catch (error: unknown) {
-    // If the failure is auth-related and we're not using a static token,
-    // spawn the CLI's own `auth login` (starts local server + browser)
-    // and retry the full init sequence.
-    if (!isAuthError(error) || options.token) throw error;
-
-    const cliEntry = process.argv[1];
-    if (!cliEntry) {
-      throw new Error(
-        'Failed to acquire access token and could not determine CLI path for interactive login.',
-      );
-    }
-
-    console.log('No cached credentials — launching interactive login…');
-    execFileSync(process.execPath, [cliEntry, 'auth', 'login'], {
-      stdio: 'inherit',
-    });
-
-    return await initAndSetup();
-  }
+  return await initAndSetup();
 };
 
 export default setupFramework;

package/src/version.ts

@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = '3.0.0';
+export const version = '4.0.1';

package/tsconfig.json

@@ -6,7 +6,9 @@
     "outDir": "dist/esm",
     "rootDir": "src",
     "declarationDir": "./dist/types",
-    "baseUrl": "."
+    "paths": {
+      "*": ["./*"]
+    }
   },
   "references": [
     {