open-multi-agent-kit 0.90.5 → 0.90.7

package/dist/core/agent-session.js

@@ -23,13 +23,16 @@ import { formatNoApiKeyFoundMessage, formatNoModelSelectedMessage } from "./auth
 import { parseBangInvocation } from "./bang-skill-invocation.js";
 import { executeBashWithOperations } from "./bash-executor.js";
 import { classifyShellCommand } from "./command-safety.js";
-import { calculateContextTokens, collectEntriesForBranchSummary, compact, estimateContextTokens, estimateProjectedContextTokens, generateBranchSummary, prepareCompaction, shouldCompact, } from "./compaction/index.js";
+import { calculateContextTokens, collectEntriesForBranchSummary, compact, estimateContextTokens, estimateProjectedContextTokens, generateBranchSummary, prepareCompaction, resolveCompactionModel, shouldCompact, } from "./compaction/index.js";
+import { compactionEmitWillRetry } from "./compaction/resume-policy.js";
 import { DEFAULT_THINKING_LEVEL } from "./defaults.js";
 import { exportSessionToHtml } from "./export-html/index.js";
 import { createToolHtmlRenderer } from "./export-html/tool-renderer.js";
 import { buildBlockedBashResult, evaluateCommandGate, isCommandSafetyAssumeYesEnabled, } from "./extensions/builtin/command-safety-gate.js";
 import { ExtensionRunner, wrapRegisteredTools, } from "./extensions/index.js";
 import { emitSessionShutdownEvent } from "./extensions/runner.js";
+import { assertTextChatModelForCompletion } from "./grok-harness.js";
+import { grokPlaybookAppendForProvider } from "./grok-playbook.js";
 import { assertLoadoutAccess, decideLoadoutAccess } from "./loadout-access-policy.js";
 import { expandPromptTemplate } from "./prompt-templates.js";
 import { getBiasStepsForCell, getDefaultRouterBiasSnapshotPath, parseRouterBiasSnapshot, } from "./reasoning-router-bias.js";
@@ -825,7 +828,12 @@ export class AgentSession {
         }
         const loaderSystemPrompt = this._resourceLoader.getSystemPrompt();
         const loaderAppendSystemPrompt = this._resourceLoader.getAppendSystemPrompt();
