open-multi-agent-kit 0.98.3 → 0.98.4

package/dist/core/agent-session.js

@@ -24,6 +24,7 @@ import { stripFrontmatter } from "../utils/frontmatter.js";
 import { resolvePath } from "../utils/paths.js";
 import { getShellConfig } from "../utils/shell.js";
 import { sleep } from "../utils/sleep.js";
+import { addActiveSkills, createActiveSkillState } from "./active-skill-state.js";
 import { createAdaptorchBridge } from "./adaptorch-bridge.js";
 import { applyCategoryTimeoutDefaults, resolveAgentToolSettings, resolveToolTimeoutCategory, } from "./agent-tool-settings.js";
 import { formatNoApiKeyFoundMessage, formatNoModelSelectedMessage } from "./auth-guidance.js";
@@ -43,7 +44,7 @@ import { exportSessionToHtml } from "./export-html/index.js";
 import { createToolHtmlRenderer } from "./export-html/tool-renderer.js";
 import { ExtensionRunner, wrapRegisteredTools, } from "./extensions/index.js";
 import { emitSessionShutdownEvent } from "./extensions/runner.js";
-import { assertTextChatModelForCompletion } from "./grok-harness.js";
+import { assertTextChatModelForCompletion, grokHarnessAutoApplyEnabled, isGrokOAuthProvider, selectGrokHarnessSkills, } from "./grok-harness.js";
 import { grokPlaybookAppendForProvider } from "./grok-playbook.js";
 import { captureHostResourceSnapshot } from "./host-resource-snapshot.js";
 import { decideLoadoutAccess } from "./loadout-access-policy.js";
@@ -107,9 +108,10 @@ import { RunResourceLeaseController } from "./run-resource-lease.js";
 import { SessionBashRuntime } from "./session-bash-runtime.js";
 import { SessionBashService } from "./session-bash-service.js";
 import { SessionCompactionService } from "./session-compaction-service.js";
-import { preflightFailureCause, providerFailureCause, runtimeFailureCause, terminationMessage, } from "./session-failure-cause.js";
+import { preflightFailureCause, runtimeFailureCause, terminationMessage } from "./session-failure-cause.js";
 import { CURRENT_SESSION_VERSION, getLatestCompactionEntry } from "./session-manager.js";
 import { acquireSessionOwnerLeaseSync } from "./session-owner-lease.js";
+import { classifyRunTermination } from "./session-run-termination.js";
 import { assembleSessionSystemPrompt } from "./session-system-prompt.js";
 import { classifySessionTermination, } from "./session-termination.js";
 import { createSyntheticSourceInfo } from "./source-info.js";
@@ -136,17 +138,6 @@ export function parseSkillBlock(text) {
         userMessage: match[4]?.trim() || undefined,
     };
 }
-function mergePromptActiveSkillNames(first, second) {
-    const names = [];
-    const seen = new Set();
-    for (const name of [...first, ...second]) {
-        if (!seen.has(name)) {
-            seen.add(name);
-            names.push(name);
-        }
-    }
-    return names;
-}
 const PENDING_TOOL_RESULT_TOKENS = {
     text: 1024,
     image: 4096,
@@ -515,64 +506,6 @@ export class AgentSession {
         });
         this._appendReplayEvent(event, details);
     }
-    _classifyRunTermination(runId, event) {
-        const timestamp = new Date().toISOString();
-        let assistant;
-        for (let index = event.messages.length - 1; index >= 0; index -= 1) {
-            const message = event.messages[index];
-            if (message?.role === "assistant") {
-                assistant = message;
-                break;
-            }
-        }
-        let cause;
-        let message;
-        let sideEffects = this._sessionRiskLevel === "elevated" ? "possible" : "none";
-        let toolCallId;
-        let toolName;
-        if (this._activeRunToolTermination) {
-            cause = { area: "tool", code: "timeout" };
-            message = `Tool ${this._activeRunToolTermination.toolName} timed out.`;
-            toolCallId = this._activeRunToolTermination.toolCallId;
-            toolName = this._activeRunToolTermination.toolName;
-            sideEffects = this._activeRunToolTermination.executionStarted ? "possible" : sideEffects;
-        }
-        else if (!assistant) {
-            cause = { area: "internal", code: "unclassified" };
-            message = "Agent run ended without an assistant result.";
-        }
-        else if (assistant.stopReason === "aborted") {
-            cause = this._userAbortRequested ? { area: "user", code: "abort" } : { area: "provider", code: "abort" };
-            message = terminationMessage(assistant.errorMessage, this._userAbortRequested ? "The user aborted the run." : "The provider aborted the run.");
-        }
-        else if (assistant.stopReason === "error") {
-            cause = providerFailureCause(assistant, this.model?.contextWindow ?? 0);
-            message = terminationMessage(assistant.errorMessage, "The provider request failed.");
-        }
-        else {
-            cause = { area: "completed" };
-            message = "Run completed.";
-        }
-        let provider = this.model?.provider;
-        if (assistant?.provider)
-            provider = assistant.provider;
-        let model = this.model?.id;
-        if (assistant?.model)
-            model = assistant.model;
-        return classifySessionTermination({
-            sessionId: this.sessionId,
-            runId,
-            timestamp,
-            source: "observed",
-            message,
-            cause,
-            sideEffects,
-            ...(provider ? { provider } : {}),
-            ...(model ? { model } : {}),
-            ...(toolCallId ? { toolCallId } : {}),
-            ...(toolName ? { toolName } : {}),
-        });
-    }
     _publishTermination(termination) {
         this._lastTermination = termination;
         this._emit({ type: "session_termination", termination });
@@ -647,11 +580,23 @@ export class AgentSession {
             }
             return;
         }
