@theokit/sdk 5.15.0 → 5.15.2

package/dist/{chunk-IOBHFP2E.js → chunk-JRQJMZKY.js}

@@ -1,24 +1,24 @@
-import { currentCredentialPool, newPooledCredential, CredentialPool } from './chunk-NK5EOTDY.js';
+import { currentCredentialPool, newPooledCredential, CredentialPool } from './chunk-OIOSY5G6.js';
 import { invalidateSessionCache } from './chunk-2XC6KDJM.js';
 import { buildErrorMetadata, mapOpenAICompatibleError, parseErrorBody, httpStatusToErrorCode } from './chunk-7ACS6P5Z.js';
 import { computeBackoffMs, sleepWithAbort } from './chunk-24MGQDK3.js';
-import { tryJson, isPlainObject, sanitizeToolInput } from './chunk-FJWQP6EE.js';
+import { tryJson, isPlainObject, sanitizeToolInput } from './chunk-WJ6OGKAO.js';
 import { providerFromApiKeyPrefix } from './chunk-NAF4L3T6.js';
-import { reconstructMessages, SessionTranscript } from './chunk-XESYJ4JC.js';
+import { reconstructMessages, SessionTranscript } from './chunk-3VX7JHJI.js';
 import { estimateTokens, resolveCompressionModel } from './chunk-SZQFCHU6.js';
 import { parseModelId } from './chunk-R7WIIPUR.js';
-import { registerProvider, registerBuiltins, getProviderProfile, listProviders, inferModelDialect, inferRegionFromModelId, stripBedrockPrefix, resolveBedrockBaseUrl, resolveVertexBaseUrl, stripVertexPrefix } from './chunk-RZL2W4C3.js';
+import { registerProvider, registerBuiltins, getProviderProfile, listProviders, inferModelDialect, inferRegionFromModelId, stripBedrockPrefix, resolveBedrockBaseUrl, resolveVertexBaseUrl, stripVertexPrefix } from './chunk-5L7S2VOL.js';
 import { globalSingleton } from './chunk-AGACYRJ2.js';
-import { readStoredOAuth } from './chunk-QD6B6W6I.js';
+import { readStoredOAuth } from './chunk-L2KC2G7H.js';
 import { boundFetch } from './chunk-Q7GYMXVC.js';
 import { NetworkError, ConfigurationError, IntegrationNotConnectedError, AuthenticationError, RateLimitError, UnknownAgentError, CompressionFailedError, CredentialPoolExhaustedError, isTransientError, TheokitAgentError } from './chunk-TNFOU6SB.js';
 import { diag } from './chunk-3OY6H3I7.js';
