PR #74499: fix(ollama): normalize prefixed tool-call names before Ollama dispatch

• Repository: openclaw/openclaw
• Author: afurm
• State: closed | merged: False
• Link: https://github.com/openclaw/openclaw/pull/74499

Description (problem / solution / changelog)

Summary

• Problem:
  • Ollama adapter was sending/handling tool call names like functions.exec or tools.exec without normalization, so tool matching could fail in downstream dispatch.
• Why it matters:
  • Tool calls from assistant/history/round-trip data could be rejected or misrouted, causing real tool execution failures in tool-using chats.
• What changed:
  • Added normalizeOllamaToolCallName in extensions/ollama/src/stream.ts.
  • Applied normalization when converting assistant content to Ollama tool calls (convertToOllamaMessages path via extractToolCalls).
  • Applied normalization when rebuilding assistant messages from Ollama responses (buildAssistantMessage) so SDK-facing tool calls stay canonical.
  • Added two regression tests in extensions/ollama/src/stream-runtime.test.ts for both directions of normalization.
• What did NOT change (scope boundary):
  • No schema/API changes, no provider-level behavior changes outside Ollama extension, no model/provider config changes, no security surface changes.

Change Type

• Bug fix
• Feature
• Refactor required for the fix
• Docs
• Security hardening
• Chore/infra

Scope

• Gateway / orchestration
• Skills / tool execution
• Auth / tokens
• Memory / storage
• Integrations
• API / contracts
• UI / DX
• CI/CD / infra

Linked Issue/PR

• Closes #74487
• Related #
• This PR fixes a bug or regression

Root Cause

• Root cause:
  • Tool names coming in as legacy/provider-prefixed forms (functions.*, tools.*) were passed through unchanged in Ollama-adapter conversion paths.
• Missing detection / guardrail:
  • No shared normalization guard existed in the Ollama request/response conversion boundary for tool-call names.
• Contributing context (if known):
  • Observed during investigation of tool-call dispatch failures across Ollama/Kimi-style prefixed tool names.

Regression Test Plan

• Coverage level that should have caught this:
  • Unit test
  • Seam / integration test
  • End-to-end test
  • Existing coverage already sufficient
• Target test or file:
  • extensions/ollama/src/stream-runtime.test.ts
• Scenario the test should lock in:
  • functions.exec / tools.exec tool-call names are normalized to exec in both outgoing Ollama messages and incoming tool-call reconstruction.
• Why this is the smallest reliable guardrail:
  • It directly verifies the exact normalization boundary where the defect appears.
• Existing test that already covers this (if any):
  • N/A (new regression coverage added)
• If no new test is added, why not:
  • N/A

User-visible / Behavior Changes

• Tool-call names with functions.* / tools.* prefixes now normalize to canonical names during Ollama conversion.
• No user-facing UI changes.
• No defaults/configuration changes.

Diagram

Before: [user assistant toolCall (functions.exec)] -> [Ollama request conversion sends "functions.exec"] -> [tool lookup mismatch / no-op execution]

After: [user assistant toolCall (functions.exec)] -> [normalize name -> "exec"] -> [Ollama conversion and SDK tool-call reconstruction use "exec"] -> [tool executes normally]

Security Impact

• New permissions/capabilities? (No)
• Secrets/tokens handling changed? (No)
• New/changed network calls? (No)
• Command/tool execution surface changed? (No changes in behavior, only name normalization)
• Data access scope changed? (No)
• If any Yes, explain risk + mitigation:
  • N/A

Repro + Verification

Environment

• OS: macOS
• Runtime/container: Node.js (repo runtime)
• Model/provider: Ollama / Kimi/GLM-compatible endpoints
• Integration/channel (if any): Tool execution flow in OpenClaw assistant runtime (Ollama extension)
• Relevant config (redacted): standard local config

Steps

1. Trigger assistant tool-call with prefixed names (functions.exec, tools.exec) from historical/Anthropic-compatible tool-call payloads.
2. Route through Ollama stream path and check emitted Ollama payloads/tool-call reconstruction.
3. Run focused tests for extensions/ollama/src/stream-runtime.test.ts (planned).

Expected

• Prefixed tool names are converted to canonical names before Ollama interaction.

Actual

• Implemented and covered by unit tests.

Evidence

• Failing test/log before + passing after
• Trace/log snippets
• Screenshot/recording
• Perf numbers (if relevant)

Human Verification (required)

• Verified scenarios:
  • Read-through code-path inspection for outbound (convertToOllamaMessages) and inbound (buildAssistantMessage) tool-call conversions.
  • Added/validated focused regression tests for both sides.
• Edge cases checked:
  • empty/standard tool names, prefixed names.
• What you did not verify:
  • Full live runtime smoke run in a running OpenClaw instance (not executed in this pass).

Review Conversations

• I replied to or resolved every bot review conversation I addressed in this PR.
• I left unresolved only the conversations that still need reviewer or maintainer judgment.

Compatibility / Migration

• Backward compatible? (Yes)
• Config/env changes? (No)
• Migration needed? (No)
• If yes, exact upgrade steps:
  • N/A

