gitlab-ai-provider 6.0.0 → 6.1.1

package/dist/index.mjs

@@ -1582,7 +1582,7 @@ var GitLabOpenAILanguageModel = class {
 import WebSocket from "isomorphic-ws";
 
 // src/version.ts
-var VERSION = true ? "5.3.3" : "0.0.0-dev";
+var VERSION = true ? "6.1.0" : "0.0.0-dev";
 
 // src/gitlab-workflow-types.ts
 var WorkflowType = /* @__PURE__ */ ((WorkflowType2) => {
@@ -1808,7 +1808,9 @@ var GitLabWorkflowClient = class {
         });
       } else if (checkpoint.status === "STOPPED" || checkpoint.status === "CANCELLED") {
         this.emit({ type: "completed" });
-      } else if (checkpoint.status === "TOOL_CALL_APPROVAL_REQUIRED" || checkpoint.status === "PLAN_APPROVAL_REQUIRED") {
+      } else if (checkpoint.status === "TOOL_CALL_APPROVAL_REQUIRED") {
+        this.emit({ type: "approval-required", tools: this.extractApprovalTools(checkpoint) });
+      } else if (checkpoint.status === "PLAN_APPROVAL_REQUIRED") {
         this.emit({ type: "completed" });
       }
       return;
@@ -1847,6 +1849,18 @@ var GitLabWorkflowClient = class {
       }
     }
   }
+  extractApprovalTools(checkpoint) {
+    if (!checkpoint.checkpoint) return [];
+    let parsed;
+    try {
+      parsed = JSON.parse(checkpoint.checkpoint);
+    } catch {
+      return [];
+    }
+    return (parsed.channel_values?.ui_chat_log ?? []).filter(
+      (e) => e.message_type === "request" && e.tool_info !== null
+    ).map((e) => ({ name: e.tool_info.name, args: JSON.stringify(e.tool_info.args) }));
+  }
   send(event) {
     if (this.socket?.readyState === WebSocket.OPEN) {
       const json = JSON.stringify(event);
@@ -3018,6 +3032,23 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
    * the AI SDK only surfaces usage via finish-step at stream end.
    */
   onUsageUpdate = null;
+  /**
+   * Tool names pre-approved for the current session.
+   * Set by the host (e.g., opencode) and merged into preapproved_tools on each StartRequest.
+   * Updated when the user chooses "always" in the approval prompt.
+   */
+  sessionPreapprovedTools = [];
+  /**
+   * Set the approval handler callback.
+   * Called when DWS requires tool call approval. Host (e.g., opencode) wires this
+   * to its permission system each stream call, similar to toolExecutor.
+   */
+  set approvalHandler(handler) {
+    this.workflowOptions.approvalHandler = handler ?? void 0;
+  }
+  get approvalHandler() {
+    return this.workflowOptions.approvalHandler ?? null;
+  }
   /**
    * Optional callback invoked when multiple workflow models are available
    * and the user should pick one. Set per-stream by the host (e.g., OpenCode)
@@ -3319,7 +3350,10 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
     const goal = this.extractGoalFromPrompt(options.prompt);
     const modelRef = await this.resolveModelRef();
     const mcpTools = this.extractMcpTools(options);
-    const preapprovedTools = this.workflowOptions.preapprovedTools ?? mcpTools.map((t) => t.name);
+    const preapprovedTools = [
+      ...this.workflowOptions.preapprovedTools ?? mcpTools.map((t) => t.name),
+      ...this.sessionPreapprovedTools
+    ];
     const additionalContext = this.buildAdditionalContext(options.prompt);
     const toolExecutor = this.toolExecutor ?? null;
     const availableToolNames = new Set(options.tools?.map((t) => t.name) ?? []);
@@ -3335,7 +3369,8 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
       workflowId = await this.tokenClient.createWorkflow(goal, {
         projectId,
         namespaceId: this.workflowOptions.namespaceId,
-        workflowDefinition: this.workflowOptions.workflowDefinition
+        workflowDefinition: this.workflowOptions.workflowDefinition,
+        agentPrivileges: this.workflowOptions.agentPrivileges
       });
       this.currentWorkflowId = workflowId;
     }
@@ -3347,11 +3382,13 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
       streamedInputChars: 0,
       streamedOutputChars: 0,
       pendingToolCount: 0,
+      approvalPending: false,
       deferredClose: null,
       activeTextBlockId: null,
       agentMessageEmitted: new Map(this.persistedAgentEmitted),
       currentAgentMessageId: "",
-      activeClient: wsClient
+      activeClient: wsClient,
+      processedRequestIDs: /* @__PURE__ */ new Set()
     };
     for (const msg of options.prompt) {
       if (msg.role === "system") {
@@ -3364,6 +3401,7 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
         }
       }
     }