-import { existsSync, readFileSync } from 'fs';
-import { readdir } from 'fs/promises';
-import { homedir } from 'os';
-import { join } from 'path';
-import { pathToFileURL } from 'url';
-import { createRequire } from 'module';
+import { existsSync, readFileSync } from 'node:fs';
+import { readdir } from 'node:fs/promises';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+import { pathToFileURL } from 'node:url';
+import { createRequire } from 'node:module';
 
 function trustFilePath() {
   return join(homedir(), ".theokit", "plugins", "trusted-providers.json");
@@ -1539,16 +1539,38 @@ function pickString(record, key) {
 // src/internal/llm/hermes-tool-extract.ts
 var HERMES_BLOCK = /<function=\s*([^>\s]+)\s*>([\s\S]*?)<\/tool_call>/g;
 var HERMES_PARAM = /<parameter=\s*([^>\s]+)\s*>([\s\S]*?)<\/parameter>/g;
+var CTRL_CALL_SRC = String.raw`print\(\s*default_api\.([A-Za-z_]\w*)\(([\s\S]*?)\)\s*\)(?=\s*(?:print\(\s*default_api\.|<ctrl\d+>|$))`;
+var CTRL_BLOCK = new RegExp(`<ctrl42>call\\s*((?:${CTRL_CALL_SRC}\\s*)+)(?=<ctrl\\d+>|$)`, "g");
+var CTRL_MARKER = "<ctrl42>call";
+var CTRL_PREFIX = "print(default_api.";
 function extractHermesToolCalls(content, makeId, allowedToolNames) {
   const isPromoted = (name) => name.length > 0 && (allowedToolNames === void 0 || allowedToolNames.has(name));
   const toolCalls = [];
   const droppedNames = [];
+  const formats = /* @__PURE__ */ new Set();
+  for (const block of content.matchAll(CTRL_BLOCK)) {
+    for (const call of (block[1] ?? "").matchAll(new RegExp(CTRL_CALL_SRC, "g"))) {
+      const name = call[1] ?? "";
+      if (!isPromoted(name)) {
+        if (allowedToolNames !== void 0) droppedNames.push(name);
+        continue;
+      }
+      toolCalls.push({
+        type: "tool_use",
+        id: makeId(),
+        name,
+        input: parseCtrlArgs(call[2] ?? "")
+      });
+      formats.add("gemini-ctrl42");
+    }
+  }
   for (const block of content.matchAll(HERMES_BLOCK)) {
     const name = (block[1] ?? "").trim();
     if (!isPromoted(name)) {
       if (name.length > 0 && allowedToolNames !== void 0) droppedNames.push(name);
       continue;
     }
+    formats.add("hermes");
     toolCalls.push({
       type: "tool_use",
       id: makeId(),
@@ -1557,10 +1579,37 @@ function extractHermesToolCalls(content, makeId, allowedToolNames) {
     });
   }
   const residualText = toolCalls.length === 0 ? content : content.replace(
+    CTRL_BLOCK,
+    (_full, calls) => keepUnpromotedCtrl(calls, isPromoted)
+  ).replace(
     HERMES_BLOCK,
     (full, rawName) => isPromoted((rawName ?? "").trim()) ? "" : full
   ).trim();
-  return { toolCalls, residualText, droppedNames };
+  return { toolCalls, residualText, droppedNames, formats: [...formats] };
+}
+function keepUnpromotedCtrl(calls, isPromoted) {
+  const kept = [...calls.matchAll(new RegExp(CTRL_CALL_SRC, "g"))].filter((c) => !isPromoted(c[1] ?? "")).map((c) => c[0]);
+  return kept.length === 0 ? "" : `<ctrl42>call
+${kept.join("\n")}`;
+}
+var CTRL_ARG = /\s*([A-Za-z_]\w*)\s*=\s*("(?:[^"\\]|\\.)*"|'(?:[^'\\]|\\.)*'|[^,]+)\s*(?:,|$)/y;
+function parseCtrlArgs(raw) {
+  const input = {};
+  CTRL_ARG.lastIndex = 0;
+  for (let m = CTRL_ARG.exec(raw); m !== null; m = CTRL_ARG.exec(raw)) {
+    input[m[1]] = parseCtrlValue(m[2].trim());
+  }
+  return sanitizeToolInput(input, { trim: true }).value;
+}
+function parseCtrlValue(v) {
+  const q = v[0];
+  if ((q === '"' || q === "'") && v.length >= 2 && v.endsWith(q)) {
+    return v.slice(1, -1).replace(/\\(.)/g, (_, c) => c === "n" ? "\n" : c === "t" ? "	" : c);
+  }
+  if (v === "True") return true;
+  if (v === "False") return false;
+  if (v === "None") return null;
+  return /^-?\d+(\.\d+)?$/.test(v) ? Number(v) : v;
 }
 function parseHermesParams(inner) {
   const input = {};
@@ -1578,6 +1627,10 @@ var isStreamWs = (c) => c === " " || c === "	" || c === "\n" || c === "\r";
 function streamToolCallBufferState(held, allowedToolNames, cap = DEFAULT_STREAM_BUFFER_CAP) {
   if (allowedToolNames.size === 0) return "impossible";
   const t = held.trimStart();
+  if (t.startsWith("<c")) return ctrlState(t, held.length, allowedToolNames, cap);
+  return functionMarkerState(held, t, allowedToolNames, cap);
+}
+function functionMarkerState(held, t, allowedToolNames, cap) {
   if (t.length < STREAM_MARKER.length) {
     return STREAM_MARKER.startsWith(t) ? "possible" : "impossible";
   }
@@ -1589,6 +1642,20 @@ function streamToolCallBufferState(held, allowedToolNames, cap = DEFAULT_STREAM_
   if (!nameOk) return "impossible";
   return held.length > cap ? "impossible" : "possible";
 }
+function ctrlState(t, heldLength, allowedToolNames, cap) {
+  if (t.length < CTRL_MARKER.length) return CTRL_MARKER.startsWith(t) ? "possible" : "impossible";
+  if (!t.startsWith(CTRL_MARKER)) return "impossible";
+  const rest = t.slice(CTRL_MARKER.length).trimStart();
+  if (rest.length <= CTRL_PREFIX.length)
+    return CTRL_PREFIX.startsWith(rest) ? "possible" : "impossible";
+  if (!rest.startsWith(CTRL_PREFIX)) return "impossible";
+  const afterPrefix = rest.slice(CTRL_PREFIX.length);
+  const paren = afterPrefix.indexOf("(");
+  const name = paren === -1 ? afterPrefix : afterPrefix.slice(0, paren);
+  if (!/^\w*$/.test(name)) return "impossible";
+  const nameOk = paren === -1 ? someToolNameStartsWith(allowedToolNames, name) : allowedToolNames.has(name);
+  return nameOk && heldLength <= cap ? "possible" : "impossible";
+}
 function parseStreamMarkerName(t) {
   let cursor = STREAM_MARKER.length;
   while (cursor < t.length && isStreamWs(t[cursor])) cursor += 1;
@@ -1944,7 +2011,7 @@ var OpenAIStreamAccumulator = class {
         text = recovered.residualText;
         stopReason = "tool_use";
         diag(
-          `[theokit-sdk] recovered ${recovered.toolCalls.length} leaked tool call(s) from assistant content (provider="${this.providerName}", names=${recovered.toolCalls.map((c) => c.name).join(",")})
+          `[theokit-sdk] recovered ${recovered.toolCalls.length} leaked tool call(s) from assistant content (provider="${this.providerName}", format=${recovered.formats.join(",") || "hermes"}, names=${recovered.toolCalls.map((c) => c.name).join(",")})
 `
         );
       }
@@ -3526,5 +3593,5 @@ async function autoCompactIfNeeded(opts) {
 }
 
 export { COMPACT_SUMMARY_MARKER, COMPACT_USER_MESSAGE_MAX_TOKENS, CircuitBreaker, DEFAULT_PRE_COMPACT_TIMEOUT_MS, abortError, autoCompactIfNeeded, buildDefaultSummarizer, compactSessionTranscript, discoverProviderPlugins, getConfiguredBaseUrl, httpRequest, inferApiMode, isCompactSummary, isFixtureApiKey, mapOllamaHttpError, mapOllamaTransportError, mergeExplicitApiKey, normalizeUsage, parseSseStream, presentProviderCredentialEnvVars, readErrorResponseBody, readTrustArray, relayStream, renderToolResultContentText, resolveProviderChain, resolveRunProvider, resolveSummarizerRoute, shouldAutoCompact, shouldUseFixtureMode, shouldUseRealLocalRuntime, trustFilePath, tryFirstEvent, validateApiKeyShape };
-//# sourceMappingURL=chunk-IOBHFP2E.js.map
-//# sourceMappingURL=chunk-IOBHFP2E.js.map
+//# sourceMappingURL=chunk-JRQJMZKY.js.map
+//# sourceMappingURL=chunk-JRQJMZKY.js.map