gitlab-ai-provider 6.3.0 → 6.4.1

package/dist/index.mjs

@@ -1582,7 +1582,7 @@ var GitLabOpenAILanguageModel = class {
 import WebSocket from "isomorphic-ws";
 
 // src/version.ts
-var VERSION = true ? "6.2.1" : "0.0.0-dev";
+var VERSION = true ? "6.4.0" : "0.0.0-dev";
 
 // src/gitlab-workflow-types.ts
 var WorkflowType = /* @__PURE__ */ ((WorkflowType2) => {
@@ -1766,6 +1766,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) {
@@ -3413,7 +3419,8 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
         this.sessionWorkflows.set(sessionKey, {
           workflowId,
           workflowDefinition: effectiveDefinition,
-          agentEmitted: /* @__PURE__ */ new Map()
+          agentEmitted: /* @__PURE__ */ new Map(),
+          toolEntries: /* @__PURE__ */ new Set()
         });
         sess = this.sessionWorkflows.get(sessionKey);
       }
@@ -3433,6 +3440,8 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
       currentAgentMessageId: "",
       activeClient: wsClient,
       processedRequestIDs: /* @__PURE__ */ new Set(),
+      emittedToolEntries: new Set(sess?.toolEntries),
+      emittedToolKeys: /* @__PURE__ */ new Set(),
       sessionKey
     };
     for (const msg of options.prompt) {
@@ -3457,7 +3466,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(
@@ -3468,7 +3479,11 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
                 toolExecutor,
                 () => `text-${textBlockCounter++}`,
                 availableToolNames,
-                startReq
+                startReq,
+                {
+                  aiCatalogItemVersionId: callAiCatalogItemVersionId,
+                  workflowDefinition: callWorkflowDefinition ?? this.workflowOptions.workflowDefinition
+                }
               );
             }
           );
@@ -3563,7 +3578,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;
     }
@@ -3576,6 +3591,7 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
         const { requestID, data } = event;
         if (ss.processedRequestIDs.has(requestID)) break;
         ss.processedRequestIDs.add(requestID);
+        ss.emittedToolKeys.add(data.name);
         let parsedArgs;
         try {
           JSON.parse(data.args);
@@ -3625,6 +3641,7 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
         if (ss.processedRequestIDs.has(event.requestID)) break;
         ss.processedRequestIDs.add(event.requestID);
         const mapped = mapBuiltinTool(event.toolName, event.data, availableToolNames);
+        ss.emittedToolKeys.add(mapped.toolName);
         const mappedArgs = JSON.stringify(mapped.args);
         if (ss.activeTextBlockId) {
           controller.enqueue({ type: "text-end", id: ss.activeTextBlockId });
@@ -3673,7 +3690,8 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
           controller,
           toolExecutor,
           nextTextId,
-          availableToolNames
+          availableToolNames,
+          wsExtras
         ).catch((_err) => {
           ss.approvalPending = false;
           if (ss.deferredClose) {
@@ -3805,6 +3823,51 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
     }
     for (let i = 0; i < chatLog.length; i++) {
       const entry = chatLog[i];
+      if (entry.message_type === "tool" && entry.tool_info) {
+        const toolId = entry.message_id || entry.correlation_id || `tool-${i}`;
+        if (ss.emittedToolEntries.has(toolId)) continue;
+        const name = entry.tool_info.name;
+        const args = JSON.stringify(entry.tool_info.args ?? {});
+        if (ss.emittedToolKeys.has(name)) {
+          ss.emittedToolEntries.add(toolId);
+          const sess2 = this.sessionWorkflows.get(ss.sessionKey);
+          if (sess2) sess2.toolEntries.add(toolId);
+          continue;
+        }
+        if (ss.activeTextBlockId) {
+          controller.enqueue({ type: "text-end", id: ss.activeTextBlockId });
+          ss.activeTextBlockId = null;
+        }
+        controller.enqueue({
+          type: "tool-input-start",
+          id: toolId,
+          toolName: name,
+          providerExecuted: true
+        });
+        controller.enqueue({ type: "tool-input-delta", id: toolId, delta: args });
+        controller.enqueue({ type: "tool-input-end", id: toolId });
+        controller.enqueue({
+          type: "tool-call",
+          toolCallId: toolId,
+          toolName: name,
+          input: args,
+          providerExecuted: true,
+          dynamic: true
+        });
+        const response = entry.tool_info.tool_response;
+        const output = typeof response === "string" ? response : response ? response.content : entry.content || "";
+        controller.enqueue({
+          type: "tool-result",
+          toolCallId: toolId,
+          toolName: name,
+          result: { output, title: name, metadata: {} },
+          isError: false
+        });
+        ss.emittedToolEntries.add(toolId);
+        const sess = this.sessionWorkflows.get(ss.sessionKey);
+        if (sess) sess.toolEntries.add(toolId);
+        continue;
+      }
       if (entry.message_type !== "agent") continue;
       const content = entry.content || "";
       const msgId = entry.message_id || `idx-${i}`;
@@ -3942,7 +4005,7 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
       }
     }
   }
-  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;
@@ -3982,7 +4045,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,
@@ -3992,7 +4057,8 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
           toolExecutor,
           nextTextId,
           availableToolNames,
-          newStartReq
+          newStartReq,
+          wsExtras
         )
       );
       newClient.sendStartRequest(newStartReq);