@bohuyeshan/openagent-labforge-core 3.11.4 → 3.11.5

package/dist/cli/index.js

@@ -9195,7 +9195,7 @@ var {
 // package.json
 var package_default = {
   name: "@bohuyeshan/openagent-labforge-core",
-  version: "3.11.4",
+  version: "3.11.5",
   description: "The Best AI Agent Harness - Batteries-Included OpenCode Plugin with Multi-Model Orchestration, Parallel Background Agents, and Crafted LSP/AST Tools",
   main: "dist/index.js",
   types: "dist/index.d.ts",

package/dist/index.js

@@ -97954,9 +97954,10 @@ function createChatMessageHandler3(args) {
   const pluginContext = ctx;
   const isRuntimeFallbackEnabled = hooks2.runtimeFallback !== null && hooks2.runtimeFallback !== undefined && (typeof pluginConfig.runtime_fallback === "boolean" ? pluginConfig.runtime_fallback : pluginConfig.runtime_fallback?.enabled ?? false);
   return async (input, output) => {
+    const isInternalInitiatedPrompt = hasInternalInitiatorMarker(output.parts);
     const previousSessionModel = getSessionModel(input.sessionID);
     const currentInputModel = input.model;
-    const manualModelChangeDetected = currentInputModel !== undefined && previousSessionModel !== undefined && (currentInputModel.providerID !== previousSessionModel.providerID || currentInputModel.modelID !== previousSessionModel.modelID);
+    const manualModelChangeDetected = !isInternalInitiatedPrompt && currentInputModel !== undefined && previousSessionModel !== undefined && (currentInputModel.providerID !== previousSessionModel.providerID || currentInputModel.modelID !== previousSessionModel.modelID);
     if (manualModelChangeDetected) {
       clearPendingModelFallback(input.sessionID);
       clearSessionFallbackChain(input.sessionID);
@@ -97966,12 +97967,14 @@ function createChatMessageHandler3(args) {
     const forcedModel = getSessionForcedModel(input.sessionID);
     const rawInputModel = input.model;
     const rawInputModelId = modelToString(rawInputModel);
-    if (rawInputModel !== undefined) {
+    if (!isInternalInitiatedPrompt && rawInputModel !== undefined) {
       setSessionAutoModelRouting(input.sessionID, isAutoModelSelection(rawInputModelId));
     }
     const autoModelRoutingEnabled = isSessionAutoModelRoutingEnabled(input.sessionID);
     if (strictUserModelPriority && lockedModel) {
-      if (!rawInputModel) {
+      if (isInternalInitiatedPrompt) {
+        input.model = lockedModel;
+      } else if (!rawInputModel) {
         input.model = lockedModel;
       } else if (isAutoModelSelection(rawInputModelId)) {
         clearSessionModelLock(input.sessionID);
@@ -98078,29 +98081,33 @@ function createChatMessageHandler3(args) {
       providerID: output.message["model"].providerID ?? "",
       modelID: output.message["model"].modelID ?? ""
     } : undefined;
-    if (requestedModel !== undefined && isAutoModelSelection(requestedModelId)) {
-      clearSessionModelLock(input.sessionID);
-      clearSessionForcedModel(input.sessionID);
-    } else if (shouldLockToRequestedModel) {
-      setSessionModelLock(input.sessionID, requestedModel);
-      if (modelBeforeUserLock && modelBeforeUserLock.providerID.length > 0 && modelBeforeUserLock.modelID.length > 0 && !sameModel(modelBeforeUserLock, requestedModel)) {
-        setSessionForcedModel(input.sessionID, modelBeforeUserLock);
-      } else {
+    if (!isInternalInitiatedPrompt) {
+      if (requestedModel !== undefined && isAutoModelSelection(requestedModelId)) {
+        clearSessionModelLock(input.sessionID);
         clearSessionForcedModel(input.sessionID);
+      } else if (shouldLockToRequestedModel) {
+        setSessionModelLock(input.sessionID, requestedModel);
+        if (modelBeforeUserLock && modelBeforeUserLock.providerID.length > 0 && modelBeforeUserLock.modelID.length > 0 && !sameModel(modelBeforeUserLock, requestedModel)) {
+          setSessionForcedModel(input.sessionID, modelBeforeUserLock);
+        } else {
+          clearSessionForcedModel(input.sessionID);
+        }
       }
     }
-    if (shouldLockToRequestedModel) {
+    if (!isInternalInitiatedPrompt && shouldLockToRequestedModel) {
       output.message["model"] = requestedModel;
     }
-    const finalOutputModel = output.message["model"];
-    if (finalOutputModel && typeof finalOutputModel === "object" && "providerID" in finalOutputModel && "modelID" in finalOutputModel) {
-      const providerID = finalOutputModel.providerID;
-      const modelID = finalOutputModel.modelID;
-      if (typeof providerID === "string" && typeof modelID === "string") {
-        setSessionModel(input.sessionID, { providerID, modelID });
+    if (!isInternalInitiatedPrompt) {
+      const finalOutputModel = output.message["model"];
+      if (finalOutputModel && typeof finalOutputModel === "object" && "providerID" in finalOutputModel && "modelID" in finalOutputModel) {
+        const providerID = finalOutputModel.providerID;
+        const modelID = finalOutputModel.modelID;
+        if (typeof providerID === "string" && typeof modelID === "string") {
+          setSessionModel(input.sessionID, { providerID, modelID });
+        }
+      } else if (requestedModel) {
+        setSessionModel(input.sessionID, requestedModel);
       }
-    } else if (requestedModel) {
-      setSessionModel(input.sessionID, requestedModel);
     }
   };
 }
@@ -98114,6 +98121,9 @@ function sameModel(left, right) {
     return false;
   return left.providerID === right.providerID && left.modelID === right.modelID;
 }
+function hasInternalInitiatorMarker(parts) {
+  return parts.some((part) => part.type === "text" && typeof part.text === "string" && part.text.includes(OMO_INTERNAL_INITIATOR_MARKER));
+}
 
 // src/plugin/messages-transform.ts
 function createMessagesTransformHandler(args) {
@@ -98171,6 +98181,11 @@ function normalizeSessionStatusToIdle(input) {
 function isRecord12(value) {
   return typeof value === "object" && value !== null;
 }
+function hasInternalInitiatorMarker2(parts) {
+  if (!Array.isArray(parts))
+    return false;
+  return parts.some((part) => isRecord12(part) && part.type === "text" && typeof part.text === "string" && part.text.includes(OMO_INTERNAL_INITIATOR_MARKER));
+}
 function normalizeFallbackModelID(modelID) {
   return modelID.replace(/-thinking$/i, "").replace(/-max$/i, "").replace(/-high$/i, "");
 }
@@ -98246,6 +98261,43 @@ function createEventHandler2(args) {
   const lastHandledModelErrorMessageID = new Map;
   const lastHandledRetryStatusKey = new Map;
   const lastKnownModelBySession = new Map;
+  const internalMarkerCache2 = new Map;
+  const INTERNAL_MARKER_CACHE_LIMIT2 = 1000;
+  const rememberInternalMarker = (cacheKey, hasMarker) => {
+    internalMarkerCache2.set(cacheKey, hasMarker);
+    if (internalMarkerCache2.size > INTERNAL_MARKER_CACHE_LIMIT2) {
+      internalMarkerCache2.clear();
+    }
+  };
+  const isInternalInitiatedUserMessage = async (sessionID, props, info) => {
+    if (hasInternalInitiatorMarker2(props?.parts))
+      return true;
+    if (hasInternalInitiatorMarker2(info?.parts))
+      return true;
+    if (hasInternalInitiatorMarker2(info?.content))
+      return true;
+    const messageID = typeof info?.id === "string" ? info.id : undefined;
+    if (!messageID)
+      return false;
+    const cacheKey = `${sessionID}:${messageID}`;
+    const cached3 = internalMarkerCache2.get(cacheKey);
+    if (cached3 !== undefined)
+      return cached3;
+    const loadMessage = pluginContext.client.session.message;
+    if (typeof loadMessage !== "function")
+      return false;
+    try {
+      const response = await loadMessage({
+        path: { id: sessionID, messageID }
+      });
+      const hasMarker = hasInternalInitiatorMarker2(response.data?.parts);
+      rememberInternalMarker(cacheKey, hasMarker);
+      return hasMarker;
+    } catch {
+      rememberInternalMarker(cacheKey, false);
+      return false;
+    }
+  };
   const resolveFallbackProviderID = (sessionID, providerHint) => {
     const sessionModel = getSessionModel(sessionID);
     if (sessionModel?.providerID) {
@@ -98397,15 +98449,18 @@ function createEventHandler2(args) {
       const agent = info?.agent;
       const role = info?.role;
       if (sessionID && role === "user") {
-        const isCompactionMessage = agent ? isCompactionAgent4(agent) : false;
-        if (agent && !isCompactionMessage) {
-          updateSessionAgent(sessionID, agent);
-        }
-        const providerID = info?.providerID;
-        const modelID = info?.modelID;
-        if (providerID && modelID && !isCompactionMessage) {
-          lastKnownModelBySession.set(sessionID, { providerID, modelID });
-          setSessionModel(sessionID, { providerID, modelID });
+        const isInternalUserMessage = await isInternalInitiatedUserMessage(sessionID, props, info);
+        if (!isInternalUserMessage) {
+          const isCompactionMessage = agent ? isCompactionAgent4(agent) : false;
+          if (agent && !isCompactionMessage) {
+            updateSessionAgent(sessionID, agent);
+          }
+          const providerID = info?.providerID;
+          const modelID = info?.modelID;
+          if (providerID && modelID && !isCompactionMessage) {
+            lastKnownModelBySession.set(sessionID, { providerID, modelID });
+            setSessionModel(sessionID, { providerID, modelID });
+          }
         }
       }
       if (sessionID && role === "assistant" && !isRuntimeFallbackEnabled && isModelFallbackEnabled && isSessionAutoModelRoutingEnabled(sessionID)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bohuyeshan/openagent-labforge-core",
-  "version": "3.11.4",
+  "version": "3.11.5",
   "description": "The Best AI Agent Harness - Batteries-Included OpenCode Plugin with Multi-Model Orchestration, Parallel Background Agents, and Crafted LSP/AST Tools",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",