open-multi-agent-kit 0.80.8 → 0.90.3

package/dist/core/agent-session.js

@@ -20,6 +20,7 @@ import { stripFrontmatter } from "../utils/frontmatter.js";
 import { resolvePath } from "../utils/paths.js";
 import { sleep } from "../utils/sleep.js";
 import { formatNoApiKeyFoundMessage, formatNoModelSelectedMessage } from "./auth-guidance.js";
+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";
@@ -53,6 +54,17 @@ 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;
+}
 // ============================================================================
 // Constants
 // ============================================================================
@@ -852,12 +864,29 @@ export class AgentSession {
     async prompt(text, options) {
         const expandPromptTemplates = options?.expandPromptTemplates ?? true;
         const preflightResult = options?.preflightResult;
+        let currentText = text;
+        let promptActiveSkillNames = [...(options?.activeSkillNames ?? [])];
+        let promptActiveSkillSource = options?.activeSkillSource;
+        let isBangSkillInvocation = false;
+        if (expandPromptTemplates) {
+            const bangInvocation = parseBangInvocation(text, {
+                hasSkill: (name) => this._resourceLoader.getSkills().skills.some((skill) => skill.name === name),
+            });
+            if (bangInvocation.kind === "skill") {
+                isBangSkillInvocation = true;
+                currentText = bangInvocation.prompt
+                    ? `/skill:${bangInvocation.skillName} ${bangInvocation.prompt}`
+                    : `/skill:${bangInvocation.skillName}`;
+                promptActiveSkillNames = mergePromptActiveSkillNames(promptActiveSkillNames, bangInvocation.activeSkillNames);
+                promptActiveSkillSource = bangInvocation.source;
+            }
+        }
         let messages;
         try {
             // Handle extension commands first (execute immediately, even during streaming)
             // Extension commands manage their own LLM interaction via omk.sendMessage()
-            if (expandPromptTemplates && text.startsWith("/")) {
-                const handled = await this._tryExecuteExtensionCommand(text);
+            if (expandPromptTemplates && !isBangSkillInvocation && currentText.startsWith("/")) {
+                const handled = await this._tryExecuteExtensionCommand(currentText);
                 if (handled) {
                     // Extension command executed, no prompt to send
                     preflightResult?.(true);
@@ -865,7 +894,6 @@ export class AgentSession {
                 }
             }
             // Emit input event for extension interception (before skill/template expansion)
-            let currentText = text;
             let currentImages = options?.images;
             if (this._extensionRunner.hasHandlers("input")) {
                 const inputResult = await this._extensionRunner.emitInput(currentText, currentImages, options?.source ?? "interactive", this.isStreaming ? options?.streamingBehavior : undefined);
@@ -943,8 +971,16 @@ export class AgentSession {
                 messages.push(msg);
             }
             this._pendingNextTurnMessages = [];
+            const turnSystemPromptOptions = promptActiveSkillNames.length > 0
+                ? {
+                    ...this._baseSystemPromptOptions,
+                    activeSkillNames: promptActiveSkillNames,
+                    ...(promptActiveSkillSource ? { activeSkillSource: promptActiveSkillSource } : {}),
+                }
+                : this._baseSystemPromptOptions;
+            const turnSystemPrompt = promptActiveSkillNames.length > 0 ? buildSystemPrompt(turnSystemPromptOptions) : this._baseSystemPrompt;
             // Emit before_agent_start extension event
-            const result = await this._extensionRunner.emitBeforeAgentStart(expandedText, currentImages, this._baseSystemPrompt, this._baseSystemPromptOptions);
+            const result = await this._extensionRunner.emitBeforeAgentStart(expandedText, currentImages, turnSystemPrompt, turnSystemPromptOptions);
             // Add all custom messages from extensions
             if (result?.messages) {
                 for (const msg of result.messages) {
@@ -964,7 +1000,7 @@ export class AgentSession {
             }
             else {
                 // Ensure we're using the base prompt (in case previous turn had modifications)
-                this.agent.state.systemPrompt = this._baseSystemPrompt;
+                this.agent.state.systemPrompt = turnSystemPrompt;
             }
             await this._checkProjectedCompaction(messages);
         }