opencode-gitlab-duo-agentic 0.1.22 → 0.1.24

package/dist/index.js

@@ -17,6 +17,7 @@ import crypto from "crypto";
 import fs2 from "fs/promises";
 import os from "os";
 import path2 from "path";
+import { z } from "zod";
 
 // src/gitlab/client.ts
 var GitLabApiError = class extends Error {
@@ -190,6 +191,16 @@ function normalizeProjectPath(remotePath, instanceBasePath) {
 }
 
 // src/gitlab/models.ts
+var CachePayloadSchema = z.object({
+  cachedAt: z.string(),
+  instanceUrl: z.string(),
+  models: z.array(
+    z.object({
+      id: z.string(),
+      name: z.string()
+    })
+  ).min(1)
+});
 var QUERY = `query lsp_aiChatAvailableModels($rootNamespaceId: GroupID!) {
   aiChatAvailableModels(rootNamespaceId: $rootNamespaceId) {
     defaultModel { name ref }
@@ -251,8 +262,7 @@ function isStale(payload) {
 async function readCache(cachePath) {
   try {
     const raw = await fs2.readFile(cachePath, "utf8");
-    const parsed = JSON.parse(raw);
-    if (!parsed.models?.length) return null;
+    const parsed = CachePayloadSchema.parse(JSON.parse(raw));
     return parsed;
   } catch {
     return null;
@@ -286,13 +296,28 @@ function normalizeInstanceUrl(value) {
   }
 }
 
+// src/gitlab/resolve-credentials.ts
+function resolveCredentials(options = {}) {
+  const instanceUrl = normalizeInstanceUrl(options.instanceUrl ?? envInstanceUrl());
+  const token = firstNonEmptyString(options.apiKey, options.token) ?? envToken() ?? "";
+  return { instanceUrl, token };
+}
+function envToken() {
+  return process.env.GITLAB_TOKEN ?? process.env.GITLAB_OAUTH_TOKEN;
+}
+function firstNonEmptyString(...values) {
+  for (const v of values) {
+    if (typeof v === "string" && v.trim().length > 0) return v.trim();
+  }
+  return void 0;
+}
+
 // src/plugin/config.ts
 async function applyRuntimeConfig(config, directory) {
   config.provider ??= {};
   const current = config.provider[PROVIDER_ID] ?? {};
   const options = current.options ?? {};
-  const instanceUrl = normalizeInstanceUrl(options.instanceUrl ?? envInstanceUrl());
-  const token = (typeof options.apiKey === "string" ? options.apiKey : void 0) ?? process.env.GITLAB_TOKEN ?? process.env.GITLAB_OAUTH_TOKEN ?? "";
+  const { instanceUrl, token } = resolveCredentials(options);
   const available = await loadAvailableModels(instanceUrl, token, directory);
   const modelIds = available.map((m) => m.id);
   const models = toModelsConfig(available);
@@ -336,6 +361,7 @@ async function createPluginHooks(input) {
     },
     "chat.params": async (context, output) => {
       if (!isGitLabProvider(context.model)) return;
+      if (isUtilityAgent(context.agent)) return;
       output.options = {
         ...output.options,
         workflowSessionID: context.sessionID
@@ -343,6 +369,7 @@ async function createPluginHooks(input) {
     },
     "chat.headers": async (context, output) => {
       if (!isGitLabProvider(context.model)) return;
+      if (isUtilityAgent(context.agent)) return;
       output.headers = {
         ...output.headers,
         "x-opencode-session": context.sessionID
@@ -350,6 +377,11 @@ async function createPluginHooks(input) {
     }
   };
 }
+var UTILITY_AGENTS = /* @__PURE__ */ new Set(["title", "compaction"]);
+function isUtilityAgent(agent) {
+  const name = typeof agent === "string" ? agent : agent.name;
+  return UTILITY_AGENTS.has(name);
+}
 function isGitLabProvider(model) {
   if (model.api?.npm === "opencode-gitlab-duo-agentic") return true;
   if (model.providerID === "gitlab" && model.api?.npm !== "@gitlab/gitlab-ai-provider") return true;
@@ -365,6 +397,25 @@ import { randomUUID as randomUUID2 } from "crypto";
 // src/workflow/session.ts
 import { randomUUID } from "crypto";
 
+// src/utils/async-queue.ts
+var AsyncQueue = class {
+  #values = [];
+  #waiters = [];
+  push(value) {
+    const waiter = this.#waiters.shift();
+    if (waiter) {
+      waiter(value);
+      return;
+    }
+    this.#values.push(value);
+  }
+  shift() {
+    const value = this.#values.shift();
+    if (value !== void 0) return Promise.resolve(value);
+    return new Promise((resolve) => this.#waiters.push(resolve));
+  }
+};
+
 // src/workflow/checkpoint.ts
 function createCheckpointState() {
   return {
@@ -464,6 +515,20 @@ var WORKFLOW_STATUS = {
   PLAN_APPROVAL_REQUIRED: "PLAN_APPROVAL_REQUIRED",
   TOOL_CALL_APPROVAL_REQUIRED: "TOOL_CALL_APPROVAL_REQUIRED"
 };
+function isCheckpointAction(action) {
+  return "newCheckpoint" in action && action.newCheckpoint != null;
+}
+var TURN_COMPLETE_STATUSES = /* @__PURE__ */ new Set([
+  WORKFLOW_STATUS.INPUT_REQUIRED,
+  WORKFLOW_STATUS.FINISHED,
+  WORKFLOW_STATUS.FAILED,
+  WORKFLOW_STATUS.STOPPED,
+  WORKFLOW_STATUS.PLAN_APPROVAL_REQUIRED,
+  WORKFLOW_STATUS.TOOL_CALL_APPROVAL_REQUIRED
+]);
+function isTurnComplete(status) {
+  return TURN_COMPLETE_STATUSES.has(status);
+}
 
 // src/workflow/websocket-client.ts
 import WebSocket from "isomorphic-ws";
@@ -561,15 +626,18 @@ var WorkflowSession = class {
   #client;
   #tokenService;
   #modelId;
+  #cwd;
   #workflowId;
   #projectPath;
   #rootNamespaceId;
   #checkpoint = createCheckpointState();
-  #pending = Promise.resolve();
-  constructor(client, modelId) {
+  /** Mutex: serialises concurrent calls to runTurn so only one runs at a time. */
+  #turnLock = Promise.resolve();
+  constructor(client, modelId, cwd) {
     this.#client = client;
     this.#tokenService = new WorkflowTokenService(client);
     this.#modelId = modelId;
+    this.#cwd = cwd;
   }
   get workflowId() {
     return this.#workflowId;
@@ -580,9 +648,9 @@ var WorkflowSession = class {
     this.#tokenService.clear();
   }
   async *runTurn(goal, abortSignal) {
-    await this.#pending;
+    await this.#turnLock;
     let resolve;
-    this.#pending = new Promise((r) => {
+    this.#turnLock = new Promise((r) => {
       resolve = r;
     });
     const queue = new AsyncQueue();
@@ -684,7 +752,7 @@ var WorkflowSession = class {
   }
   async #loadProjectContext() {
     if (this.#projectPath !== void 0) return;
-    const projectPath = await detectProjectPath(process.cwd(), this.#client.instanceUrl);
+    const projectPath = await detectProjectPath(this.#cwd, this.#client.instanceUrl);
     this.#projectPath = projectPath;
     if (!projectPath) return;
     try {
@@ -695,12 +763,6 @@ var WorkflowSession = class {
     }
   }
 };
-function isCheckpointAction(action) {
-  return Boolean(action.newCheckpoint);
-}
-function isTurnComplete(status) {
-  return status === WORKFLOW_STATUS.INPUT_REQUIRED || status === WORKFLOW_STATUS.FINISHED || status === WORKFLOW_STATUS.FAILED || status === WORKFLOW_STATUS.STOPPED || status === WORKFLOW_STATUS.PLAN_APPROVAL_REQUIRED || status === WORKFLOW_STATUS.TOOL_CALL_APPROVAL_REQUIRED;
-}
 function buildWebSocketUrl(instanceUrl, modelId) {
   const base = new URL(instanceUrl.endsWith("/") ? instanceUrl : `${instanceUrl}/`);
   const url = new URL("api/v4/ai/duo_workflows/ws", base);
@@ -709,35 +771,65 @@ function buildWebSocketUrl(instanceUrl, modelId) {
   if (modelId) url.searchParams.set("user_selected_model_identifier", modelId);
   return url.toString();
 }
-var AsyncQueue = class {
-  #values = [];
-  #waiters = [];
-  push(value) {
-    const waiter = this.#waiters.shift();
-    if (waiter) {
-      waiter(value);
-      return;
-    }
-    this.#values.push(value);
+
+// src/provider/prompt.ts
+var SYSTEM_REMINDER_RE = /<system-reminder>[\s\S]*?<\/system-reminder>/g;
+var WRAPPED_USER_RE = /^<system-reminder>\s*The user sent the following message:\s*\n([\s\S]*?)\n\s*Please address this message and continue with your tasks\.\s*<\/system-reminder>$/;
+function extractGoal(prompt) {
+  for (let i = prompt.length - 1; i >= 0; i--) {
+    const message = prompt[i];
+    if (message.role !== "user") continue;
+    const content = Array.isArray(message.content) ? message.content : [];
+    const text2 = content.filter((part) => part.type === "text").map((part) => stripSystemReminders(part.text)).filter(Boolean).join("\n").trim();
+    if (text2) return text2;
   }
-  shift() {
-    const value = this.#values.shift();
-    if (value !== void 0) return Promise.resolve(value);
-    return new Promise((resolve) => this.#waiters.push(resolve));
+  return "";
+}
+function stripSystemReminders(value) {
+  return value.replace(SYSTEM_REMINDER_RE, (block) => {
+    const wrapped = WRAPPED_USER_RE.exec(block);
+    return wrapped?.[1]?.trim() ?? "";
+  }).trim();
+}
+
+// src/provider/session-context.ts
+function readSessionID(options) {
+  const providerBlock = readProviderBlock(options);
+  if (typeof providerBlock?.workflowSessionID === "string" && providerBlock.workflowSessionID.trim()) {
+    return providerBlock.workflowSessionID.trim();
   }
-};
+  const headers = options.headers ?? {};
+  for (const [key, value] of Object.entries(headers)) {
+    if (key.toLowerCase() === "x-opencode-session" && value?.trim()) return value.trim();
+  }
+  return void 0;
+}
+function readProviderBlock(options) {
+  const block = options.providerOptions?.[PROVIDER_ID];
+  if (block && typeof block === "object" && !Array.isArray(block)) {
+    return block;
+  }
+  return void 0;
+}
 
 // src/provider/duo-workflow-model.ts
 var sessions = /* @__PURE__ */ new Map();
+var UNKNOWN_USAGE = {
+  inputTokens: void 0,
+  outputTokens: void 0,
+  totalTokens: void 0
+};
 var DuoWorkflowModel = class {
   specificationVersion = "v2";
   provider = PROVIDER_ID;
   modelId;
   supportedUrls = {};
   #client;
-  constructor(modelId, client) {
+  #cwd;
+  constructor(modelId, client, cwd) {
     this.modelId = modelId;
     this.#client = client;
+    this.#cwd = cwd ?? process.cwd();
   }
   async doGenerate(options) {
     const sessionID = readSessionID(options);
@@ -757,11 +849,7 @@ var DuoWorkflowModel = class {
         }
       ],
       finishReason: "stop",
-      usage: {
-        inputTokens: void 0,
-        outputTokens: void 0,
-        totalTokens: void 0
-      },
+      usage: UNKNOWN_USAGE,
       warnings: []
     };
   }
@@ -806,11 +894,7 @@ var DuoWorkflowModel = class {
             controller.enqueue({
               type: "finish",
               finishReason: "stop",
-              usage: {
-                inputTokens: void 0,
-                outputTokens: void 0,
-                totalTokens: void 0
-              }
+              usage: UNKNOWN_USAGE
             });
             controller.close();
           } catch (error) {
@@ -821,11 +905,7 @@ var DuoWorkflowModel = class {
             controller.enqueue({
               type: "finish",
               finishReason: "error",
-              usage: {
-                inputTokens: void 0,
-                outputTokens: void 0,
-                totalTokens: void 0
-              }
+              usage: UNKNOWN_USAGE
             });
             controller.close();
           }
@@ -839,57 +919,26 @@ var DuoWorkflowModel = class {
       }
     };
   }
+  /** Remove a cached session, freeing its resources. */
+  disposeSession(sessionID) {
+    return sessions.delete(sessionKey(this.#client.instanceUrl, this.modelId, sessionID));
+  }
   #resolveSession(sessionID) {
-    const key = `${this.#client.instanceUrl}::${this.modelId}::${sessionID}`;
+    const key = sessionKey(this.#client.instanceUrl, this.modelId, sessionID);
     const existing = sessions.get(key);
     if (existing) return existing;
-    const created = new WorkflowSession(this.#client, this.modelId);
+    const created = new WorkflowSession(this.#client, this.modelId, this.#cwd);
     sessions.set(key, created);
     return created;
   }
 };
-function extractGoal(prompt) {
-  for (let i = prompt.length - 1; i >= 0; i--) {
-    const message = prompt[i];
-    if (message.role !== "user") continue;
-    const content = Array.isArray(message.content) ? message.content : [];
-    const text2 = content.filter((part) => part.type === "text").map((part) => stripSystemReminders(part.text)).filter(Boolean).join("\n").trim();
-    if (text2) return text2;
-  }
-  return "";
-}
-var SYSTEM_REMINDER_RE = /<system-reminder>[\s\S]*?<\/system-reminder>/g;
-var WRAPPED_USER_RE = /^<system-reminder>\s*The user sent the following message:\s*\n([\s\S]*?)\n\s*Please address this message and continue with your tasks\.\s*<\/system-reminder>$/;
-function stripSystemReminders(value) {
-  return value.replace(SYSTEM_REMINDER_RE, (block) => {
-    const wrapped = WRAPPED_USER_RE.exec(block);
-    return wrapped?.[1]?.trim() ?? "";
-  }).trim();
-}
-function readSessionID(options) {
-  const providerBlock = readProviderBlock(options);
-  if (typeof providerBlock?.workflowSessionID === "string" && providerBlock.workflowSessionID.trim()) {
-    return providerBlock.workflowSessionID.trim();
-  }
-  const headers = options.headers ?? {};
-  for (const [key, value] of Object.entries(headers)) {
-    if (key.toLowerCase() === "x-opencode-session" && value?.trim()) return value.trim();
-  }
-  return void 0;
-}
-function readProviderBlock(options) {
-  const block = options.providerOptions?.[PROVIDER_ID];
-  if (block && typeof block === "object" && !Array.isArray(block)) {
-    return block;
-  }
-  return void 0;
+function sessionKey(instanceUrl, modelId, sessionID) {
+  return `${instanceUrl}::${modelId}::${sessionID}`;
 }
 
 // src/provider/index.ts
 function createFallbackProvider(input = {}) {
-  const instanceUrl = normalizeInstanceUrl(input.instanceUrl ?? envInstanceUrl());
-  const token = text(input.apiKey) ?? text(input.token) ?? process.env.GITLAB_TOKEN ?? process.env.GITLAB_OAUTH_TOKEN ?? "";
-  const client = { instanceUrl, token };
+  const client = resolveCredentials(input);
   return {
     languageModel(modelId) {
       return new DuoWorkflowModel(modelId, client);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-gitlab-duo-agentic",
-  "version": "0.1.22",
+  "version": "0.1.24",
   "description": "OpenCode plugin and provider for GitLab Duo Agentic workflows",
   "license": "MIT",
   "type": "module",
@@ -43,9 +43,6 @@
     "@ai-sdk/provider": "2.0.1",
     "@opencode-ai/plugin": "^1.2.6",
     "isomorphic-ws": "^5.0.0",
-    "neverthrow": "^8.2.0",
-    "proxy-agent": "^6.5.0",
-    "uuid": "^11.0.5",
     "zod": "^3.25.76"
   },
   "devDependencies": {