@general-liquidity/gordon-cli 0.8.15 → 0.8.16

package/dist/index.js

@@ -2141431,7 +2141431,6 @@ When a user asks for market data, prices, candles, or orderbook info, route to S
 });
 
 // src/infra/agents/contextBudget.ts
-import { createHash as createHash10 } from "crypto";
 function estimateTokens2(text6) {
   const trimmed = text6.trim();
   if (!trimmed)
@@ -2141531,27 +2141530,18 @@ function getActiveIntegrationIds(context11, selection) {
 function isAnthropicProvider(provider) {
   return provider === "anthropic" || provider.includes("anthropic") || provider === "claude";
 }
-function getPromptCacheMetadata(context11, stablePrefix) {
+function getPromptCacheMetadata(context11, _stablePrefix) {
   const provider = context11.config.modelConfig?.provider ?? process.env.GORDON_PROVIDER ?? "unknown";
   if (isAnthropicProvider(provider)) {
     return {
       supported: true,
-      provider,
-      key: "anthropic-stable-prefix"
-    };
-  }
-  if (provider !== "openai") {
-    return {
-      supported: false,
-      provider,
-      reason: "Prompt-cache key hooks are only enabled on the native OpenAI and Anthropic paths."
+      provider
     };
   }
-  const hash9 = createHash10("sha256").update(stablePrefix).digest("hex").slice(0, 32);
   return {
-    supported: true,
+    supported: false,
     provider,
-    key: `gordon:${hash9}`
+    reason: "Transport-level prompt caching is currently only emitted on the Anthropic path."
   };
 }
 function buildAnthropicCacheControlBlocks(envelope) {
@@ -2141649,18 +2141639,14 @@ ${userMessage}`].filter(Boolean).join(`
   const report = buildReport(context11, selection, contextPieces, userMessage);
   latestReports.set(report.threadId, report);
   const requestOptions = {};
-  if (report.cache.supported && report.cache.key) {
-    requestOptions.promptCacheKey = report.cache.key;
-  }
-  const providerOptions = report.cache.key === "anthropic-stable-prefix" ? { anthropic: { cacheControl: { type: "ephemeral" } } } : undefined;
+  const providerOptions = report.cache.supported && isAnthropicProvider(report.cache.provider) ? { anthropic: { cacheControl: { type: "ephemeral" } } } : undefined;
   const messages2 = [];
   if (stablePrefix.trim()) {
     messages2.push({
       role: "system",
       content: stablePrefix,
       ...providerOptions ? {
-        providerOptions,
-        experimental_providerMetadata: providerOptions
+        providerOptions
       } : {}
     });
   }
@@ -2141698,7 +2141684,7 @@ ${uniqueReminderLines.join(`
     requestOptions,
     messages: messages2
   };
-  if (report.cache.key === "anthropic-stable-prefix") {
+  if (report.cache.supported && isAnthropicProvider(report.cache.provider)) {
     envelope.anthropicSystemBlocks = buildAnthropicCacheControlBlocks(envelope);
   }
   if (providerOptions) {
@@ -2141738,7 +2141724,7 @@ function formatPromptContextReport(report) {
   if (!report) {
     return "No prompt/context report is available for this session yet.";
   }
-  const cacheLine = report.cache.supported ? report.cache.key === "anthropic-stable-prefix" ? "Enabled (anthropic-cache-control)" : `Enabled (${report.cache.key})` : `Unavailable (${report.cache.reason ?? "unsupported"})`;
+  const cacheLine = report.cache.supported ? "Enabled (anthropic-cache-control)" : `Unavailable (${report.cache.reason ?? "unsupported"})`;
   const usageLine = report.usage ? `${report.usage.promptTokens} prompt / ${report.usage.completionTokens} completion / ${report.usage.totalTokens} total` : "No provider usage reported yet.";
   const cumulativeUsageLine = report.cumulativeUsage ? `${report.cumulativeUsage.requestCount} req \xB7 ${report.cumulativeUsage.promptTokens} prompt / ${report.cumulativeUsage.completionTokens} completion / ${report.cumulativeUsage.totalTokens} total` : "No cumulative usage recorded yet.";
   const lines = [
@@ -2142079,7 +2142065,7 @@ var init_alpaca = __esm(() => {
 });
 
 // src/infra/broker/adapters/webull.ts
-import { createHash as createHash11, createHmac as createHmac7, randomUUID as randomUUID17 } from "crypto";
+import { createHash as createHash10, createHmac as createHmac7, randomUUID as randomUUID17 } from "crypto";
 function parseNumber6(value) {
   if (value === undefined || value === null || value === "")
     return 0;
@@ -2142099,7 +2142085,7 @@ function parseBoolean3(value) {
   return normalized === "1" || normalized === "true" || normalized === "yes" || normalized === "on";
 }
 function upperMd5(input) {
-  return createHash11("md5").update(input).digest("hex").toUpperCase();
+  return createHash10("md5").update(input).digest("hex").toUpperCase();
 }
 function upperHmacSha1(secret, payload) {
   return createHmac7("sha1", secret).update(payload).digest("hex").toUpperCase();
@@ -2145211,6 +2145197,9 @@ function normalizeWhitespace(message5) {
 function normalizeForDeduplication(message5) {
   return normalizeWhitespace(message5).toLowerCase();
 }
+function getProviderOptions(message5) {
+  return "providerOptions" in message5 ? message5.providerOptions : undefined;
+}
 function isMeaningfulUserContent(message5) {
   const unescaped = RESERVED_MARKERS.reduce((current, marker21) => current.replaceAll(marker21.replace("[", "\\["), ""), message5);
   return normalizeWhitespace(unescaped).length > 0;
@@ -2145297,6 +2145286,7 @@ function validateAndRepairModelMessages(messages2) {
   for (const rawMessage of messages2) {
     const role = rawMessage.role === "system" ? "system" : "user";
     const normalizedContent = normalizeWhitespace(String(rawMessage.content ?? ""));
+    const providerOptions = getProviderOptions(rawMessage);
     if (!normalizedContent) {
       repairNotes.push(`Dropped empty ${role} message before model call.`);
       continue;
@@ -2145307,7 +2145297,7 @@ function validateAndRepairModelMessages(messages2) {
     if (role === "system" && normalizedForDedup.includes("[gordon_runtime_reminders_note]")) {
       repairNotes.push("Converted a misplaced runtime reminder block into user-side guidance semantics.");
     }
-    if (role === "system" && !rawMessage.providerOptions) {
+    if (role === "system" && !providerOptions) {
       if (seenDynamicSystemBlocks.has(normalizedForDedup)) {
         repairNotes.push("Dropped a duplicate dynamic system block before provider call.");
         continue;
@@ -2145328,18 +2145318,26 @@ function validateAndRepairModelMessages(messages2) {
       }
       seenUserIntents.add(normalizedForDedup);
     }
-    if (previous && previous.role === "system" && role === "system" && !previous.providerOptions && !rawMessage.providerOptions) {
+    if (previous && previous.role === "system" && role === "system" && !getProviderOptions(previous) && !providerOptions) {
       previous.content = `${previous.content}
 
 ${sanitizedContent}`;
       repairNotes.push("Merged adjacent uncached system messages before provider call.");
       continue;
     }
-    repaired.push({
-      role,
-      content: sanitizedContent,
-      ...rawMessage.providerOptions ? { providerOptions: rawMessage.providerOptions } : {}
-    });
+    if (role === "system") {
+      repaired.push({
+        role: "system",
+        content: sanitizedContent,
+        ...providerOptions ? { providerOptions } : {}
+      });
+    } else {
+      repaired.push({
+        role: "user",
+        content: sanitizedContent,
+        ...providerOptions ? { providerOptions } : {}
+      });
+    }
   }
   if (repaired.length === 0 || repaired[repaired.length - 1]?.role !== "user") {
     repaired.push({
@@ -2145623,6 +2145621,16 @@ var init_handoffs = __esm(() => {
 });
 
 // src/infra/memory/summarizer.ts
+function determineCompactionStageFromPressure(contextFillRatio) {
+  if (contextFillRatio >= COMPACTION_PRESSURE_THRESHOLDS.full)
+    return "full";
+  if (contextFillRatio >= COMPACTION_PRESSURE_THRESHOLDS.aggressive)
+    return "aggressive";
+  if (contextFillRatio >= COMPACTION_PRESSURE_THRESHOLDS.pruning)
+    return "pruning";
+  return "masking";
+}
+
 class ConversationSummarizer {
   config;
   llm;
@@ -2145632,7 +2145640,7 @@ class ConversationSummarizer {
     logger118.debug("Summarizer initialized", { config: this.config });
   }
   shouldSummarize(messages2) {
-    return messages2.length > this.config.messageThreshold;
+    return messages2.length > this.config.messageThreshold || this.estimateContextFillRatio(messages2) >= COMPACTION_PRESSURE_THRESHOLDS.masking;
   }
   getMessagesToSummarizeCount(messages2) {
     if (!this.shouldSummarize(messages2)) {
@@ -2145640,6 +2145648,13 @@ class ConversationSummarizer {
     }
     return messages2.length - this.config.recentMessagesToKeep;
   }
+  estimateMessageTokens(messages2) {
+    return messages2.reduce((total, message5) => total + Math.ceil(message5.content.length / 4), 0);
+  }
+  estimateContextFillRatio(messages2) {
+    const budget = Math.max(1, this.config.maxContextTokensEstimate);
+    return Math.min(1, this.estimateMessageTokens(messages2) / budget);
+  }
   async summarize(messages2) {
     if (!this.shouldSummarize(messages2)) {
       logger118.debug("Summarization not needed", {
@@ -2145649,16 +2145664,19 @@ class ConversationSummarizer {
       return {
         summarized: false,
         messages: messages2,
-        messagesSummarized: 0
+        messagesSummarized: 0,
+        contextFillRatio: this.estimateContextFillRatio(messages2)
       };
     }
     const messagesToSummarize = messages2.length - this.config.recentMessagesToKeep;
-    const compactionStage = this.determineCompactionStage(messages2.length);
+    const contextFillRatio = this.estimateContextFillRatio(messages2);
+    const compactionStage = determineCompactionStageFromPressure(contextFillRatio);
     logger118.info("Starting conversation summarization", {
       totalMessages: messages2.length,
       messagesToSummarize,
       keepingRecent: this.config.recentMessagesToKeep,
-      compactionStage
+      compactionStage,
+      contextFillRatio
     });
     try {
       const preservedStableMessages = messages2.filter((message5) => this.isStableContextMessage(message5));
@@ -2145674,7 +2145692,8 @@ class ConversationSummarizer {
           summarized: false,
           messages: [...preservedStableMessages, ...recentMessages],
           messagesSummarized: 0,
-          compactionStage
+          compactionStage,
+          contextFillRatio
         };
       }
       const conversationText = this.formatMessagesForSummary(summarizableOlderMessages);
@@ -2145702,7 +2145721,8 @@ class ConversationSummarizer {
         messagesSummarized: adjustedMessagesToSummarize,
         summaryText,
         tradingContext,
-        compactionStage
+        compactionStage,
+        contextFillRatio
       };
     } catch (error56) {
       logger118.error("Summarization failed, returning original messages", error56);
@@ -2145710,23 +2145730,11 @@ class ConversationSummarizer {
         summarized: false,
         messages: messages2,
         messagesSummarized: 0,
-        compactionStage
+        compactionStage,
+        contextFillRatio
       };
     }
   }
-  determineCompactionStage(messageCount) {
-    const overage = messageCount - this.config.messageThreshold;
-    if (overage >= Math.max(12, Math.floor(this.config.messageThreshold * 1))) {
-      return "full";
-    }
-    if (overage >= Math.max(8, Math.floor(this.config.messageThreshold * 0.75))) {
-      return "aggressive";
-    }
-    if (overage >= Math.max(4, Math.floor(this.config.messageThreshold * 0.35))) {
-      return "pruning";
-    }
-    return "masking";
-  }
   getRecentMessagesToKeepForStage(stage) {
     const observationCount = RECENT_OBSERVATIONS_TO_KEEP[stage];
     return Math.max(observationCount, Math.min(this.config.recentMessagesToKeep, observationCount + 2));
@@ -2145992,10 +2146000,11 @@ function createSummarizerConfigFromMemoryConfig(memoryConfig) {
   const recentMessagesToKeep = Math.max(3, Math.floor(lastMessages * 0.25));
   return {
     messageThreshold,
-    recentMessagesToKeep
+    recentMessagesToKeep,
+    maxContextTokensEstimate: Math.max(6000, lastMessages * 600)
   };
 }
-var logger118, DEFAULT_SUMMARIZER_CONFIG, RECENT_OBSERVATIONS_TO_KEEP, SUMMARIZATION_SYSTEM_PROMPT = `You are a trading conversation summarizer. Your job is to create a concise but complete summary of a conversation between a user and Gordon, an AI trading assistant.
+var logger118, DEFAULT_SUMMARIZER_CONFIG, COMPACTION_PRESSURE_THRESHOLDS, RECENT_OBSERVATIONS_TO_KEEP, SUMMARIZATION_SYSTEM_PROMPT = `You are a trading conversation summarizer. Your job is to create a concise but complete summary of a conversation between a user and Gordon, an AI trading assistant.
 
 IMPORTANT: Preserve ALL key trading information including:
 - Trade decisions made (buy/sell, positions, sizing)
@@ -2146032,7 +2146041,14 @@ var init_summarizer = __esm(async () => {
     messageThreshold: 20,
     recentMessagesToKeep: 5,
     maxSummaryTokens: 1000,
-    temperature: 0.3
+    temperature: 0.3,
+    maxContextTokensEstimate: 12000
+  };
+  COMPACTION_PRESSURE_THRESHOLDS = {
+    masking: 0.7,
+    pruning: 0.8,
+    aggressive: 0.9,
+    full: 0.99
   };
   RECENT_OBSERVATIONS_TO_KEEP = {
     masking: 6,
@@ -2146670,6 +2146686,12 @@ async function awaitWithAbort(promise4, signal) {
     });
   });
 }
+function advanceReActStage(current, next) {
+  if (!REACT_STAGE_TRANSITIONS[current].includes(next)) {
+    throw new Error(`Invalid ReAct stage transition: ${current} -> ${next}`);
+  }
+  return next;
+}
 async function* processMessageStream(userMessage, context11, threadId, resourceId, options3 = {}) {
   const startTime = Date.now();
   logger119.debug("Starting streaming message processing", { messageLength: userMessage.length });
@@ -2146679,7 +2146701,9 @@ async function* processMessageStream(userMessage, context11, threadId, resourceI
   const requestContext = createRequestContext(context11);
   try {
     const groundedPrompt = await buildGroundedPrompt(userMessage, context11, requestContext);
+    let reactStage = "compaction_checked";
     await throwIfStreamAborted(signal);
+    reactStage = advanceReActStage(reactStage, "interrupt_checked_before_thinking");
     let _thinkingResult = null;
     const _thinkingDepth = getThinkingDepthFromContext(context11);
     if (_thinkingDepth !== "off") {
@@ -2146692,9 +2146716,13 @@ async function* processMessageStream(userMessage, context11, threadId, resourceI
         }
       }
     }
+    reactStage = advanceReActStage(reactStage, "thinking_complete");
+    reactStage = advanceReActStage(reactStage, "ui_drained");
     await emitEvent("agent:started", { agent: "gordon" });
     const tracingOptions = createAgentTracingOptions();
     const effectiveResourceId = resourceId || context11.userId || "default";
+    await throwIfStreamAborted(signal);
+    reactStage = advanceReActStage(reactStage, "interrupt_checked_before_action");
     const streamRequest = gordonAgent().stream(groundedPrompt.messages, {
       requestContext,
       ...threadId && effectiveResourceId ? {
@@ -2146707,6 +2146735,7 @@ async function* processMessageStream(userMessage, context11, threadId, resourceI
       ...groundedPrompt.requestOptions,
       ...tracingOptions && { tracingOptions }
     });
+    reactStage = advanceReActStage(reactStage, "action_started");
     const streamResult = await awaitWithAbort(streamRequest, signal);
     let fullText = "";
     let lastSubAgentToolResult = null;
@@ -2147222,6 +2147251,7 @@ async function* processMessageStream(userMessage, context11, threadId, resourceI
       usage,
       agentName: currentAgent
     };
+    reactStage = advanceReActStage(reactStage, "response_dispatched");
     await finalizeAfterRequest(context11, {
       threadId: threadId ?? context11.threadId,
       agentName: currentAgent,
@@ -2147233,6 +2147263,7 @@ async function* processMessageStream(userMessage, context11, threadId, resourceI
         totalTokens: usage.totalTokens
       }
     });
+    reactStage = advanceReActStage(reactStage, "persisted");
   } catch (err2) {
     if (err2 instanceof StreamCancelledError) {
       logger119.info("Streaming cancelled by user", {
@@ -2147772,7 +2147803,7 @@ function createMessageStreamWorkflow(userMessage, context11, threadId, resourceI
     }
   };
 }
-var DEFAULT_FALLBACK_CHAIN, backtestCache, BACKTEST_CACHE_TTL_MS, logger119, _summarizer = null, lifecycleSessionContexts, lifecycleProcessHooksRegistered = false, TOOL_AGENT_MAP, handoffHistory, handoffCounter = 0, VALID_HANDOFF_RULES, StreamCancelledError;
+var DEFAULT_FALLBACK_CHAIN, backtestCache, BACKTEST_CACHE_TTL_MS, logger119, _summarizer = null, lifecycleSessionContexts, lifecycleProcessHooksRegistered = false, TOOL_AGENT_MAP, handoffHistory, handoffCounter = 0, VALID_HANDOFF_RULES, StreamCancelledError, REACT_STAGE_TRANSITIONS;
 var init_orchestrator = __esm(async () => {
   init_request_context();
   init_integrationGlossary();
@@ -2148263,6 +2148294,16 @@ var init_orchestrator = __esm(async () => {
       this.name = "StreamCancelledError";
     }
   };
+  REACT_STAGE_TRANSITIONS = {
+    compaction_checked: ["interrupt_checked_before_thinking"],
+    interrupt_checked_before_thinking: ["thinking_complete"],
+    thinking_complete: ["ui_drained"],
+    ui_drained: ["interrupt_checked_before_action"],
+    interrupt_checked_before_action: ["action_started"],
+    action_started: ["response_dispatched"],
+    response_dispatched: ["persisted"],
+    persisted: []
+  };
 });
 
 // src/infra/rails/mcp.ts
@@ -2150203,11 +2150244,11 @@ function getSchemaByName(name16) {
 // src/gateway/store/idempotency-store.ts
 init_logger2();
 init_database();
-import { createHash as createHash12 } from "crypto";
+import { createHash as createHash11 } from "crypto";
 var logger120 = createModuleLogger("gateway-idempotency");
 function hashIdempotencyPayload(payload) {
   const canonical = JSON.stringify(payload ?? {});
-  return createHash12("sha256").update(canonical).digest("hex");
+  return createHash11("sha256").update(canonical).digest("hex");
 }
 function reserveIdempotencyKey(input) {
   const key = input.idempotencyKey;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@general-liquidity/gordon-cli",
-  "version": "0.8.15",
+  "version": "0.8.16",
   "description": "The Frontier Trading Agent",
   "author": "General Liquidity, Inc.",
   "license": "MIT",