@theokit/agents 0.24.0 → 0.25.0

package/dist/{bridge-entry-CILcYM0y.d.ts → bridge-entry-DfwOnvUB.d.ts}

@@ -1,5 +1,5 @@
 import { ExecutionContext } from '@theokit/http';
-import { A as AgentOptions, T as ToolOptions, g as MainLoopMeta, a as ApprovalOptions, B as BudgetOptions, f as GatewayOptions, l as MemoryOptions, t as SkillsOptions, e as ContextWindowOptions, q as ProjectContextOptions, j as McpServersMap, b as CompactionDecoratorConfig, R as ReasoningEffort } from './skills-CTzgfoff.js';
+import { A as AgentOptions, T as ToolOptions, g as MainLoopMeta, a as ApprovalOptions, B as BudgetOptions, f as GatewayOptions, l as MemoryOptions, t as SkillsOptions, e as ContextWindowOptions, q as ProjectContextOptions, j as McpServersMap, b as CompactionDecoratorConfig, R as ReasoningEffort } from './skills-CLymniNy.js';
 import { SystemPromptResolver, SkillsSettings, ContextSettings, PluginsSettings, Plugin, ProviderRoutingSettings, AgentDefinition, BudgetTracker, ConversationStorageAdapter, CustomTool, ModelSelection } from '@theokit/sdk';
 import { RetryOptions } from '@theokit/sdk/retry';
 import { z } from 'zod';
