opencode-gitlab-duo-agentic 0.2.21 → 0.2.24

package/dist/index.js

@@ -382,6 +382,7 @@ function isUtilityAgent(agent) {
   return UTILITY_AGENTS.has(name);
 }
 function isGitLabProvider(model) {
+  if (model.api?.npm === "opencode-gitlab-duo-agentic") return true;
   if (model.api?.npm === "opencode-gitlab-duo-agentic") return true;
   if (model.providerID === "gitlab" && model.api?.npm !== "@gitlab/gitlab-ai-provider") return true;
   return model.providerID.toLowerCase().includes("gitlab-duo");
@@ -779,6 +780,8 @@ function dlog(msg) {
 }
 
 // src/workflow/session.ts
+var BLOCKED_HTTP_REQUEST_ERROR = "gitlab_api_request is disabled by client policy";
+var BLOCKED_GIT_COMMAND_ERROR = "run_git_command is disabled by client policy";
 var WorkflowSession = class {
   #client;
   #tokenService;
@@ -793,6 +796,7 @@ var WorkflowSession = class {
   #queue;
   #startRequestSent = false;
   #pendingApproval = false;
+  #resumed = false;
   #onWorkflowCreated;
   constructor(client, modelId, cwd, options) {
     this.#client = client;
@@ -801,6 +805,7 @@ var WorkflowSession = class {
     this.#cwd = cwd;
     if (options?.existingWorkflowId) {
       this.#workflowId = options.existingWorkflowId;
+      this.#resumed = true;
     }
     this.#onWorkflowCreated = options?.onWorkflowCreated;
   }
@@ -822,6 +827,7 @@ var WorkflowSession = class {
     this.#tokenService.clear();
     this.#closeConnection();
     this.#pendingApproval = false;
+    this.#resumed = false;
     this.#startRequestSent = false;
   }
   // ---------------------------------------------------------------------------
@@ -953,11 +959,16 @@ var WorkflowSession = class {
       const status = action.newCheckpoint.status;
       dlog(`checkpoint: status=${status} ckptLen=${ckpt.length}`);
       const deltas = extractAgentTextDeltas(ckpt, this.#checkpoint);
-      for (const delta of deltas) {
-        queue.push({ type: "text-delta", value: delta });
-      }
-      if (deltas.length > 0) {
-        dlog(`checkpoint: ${deltas.length} text deltas`);
+      if (this.#resumed) {
+        dlog(`checkpoint: RESUMED \u2014 discarding ${deltas.length} old deltas, fast-forwarding state`);
+        this.#resumed = false;
+      } else {
+        for (const delta of deltas) {
+          queue.push({ type: "text-delta", value: delta });
+        }
+        if (deltas.length > 0) {
+          dlog(`checkpoint: ${deltas.length} text deltas`);
+        }
       }
       if (isToolApproval(status)) {
         dlog(`checkpoint: TOOL_APPROVAL \u2192 pendingApproval=true (waiting for DWS close)`);
@@ -973,9 +984,13 @@ var WorkflowSession = class {
     }
     const toolAction = action;
     if (toolAction.runHTTPRequest && toolAction.requestID) {
-      dlog(`standalone: httpRequest ${toolAction.runHTTPRequest.method} ${toolAction.runHTTPRequest.path} reqId=${toolAction.requestID}`);
-      this.#executeHttpRequest(toolAction.requestID, toolAction.runHTTPRequest).catch(() => {
-      });
+      dlog(`standalone: BLOCKED httpRequest ${toolAction.runHTTPRequest.method} ${toolAction.runHTTPRequest.path} reqId=${toolAction.requestID}`);
+      this.sendHttpResult(toolAction.requestID, 403, {}, "", BLOCKED_HTTP_REQUEST_ERROR);
+      return;
+    }
+    if (toolAction.runGitCommand && toolAction.requestID) {
+      dlog(`standalone: BLOCKED runGitCommand ${toolAction.runGitCommand.command} reqId=${toolAction.requestID}`);
+      this.sendToolResult(toolAction.requestID, "", BLOCKED_GIT_COMMAND_ERROR);
       return;
     }
     const mapped = mapActionToToolRequest(toolAction);
@@ -992,42 +1007,6 @@ var WorkflowSession = class {
     }
   }
   // ---------------------------------------------------------------------------
-  // Private: HTTP request handling (gitlab_api_request)
-  // ---------------------------------------------------------------------------
-  /**
-   * Execute a GitLab API request directly and send the response as httpResponse.
-   * DWS is the only action that expects httpResponse instead of plainTextResponse.
-   * Runs async in the background (fire-and-forget from #handleAction).
-   */
-  async #executeHttpRequest(requestId, request2) {
-    try {
-      const url = `${this.#client.instanceUrl}/api/v4/${request2.path}`;
-      dlog(`httpRequest: ${request2.method} ${request2.path} reqId=${requestId}`);
-      const init = {
-        method: request2.method,
-        headers: {
-          "authorization": `Bearer ${this.#client.token}`,
-          "content-type": "application/json"
-        }
-      };
-      if (request2.body) {
-        init.body = request2.body;
-      }
-      const response = await fetch(url, init);
-      const body = await response.text();
-      const headers = {};
-      response.headers.forEach((value, key) => {
-        headers[key] = value;
-      });
-      dlog(`httpRequest: ${request2.method} ${request2.path} \u2192 ${response.status} body=${body.length}b`);
-      this.sendHttpResult(requestId, response.status, headers, body);
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      dlog(`httpRequest: ERROR ${request2.method} ${request2.path} \u2192 ${message}`);
-      this.sendHttpResult(requestId, 0, {}, "", message);
-    }
-  }
-  // ---------------------------------------------------------------------------
   // Private: connection management
   // ---------------------------------------------------------------------------
   /**
@@ -1061,7 +1040,11 @@ var WorkflowSession = class {
           mcpTools,
           additional_context: [],
           preapproved_tools: mcpTools.map((t) => t.name),
-          approval: { approval: {} }
+          approval: { approval: {} },
+          ...this.#toolsConfig?.flowConfig ? {
+            flowConfig: this.#toolsConfig.flowConfig,
+            flowConfigSchemaVersion: this.#toolsConfig.flowConfigSchemaVersion ?? "v1"
+          } : {}
         }
       });
       this.#startRequestSent = true;
@@ -1506,6 +1489,44 @@ function loadWorkflowId(key) {
   return store[key];
 }
 
+// src/workflow/flow-config.ts
+var TOOL_ALLOWLIST = [
+  "read_file",
+  "read_files",
+  "create_file_with_contents",
+  "edit_file",
+  "list_dir",
+  "find_files",
+  "grep",
+  "mkdir",
+  "run_command"
+];
+function buildFlowConfig(systemPrompt) {
+  return {
+    version: "v1",
+    environment: "chat-partial",
+    components: [
+      {
+        // Keep "chat" for behavior parity with GitLab Duo CLI flow metadata.
+        name: "chat",
+        type: "AgentComponent",
+        prompt_id: "chat/agent",
+        toolset: [...TOOL_ALLOWLIST]
+      }
+    ],
+    prompts: [
+      {
+        name: "chat",
+        prompt_id: "chat/agent",
+        unit_primitives: ["duo_chat"],
+        prompt_template: {
+          system: systemPrompt
+        }
+      }
+    ]
+  };
+}
+
 // src/provider/duo-workflow-model.ts
 var sessions = /* @__PURE__ */ new Map();
 var UNKNOWN_USAGE = {
@@ -1527,8 +1548,6 @@ var DuoWorkflowModel = class {
   #sentToolCallIds = /* @__PURE__ */ new Set();
   #lastSentGoal = null;
   #stateSessionId;
-  #agentMode;
-  #agentModeReminder;
   constructor(modelId, client, cwd) {
     this.modelId = modelId;
     this.#client = client;
@@ -1569,8 +1588,6 @@ var DuoWorkflowModel = class {
       this.#multiCallGroups.clear();
       this.#sentToolCallIds.clear();
       this.#lastSentGoal = null;
-      this.#agentMode = void 0;
-      this.#agentModeReminder = void 0;
       this.#stateSessionId = sessionID;
     }
     const model = this;
@@ -1639,31 +1656,24 @@ var DuoWorkflowModel = class {
               await session.ensureConnected(goal);
               if (!session.hasStarted) {
                 const extraContext = [];
+                const extractedSystemPrompt = extractSystemPrompt(options.prompt);
+                const sanitizedSystemPrompt = sanitizeSystemPrompt(
+                  extractedSystemPrompt ?? "You are GitLab Duo, an AI coding assistant."
+                );
+                session.setToolsConfig({
+                  mcpTools: [],
+                  flowConfig: buildFlowConfig(sanitizedSystemPrompt),
+                  flowConfigSchemaVersion: "v1"
+                });
                 extraContext.push(...buildSystemContext());
-                const systemPrompt = extractSystemPrompt(options.prompt);
-                if (systemPrompt) {
-                  extraContext.push({
-                    category: "agent_context",
-                    content: sanitizeSystemPrompt(systemPrompt),
-                    id: "agent_system_prompt",
-                    metadata: JSON.stringify({
-                      title: "Agent System Prompt",
-                      enabled: true,
-                      subType: "system_prompt"
-                    })
-                  });
-                }
                 const agentReminders = extractAgentReminders(options.prompt);
-                const modeReminder = detectLatestModeReminder(agentReminders);
-                if (modeReminder) {
-                  model.#agentMode = modeReminder.mode;
-                  model.#agentModeReminder = modeReminder.reminder;
-                }
-                const remindersForContext = buildReminderContext(agentReminders, model.#agentModeReminder);
-                if (remindersForContext.length > 0) {
+                if (agentReminders.length > 0) {
                   extraContext.push({
                     category: "agent_context",
-                    content: sanitizeSystemPrompt(remindersForContext.join("\n\n")),
+                    content: sanitizeSystemPrompt(
+                      `[context-id:${Date.now()}]
+${agentReminders.join("\n\n")}`
+                    ),
                     id: "agent_reminders",
                     metadata: JSON.stringify({
                       title: "Agent Reminders",
@@ -1802,32 +1812,6 @@ var DuoWorkflowModel = class {
 function sessionKey(instanceUrl, modelId, sessionID) {
   return `${instanceUrl}::${modelId}::${sessionID}`;
 }
-function detectLatestModeReminder(reminders) {
-  let latest;
-  for (const reminder of reminders) {
-    const classification = classifyModeReminder(reminder);
-    if (classification === "other") continue;
-    latest = { mode: classification, reminder };
-  }
-  return latest;
-}
-function buildReminderContext(reminders, modeReminder) {
-  const nonModeReminders = reminders.filter(
-    (r) => classifyModeReminder(r) === "other"
-  );
-  if (!modeReminder) return nonModeReminders;
-  return [...nonModeReminders, modeReminder];
-}
-function classifyModeReminder(reminder) {
-  const text2 = reminder.toLowerCase();
-  if (text2.includes("operational mode has changed from build to plan")) return "plan";
-  if (text2.includes("operational mode has changed from plan to build")) return "build";
-  if (text2.includes("you are no longer in read-only mode")) return "build";
-  if (text2.includes("you are now in read-only mode")) return "plan";
-  if (text2.includes("you are in read-only mode")) return "plan";
-  if (text2.includes("you are permitted to make file changes")) return "build";
-  return "other";
-}
 
 // src/provider/index.ts
 function createFallbackProvider(input = {}) {

package/package.json

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