@rama_nigg/open-cursor 2.3.18 → 2.3.20

package/dist/cli/mcptool.js

@@ -292,6 +292,42 @@ function readMcpConfigs(deps = {}) {
   }
   return configs;
 }
+function readSubagentNames(deps = {}) {
+  let raw;
+  if (deps.configJson != null) {
+    raw = deps.configJson;
+  } else {
+    const exists = deps.existsSync ?? nodeExistsSync;
+    const readFile = deps.readFileSync ?? nodeReadFileSync;
+    const configPath = resolveOpenCodeConfigPath(deps.env ?? process.env);
+    if (!exists(configPath))
+      return ["general-purpose"];
+    try {
+      raw = readFile(configPath, "utf8");
+    } catch {
+      return ["general-purpose"];
+    }
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    return ["general-purpose"];
+  }
+  const agentSection = parsed.agent;
+  if (!agentSection || typeof agentSection !== "object" || Array.isArray(agentSection)) {
+    return ["general-purpose"];
+  }
+  const agents = agentSection;
+  const names = Object.keys(agents);
+  if (names.length === 0)
+    return ["general-purpose"];
+  const subagentNames = names.filter((name) => {
+    const entry = agents[name];
+    return entry && typeof entry === "object" && !Array.isArray(entry) && entry.mode === "subagent";
+  });
+  return subagentNames.length > 0 ? subagentNames : names;
+}
 function isStringRecord(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v);
 }

package/dist/index.js

@@ -889,7 +889,7 @@ function debugLogToFile(message, data) {
     log4.debug(message, data);
   }
 }