-        const appendSystemPrompt = loaderAppendSystemPrompt.length > 0 ? loaderAppendSystemPrompt.join("\n\n") : undefined;
+        const grokAppend = grokPlaybookAppendForProvider(this.model?.provider);
+        const appendParts = [...loaderAppendSystemPrompt];
+        if (grokAppend) {
+            appendParts.push(grokAppend);
+        }
+        const appendSystemPrompt = appendParts.length > 0 ? appendParts.join("\n\n") : undefined;
         const loadedSkills = this._resourceLoader.getSkills().skills;
         const loadedContextFiles = this._resourceLoader.getAgentsFiles().agentsFiles;
         this._baseSystemPromptOptions = {
@@ -960,6 +968,8 @@ export class AgentSession {
             if (!this.model) {
                 throw new Error(formatNoModelSelectedMessage());
             }
+            // Grok OAuth: refuse Imagine ids on the chat/completions path (tool-only).
+            assertTextChatModelForCompletion(this.model.id, this.model.provider);
             if (!this._modelRegistry.hasConfiguredAuth(this.model)) {
                 const isOAuth = this._modelRegistry.isUsingOAuth(this.model);
                 if (isOAuth) {
@@ -1318,6 +1328,8 @@ export class AgentSession {
         if (!this._modelRegistry.hasConfiguredAuth(model)) {
             throw new Error(`No API key for ${model.provider}/${model.id}`);
         }
+        // Grok OAuth: block selecting Imagine models as the session chat model.
+        assertTextChatModelForCompletion(model.id, model.provider);
         const previousModel = this.model;
         const thinkingLevel = this._getThinkingLevelForModelSwitch();
         this.agent.state.model = model;
@@ -1651,7 +1663,8 @@ export class AgentSession {
             if (!this.model) {
                 throw new Error(formatNoModelSelectedMessage());
             }
-            const { apiKey, headers } = await this._getCompactionRequestAuth(this.model);
+            const compactionModel = resolveCompactionModel(this.model, this._modelRegistry.getAvailable());
+            const { apiKey, headers } = await this._getCompactionRequestAuth(compactionModel);
             const pathEntries = this.sessionManager.getBranch();
             const settings = this.settingsManager.getCompactionSettings();
             const preparation = prepareCompaction(pathEntries, settings);
@@ -1694,7 +1707,7 @@ export class AgentSession {
             }
             else {
                 // Generate compaction result
-                const result = await compact(preparation, this.model, apiKey, headers, customInstructions, this._compactionAbortController.signal, this.thinkingLevel, this.agent.streamFn);
+                const result = await compact(preparation, compactionModel, apiKey, headers, customInstructions, this._compactionAbortController.signal, this.thinkingLevel, this.agent.streamFn);
                 summary = result.summary;
                 firstKeptEntryId = result.firstKeptEntryId;
                 tokensBefore = result.tokensBefore;
@@ -1884,17 +1897,21 @@ export class AgentSession {
                 });
                 return false;
             }
+            const compactionModel = resolveCompactionModel(this.model, this._modelRegistry.getAvailable());
             let apiKey;
             let headers;
             if (this.agent.streamFn === streamSimple) {
-                const authResult = await this._modelRegistry.getApiKeyAndHeaders(this.model);
+                const authResult = await this._modelRegistry.getApiKeyAndHeaders(compactionModel);
                 if (!authResult.ok || !authResult.apiKey) {
+                    const providerLabel = compactionModel.provider;
                     this._emit({
                         type: "compaction_end",
                         reason,
                         result: undefined,
                         aborted: false,
                         willRetry: false,
+                        errorMessage: `Auto-compaction could not authenticate for "${providerLabel}" (${compactionModel.id}). ` +
+                            `Check proxy/OAuth health and run '/login ${providerLabel}' if needed.`,
                     });
                     return false;
                 }
@@ -1902,7 +1919,7 @@ export class AgentSession {
                 headers = authResult.headers;
             }
             else {
-                ({ apiKey, headers } = await this._getCompactionRequestAuth(this.model));
+                ({ apiKey, headers } = await this._getCompactionRequestAuth(compactionModel));
             }
             const pathEntries = this.sessionManager.getBranch();
             const preparation = prepareCompaction(pathEntries, settings);
@@ -1954,7 +1971,7 @@ export class AgentSession {
             }
             else {
                 // Generate compaction result
-                const compactResult = await compact(preparation, this.model, apiKey, headers, undefined, this._autoCompactionAbortController.signal, this.thinkingLevel, this.agent.streamFn);
+                const compactResult = await compact(preparation, compactionModel, apiKey, headers, undefined, this._autoCompactionAbortController.signal, this.thinkingLevel, this.agent.streamFn);
                 summary = compactResult.summary;
                 firstKeptEntryId = compactResult.firstKeptEntryId;
                 tokensBefore = compactResult.tokensBefore;
@@ -1989,7 +2006,8 @@ export class AgentSession {
                 tokensBefore,
                 details,
             };
-            this._emit({ type: "compaction_end", reason, result, aborted: false, willRetry });
+            const emitWillRetry = compactionEmitWillRetry(willRetry, this.agent.hasQueuedMessages());
+            this._emit({ type: "compaction_end", reason, result, aborted: false, willRetry: emitWillRetry });
             if (willRetry) {
                 const messages = this.agent.state.messages;
                 const lastMsg = messages[messages.length - 1];
@@ -2178,6 +2196,10 @@ export class AgentSession {
             },
             getThinkingLevel: () => this.thinkingLevel,
             setThinkingLevel: (level) => this.setThinkingLevel(level),
+            // Optional: no in-process MCP client manager yet. Leave unbound so
+            // ExtensionAPI.callMcpTool remains present (load-time capture) but throws
+            // until a session-level handler is provided. Tests / future MCP hub bind here.
+            callMcpTool: undefined,
         }, {
             getModel: () => this.model,
             isIdle: () => !this.isStreaming,