opencode-gitlab-duo-agentic 0.1.5 → 0.1.7

package/dist/index.js

@@ -1180,7 +1180,7 @@ var TokenUsageEstimator = class {
 };
 
 // src/provider/core/debug_log.ts
-import { appendFileSync, writeFileSync } from "fs";
+import { appendFileSync } from "fs";
 var LOG_PATH = "/tmp/duo-debug.log";
 function duoLog(...args) {
   const ts = (/* @__PURE__ */ new Date()).toISOString().slice(11, 23);
@@ -1194,6 +1194,7 @@ function duoLog(...args) {
 }
 
 // src/provider/application/model.ts
+var EMPTY_USAGE = { inputTokens: 0, outputTokens: 0, totalTokens: 0 };
 var GitLabDuoAgenticLanguageModel = class {
   specificationVersion = "v2";
   provider = GITLAB_DUO_PROVIDER_ID;
@@ -1236,10 +1237,14 @@ var GitLabDuoAgenticLanguageModel = class {
     };
   }
   async doStream(options) {
-    const workflowType = "chat";
     const promptText = extractLastUserText(options.prompt);
+    if (!this.#runtime.tryAcquireStreamLock()) {
+      duoLog("--- doStream BUSY (rejected)", "prompt=" + (promptText?.slice(0, 40) ?? "null"));
+      return { stream: emptyFinishStream() };
+    }
+    const workflowType = "chat";
     const toolResults = extractToolResults(options.prompt);
-    duoLog("--- doStream", "hasStarted=" + this.#runtime.hasStarted, "prompt=" + (promptText?.slice(0, 60) ?? "null"), "toolResults=" + toolResults.length);
+    duoLog("--- doStream", "hasStarted=" + this.#runtime.hasStarted, "prompt=" + (promptText?.slice(0, 60) ?? "null"));
     this.#runtime.resetMapperState();
     if (!this.#runtime.hasStarted) {
       this.#sentToolCallIds.clear();
@@ -1257,7 +1262,6 @@ var GitLabDuoAgenticLanguageModel = class {
     const mcpTools = this.#options.enableMcp === false ? [] : buildMcpTools(options);
     const toolContext = buildToolContext(mcpTools);
     const isNewUserMessage = promptText != null && promptText !== this.#lastSentPrompt;
-    duoLog("gate", "isNewUserMessage=" + isNewUserMessage, "freshTools=" + freshToolResults.length, "lastSent=" + (this.#lastSentPrompt?.slice(0, 40) ?? "null"));
     let sentToolResults = false;
     if (freshToolResults.length > 0) {
       for (const result of freshToolResults) {
@@ -1378,8 +1382,6 @@ var GitLabDuoAgenticLanguageModel = class {
       for (const ctx of extraContext) {
         if (ctx.content) this.#usageEstimator.addInputChars(ctx.content);
       }
-    } else {
-      duoLog("SKIP startRequest", "sentToolResults=" + sentToolResults, "isNewUserMessage=" + isNewUserMessage);
     }
     const iterator = this.#mapEventsToStream(this.#runtime.getEventStream());
     const stream = asyncIteratorToReadableStream(iterator);
@@ -1398,7 +1400,6 @@ var GitLabDuoAgenticLanguageModel = class {
     try {
       for await (const event of events) {
         eventCount++;
-        duoLog("evt", event.type, eventCount);
         if (event.type === "TEXT_CHUNK") {
           if (event.content.length > 0) {
             estimator.addOutputChars(event.content);
@@ -1447,6 +1448,8 @@ var GitLabDuoAgenticLanguageModel = class {
       duoLog("streamErr", streamErr instanceof Error ? streamErr.message : String(streamErr));
       yield { type: "error", error: streamErr instanceof Error ? streamErr : new Error(String(streamErr)) };
       return;
+    } finally {
+      this.#runtime.releaseStreamLock();
     }
     duoLog("finish", "events=" + eventCount);
     yield { type: "finish", finishReason: "stop", usage: this.#currentUsage };
@@ -1487,6 +1490,14 @@ var GitLabDuoAgenticLanguageModel = class {
     yield { type: "finish", finishReason: "tool-calls", usage: this.#currentUsage };
   }
 };
+function emptyFinishStream() {
+  return new ReadableStream({
+    start(controller) {
+      controller.enqueue({ type: "finish", finishReason: "stop", usage: EMPTY_USAGE });
+      controller.close();
+    }
+  });
+}
 function buildReminderContext(reminders, modeReminder) {
   const nonModeReminders = reminders.filter((reminder) => classifyModeReminder2(reminder) === "other");
   if (!modeReminder) {
@@ -1873,7 +1884,7 @@ var GitLabAgenticRuntime = class {
   #mapper = new WorkflowEventMapper();
   #containerParams;
   #startRequestSent = false;
-  #connectingPromise;
+  #streamingLock = false;
   constructor(options, dependencies) {
     this.#options = options;
     this.#dependencies = dependencies;
@@ -1889,6 +1900,14 @@ var GitLabAgenticRuntime = class {
     this.#selectedModelIdentifier = ref;
     this.#resetStreamState();
   }
+  tryAcquireStreamLock() {
+    if (this.#streamingLock) return false;
+    this.#streamingLock = true;
+    return true;
+  }
+  releaseStreamLock() {
+    this.#streamingLock = false;
+  }
   resetMapperState() {
     this.#mapper.resetStreamState();
   }
@@ -1896,24 +1915,10 @@ var GitLabAgenticRuntime = class {
   // Connection lifecycle
   // ---------------------------------------------------------------------------
   async ensureConnected(goal, workflowType) {
-    duoLog("ensureConnected", "stream=" + !!this.#stream, "wfId=" + !!this.#workflowId, "queue=" + !!this.#queue, "connecting=" + !!this.#connectingPromise);
-    if (this.#connectingPromise) {
-      duoLog("ensureConnected", "awaiting in-flight connection");
-      await this.#connectingPromise;
-      return;
-    }
+    duoLog("ensureConnected", "stream=" + !!this.#stream, "wfId=" + !!this.#workflowId, "queue=" + !!this.#queue);
     if (this.#stream && this.#workflowId && this.#queue) {
-      duoLog("ensureConnected", "skip (connected)");
       return;
     }
-    this.#connectingPromise = this.#doConnect(goal, workflowType);
-    try {
-      await this.#connectingPromise;
-    } finally {
-      this.#connectingPromise = void 0;
-    }
-  }
-  async #doConnect(goal, workflowType) {
     if (!this.#containerParams) {
       this.#containerParams = await this.#resolveContainerParams();
     }
@@ -1984,8 +1989,7 @@ var GitLabAgenticRuntime = class {
         preapproved_tools: preapprovedTools
       }
     };
-    const ok2 = this.#stream.write(startRequest);
-    duoLog("startReq write=" + ok2, "wf=" + this.#workflowId);
+    this.#stream.write(startRequest);
     this.#startRequestSent = true;
   }
   sendToolResponse(requestId, response, responseType) {
@@ -2089,7 +2093,6 @@ var GitLabAgenticRuntime = class {
           workflowStatus: action.newCheckpoint.status
         };
         const events = await this.#mapper.mapWorkflowEvent(duoEvent);
-        duoLog("mapped", events.length, events.map((e) => e.type).join(","));
         for (const event of events) {
           queue.push(event);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-gitlab-duo-agentic",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "OpenCode plugin and provider for GitLab Duo Agentic workflows",
   "license": "MIT",
   "type": "module",