-function buildPromptFromMessages(messages, tools) {
+function buildPromptFromMessages(messages, tools, subagentNames = []) {
   const messageSummary = messages.map((m, i) => {
     const role = m?.role ?? "?";
     const hasToolCalls = Array.isArray(m?.tool_calls) ? m.tool_calls.length : 0;
@@ -947,6 +947,13 @@ function buildPromptFromMessages(messages, tools) {
 
 Available tools:
 ${toolDescs}`);
+    const hasTaskTool = tools.some((t) => {
+      const name = (t?.function?.name ?? t?.name ?? "").toLowerCase();
+      return name === "task";
+    });
+    if (hasTaskTool && subagentNames.length > 0) {
+      lines.push(`When calling the task tool, set subagent_type to one of: ${subagentNames.join(", ")}. Do not omit this parameter.`);
+    }
   }
   for (const message of messages) {
     const role = typeof message.role === "string" ? message.role : "user";
@@ -1908,6 +1915,42 @@ function readMcpConfigs(deps = {}) {
   }
   return configs;
 }
+function readSubagentNames(deps = {}) {
+  let raw;
+  if (deps.configJson != null) {
+    raw = deps.configJson;
+  } else {
+    const exists = deps.existsSync ?? nodeExistsSync2;
+    const readFile = deps.readFileSync ?? nodeReadFileSync2;
+    const configPath = resolveOpenCodeConfigPath(deps.env ?? process.env);
+    if (!exists(configPath))
+      return ["general-purpose"];
+    try {
+      raw = readFile(configPath, "utf8");
+    } catch {
+      return ["general-purpose"];
+    }
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    return ["general-purpose"];
+  }
+  const agentSection = parsed.agent;
+  if (!agentSection || typeof agentSection !== "object" || Array.isArray(agentSection)) {
+    return ["general-purpose"];
+  }
+  const agents = agentSection;
+  const names = Object.keys(agents);
+  if (names.length === 0)
+    return ["general-purpose"];
+  const subagentNames = names.filter((name) => {
+    const entry = agents[name];
+    return entry && typeof entry === "object" && !Array.isArray(entry) && entry.mode === "subagent";
+  });
+  return subagentNames.length > 0 ? subagentNames : names;
+}
 function isStringRecord(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v);
 }
@@ -14535,6 +14578,15 @@ async function handleToolLoopEventLegacy(options) {
     if (compat.validation.hasSchema && !compat.validation.ok) {
       const validationTermination = evaluateSchemaValidationLoopGuard(toolLoopGuard, normalizedToolCall, compat.validation);
       if (validationTermination) {
+        if (validationTermination.soft) {
+          const hintChunk = createLoopGuardHintChunk(responseMeta, normalizedToolCall, validationTermination);
+          log17.debug("Soft-blocking schema validation loop guard in legacy (emitting hint)", {
+            tool: normalizedToolCall.function.name,
+            fingerprint: validationTermination.fingerprint
+          });
+          await onToolResult(hintChunk);
+          return { intercepted: false, skipConverter: true };
+        }
         return { intercepted: false, skipConverter: true, terminate: validationTermination };
       }
       const reroutedWrite = tryRerouteEditToWrite(normalizedToolCall, compat.normalizedArgs, allowedToolNames, toolSchemaMap);
@@ -14558,6 +14610,15 @@ async function handleToolLoopEventLegacy(options) {
     }
     const termination = evaluateToolLoopGuard(toolLoopGuard, normalizedToolCall);
     if (termination) {
+      if (termination.soft) {
+        const hintChunk = createLoopGuardHintChunk(responseMeta, normalizedToolCall, termination);
+        log17.debug("Soft-blocking tool loop guard in legacy (emitting hint)", {
+          tool: normalizedToolCall.function.name,
+          fingerprint: termination.fingerprint
+        });
+        await onToolResult(hintChunk);
+        return { intercepted: false, skipConverter: true };
+      }
       return { intercepted: false, skipConverter: true, terminate: termination };
     }
     await onInterceptedToolCall(normalizedToolCall);
@@ -14654,10 +14715,30 @@ async function handleToolLoopEventV1(options) {
     });
     const validationTermination = evaluateSchemaValidationLoopGuard(toolLoopGuard, normalizedToolCall, compat.validation);
     if (validationTermination) {
+      if (validationTermination.soft) {
+        const hintChunk = createLoopGuardHintChunk(responseMeta, normalizedToolCall, validationTermination);
+        log17.debug("Soft-blocking schema validation loop guard (emitting hint)", {
+          tool: normalizedToolCall.function.name,
+          fingerprint: validationTermination.fingerprint,
+          repeatCount: validationTermination.repeatCount
+        });
+        await onToolResult(hintChunk);
+        return { intercepted: false, skipConverter: true };
+      }
       return { intercepted: false, skipConverter: true, terminate: validationTermination };
     }
     const termination2 = evaluateToolLoopGuard(toolLoopGuard, normalizedToolCall);
     if (termination2) {
+      if (termination2.soft) {
+        const hintChunk = createLoopGuardHintChunk(responseMeta, normalizedToolCall, termination2);
+        log17.debug("Soft-blocking tool loop guard in validation path (emitting hint)", {
+          tool: normalizedToolCall.function.name,
+          fingerprint: termination2.fingerprint,
+          repeatCount: termination2.repeatCount
+        });
+        await onToolResult(hintChunk);
+        return { intercepted: false, skipConverter: true };
+      }
       return { intercepted: false, skipConverter: true, terminate: termination2 };
     }
     const reroutedWrite = tryRerouteEditToWrite(normalizedToolCall, compat.normalizedArgs, allowedToolNames, toolSchemaMap);
@@ -14712,6 +14793,16 @@ async function handleToolLoopEventV1(options) {
   }
   const termination = evaluateToolLoopGuard(toolLoopGuard, normalizedToolCall);
   if (termination) {
+    if (termination.soft) {
+      const hintChunk = createLoopGuardHintChunk(responseMeta, normalizedToolCall, termination);
+      log17.debug("Soft-blocking tool loop guard (emitting hint)", {
+        tool: normalizedToolCall.function.name,
+        fingerprint: termination.fingerprint,
+        repeatCount: termination.repeatCount
+      });
+      await onToolResult(hintChunk);
+      return { intercepted: false, skipConverter: true };
+    }
     return { intercepted: false, skipConverter: true, terminate: termination };
   }
   await onInterceptedToolCall(normalizedToolCall);
@@ -14782,6 +14873,7 @@ function evaluateToolLoopGuard(toolLoopGuard, toolCall) {
       silent: true
     };
   }
+  const isFirstTrigger = decision.repeatCount === decision.maxRepeat + 1;
   return {
     reason: "loop_guard",
     message: `Tool loop guard stopped repeated failing calls to "${toolCall.function.name}" ` + `after ${decision.repeatCount} attempts (limit ${decision.maxRepeat}). ` + "Adjust tool arguments and retry.",
@@ -14789,7 +14881,8 @@ function evaluateToolLoopGuard(toolLoopGuard, toolCall) {
     fingerprint: decision.fingerprint,
     repeatCount: decision.repeatCount,
     maxRepeat: decision.maxRepeat,
-    errorClass: decision.errorClass
+    errorClass: decision.errorClass,
+    soft: isFirstTrigger
   };
 }
 function createSchemaValidationTermination(toolCall, validation) {
@@ -14822,12 +14915,14 @@ function evaluateSchemaValidationLoopGuard(toolLoopGuard, toolCall, validation)
   if (!decision.tracked || !decision.triggered) {
     return null;
   }
-  log17.warn("Tool loop guard triggered on schema validation", {
+  const isFirstTrigger = decision.repeatCount === decision.maxRepeat + 1;
+  log17.debug("Tool loop guard triggered on schema validation", {
     tool: toolCall.function.name,
     fingerprint: decision.fingerprint,
     repeatCount: decision.repeatCount,
     maxRepeat: decision.maxRepeat,
-    validationSignature
+    validationSignature,
+    soft: isFirstTrigger
   });
   return {
     reason: "loop_guard",
@@ -14836,7 +14931,8 @@ function evaluateSchemaValidationLoopGuard(toolLoopGuard, toolCall, validation)
     fingerprint: decision.fingerprint,
     repeatCount: decision.repeatCount,
     maxRepeat: decision.maxRepeat,
-    errorClass: decision.errorClass
+    errorClass: decision.errorClass,
+    soft: isFirstTrigger
   };
 }
 function buildValidationSignature(validation) {
@@ -14894,6 +14990,25 @@ function createNonFatalSchemaValidationHintChunk(meta, toolCall, validation) {
     ]
   };
 }
+function createLoopGuardHintChunk(meta, toolCall, termination) {
+  const content = `Tool "${toolCall.function.name}" has been temporarily blocked after ` + `${termination.repeatCount} repeated ${termination.errorClass} failures. ` + "Do not retry this tool. Use a different approach to complete the task.";
+  return {
+    id: meta.id,
+    object: "chat.completion.chunk",
+    created: meta.created,
+    model: meta.model,
+    choices: [
+      {
+        index: 0,
+        delta: {
+          role: "assistant",
+          content
+        },
+        finish_reason: null
+      }
+    ]
+  };
+}
 function safeArgTypeSummary(event) {
   try {
     let raw;
@@ -15373,15 +15488,16 @@ function evaluateWithFingerprints(toolName, errorClass, strictFingerprint, coars
       tracked: false
     };
   }
+  const isExplorationTool = EXPLORATION_TOOLS.has(toolName.toLowerCase());
+  const effectiveMaxRepeat = isExplorationTool ? maxRepeat * EXPLORATION_LIMIT_MULTIPLIER : maxRepeat;
   const strictRepeatCount = (strictCounts.get(strictFingerprint) ?? 0) + 1;
   strictCounts.set(strictFingerprint, strictRepeatCount);
-  const strictTriggered = strictRepeatCount > maxRepeat;
-  const isExplorationTool = EXPLORATION_TOOLS.has(toolName.toLowerCase());
+  const strictTriggered = strictRepeatCount > effectiveMaxRepeat;
   if (isExplorationTool) {
     return {
       fingerprint: strictFingerprint,
       repeatCount: strictRepeatCount,
-      maxRepeat,
+      maxRepeat: effectiveMaxRepeat,
       errorClass,
       triggered: strictTriggered,
       tracked: true
@@ -15506,7 +15622,8 @@ var init_tool_loop_guard = __esm(() => {
     "semsearch",
     "bash",
     "shell",
-    "webfetch"
+    "webfetch",
+    "task"
   ]);
 });
 
@@ -15543,7 +15660,7 @@ function debugLogToFile2(message, data) {
     appendFileSync3(DEBUG_LOG_FILE2, logLine);
   } catch {}
 }
-function buildAvailableToolsSystemMessage(lastToolNames, lastToolMap, mcpToolDefs, mcpToolSummaries) {
+function buildAvailableToolsSystemMessage(lastToolNames, lastToolMap, mcpToolDefs, mcpToolSummaries, subagentNames = []) {
   const parts = [];
   if (lastToolNames.length > 0 || lastToolMap.length > 0) {
     const names = lastToolNames.join(", ");
@@ -15578,6 +15695,9 @@ function buildAvailableToolsSystemMessage(lastToolNames, lastToolMap, mcpToolDef
     parts.push(lines.join(`
 `));
   }
+  if (subagentNames.length > 0) {
+    parts.push(`When calling the task tool, set subagent_type to one of: ${subagentNames.join(", ")}. Do not omit this parameter.`);
+  }
   return parts.length > 0 ? parts.join(`
 
 `) : null;
@@ -15949,7 +16069,8 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
       const toolSchemaMap = buildToolSchemaMap(tools);
       const toolLoopGuard = createToolLoopGuard(messages, TOOL_LOOP_MAX_REPEAT);
       const boundaryContext = createBoundaryRuntimeContext("bun-handler");
-      const prompt = buildPromptFromMessages(messages, tools);
+      const subagentNames = readSubagentNames();
+      const prompt = buildPromptFromMessages(messages, tools, subagentNames);
       const model = boundaryContext.run("normalizeRuntimeModel", (boundary) => boundary.normalizeRuntimeModel(body?.model));
       const msgSummaryBun = messages.map((m, i) => {
         const role = m?.role ?? "?";
@@ -16377,7 +16498,8 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
       const toolSchemaMap = buildToolSchemaMap(tools);
       const toolLoopGuard = createToolLoopGuard(messages, TOOL_LOOP_MAX_REPEAT);
       const boundaryContext = createBoundaryRuntimeContext("node-handler");
-      const prompt = buildPromptFromMessages(messages, tools);
+      const subagentNames = readSubagentNames();
+      const prompt = buildPromptFromMessages(messages, tools, subagentNames);
       const model = boundaryContext.run("normalizeRuntimeModel", (boundary) => boundary.normalizeRuntimeModel(bodyData?.model));
       const msgSummary = messages.map((m, i) => {
         const role = m?.role ?? "?";
@@ -17180,7 +17302,8 @@ var log19, DEBUG_LOG_DIR2, DEBUG_LOG_FILE2, CURSOR_PROVIDER_ID2 = "cursor-acp",
     async "experimental.chat.system.transform"(input, output) {
       if (!toolsEnabled)
         return;
-      const systemMessage = buildAvailableToolsSystemMessage(lastToolNames, lastToolMap, mcpToolDefs, mcpToolSummaries);
+      const subagentNames = readSubagentNames();
+      const systemMessage = buildAvailableToolsSystemMessage(lastToolNames, lastToolMap, mcpToolDefs, mcpToolSummaries, subagentNames);
       if (!systemMessage)
         return;
       output.system = output.system || [];

package/dist/plugin-entry.js

@@ -948,7 +948,7 @@ function debugLogToFile(message, data) {
     log4.debug(message, data);
   }
 }
-function buildPromptFromMessages(messages, tools) {
+function buildPromptFromMessages(messages, tools, subagentNames = []) {
   const messageSummary = messages.map((m, i) => {
     const role = m?.role ?? "?";
     const hasToolCalls = Array.isArray(m?.tool_calls) ? m.tool_calls.length : 0;
@@ -1006,6 +1006,13 @@ function buildPromptFromMessages(messages, tools) {
 
 Available tools:
 ${toolDescs}`);
+    const hasTaskTool = tools.some((t) => {
+      const name = (t?.function?.name ?? t?.name ?? "").toLowerCase();
+      return name === "task";
+    });
+    if (hasTaskTool && subagentNames.length > 0) {
+      lines.push(`When calling the task tool, set subagent_type to one of: ${subagentNames.join(", ")}. Do not omit this parameter.`);
+    }
   }
   for (const message of messages) {
     const role = typeof message.role === "string" ? message.role : "user";
@@ -1908,6 +1915,42 @@ function readMcpConfigs(deps = {}) {
   }
   return configs;
 }
+function readSubagentNames(deps = {}) {
+  let raw;
+  if (deps.configJson != null) {
+    raw = deps.configJson;
+  } else {
+    const exists = deps.existsSync ?? nodeExistsSync2;
+    const readFile = deps.readFileSync ?? nodeReadFileSync2;
+    const configPath = resolveOpenCodeConfigPath(deps.env ?? process.env);
+    if (!exists(configPath))
+      return ["general-purpose"];
+    try {
+      raw = readFile(configPath, "utf8");
+    } catch {
+      return ["general-purpose"];
+    }
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    return ["general-purpose"];
+  }
+  const agentSection = parsed.agent;
+  if (!agentSection || typeof agentSection !== "object" || Array.isArray(agentSection)) {
+    return ["general-purpose"];
+  }
+  const agents = agentSection;
+  const names = Object.keys(agents);
+  if (names.length === 0)
+    return ["general-purpose"];
+  const subagentNames = names.filter((name) => {
+    const entry = agents[name];
+    return entry && typeof entry === "object" && !Array.isArray(entry) && entry.mode === "subagent";
+  });
+  return subagentNames.length > 0 ? subagentNames : names;
+}
 function isStringRecord(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v);
 }
@@ -14535,6 +14578,15 @@ async function handleToolLoopEventLegacy(options) {
     if (compat.validation.hasSchema && !compat.validation.ok) {
       const validationTermination = evaluateSchemaValidationLoopGuard(toolLoopGuard, normalizedToolCall, compat.validation);
       if (validationTermination) {
+        if (validationTermination.soft) {
+          const hintChunk = createLoopGuardHintChunk(responseMeta, normalizedToolCall, validationTermination);
+          log17.debug("Soft-blocking schema validation loop guard in legacy (emitting hint)", {
+            tool: normalizedToolCall.function.name,
+            fingerprint: validationTermination.fingerprint
+          });
+          await onToolResult(hintChunk);
+          return { intercepted: false, skipConverter: true };
+        }
         return { intercepted: false, skipConverter: true, terminate: validationTermination };
       }
       const reroutedWrite = tryRerouteEditToWrite(normalizedToolCall, compat.normalizedArgs, allowedToolNames, toolSchemaMap);
@@ -14558,6 +14610,15 @@ async function handleToolLoopEventLegacy(options) {
     }
     const termination = evaluateToolLoopGuard(toolLoopGuard, normalizedToolCall);
     if (termination) {
+      if (termination.soft) {
+        const hintChunk = createLoopGuardHintChunk(responseMeta, normalizedToolCall, termination);
+        log17.debug("Soft-blocking tool loop guard in legacy (emitting hint)", {
+          tool: normalizedToolCall.function.name,
+          fingerprint: termination.fingerprint
+        });
+        await onToolResult(hintChunk);
+        return { intercepted: false, skipConverter: true };
+      }
       return { intercepted: false, skipConverter: true, terminate: termination };
     }
     await onInterceptedToolCall(normalizedToolCall);
@@ -14654,10 +14715,30 @@ async function handleToolLoopEventV1(options) {
     });
     const validationTermination = evaluateSchemaValidationLoopGuard(toolLoopGuard, normalizedToolCall, compat.validation);
     if (validationTermination) {
+      if (validationTermination.soft) {
+        const hintChunk = createLoopGuardHintChunk(responseMeta, normalizedToolCall, validationTermination);
+        log17.debug("Soft-blocking schema validation loop guard (emitting hint)", {
+          tool: normalizedToolCall.function.name,
+          fingerprint: validationTermination.fingerprint,
+          repeatCount: validationTermination.repeatCount
+        });
+        await onToolResult(hintChunk);
+        return { intercepted: false, skipConverter: true };
+      }
       return { intercepted: false, skipConverter: true, terminate: validationTermination };
     }
     const termination2 = evaluateToolLoopGuard(toolLoopGuard, normalizedToolCall);
     if (termination2) {
+      if (termination2.soft) {
+        const hintChunk = createLoopGuardHintChunk(responseMeta, normalizedToolCall, termination2);
+        log17.debug("Soft-blocking tool loop guard in validation path (emitting hint)", {
+          tool: normalizedToolCall.function.name,
+          fingerprint: termination2.fingerprint,
+          repeatCount: termination2.repeatCount
+        });
+        await onToolResult(hintChunk);
+        return { intercepted: false, skipConverter: true };
+      }
       return { intercepted: false, skipConverter: true, terminate: termination2 };
     }
     const reroutedWrite = tryRerouteEditToWrite(normalizedToolCall, compat.normalizedArgs, allowedToolNames, toolSchemaMap);
@@ -14712,6 +14793,16 @@ async function handleToolLoopEventV1(options) {
   }
   const termination = evaluateToolLoopGuard(toolLoopGuard, normalizedToolCall);
   if (termination) {
+    if (termination.soft) {
+      const hintChunk = createLoopGuardHintChunk(responseMeta, normalizedToolCall, termination);
+      log17.debug("Soft-blocking tool loop guard (emitting hint)", {
+        tool: normalizedToolCall.function.name,
+        fingerprint: termination.fingerprint,
+        repeatCount: termination.repeatCount
+      });
+      await onToolResult(hintChunk);
+      return { intercepted: false, skipConverter: true };
+    }
     return { intercepted: false, skipConverter: true, terminate: termination };
   }
   await onInterceptedToolCall(normalizedToolCall);
@@ -14782,6 +14873,7 @@ function evaluateToolLoopGuard(toolLoopGuard, toolCall) {
       silent: true
     };
   }
+  const isFirstTrigger = decision.repeatCount === decision.maxRepeat + 1;
   return {
     reason: "loop_guard",
     message: `Tool loop guard stopped repeated failing calls to "${toolCall.function.name}" ` + `after ${decision.repeatCount} attempts (limit ${decision.maxRepeat}). ` + "Adjust tool arguments and retry.",
@@ -14789,7 +14881,8 @@ function evaluateToolLoopGuard(toolLoopGuard, toolCall) {
     fingerprint: decision.fingerprint,
     repeatCount: decision.repeatCount,
     maxRepeat: decision.maxRepeat,
-    errorClass: decision.errorClass
+    errorClass: decision.errorClass,
+    soft: isFirstTrigger
   };
 }
 function createSchemaValidationTermination(toolCall, validation) {
@@ -14822,12 +14915,14 @@ function evaluateSchemaValidationLoopGuard(toolLoopGuard, toolCall, validation)
   if (!decision.tracked || !decision.triggered) {
     return null;
   }
-  log17.warn("Tool loop guard triggered on schema validation", {
+  const isFirstTrigger = decision.repeatCount === decision.maxRepeat + 1;
+  log17.debug("Tool loop guard triggered on schema validation", {
     tool: toolCall.function.name,
     fingerprint: decision.fingerprint,
     repeatCount: decision.repeatCount,
     maxRepeat: decision.maxRepeat,
-    validationSignature
+    validationSignature,
+    soft: isFirstTrigger
   });
   return {
     reason: "loop_guard",
@@ -14836,7 +14931,8 @@ function evaluateSchemaValidationLoopGuard(toolLoopGuard, toolCall, validation)
     fingerprint: decision.fingerprint,
     repeatCount: decision.repeatCount,
     maxRepeat: decision.maxRepeat,
-    errorClass: decision.errorClass
+    errorClass: decision.errorClass,
+    soft: isFirstTrigger
   };
 }
 function buildValidationSignature(validation) {
@@ -14894,6 +14990,25 @@ function createNonFatalSchemaValidationHintChunk(meta, toolCall, validation) {
     ]
   };
 }
+function createLoopGuardHintChunk(meta, toolCall, termination) {
+  const content = `Tool "${toolCall.function.name}" has been temporarily blocked after ` + `${termination.repeatCount} repeated ${termination.errorClass} failures. ` + "Do not retry this tool. Use a different approach to complete the task.";
+  return {
+    id: meta.id,
+    object: "chat.completion.chunk",
+    created: meta.created,
+    model: meta.model,
+    choices: [
+      {
+        index: 0,
+        delta: {
+          role: "assistant",
+          content
+        },
+        finish_reason: null
+      }
+    ]
+  };
+}
 function safeArgTypeSummary(event) {
   try {
     let raw;
@@ -15373,15 +15488,16 @@ function evaluateWithFingerprints(toolName, errorClass, strictFingerprint, coars
       tracked: false
     };
   }
+  const isExplorationTool = EXPLORATION_TOOLS.has(toolName.toLowerCase());
+  const effectiveMaxRepeat = isExplorationTool ? maxRepeat * EXPLORATION_LIMIT_MULTIPLIER : maxRepeat;
   const strictRepeatCount = (strictCounts.get(strictFingerprint) ?? 0) + 1;
   strictCounts.set(strictFingerprint, strictRepeatCount);
-  const strictTriggered = strictRepeatCount > maxRepeat;
-  const isExplorationTool = EXPLORATION_TOOLS.has(toolName.toLowerCase());
+  const strictTriggered = strictRepeatCount > effectiveMaxRepeat;
   if (isExplorationTool) {
     return {
       fingerprint: strictFingerprint,
       repeatCount: strictRepeatCount,
-      maxRepeat,
+      maxRepeat: effectiveMaxRepeat,
       errorClass,
       triggered: strictTriggered,
       tracked: true
@@ -15506,7 +15622,8 @@ var init_tool_loop_guard = __esm(() => {
     "semsearch",
     "bash",
     "shell",
-    "webfetch"
+    "webfetch",
+    "task"
   ]);
 });
 
@@ -15543,7 +15660,7 @@ function debugLogToFile2(message, data) {
     appendFileSync3(DEBUG_LOG_FILE2, logLine);
   } catch {}
 }
-function buildAvailableToolsSystemMessage(lastToolNames, lastToolMap, mcpToolDefs, mcpToolSummaries) {
+function buildAvailableToolsSystemMessage(lastToolNames, lastToolMap, mcpToolDefs, mcpToolSummaries, subagentNames = []) {
   const parts = [];
   if (lastToolNames.length > 0 || lastToolMap.length > 0) {
     const names = lastToolNames.join(", ");
@@ -15578,6 +15695,9 @@ function buildAvailableToolsSystemMessage(lastToolNames, lastToolMap, mcpToolDef
     parts.push(lines.join(`
 `));
   }
+  if (subagentNames.length > 0) {
+    parts.push(`When calling the task tool, set subagent_type to one of: ${subagentNames.join(", ")}. Do not omit this parameter.`);
+  }
   return parts.length > 0 ? parts.join(`
 
 `) : null;
@@ -15949,7 +16069,8 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
       const toolSchemaMap = buildToolSchemaMap(tools);
       const toolLoopGuard = createToolLoopGuard(messages, TOOL_LOOP_MAX_REPEAT);
       const boundaryContext = createBoundaryRuntimeContext("bun-handler");
-      const prompt = buildPromptFromMessages(messages, tools);
+      const subagentNames = readSubagentNames();
+      const prompt = buildPromptFromMessages(messages, tools, subagentNames);
       const model = boundaryContext.run("normalizeRuntimeModel", (boundary) => boundary.normalizeRuntimeModel(body?.model));
       const msgSummaryBun = messages.map((m, i) => {
         const role = m?.role ?? "?";
@@ -16377,7 +16498,8 @@ async function ensureCursorProxyServer(workspaceDirectory, toolRouter) {
       const toolSchemaMap = buildToolSchemaMap(tools);
       const toolLoopGuard = createToolLoopGuard(messages, TOOL_LOOP_MAX_REPEAT);
       const boundaryContext = createBoundaryRuntimeContext("node-handler");
-      const prompt = buildPromptFromMessages(messages, tools);
+      const subagentNames = readSubagentNames();
+      const prompt = buildPromptFromMessages(messages, tools, subagentNames);
       const model = boundaryContext.run("normalizeRuntimeModel", (boundary) => boundary.normalizeRuntimeModel(bodyData?.model));
       const msgSummary = messages.map((m, i) => {
         const role = m?.role ?? "?";
@@ -17180,7 +17302,8 @@ var log19, DEBUG_LOG_DIR2, DEBUG_LOG_FILE2, CURSOR_PROVIDER_ID2 = "cursor-acp",
     async "experimental.chat.system.transform"(input, output) {
       if (!toolsEnabled)
         return;
-      const systemMessage = buildAvailableToolsSystemMessage(lastToolNames, lastToolMap, mcpToolDefs, mcpToolSummaries);
+      const subagentNames = readSubagentNames();
+      const systemMessage = buildAvailableToolsSystemMessage(lastToolNames, lastToolMap, mcpToolDefs, mcpToolSummaries, subagentNames);
       if (!systemMessage)
         return;
       output.system = output.system || [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rama_nigg/open-cursor",
-  "version": "2.3.18",
+  "version": "2.3.20",
   "description": "No prompt limits. No broken streams. Full thinking + tool support. Your Cursor subscription, properly integrated.",
   "type": "module",
   "main": "dist/plugin-entry.js",

package/src/mcp/config.ts

@@ -93,6 +93,55 @@ export function readMcpConfigs(deps: ReadMcpConfigsDeps = {}): McpServerConfig[]
   return configs;
 }
 
+interface ReadSubagentNamesDeps {
+  configJson?: string;
+  existsSync?: (path: string) => boolean;
+  readFileSync?: (path: string, enc: BufferEncoding) => string;
+  env?: NodeJS.ProcessEnv;
+}
+
+export function readSubagentNames(deps: ReadSubagentNamesDeps = {}): string[] {
+  let raw: string;
+
+  if (deps.configJson != null) {
+    raw = deps.configJson;
+  } else {
+    const exists = deps.existsSync ?? nodeExistsSync;
+    const readFile = deps.readFileSync ?? nodeReadFileSync;
+    const configPath = resolveOpenCodeConfigPath(deps.env ?? process.env);
+    if (!exists(configPath)) return ["general-purpose"];
+    try {
+      raw = readFile(configPath, "utf8");
+    } catch {
+      return ["general-purpose"];
+    }
+  }
+
+  let parsed: Record<string, unknown>;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    return ["general-purpose"];
+  }
+
+  const agentSection = parsed.agent;
+  if (!agentSection || typeof agentSection !== "object" || Array.isArray(agentSection)) {
+    return ["general-purpose"];
+  }
+
+  const agents = agentSection as Record<string, unknown>;
+  const names = Object.keys(agents);
+  if (names.length === 0) return ["general-purpose"];
+
+  const subagentNames = names.filter((name) => {
+    const entry = agents[name];
+    return entry && typeof entry === "object" && !Array.isArray(entry)
+      && (entry as Record<string, unknown>).mode === "subagent";
+  });
+
+  return subagentNames.length > 0 ? subagentNames : names;
+}
+
 function isStringRecord(v: unknown): v is Record<string, string> {
   return typeof v === "object" && v !== null && !Array.isArray(v);
 }

package/src/plugin.ts

@@ -25,7 +25,7 @@ import { ToolRouter } from "./tools/router.js";
 import { SkillLoader } from "./tools/skills/loader.js";
 import { SkillResolver } from "./tools/skills/resolver.js";
 import { autoRefreshModels } from "./models/sync.js";
-import { readMcpConfigs } from "./mcp/config.js";
+import { readMcpConfigs, readSubagentNames } from "./mcp/config.js";
 import { McpClientManager } from "./mcp/client-manager.js";
 import { buildMcpToolHookEntries, buildMcpToolDefinitions } from "./mcp/tool-bridge.js";
 import { createOpencodeClient } from "@opencode-ai/sdk";
@@ -92,6 +92,7 @@ export function buildAvailableToolsSystemMessage(
   lastToolMap: Array<{ id: string; name: string }>,
   mcpToolDefs: any[],
   mcpToolSummaries?: McpToolSummary[],
+  subagentNames: string[] = [],
 ): string | null {
   const parts: string[] = [];
 
@@ -132,6 +133,12 @@ export function buildAvailableToolsSystemMessage(
     parts.push(lines.join("\n"));
   }
 
+  if (subagentNames.length > 0) {
+    parts.push(
+      `When calling the task tool, set subagent_type to one of: ${subagentNames.join(", ")}. Do not omit this parameter.`
+    );
+  }
+
   return parts.length > 0 ? parts.join("\n\n") : null;
 }
 
@@ -628,7 +635,8 @@ async function ensureCursorProxyServer(workspaceDirectory: string, toolRouter?:
       const toolLoopGuard = createToolLoopGuard(messages, TOOL_LOOP_MAX_REPEAT);
       const boundaryContext = createBoundaryRuntimeContext("bun-handler");
 
-      const prompt = buildPromptFromMessages(messages, tools);
+      const subagentNames = readSubagentNames();
+      const prompt = buildPromptFromMessages(messages, tools, subagentNames);
       const model = boundaryContext.run("normalizeRuntimeModel", (boundary) =>
         boundary.normalizeRuntimeModel(body?.model),
       );
@@ -1092,7 +1100,8 @@ async function ensureCursorProxyServer(workspaceDirectory: string, toolRouter?:
       const toolLoopGuard = createToolLoopGuard(messages, TOOL_LOOP_MAX_REPEAT);
       const boundaryContext = createBoundaryRuntimeContext("node-handler");
 
-      const prompt = buildPromptFromMessages(messages, tools);
+      const subagentNames = readSubagentNames();
+      const prompt = buildPromptFromMessages(messages, tools, subagentNames);
       const model = boundaryContext.run("normalizeRuntimeModel", (boundary) =>
         boundary.normalizeRuntimeModel(bodyData?.model),
       );
@@ -2058,7 +2067,11 @@ export const CursorPlugin: Plugin = async ({ $, directory, worktree, client, ser
 
     async "experimental.chat.system.transform"(input: any, output: { system: string[] }) {
       if (!toolsEnabled) return;
-      const systemMessage = buildAvailableToolsSystemMessage(lastToolNames, lastToolMap, mcpToolDefs, mcpToolSummaries);
+      const subagentNames = readSubagentNames();
+      const systemMessage = buildAvailableToolsSystemMessage(
+        lastToolNames, lastToolMap, mcpToolDefs, mcpToolSummaries,
+        subagentNames,
+      );
       if (!systemMessage) return;
       output.system = output.system || [];
       output.system.push(systemMessage);

package/src/provider/runtime-interception.ts

@@ -59,6 +59,7 @@ export interface ToolLoopGuardTermination {
   maxRepeat: number;
   errorClass: string;
   silent?: boolean;
+  soft?: boolean;
 }
 
 export interface ToolSchemaValidationTermination {
@@ -177,6 +178,15 @@ export async function handleToolLoopEventLegacy(
         compat.validation,
       );
       if (validationTermination) {
+        if (validationTermination.soft) {
+          const hintChunk = createLoopGuardHintChunk(responseMeta, normalizedToolCall, validationTermination);
+          log.debug("Soft-blocking schema validation loop guard in legacy (emitting hint)", {
+            tool: normalizedToolCall.function.name,
+            fingerprint: validationTermination.fingerprint,
+          });
+          await onToolResult(hintChunk);
+          return { intercepted: false, skipConverter: true };
+        }
         return { intercepted: false, skipConverter: true, terminate: validationTermination };
       }
 
@@ -211,6 +221,15 @@ export async function handleToolLoopEventLegacy(
 
     const termination = evaluateToolLoopGuard(toolLoopGuard, normalizedToolCall);
     if (termination) {
+      if (termination.soft) {
+        const hintChunk = createLoopGuardHintChunk(responseMeta, normalizedToolCall, termination);
+        log.debug("Soft-blocking tool loop guard in legacy (emitting hint)", {
+          tool: normalizedToolCall.function.name,
+          fingerprint: termination.fingerprint,
+        });
+        await onToolResult(hintChunk);
+        return { intercepted: false, skipConverter: true };
+      }
       return { intercepted: false, skipConverter: true, terminate: termination };
     }
     await onInterceptedToolCall(normalizedToolCall);
@@ -341,10 +360,30 @@ export async function handleToolLoopEventV1(
       compat.validation,
     );
     if (validationTermination) {
+      if (validationTermination.soft) {
+        const hintChunk = createLoopGuardHintChunk(responseMeta, normalizedToolCall, validationTermination);
+        log.debug("Soft-blocking schema validation loop guard (emitting hint)", {
+          tool: normalizedToolCall.function.name,
+          fingerprint: validationTermination.fingerprint,
+          repeatCount: validationTermination.repeatCount,
+        });
+        await onToolResult(hintChunk);
+        return { intercepted: false, skipConverter: true };
+      }
       return { intercepted: false, skipConverter: true, terminate: validationTermination };
     }
     const termination = evaluateToolLoopGuard(toolLoopGuard, normalizedToolCall);
     if (termination) {
+      if (termination.soft) {
+        const hintChunk = createLoopGuardHintChunk(responseMeta, normalizedToolCall, termination);
+        log.debug("Soft-blocking tool loop guard in validation path (emitting hint)", {
+          tool: normalizedToolCall.function.name,
+          fingerprint: termination.fingerprint,
+          repeatCount: termination.repeatCount,
+        });
+        await onToolResult(hintChunk);
+        return { intercepted: false, skipConverter: true };
+      }
       return { intercepted: false, skipConverter: true, terminate: termination };
     }
     const reroutedWrite = tryRerouteEditToWrite(
@@ -415,6 +454,16 @@ export async function handleToolLoopEventV1(
 
   const termination = evaluateToolLoopGuard(toolLoopGuard, normalizedToolCall);
   if (termination) {
+    if (termination.soft) {
+      const hintChunk = createLoopGuardHintChunk(responseMeta, normalizedToolCall, termination);
+      log.debug("Soft-blocking tool loop guard (emitting hint)", {
+        tool: normalizedToolCall.function.name,
+        fingerprint: termination.fingerprint,
+        repeatCount: termination.repeatCount,
+      });
+      await onToolResult(hintChunk);
+      return { intercepted: false, skipConverter: true };
+    }
     return { intercepted: false, skipConverter: true, terminate: termination };
   }
   await onInterceptedToolCall(normalizedToolCall);
@@ -515,6 +564,11 @@ function evaluateToolLoopGuard(
     };
   }
 
+  // First trigger (repeatCount exactly one over threshold): soft block.
+  // Emit a hint to the model instead of killing the stream.
+  // If the model ignores the hint and retries, subsequent triggers are hard kills.
+  const isFirstTrigger = decision.repeatCount === decision.maxRepeat + 1;
+
   return {
     reason: "loop_guard",
     message: `Tool loop guard stopped repeated failing calls to "${toolCall.function.name}" `
@@ -525,6 +579,7 @@ function evaluateToolLoopGuard(
     repeatCount: decision.repeatCount,
     maxRepeat: decision.maxRepeat,
     errorClass: decision.errorClass,
+    soft: isFirstTrigger,
   };
 }
 
@@ -570,12 +625,15 @@ function evaluateSchemaValidationLoopGuard(
     return null;
   }
 
-  log.warn("Tool loop guard triggered on schema validation", {
+  const isFirstTrigger = decision.repeatCount === decision.maxRepeat + 1;
+
+  log.debug("Tool loop guard triggered on schema validation", {
     tool: toolCall.function.name,
     fingerprint: decision.fingerprint,
     repeatCount: decision.repeatCount,
     maxRepeat: decision.maxRepeat,
     validationSignature,
+    soft: isFirstTrigger,
   });
   return {
     reason: "loop_guard",
@@ -588,6 +646,7 @@ function evaluateSchemaValidationLoopGuard(
     repeatCount: decision.repeatCount,
     maxRepeat: decision.maxRepeat,
     errorClass: decision.errorClass,
+    soft: isFirstTrigger,
   };
 }
 
@@ -663,6 +722,35 @@ function createNonFatalSchemaValidationHintChunk(
   };
 }
 
+type LoopGuardHintChunk = NonFatalSchemaValidationResultChunk;
+
+function createLoopGuardHintChunk(
+  meta: { id: string; created: number; model: string },
+  toolCall: OpenAiToolCall,
+  termination: ToolLoopGuardTermination,
+): LoopGuardHintChunk {
+  const content =
+    `Tool "${toolCall.function.name}" has been temporarily blocked after `
+    + `${termination.repeatCount} repeated ${termination.errorClass} failures. `
+    + "Do not retry this tool. Use a different approach to complete the task.";
+  return {
+    id: meta.id,
+    object: "chat.completion.chunk",
+    created: meta.created,
+    model: meta.model,
+    choices: [
+      {
+        index: 0,
+        delta: {
+          role: "assistant",
+          content,
+        },
+        finish_reason: null,
+      },
+    ],
+  };
+}
+
 function safeArgTypeSummary(event: StreamJsonToolCallEvent): Record<string, string> {
   try {
     let raw: unknown;

package/src/provider/tool-loop-guard.ts

@@ -44,6 +44,7 @@ const EXPLORATION_TOOLS = new Set([
   "bash",
   "shell",
   "webfetch",
+  "task",
 ]);
 
 export interface ToolLoopGuardDecision {
@@ -511,16 +512,20 @@ function evaluateWithFingerprints(
     };
   }
 
+  const isExplorationTool = EXPLORATION_TOOLS.has(toolName.toLowerCase());
+  const effectiveMaxRepeat = isExplorationTool
+    ? maxRepeat * EXPLORATION_LIMIT_MULTIPLIER
+    : maxRepeat;
+
   const strictRepeatCount = (strictCounts.get(strictFingerprint) ?? 0) + 1;
   strictCounts.set(strictFingerprint, strictRepeatCount);
-  const strictTriggered = strictRepeatCount > maxRepeat;
+  const strictTriggered = strictRepeatCount > effectiveMaxRepeat;
 
-  const isExplorationTool = EXPLORATION_TOOLS.has(toolName.toLowerCase());
   if (isExplorationTool) {
     return {
       fingerprint: strictFingerprint,
       repeatCount: strictRepeatCount,
-      maxRepeat,
+      maxRepeat: effectiveMaxRepeat,
       errorClass,
       triggered: strictTriggered,
       tracked: true,

package/src/proxy/prompt-builder.ts

@@ -36,7 +36,7 @@ function debugLogToFile(message: string, data: any): void {
  * Handles role:"tool" result messages and assistant tool_calls that
  * plain text flattening would silently drop.
  */
-export function buildPromptFromMessages(messages: Array<any>, tools: Array<any>): string {
+export function buildPromptFromMessages(messages: Array<any>, tools: Array<any>, subagentNames: string[] = []): string {
   // DEBUG: Log incoming message structure to file for root cause analysis
   const messageSummary = messages.map((m: any, i: number) => {
     const role = m?.role ?? "?";
@@ -98,6 +98,15 @@ export function buildPromptFromMessages(messages: Array<any>, tools: Array<any>)
       `SYSTEM: You have access to the following tools. When you need to use one, respond with a tool_call in the standard OpenAI format.\n` +
         `Tool guidance: prefer write/edit for file changes; use bash mainly to run commands/tests.\n\nAvailable tools:\n${toolDescs}`,
     );
+    const hasTaskTool = tools.some((t: any) => {
+      const name = (t?.function?.name ?? t?.name ?? "").toLowerCase();
+      return name === "task";
+    });
+    if (hasTaskTool && subagentNames.length > 0) {
+      lines.push(
+        `When calling the task tool, set subagent_type to one of: ${subagentNames.join(", ")}. Do not omit this parameter.`
+      );
+    }
   }
 
   for (const message of messages) {