gitlab-ai-provider 6.2.1 → 6.4.0

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 6.4.0 (2026-04-02)
+
+- chore: regenerate dist ([c6833c4](https://gitlab.com/vglafirov/gitlab-ai-provider/commit/c6833c4))
+- feat: pass ai_catalog_item_version_id to WebSocket for MCP tool injection ([19cd4e5](https://gitlab.com/vglafirov/gitlab-ai-provider/commit/19cd4e5))
+
+## 6.3.0 (2026-03-31)
+
+- fix(model): clear deferredClose before reconnect to prevent stream dying after batch approval ([017f8fe](https://gitlab.com/vglafirov/gitlab-ai-provider/commit/017f8fe))
+- fix(tests): use class mock for GitLabWorkflowTokenClient to support new in all environments ([e3f0e24](https://gitlab.com/vglafirov/gitlab-ai-provider/commit/e3f0e24))
+- chore: rebuild dist ([71bdc51](https://gitlab.com/vglafirov/gitlab-ai-provider/commit/71bdc51))
+- feat(model): per-session DWS workflow lifecycle and tool call approval ([aa7a09a](https://gitlab.com/vglafirov/gitlab-ai-provider/commit/aa7a09a))
+
 ## <small>6.2.1 (2026-03-31)</small>
 
 - fix(model): pre-approve all batch tools on approval reconnect to prevent re-triggering ([d7f80e2](https://gitlab.com/vglafirov/gitlab-ai-provider/commit/d7f80e2))

package/dist/index.d.mts

@@ -703,6 +703,7 @@ declare class GitLabWorkflowLanguageModel implements LanguageModelV3 {
     private readonly modelDiscovery;
     private readonly modelCache;
     private detectedProjectPath;
+    private readonly sessionWorkflows;
     private currentWorkflowId;
     private currentWorkflowDefinition;
     private persistedAgentEmitted;
@@ -756,6 +757,11 @@ declare class GitLabWorkflowLanguageModel implements LanguageModelV3 {
      * Updated when the user chooses "always" in the approval prompt.
      */
     sessionPreapprovedTools: string[];
+    /**
+     * The opencode session ID. Set per-stream by the host to key per-session
+     * DWS workflows. Different sessions get different DWS workflows.
+     */
+    sessionID: string;
     /**
      * Set the approval handler callback.
      * Called when DWS requires tool call approval. Host (e.g., opencode) wires this
@@ -843,7 +849,7 @@ declare class GitLabWorkflowLanguageModel implements LanguageModelV3 {
      * Reset the workflow state, forcing a new workflow to be created on the
      * next doStream() call. Call this when starting a new conversation.
      */
-    resetWorkflow(): void;
+    resetWorkflow(sessionKey?: string): void;
     /**
      * Get the current workflow ID (if any).
      * Useful for consumers that need to track workflow state.
@@ -1466,6 +1472,10 @@ interface WorkflowWebSocketOptions {
     projectId?: string;
     namespaceId?: string;
     rootNamespaceId?: string;
+    /** AI Catalog item version ID — required for Workhorse to inject MCP tools */
+    aiCatalogItemVersionId?: number;
+    /** Workflow definition type (e.g. 'chat') — used by Workhorse for MCP config */
+    workflowDefinition?: string;
 }
 type EventCallback = (event: WorkflowClientEvent) => void;
 declare class GitLabWorkflowClient {

package/dist/index.d.ts

@@ -703,6 +703,7 @@ declare class GitLabWorkflowLanguageModel implements LanguageModelV3 {
     private readonly modelDiscovery;
     private readonly modelCache;
     private detectedProjectPath;
+    private readonly sessionWorkflows;
     private currentWorkflowId;
     private currentWorkflowDefinition;
     private persistedAgentEmitted;
@@ -756,6 +757,11 @@ declare class GitLabWorkflowLanguageModel implements LanguageModelV3 {
      * Updated when the user chooses "always" in the approval prompt.
      */
     sessionPreapprovedTools: string[];
+    /**
+     * The opencode session ID. Set per-stream by the host to key per-session
+     * DWS workflows. Different sessions get different DWS workflows.
+     */
+    sessionID: string;
     /**
      * Set the approval handler callback.
      * Called when DWS requires tool call approval. Host (e.g., opencode) wires this
@@ -843,7 +849,7 @@ declare class GitLabWorkflowLanguageModel implements LanguageModelV3 {
      * Reset the workflow state, forcing a new workflow to be created on the
      * next doStream() call. Call this when starting a new conversation.
      */
-    resetWorkflow(): void;
+    resetWorkflow(sessionKey?: string): void;
     /**
      * Get the current workflow ID (if any).
      * Useful for consumers that need to track workflow state.
@@ -1466,6 +1472,10 @@ interface WorkflowWebSocketOptions {
     projectId?: string;
     namespaceId?: string;
     rootNamespaceId?: string;
+    /** AI Catalog item version ID — required for Workhorse to inject MCP tools */
+    aiCatalogItemVersionId?: number;
+    /** Workflow definition type (e.g. 'chat') — used by Workhorse for MCP config */
+    workflowDefinition?: string;
 }
 type EventCallback = (event: WorkflowClientEvent) => void;
 declare class GitLabWorkflowClient {

package/dist/index.js

@@ -1653,7 +1653,7 @@ var GitLabOpenAILanguageModel = class {
 var import_isomorphic_ws = __toESM(require("isomorphic-ws"));
 
 // src/version.ts
-var VERSION = true ? "6.2.1" : "0.0.0-dev";
+var VERSION = true ? "6.3.0" : "0.0.0-dev";
 
 // src/gitlab-workflow-types.ts
 var WorkflowType = /* @__PURE__ */ ((WorkflowType2) => {
@@ -1837,6 +1837,12 @@ var GitLabWorkflowClient = class {
     if (options.modelRef && options.modelRef !== "default") {
       url.searchParams.set("user_selected_model_identifier", options.modelRef);
     }
+    if (options.aiCatalogItemVersionId) {
+      url.searchParams.set("ai_catalog_item_version_id", String(options.aiCatalogItemVersionId));
+    }
+    if (options.workflowDefinition) {
+      url.searchParams.set("workflow_definition", options.workflowDefinition);
+    }
     return url.toString();
   }
   buildWebSocketHeaders(options) {
@@ -3046,14 +3052,12 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
   // Cached detected project path
   detectedProjectPath = null;
   // Workflow ID persisted across turns for multi-turn conversations.
-  // When DWS sends INPUT_REQUIRED, the workflow stays alive server-side.
-  // On the next doStream() call we reuse this ID (skip createWorkflow).
+  // Per-session workflow state. Keyed by opencode sessionID (x-opencode-session header).
+  // Each opencode session gets its own DWS workflow, reused across turns within that session.
+  sessionWorkflows = /* @__PURE__ */ new Map();
+  // Fallback for callers that don't pass x-opencode-session (e.g. direct SDK use).
   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();
   // Track all active stream clients so stopWorkflow() can stop them all.
   activeClients = /* @__PURE__ */ new Set();
@@ -3115,6 +3119,11 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
    * Updated when the user chooses "always" in the approval prompt.
    */
   sessionPreapprovedTools = [];
+  /**
+   * The opencode session ID. Set per-stream by the host to key per-session
+   * DWS workflows. Different sessions get different DWS workflows.
+   */
+  sessionID = "";
   /**
    * Set the approval handler callback.
    * Called when DWS requires tool call approval. Host (e.g., opencode) wires this
@@ -3344,9 +3353,14 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
    * Reset the workflow state, forcing a new workflow to be created on the
    * next doStream() call. Call this when starting a new conversation.
    */
-  resetWorkflow() {
-    this.currentWorkflowId = null;
-    this.persistedAgentEmitted.clear();
+  resetWorkflow(sessionKey) {
+    if (sessionKey) {
+      this.sessionWorkflows.delete(sessionKey);
+    } else {
+      this.sessionWorkflows.clear();
+      this.currentWorkflowId = null;
+      this.persistedAgentEmitted.clear();
+    }
   }
   /**
    * Get the current workflow ID (if any).
@@ -3445,12 +3459,21 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
     );
     const projectId = await this.resolveProjectId();
     const effectiveDefinition = callFlowConfig ?? callWorkflowDefinition ?? DEFAULT_WORKFLOW_DEFINITION;
-    if (this.currentWorkflowId && this.currentWorkflowDefinition !== effectiveDefinition) {
+    const sessionKey = this.sessionID;
+    let sess = this.sessionWorkflows.get(sessionKey);
+    if (sess && sess.workflowDefinition !== effectiveDefinition) {
+      this.sessionWorkflows.delete(sessionKey);
+      sess = void 0;
+    }
+    const useLegacy = sessionKey === "";
+    if (useLegacy && this.currentWorkflowId && this.currentWorkflowDefinition !== effectiveDefinition) {
       this.currentWorkflowId = null;
       this.currentWorkflowDefinition = null;
     }
     let workflowId;
-    if (this.currentWorkflowId) {
+    if (sess) {
+      workflowId = sess.workflowId;
+    } else if (useLegacy && this.currentWorkflowId) {
       workflowId = this.currentWorkflowId;
     } else {
       workflowId = await this.tokenClient.createWorkflow(goal, {
@@ -3460,8 +3483,17 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
         agentPrivileges: this.workflowOptions.agentPrivileges,
         aiCatalogItemVersionId: callAiCatalogItemVersionId
       });
-      this.currentWorkflowId = workflowId;
-      this.currentWorkflowDefinition = effectiveDefinition;
+      if (useLegacy) {
+        this.currentWorkflowId = workflowId;
+        this.currentWorkflowDefinition = effectiveDefinition;
+      } else {
+        this.sessionWorkflows.set(sessionKey, {
+          workflowId,
+          workflowDefinition: effectiveDefinition,
+          agentEmitted: /* @__PURE__ */ new Map()
+        });
+        sess = this.sessionWorkflows.get(sessionKey);
+      }
     }
     const wsClient = new GitLabWorkflowClient();
     this.activeClients.add(wsClient);
@@ -3474,10 +3506,11 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
       approvalPending: false,
       deferredClose: null,
       activeTextBlockId: null,
-      agentMessageEmitted: new Map(this.persistedAgentEmitted),
+      agentMessageEmitted: new Map(sess?.agentEmitted ?? this.persistedAgentEmitted),
       currentAgentMessageId: "",
       activeClient: wsClient,
-      processedRequestIDs: /* @__PURE__ */ new Set()
+      processedRequestIDs: /* @__PURE__ */ new Set(),
+      sessionKey
     };
     for (const msg of options.prompt) {
       if (msg.role === "system") {
@@ -3501,7 +3534,9 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
               headers: this.config.getHeaders(),
               projectId: this.workflowOptions.projectId,
               namespaceId: this.workflowOptions.namespaceId,
-              rootNamespaceId: this.workflowOptions.rootNamespaceId
+              rootNamespaceId: this.workflowOptions.rootNamespaceId,
+              aiCatalogItemVersionId: callAiCatalogItemVersionId,
+              workflowDefinition: callWorkflowDefinition ?? this.workflowOptions.workflowDefinition
             },
             (event) => {
               this.handleWorkflowEvent(
@@ -3512,7 +3547,11 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
                 toolExecutor,
                 () => `text-${textBlockCounter++}`,
                 availableToolNames,
-                startReq
+                startReq,
+                {
+                  aiCatalogItemVersionId: callAiCatalogItemVersionId,
+                  workflowDefinition: callWorkflowDefinition ?? this.workflowOptions.workflowDefinition
+                }
               );
             }
           );
@@ -3588,7 +3627,13 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
         wsClient.close();
         this.activeClients.delete(wsClient);
         ss.activeClient = null;
-        this.currentWorkflowId = null;
+        if (!ss.streamClosed) {
+          if (ss.sessionKey) {
+            this.sessionWorkflows.delete(ss.sessionKey);
+          } else {
+            this.currentWorkflowId = null;
+          }
+        }
       }
     });
     return {
@@ -3601,7 +3646,7 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
   // ---------------------------------------------------------------------------
   // Event handling
   // ---------------------------------------------------------------------------
-  handleWorkflowEvent(ss, event, controller, wsClient, toolExecutor, nextTextId, availableToolNames, startReq) {
+  handleWorkflowEvent(ss, event, controller, wsClient, toolExecutor, nextTextId, availableToolNames, startReq, wsExtras) {
     if (ss.streamClosed) {
       return;
     }
@@ -3711,8 +3756,9 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
           controller,
           toolExecutor,
           nextTextId,
-          availableToolNames
-        ).catch(() => {
+          availableToolNames,
+          wsExtras
+        ).catch((_err) => {
           ss.approvalPending = false;
           if (ss.deferredClose) {
             const close = ss.deferredClose;
@@ -3738,7 +3784,7 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
           });
           ss.streamClosed = true;
           controller.close();
-          this.cleanupClient(ss);
+          this.cleanupClient(ss, false);
         };
         if (ss.pendingToolCount > 0 || ss.approvalPending) {
           ss.deferredClose = doCompleteClose;
@@ -3796,7 +3842,7 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
             });
             ss.streamClosed = true;
             controller.close();
-            this.cleanupClient(ss);
+            this.cleanupClient(ss, false);
           }
         };
         if (ss.pendingToolCount > 0 || ss.approvalPending) {
@@ -3865,7 +3911,8 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
       });
       ss.streamedOutputChars += delta.length;
       ss.agentMessageEmitted.set(msgId, content.length);
-      this.persistedAgentEmitted.set(msgId, content.length);
+      const target = this.sessionWorkflows.get(ss.sessionKey)?.agentEmitted ?? this.persistedAgentEmitted;
+      target.set(msgId, content.length);
       ss.currentAgentMessageId = msgId;
     }
   }
@@ -3971,11 +4018,15 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
       ss.activeClient = null;
     }
     if (clearWorkflow) {
-      this.currentWorkflowId = null;
-      this.persistedAgentEmitted.clear();
+      if (ss.sessionKey) {
+        this.sessionWorkflows.delete(ss.sessionKey);
+      } else {
+        this.currentWorkflowId = null;
+        this.persistedAgentEmitted.clear();
+      }
     }
   }
-  async approveAndResume(ss, tools, startReq, controller, toolExecutor, nextTextId, availableToolNames) {
+  async approveAndResume(ss, tools, startReq, controller, toolExecutor, nextTextId, availableToolNames, wsExtras) {
     const handler = this.workflowOptions.approvalHandler;
     if (!handler || !startReq) {
       ss.approvalPending = false;
@@ -3995,6 +4046,7 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
       return;
     }
     ss.approvalPending = false;
+    ss.deferredClose = null;
     this.cleanupClient(ss, false);
     const approval = decision.approved ? { approval: { tool_name: tools[0]?.name, tool_args_json: tools[0]?.args } } : { rejection: { message: decision.message ?? "User rejected" } };
     const newStartReq = {
@@ -4014,7 +4066,9 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
           headers: this.config.getHeaders(),
           projectId: this.workflowOptions.projectId,
           namespaceId: this.workflowOptions.namespaceId,
-          rootNamespaceId: this.workflowOptions.rootNamespaceId
+          rootNamespaceId: this.workflowOptions.rootNamespaceId,
+          aiCatalogItemVersionId: wsExtras?.aiCatalogItemVersionId,
+          workflowDefinition: wsExtras?.workflowDefinition
         },
         (event) => this.handleWorkflowEvent(
           ss,
@@ -4024,7 +4078,8 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
           toolExecutor,
           nextTextId,
           availableToolNames,
-          newStartReq
+          newStartReq,
+          wsExtras
         )
       );
       newClient.sendStartRequest(newStartReq);