@@ -138,6 +138,8 @@ interface CompiledAgentOptions {
     reasoningEffort?: ReasoningEffort;
     /** Opt-in `<think>`-tag extraction declared via `@Agent({ parseThinkTags })` (M2); wraps the stream when true. */
     parseThinkTags?: boolean;
+    /** Opt-in tool-dialect stripping declared via `@Agent({ stripToolDialect })` (theocode#32); strips leaked `<function=…></tool_call>` from text when true. */
+    stripToolDialect?: boolean;
     /** Static prompt OR a per-request {@link SystemPromptResolver} (V4-L.1, Axis-B). */
     systemPrompt?: string | SystemPromptResolver;
     tools: CompiledTool[];
@@ -427,6 +429,11 @@ interface RuntimeOverrides {
      * `<think>`-tag extractor so inline `<think>…</think>` text becomes `thinking` StreamEvents.
      */
     parseThinkTags?: boolean;
+    /**
+     * Per-run opt-in (`?? compiled.stripToolDialect`): when true, strip a leaked Hermes
+     * `<function=…></tool_call>` tool-call dialect out of the assistant text stream (theocode#32).
+     */
+    stripToolDialect?: boolean;
     /** Per-run cwd → `Agent.create({ local: { cwd } })` → `SystemPromptContext.cwd`. */
     cwd?: string;
     /**

package/dist/bridge.d.ts

@@ -1,6 +1,6 @@
-export { A as AgentExecutionContext, b as AgentManifest, c as AgentManifestEntry, d as AgentManifestTool, e as AgentRoute, f as AgentRouteContext, g as AgentRunInfo, h as AgentStreamEvent, i as AgentWalkResult, j as AgentWarningCode, k as AgentsPluginOptions, l as ApprovalRequiredEvent, m as ArtifactChunkEvent, n as ArtifactStartEvent, B as BudgetExceededError, o as CheckpointSavedEvent, C as CompiledAgentOptions, p as CompiledContextWindow, a as CompiledTool, r as DelegateOptions, s as DelegationError, D as DelegationResult, t as DoneEvent, E as ErrorEvent, F as FileEditEvent, I as IterationEvent, G as RunStartedEvent, H as SdkMessage, J as Segment, K as StateUpdateEvent, S as StreamEvent, T as TextDeltaEvent, M as ThinkingEvent, N as ToolCallEvent, O as ToolResultEvent, P as ToolWalkResult, Q as ToolboxWalkResult, U as agentsPlugin, V as buildModelSelection, W as compileAgent, X as compileContextWindow, Y as compileProjectContext, Z as compileSkills, _ as compileTools, $ as createAgentExecutionContext, a0 as createSdkAgentStream, a1 as createThinkTagExtractor, a2 as delegate, a3 as extractThinkTagStream, a4 as generateAgentManifest, a5 as generateAgentRoutes, a6 as isAgentContext, a7 as isApprovalRequired, a8 as isDone, a9 as isError, aa as isTextDelta, ab as isToolCall, ac as isToolResult, ag as projectContextMetadataOnlyKnobs, aj as streamAgentResponse, ak as translateSdkEvent, al as validateUniqueRoutes, am as walkAgentMetadata } from './bridge-entry-CILcYM0y.js';
+export { A as AgentExecutionContext, b as AgentManifest, c as AgentManifestEntry, d as AgentManifestTool, e as AgentRoute, f as AgentRouteContext, g as AgentRunInfo, h as AgentStreamEvent, i as AgentWalkResult, j as AgentWarningCode, k as AgentsPluginOptions, l as ApprovalRequiredEvent, m as ArtifactChunkEvent, n as ArtifactStartEvent, B as BudgetExceededError, o as CheckpointSavedEvent, C as CompiledAgentOptions, p as CompiledContextWindow, a as CompiledTool, r as DelegateOptions, s as DelegationError, D as DelegationResult, t as DoneEvent, E as ErrorEvent, F as FileEditEvent, I as IterationEvent, G as RunStartedEvent, H as SdkMessage, J as Segment, K as StateUpdateEvent, S as StreamEvent, T as TextDeltaEvent, M as ThinkingEvent, N as ToolCallEvent, O as ToolResultEvent, P as ToolWalkResult, Q as ToolboxWalkResult, U as agentsPlugin, V as buildModelSelection, W as compileAgent, X as compileContextWindow, Y as compileProjectContext, Z as compileSkills, _ as compileTools, $ as createAgentExecutionContext, a0 as createSdkAgentStream, a1 as createThinkTagExtractor, a2 as delegate, a3 as extractThinkTagStream, a4 as generateAgentManifest, a5 as generateAgentRoutes, a6 as isAgentContext, a7 as isApprovalRequired, a8 as isDone, a9 as isError, aa as isTextDelta, ab as isToolCall, ac as isToolResult, ag as projectContextMetadataOnlyKnobs, aj as streamAgentResponse, ak as translateSdkEvent, al as validateUniqueRoutes, am as walkAgentMetadata } from './bridge-entry-DfwOnvUB.js';
 import '@theokit/http';
-import './skills-CTzgfoff.js';
+import './skills-CLymniNy.js';
 import '@theokit/sdk';
 import 'zod';
 import '@theokit/sdk/retry';

package/dist/bridge.js

@@ -28,7 +28,7 @@ import {
   translateSdkEvent,
   validateUniqueRoutes,
   walkAgentMetadata
-} from "./chunk-FJXXNWCG.js";
+} from "./chunk-DOEEZXSW.js";
 import "./chunk-GVPUUKKE.js";
 import "./chunk-7QVYU63E.js";
 export {

package/dist/{chunk-FJXXNWCG.js → chunk-DOEEZXSW.js}

@@ -302,6 +302,7 @@ function compileAgent(walkResult, toolboxInstances = /* @__PURE__ */ new Map())
     model: walkResult.agentConfig.model,
     reasoningEffort: walkResult.agentConfig.reasoningEffort,
     parseThinkTags: walkResult.agentConfig.parseThinkTags,
+    stripToolDialect: walkResult.agentConfig.stripToolDialect,
     systemPrompt: walkResult.agentConfig.systemPrompt,
     tools,
     agents,
@@ -753,6 +754,104 @@ async function* extractThinkTagStream(source) {
 }
 __name(extractThinkTagStream, "extractThinkTagStream");
 
+// src/bridge/tool-dialect-stripper.ts
+var OPEN2 = "<function=";
+var CLOSE2 = "</tool_call>";
+function heldPrefixLength2(s, delim) {
+  const max = Math.min(s.length, delim.length - 1);
+  for (let k = max; k >= 1; k--) {
+    if (s.slice(s.length - k) === delim.slice(0, k)) return k;
+  }
+  return 0;
+}
+__name(heldPrefixLength2, "heldPrefixLength");
+function createToolDialectStripper() {
+  let mode = "text";
+  let buffer = "";
+  let pendingLeak = "";
+  const write = /* @__PURE__ */ __name((chunk) => {
+    buffer += chunk;
+    const out = [];
+    for (; ; ) {
+      if (mode === "text") {
+        const idx2 = buffer.indexOf(OPEN2);
+        if (idx2 !== -1) {
+          const content = buffer.slice(0, idx2);
+          if (content) out.push({
+            kind: "text",
+            content
+          });
+          pendingLeak = OPEN2;
+          buffer = buffer.slice(idx2 + OPEN2.length);
+          mode = "stripping";
+          continue;
+        }
+        const keep2 = heldPrefixLength2(buffer, OPEN2);
+        const emit = buffer.slice(0, buffer.length - keep2);
+        if (emit) out.push({
+          kind: "text",
+          content: emit
+        });
+        buffer = buffer.slice(buffer.length - keep2);
+        break;
+      }
+      const idx = buffer.indexOf(CLOSE2);
+      if (idx !== -1) {
+        buffer = buffer.slice(idx + CLOSE2.length);
+        pendingLeak = "";
+        mode = "text";
+        continue;
+      }
+      const keep = heldPrefixLength2(buffer, CLOSE2);
+      pendingLeak += buffer.slice(0, buffer.length - keep);
+      buffer = buffer.slice(buffer.length - keep);
+      break;
+    }
+    return out;
+  }, "write");
+  const end = /* @__PURE__ */ __name(() => {
+    const leftover = mode === "stripping" ? pendingLeak + buffer : buffer;
+    buffer = "";
+    pendingLeak = "";
+    return leftover ? [
+      {
+        kind: "text",
+        content: leftover
+      }
+    ] : [];
+  }, "end");
+  return {
+    write,
+    end
+  };
+}
+__name(createToolDialectStripper, "createToolDialectStripper");
+async function* stripToolDialectStream(source) {
+  const stripper = createToolDialectStripper();
+  try {
+    for await (const event of source) {
+      if (event.type === "text_delta" && typeof event.content === "string") {
+        for (const seg of stripper.write(event.content)) {
+          yield {
+            type: "text_delta",
+            content: seg.content
+          };
+        }
+      } else {
+        yield event;
+      }
+    }
+  } finally {
+    for (const seg of stripper.end()) {
+      yield {
+        type: "text_delta",
+        content: seg.content
+      };
+    }
+  }
+}
+__name(stripToolDialectStream, "stripToolDialectStream");
+
 // src/bridge/sdk-adapter.ts
 function assembleM8CreateOptions(compiled) {
   const options = {};
@@ -930,10 +1029,35 @@ function createDeltaSink(queue) {
   };
 }
 __name(createDeltaSink, "createDeltaSink");
+function resolveTextTransformFlags(compiled, overrides) {
+  return {
+    parseThinkTags: overrides.parseThinkTags ?? compiled.parseThinkTags ?? false,
+    stripToolDialect: overrides.stripToolDialect ?? compiled.stripToolDialect ?? false
+  };
+}
+__name(resolveTextTransformFlags, "resolveTextTransformFlags");
+function applyTextTransforms(events, opts) {
+  let out = opts.parseThinkTags ? extractThinkTagStream(events) : events;
+  if (opts.stripToolDialect) out = stripToolDialectStream(out);
+  return out;
+}
+__name(applyTextTransforms, "applyTextTransforms");
+function buildSdkTools(compiledTools, defineTool, extraSdkTools = []) {
+  return [
+    ...compiledTools.map((t) => defineTool({
+      name: t.name,
+      description: t.description,
+      inputSchema: t.inputSchema,
+      handler: t.handler
+    })),
+    ...extraSdkTools
+  ];
+}
+__name(buildSdkTools, "buildSdkTools");
 function createSdkAgentStream(compiled, compiledTools, apiKey, overrides = {}) {
   const model = overrides.model ?? compiled.model ?? "openai/gpt-4o-mini";
   const reasoningEffort = overrides.reasoningEffort ?? compiled.reasoningEffort;
-  const parseThinkTags = overrides.parseThinkTags ?? compiled.parseThinkTags ?? false;
+  const { parseThinkTags, stripToolDialect } = resolveTextTransformFlags(compiled, overrides);
   let storage = overrides.conversationStorage;
   return (message, sessionId, factoryOpts) => ({
     async *[Symbol.asyncIterator]() {
@@ -956,15 +1080,7 @@ function createSdkAgentStream(compiled, compiledTools, apiKey, overrides = {}) {
         };
         return;
       }
-      const sdkTools = [
-        ...compiledTools.map((t) => defineTool({
-          name: t.name,
-          description: t.description,
-          inputSchema: t.inputSchema,
-          handler: t.handler
-        })),
-        ...overrides.sdkTools ?? []
-      ];
+      const sdkTools = buildSdkTools(compiledTools, defineTool, overrides.sdkTools);
       let agent;
       try {
         const { options: m8, applied } = assembleM8CreateOptions(compiled);
@@ -999,8 +1115,10 @@ function createSdkAgentStream(compiled, compiledTools, apiKey, overrides = {}) {
         });
         const openStream = /* @__PURE__ */ __name(async () => (await sendPromise).stream(), "openStream");
         const merged = mergeDeltaStream(queue, openStream, runId, state);
-        const events = parseThinkTags ? extractThinkTagStream(merged) : merged;
-        for await (const event of events) {
+        for await (const event of applyTextTransforms(merged, {
+          parseThinkTags,
+          stripToolDialect
+        })) {
           yield event;
         }
         if (!state.sawError) {
@@ -1165,9 +1283,8 @@ function stableStringify(value) {
   return `{${entries.join(",")}}`;
 }
 __name(stableStringify, "stableStringify");
-function roundSignature(toolCalls, text) {
-  const calls = toolCalls.map((tc) => `${tc.name}:${stableStringify(tc.input)}`).sort((a, b) => a.localeCompare(b)).join(",");
-  return `${calls}|${text}`;
+function roundSignature(toolCalls) {
+  return toolCalls.map((tc) => `${tc.name}:${stableStringify(tc.input)}`).sort((a, b) => a.localeCompare(b)).join(",");
 }
 __name(roundSignature, "roundSignature");
 function terminalReason(reflectionContinue, roundReason, round, maxIterations) {
@@ -1368,8 +1485,8 @@ async function* runReflectiveLoopStream(factory, message, sessionId, config) {
     if (Number.isFinite(budget) && acc.cost > budget) {
       throw new BudgetExceededError(agentName, acc.cost, budget);
     }
-    if (r.finishReason === TOOL_CALLS) {
-      const sig = roundSignature(r.toolCalls, r.responseText);
+    if (r.finishReason === TOOL_CALLS && r.toolCalls.length > 0) {
+      const sig = roundSignature(r.toolCalls);
       stuck = sig === prevSig ? stuck + 1 : 0;
       if (stuck >= NO_PROGRESS_THRESHOLD) return finalize(acc, round, "no_progress", loop.name);
       prevSig = sig;
@@ -1453,6 +1570,7 @@ var AgentRunner = class {
       model: opts.model,
       reasoningEffort: opts.reasoningEffort,
       parseThinkTags: opts.parseThinkTags,
+      stripToolDialect: opts.stripToolDialect,
       cwd: opts.cwd,
       plugins: opts.plugins,
       providers: opts.providers,
@@ -1756,4 +1874,4 @@ export {
   generateAgentManifest,
   agentsPlugin
 };
-//# sourceMappingURL=chunk-FJXXNWCG.js.map
+//# sourceMappingURL=chunk-DOEEZXSW.js.map