+        if (event.type === "provider_denied" && event.deniedReason === "contract-violation") {
+            this._pendingRuntimeTerminationCause = { area: "configuration", code: "invalid" };
+        }
         if (event.type !== "agent_end")
             return;
         if (this._activeRunId === null)
             throw new Error("run journal received agent_end without run_started");
-        const termination = this._classifyRunTermination(this._activeRunId, event);
+        const termination = classifyRunTermination(event.messages, {
+            sessionId: this.sessionId,
+            runId: this._activeRunId,
+            timestamp: new Date().toISOString(),
+            model: this.model,
+            elevatedRisk: this._sessionRiskLevel === "elevated",
+            userAbortRequested: this._userAbortRequested,
+            pendingCause: this._pendingRuntimeTerminationCause,
+            toolTimeout: this._activeRunToolTermination,
+        });
         try {
             this._runJournalStore.finish({
                 termination,
@@ -1815,12 +1760,7 @@ export class AgentSession {
         const preflightResult = options?.preflightResult;
         let currentText = redactSensitiveText(text);
         const defaultActiveSkills = this._getDefaultActiveSkills();
-        let promptActiveSkillNames = mergePromptActiveSkillNames(defaultActiveSkills, options?.activeSkillNames ?? []);
-        let promptActiveSkillSource = defaultActiveSkills.length > 0
-            ? options?.activeSkillSource
-                ? `settings+${options.activeSkillSource}`
-                : "settings"
-            : options?.activeSkillSource;
+        let promptSkills = createActiveSkillState(defaultActiveSkills, options?.activeSkillNames ?? [], options?.activeSkillSource);
         let isBangSkillInvocation = false;
         if (expandPromptTemplates) {
             const bangInvocation = parseBangInvocation(text, {
@@ -1831,9 +1771,7 @@ export class AgentSession {
                 currentText = bangInvocation.prompt
                     ? `/skill:${bangInvocation.skillName} ${bangInvocation.prompt}`
                     : `/skill:${bangInvocation.skillName}`;
-                promptActiveSkillNames = mergePromptActiveSkillNames(promptActiveSkillNames, bangInvocation.activeSkillNames);
-                promptActiveSkillSource =
-                    defaultActiveSkills.length > 0 ? `settings+${bangInvocation.source}` : bangInvocation.source;
+                promptSkills = addActiveSkills(promptSkills, bangInvocation.activeSkillNames, bangInvocation.source);
             }
         }
         let messages;
@@ -1934,11 +1872,18 @@ export class AgentSession {
                 messages.push(msg);
             }
             this._pendingNextTurnMessages = [];
+            if (isGrokOAuthProvider(this.model?.provider) && grokHarnessAutoApplyEnabled(process.env)) {
+                const skillQuery = isBangSkillInvocation ? currentText : expandedText;
+                const grokSkills = selectGrokHarnessSkills(skillQuery, this._resourceLoader.getSkills().skills, {
+                    contextPressure: this._computePressureBucket(messages) > 0,
+                });
+                promptSkills = addActiveSkills(promptSkills, grokSkills, "grok-harness");
+            }
             const turnSystemPromptOptions = {
                 ...this._baseSystemPromptOptions,
                 contextBudget: this._getContextBudgetOptions(expandedText),
-                activeSkillNames: promptActiveSkillNames,
-                activeSkillSource: promptActiveSkillSource,
+                activeSkillNames: promptSkills.names,
+                activeSkillSource: promptSkills.source,
             };
             const turnSystemPrompt = buildSystemPromptPlan(turnSystemPromptOptions);
             // Emit before_agent_start extension event
@@ -2573,11 +2518,11 @@ export class AgentSession {
      * 1..<0.75, 2..<0.9, 3..>=0.9. The released default pressure coefficient
      * is 1 and participates only after the classifier has prompt evidence.
      */
-    _computePressureBucket() {
+    _computePressureBucket(pendingMessages = []) {
         const contextWindow = this.model?.contextWindow ?? 0;
         if (contextWindow <= 0)
             return 0;
-        const estimate = estimateProjectedContextTokens(this.agent.state.messages, []);
+        const estimate = estimateProjectedContextTokens(this.agent.state.messages, pendingMessages);
         const pressure = estimate.tokens / contextWindow;
         if (pressure >= 0.9)
             return 3;