gitlab-ai-provider 6.1.0 → 6.2.0

package/dist/index.mjs

@@ -1582,7 +1582,7 @@ var GitLabOpenAILanguageModel = class {
 import WebSocket from "isomorphic-ws";
 
 // src/version.ts
-var VERSION = true ? "6.0.0" : "0.0.0-dev";
+var VERSION = true ? "6.1.1" : "0.0.0-dev";
 
 // src/gitlab-workflow-types.ts
 var WorkflowType = /* @__PURE__ */ ((WorkflowType2) => {
@@ -2335,7 +2335,10 @@ var GitLabWorkflowTokenClient = class {
       workflow_definition: options?.workflowDefinition ?? DEFAULT_WORKFLOW_DEFINITION,
       agent_privileges: options?.agentPrivileges ?? DEFAULT_AGENT_PRIVILEGES,
       environment: options?.environment ?? WORKFLOW_ENVIRONMENT,
-      allow_agent_to_request_user: options?.allowAgentToRequestUser ?? true
+      allow_agent_to_request_user: options?.allowAgentToRequestUser ?? true,
+      ...options?.aiCatalogItemVersionId !== void 0 && {
+        ai_catalog_item_version_id: options.aiCatalogItemVersionId
+      }
     };
     try {
       const response = await this.fetchFn(url, {
@@ -2975,6 +2978,9 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
   // When DWS sends INPUT_REQUIRED, the workflow stays alive server-side.
   // On the next doStream() call we reuse this ID (skip createWorkflow).
   currentWorkflowId = null;
+  // Track which workflowDefinition/flowConfig the current workflow was created with.
+  // When the agent changes, reset the workflow so a new one is created correctly.
+  currentWorkflowDefinition = null;
   // Persisted across turns so that cumulative DWS chat logs don't re-emit
   // messages that were already streamed in a previous doStream() call.
   persistedAgentEmitted = /* @__PURE__ */ new Map();
@@ -3357,11 +3363,21 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
     const additionalContext = this.buildAdditionalContext(options.prompt);
     const toolExecutor = this.toolExecutor ?? null;
     const availableToolNames = new Set(options.tools?.map((t) => t.name) ?? []);
+    const gitlabProviderOptions = options.providerOptions?.["gitlab"];
+    const callWorkflowDefinition = gitlabProviderOptions?.workflowDefinition ?? this.workflowOptions.workflowDefinition;
+    const callFlowConfig = gitlabProviderOptions?.flowConfig ?? void 0;
+    const callFlowConfigSchemaVersion = gitlabProviderOptions?.flowConfigSchemaVersion ?? void 0;
+    const callAiCatalogItemVersionId = gitlabProviderOptions?.aiCatalogItemVersionId ?? void 0;
     await this.tokenClient.getToken(
-      this.workflowOptions.workflowDefinition ?? DEFAULT_WORKFLOW_DEFINITION,
+      callWorkflowDefinition ?? DEFAULT_WORKFLOW_DEFINITION,
       this.workflowOptions.rootNamespaceId
     );
     const projectId = await this.resolveProjectId();
+    const effectiveDefinition = callFlowConfig ?? callWorkflowDefinition ?? DEFAULT_WORKFLOW_DEFINITION;
+    if (this.currentWorkflowId && this.currentWorkflowDefinition !== effectiveDefinition) {
+      this.currentWorkflowId = null;
+      this.currentWorkflowDefinition = null;
+    }
     let workflowId;
     if (this.currentWorkflowId) {
       workflowId = this.currentWorkflowId;
@@ -3369,10 +3385,12 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
       workflowId = await this.tokenClient.createWorkflow(goal, {
         projectId,
         namespaceId: this.workflowOptions.namespaceId,
-        workflowDefinition: this.workflowOptions.workflowDefinition,
-        agentPrivileges: this.workflowOptions.agentPrivileges
+        workflowDefinition: callWorkflowDefinition,
+        agentPrivileges: this.workflowOptions.agentPrivileges,
+        aiCatalogItemVersionId: callAiCatalogItemVersionId
       });
       this.currentWorkflowId = workflowId;
+      this.currentWorkflowDefinition = effectiveDefinition;
     }
     const wsClient = new GitLabWorkflowClient();
     this.activeClients.add(wsClient);
@@ -3427,7 +3445,7 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
               );
             }
           );
-          const workflowDef = this.workflowOptions.workflowDefinition ?? DEFAULT_WORKFLOW_DEFINITION;
+          const workflowDef = callWorkflowDefinition ?? DEFAULT_WORKFLOW_DEFINITION;
           const capabilities = this.workflowOptions.clientCapabilities ?? DEFAULT_CLIENT_CAPABILITIES;
           const workflowMetadata = await this.buildWorkflowMetadata();
           const metadataStr = JSON.stringify(workflowMetadata);
@@ -3456,15 +3474,17 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
             mcpTools: trimmed.mcpTools,
             preapproved_tools: trimmedPreapproved
           };
-          if (this.workflowOptions.flowConfig) {
-            startReq.flowConfig = this.workflowOptions.flowConfig;
+          const resolvedFlowConfig = callFlowConfig ?? this.workflowOptions.flowConfig;
+          const resolvedFlowConfigSchemaVersion = callFlowConfigSchemaVersion ?? this.workflowOptions.flowConfigSchemaVersion;
+          if (resolvedFlowConfig) {
+            startReq.flowConfig = resolvedFlowConfig;
           } else if (this.workflowOptions.systemPrompt) {
             startReq.flowConfig = {
               prompts: [{ prompt_template: { system: this.workflowOptions.systemPrompt } }]
             };
           }
-          if (this.workflowOptions.flowConfigSchemaVersion) {
-            startReq.flowConfigSchemaVersion = this.workflowOptions.flowConfigSchemaVersion;
+          if (resolvedFlowConfigSchemaVersion) {
+            startReq.flowConfigSchemaVersion = resolvedFlowConfigSchemaVersion;
           } else if (startReq.flowConfig) {
             startReq.flowConfigSchemaVersion = "v1";
           }