Risks and Mitigations

• Risk:
  • Rare edge case where a tool name intentionally starts with functions or tools as a literal prefix without separator.
• Mitigation:
  • Prefix stripping only applies when followed by ., /, _, or - and only in Ollama conversion paths; normal non-prefixed names are unchanged.

Changed files

• extensions/ollama/src/stream-runtime.test.ts (modified, +74/-0)
• extensions/ollama/src/stream.ts (modified, +24/-3)

---

PR #74563: fix: Found one narrow regression risk in the new Ollama tool-call name

• Repository: openclaw/openclaw
• Author: clawsweeper[bot]
• State: closed | merged: True
• Link: https://github.com/openclaw/openclaw/pull/74563

Description (problem / solution / changelog)

Summary

Found one narrow regression risk in the new Ollama tool-call name normalizer.

What ClawSweeper Is Fixing

• Low: Ollama now rewrites valid tool_ / function_ tool names before dispatch (regression)
  • File: extensions/ollama/src/stream.ts:792
  • Evidence: normalizeOllamaToolCallName unconditionally strips any leading function, functions, tool, or tools followed by ., /, _, or -. That means a legitimate tool named tool_a, tools_invoke_test, or function-run is converted to a, invoke_test, or run in both replay conversion (extensions/ollama/src/stream.ts:771) and response conversion (extensions/ollama/src/stream.ts:887). The same adapter advertises tools to Ollama using the exact registered tool.name (extensions/ollama/src/stream.ts:845), while OpenClaw docs and prompt construction treat tool names as exact strings (docs/plugins/building-plugins.md:110, src/agents/system-prompt.ts:720). Ollama’s own tool-calling docs also use call.function.name as the tool identity that is executed and sent back as tool_name. citeturn1view1turn1view0
  • Impact: Any current or third-party plugin tool whose canonical name starts with these prefixes plus an allowed separator can become unusable under native Ollama: the model is shown the real tool name, but OpenClaw receives a different name and dispatch/allowlist matching can fail with “tool not found.”
  • Suggested fix: Make Ollama normalization allowlist-aware, matching the existing embedded-runner approach: preserve an exact registered tool name first, and only strip provider prefixes when the stripped suffix matches an available tool. If no allowlist is available, avoid stripping _/- forms or keep normalization limited to the observed provider namespace forms.
  • Confidence: high

Expected Repair Surface

• extensions/ollama/src/stream.ts
• extensions/ollama/src/stream-runtime.test.ts

Source And Review Context

• ClawSweeper report: https://github.com/openclaw/clawsweeper/blob/main/records/openclaw-openclaw/commits/89f871679e8def9aab0d7054f75f807b0e65e548.md

• Commit under review: https://github.com/openclaw/openclaw/commit/89f871679e8def9aab0d7054f75f807b0e65e548

• Latest main at intake: eb7d89f4b9d5e7de330073ac835006a7b91148ee

• Original commit author: Peter Steinberger

• GitHub author: @steipete

• Highest severity: low

• Review confidence: high

• Diff: f5aebe42e1dbdec61d998486f8d6bfbf548b4159..89f871679e8def9aab0d7054f75f807b0e65e548

• Changed files: CHANGELOG.md, extensions/ollama/src/stream.ts, extensions/ollama/src/stream-runtime.test.ts

• Code read: full changed Ollama stream/test files, Ollama registration path, embedded runner tool-name normalization/allowlist path, plugin tool docs, issue #74487 context.

• Dependencies/web: official Ollama API/tool-calling docs for tool_calls.function.name.

Expected validation

• pnpm check:changed

ClawSweeper already ran:

• pnpm test extensions/ollama/src/stream-runtime.test.ts -- --reporter=verbose passed: 71 tests.
• pnpm test src/agents/pi-embedded-runner/run/attempt.test.ts -- --reporter=verbose -t "maps provider-prefixed tool names to allowed canonical tools|normalizes toolUse and functionCall names before dispatch|preserves multi-segment tool suffixes" passed: 3 tests, 124 skipped.
• Initial test attempt failed because node_modules was missing; ran one pnpm install per repo instructions, then retried.

Known review limits:

• No live Ollama/Kimi request was run; review used mocked stream tests, code tracing, issue context, and official API docs.

ClawSweeper Guardrails

• Re-check the finding against latest main before changing code.
• Keep the patch to the narrowest behavior change and matching regression coverage.
• Do not merge automatically; this PR stays for maintainer review.

ClawSweeper 🐠 replacement reef notes:

• Cluster: clawsweeper-commit-openclaw-openclaw-89f871679e8d
• Source PRs: none
• Credit: Detected by ClawSweeper commit review for 89f871679e8def9aab0d7054f75f807b0e65e548.; Original commit author: Peter Steinberger.
• Validation: pnpm check:changed

fish notes: model gpt-5.5, reasoning medium; reviewed against b1deca6b9cb7.

Changed files

• extensions/ollama/src/stream-runtime.test.ts (modified, +79/-0)
• extensions/ollama/src/stream.ts (modified, +60/-8)