@kolisachint/hoocode-agent 0.4.23 → 0.4.25

package/dist/core/agent-session.js

@@ -27,7 +27,8 @@ 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 { expandPromptTemplate } from "./prompt-templates.js";
+import { expandPromptTemplate, tryExpandPromptTemplate } from "./prompt-templates.js";
+import { clearProviderExhaustion, isProviderQuotaError, markProviderExhausted } from "./provider-health.js";
 import { CURRENT_SESSION_VERSION, getLatestCompactionEntry } from "./session-manager.js";
 import { createSyntheticSourceInfo } from "./source-info.js";
 import { updateSubagentSkillPaths } from "./subagent-pool-instance.js";
@@ -317,6 +318,11 @@ export class AgentSession {
                 const assistantMsg = event.message;
                 if (assistantMsg.stopReason !== "error") {
                     this._overflowRecoveryAttempted = false;
+                    // A successful response clears any prior provider-exhaustion flag so
+                    // subagent dispatch is unblocked as soon as the provider recovers.
+                    const provider = this.model?.provider;
+                    if (provider)
+                        clearProviderExhaustion(provider);
                 }
                 // Reset retry counter immediately on successful assistant response
                 // This prevents accumulation across multiple LLM calls within a turn
@@ -339,6 +345,14 @@ export class AgentSession {
                 const didRetry = await this._handleRetryableError(msg);
                 if (didRetry)
                     return; // Retry was initiated, don't proceed to compaction
+                // Retries are exhausted/disabled and a quota or rate-limit error
+                // persists: flag the provider so subagent dispatch can skip pointless
+                // spawns (subagents inherit this provider). Self-expires via TTL and is
+                // cleared on the next successful response.
+                const provider = this.model?.provider;
+                if (provider && isProviderQuotaError(msg.errorMessage)) {
+                    markProviderExhausted(provider, msg.errorMessage ?? "provider error");
+                }
             }
             this._resolveRetry();
             await this._checkCompaction(msg);
@@ -725,9 +739,14 @@ export class AgentSession {
             }
             // Expand skill commands (/skill:name args) and prompt templates (/template args)
             let expandedText = currentText;
+            let expansionTemplate;
+            let expansionArgsString = "";
             if (expandPromptTemplates) {
                 expandedText = this._expandSkillCommand(expandedText);
-                expandedText = expandPromptTemplate(expandedText, [...this.promptTemplates]);
+                const expansion = tryExpandPromptTemplate(expandedText, [...this.promptTemplates]);
+                expandedText = expansion.text;
+                expansionTemplate = expansion.template;
+                expansionArgsString = expansion.argsString;
             }
             // If streaming, queue via steer() or followUp() based on option
             if (this.isStreaming) {
@@ -765,8 +784,22 @@ export class AgentSession {
             }
             // Build messages array (custom message if any, then user message)
             messages = [];
+            // For system/context slash commands, user message is the raw args if present
+            const userMessageText = expansionTemplate && expansionTemplate.type !== "user" && expansionArgsString.trim()
+                ? expansionArgsString
+                : expandedText;
+            // Inject context-type slash command as a custom message
+            if (expansionTemplate?.type === "context") {
+                messages.push({
+                    role: "custom",
+                    customType: "slash_command",
+                    content: expandedText,
+                    display: false,
+                    timestamp: Date.now(),
+                });
+            }
             // Add user message
-            const userContent = [{ type: "text", text: expandedText }];
+            const userContent = [{ type: "text", text: userMessageText }];
             if (currentImages) {
                 userContent.push(...currentImages);
             }
@@ -803,6 +836,11 @@ export class AgentSession {
                 // Ensure we're using the base prompt (in case previous turn had modifications)
                 this.agent.state.systemPrompt = this._baseSystemPrompt;
             }
+            // Inject system-type slash command into system prompt
+            if (expansionTemplate?.type === "system") {
+                const prefix = this.agent.state.systemPrompt ? "\n\n" : "";
+                this.agent.state.systemPrompt += prefix + expandedText;
+            }
         }
         catch (error) {
             preflightResult?.(false);