+    let startReq;
     const stream = new ReadableStream({
       start: async (controller) => {
         try {
@@ -3384,7 +3422,8 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
                 wsClient,
                 toolExecutor,
                 () => `text-${textBlockCounter++}`,
-                availableToolNames
+                availableToolNames,
+                startReq
               );
             }
           );
@@ -3406,7 +3445,7 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
           const trimmedPreapproved = preapprovedTools.filter(
             (name) => trimmed.mcpTools.some((t) => t.name === name)
           );
-          const startReq = {
+          startReq = {
             workflowID: workflowId,
             clientVersion: CLIENT_VERSION,
             workflowDefinition: workflowDef,
@@ -3471,7 +3510,7 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
   // ---------------------------------------------------------------------------
   // Event handling
   // ---------------------------------------------------------------------------
-  handleWorkflowEvent(ss, event, controller, wsClient, toolExecutor, nextTextId, availableToolNames) {
+  handleWorkflowEvent(ss, event, controller, wsClient, toolExecutor, nextTextId, availableToolNames, startReq) {
     if (ss.streamClosed) {
       return;
     }
@@ -3482,6 +3521,8 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
       }
       case "tool-request": {
         const { requestID, data } = event;
+        if (ss.processedRequestIDs.has(requestID)) break;
+        ss.processedRequestIDs.add(requestID);
         let parsedArgs;
         try {
           JSON.parse(data.args);
@@ -3528,6 +3569,8 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
         break;
       }
       case "builtin-tool-request": {
+        if (ss.processedRequestIDs.has(event.requestID)) break;
+        ss.processedRequestIDs.add(event.requestID);
         const mapped = mapBuiltinTool(event.toolName, event.data, availableToolNames);
         const mappedArgs = JSON.stringify(mapped.args);
         if (ss.activeTextBlockId) {
@@ -3568,6 +3611,26 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
         });
         break;
       }
+      case "approval-required": {
+        ss.approvalPending = true;
+        this.approveAndResume(
+          ss,
+          event.tools,
+          startReq,
+          controller,
+          toolExecutor,
+          nextTextId,
+          availableToolNames
+        ).catch(() => {
+          ss.approvalPending = false;
+          if (ss.deferredClose) {
+            const close = ss.deferredClose;
+            ss.deferredClose = null;
+            close();
+          }
+        });
+        break;
+      }
       case "completed": {
         if (ss.activeTextBlockId) {
           controller.enqueue({ type: "text-end", id: ss.activeTextBlockId });
@@ -3586,7 +3649,7 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
           controller.close();
           this.cleanupClient(ss);
         };
-        if (ss.pendingToolCount > 0) {
+        if (ss.pendingToolCount > 0 || ss.approvalPending) {
           ss.deferredClose = doCompleteClose;
         } else {
           ss.deferredClose = null;
@@ -3645,7 +3708,7 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
             this.cleanupClient(ss);
           }
         };
-        if (ss.pendingToolCount > 0) {
+        if (ss.pendingToolCount > 0 || ss.approvalPending) {
           ss.deferredClose = doClose;
         } else {
           ss.deferredClose = null;
@@ -3821,6 +3884,60 @@ var GitLabWorkflowLanguageModel = class _GitLabWorkflowLanguageModel {
       this.persistedAgentEmitted.clear();
     }
   }
+  async approveAndResume(ss, tools, startReq, controller, toolExecutor, nextTextId, availableToolNames) {
+    const handler = this.workflowOptions.approvalHandler;
+    if (!handler || !startReq) {
+      ss.approvalPending = false;
+      if (ss.deferredClose) {
+        const close = ss.deferredClose;
+        ss.deferredClose = null;
+        close();
+      }
+      return;
+    }
+    let decision;
+    try {
+      decision = await handler(tools);
+    } catch (err) {
+      ss.approvalPending = false;
+      if (!ss.streamClosed) controller.error(err);
+      return;
+    }
+    ss.approvalPending = false;
+    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 = { ...startReq, approval };
+    const newClient = new GitLabWorkflowClient();
+    this.activeClients.add(newClient);
+    ss.activeClient = newClient;
+    const modelRef = await this.resolveModelRef();
+    try {
+      await newClient.connect(
+        {
+          instanceUrl: this.config.instanceUrl,
+          modelRef,
+          headers: this.config.getHeaders(),
+          projectId: this.workflowOptions.projectId,
+          namespaceId: this.workflowOptions.namespaceId,
+          rootNamespaceId: this.workflowOptions.rootNamespaceId
+        },
+        (event) => this.handleWorkflowEvent(
+          ss,
+          event,
+          controller,
+          newClient,
+          toolExecutor,
+          nextTextId,
+          availableToolNames,
+          newStartReq
+        )
+      );
+      newClient.sendStartRequest(newStartReq);
+    } catch (err) {
+      this.cleanupClient(ss, true);
+      if (!ss.streamClosed) controller.error(err);
+    }
+  }
   // ---------------------------------------------------------------------------
   // Workflow metadata
   // ---------------------------------------------------------------------------