feat(ollama): add tools support filtering, configurable timeouts, and… #10947

randomizedcoder · 2026-01-25T01:59:08Z

feat(ollama): add tools support filtering, configurable timeouts, and improved UI

Features added

Connection settings

Works when squished

Test Base URL

Refresh models

Related GitHub Issue

Closes: #10795
#10795

Description

This PR addresses issue #10795 by adding a "Refresh Models" button and significantly enhancing the Ollama provider integration.

The video for this pull request is (updated) : https://youtu.be/IqmIjSklBe8

The changes include:

Key Implementation Details:

Enhanced Model Discovery (discoverOllamaModelsWithSorting)
- Single-pass discovery: One /api/tags call followed by parallel /api/show calls for all models
- Automatic sorting into "Tools Support" and "No Tools Support" groups based on capabilities.includes("tools")
- Robust null/undefined handling for model_info fields (fixes Object.keys(null) errors)
- Graceful partial failure handling - if some model detail calls fail, others still succeed
Axios Configuration (createOllamaAxiosInstance)
- Centralized Axios instance creation with configurable timeouts, retries, and logging
- Retry logic with exponential backoff (configurable retries and delay)
- Request/response interceptors for detailed logging when enabled
- Proper timeout error handling (ECONNABORTED, ETIMEDOUT)
UI Redesign
- Tools Support Table: Structured table display with Model Name (radio selection), Context, Size (GB/MB), Quantization, Family, and Images support
- No Tools Support Section: Informational list of models that don't support native tool calling
- Connection Testing: "Test" button validates Base URL with timing information
- Model Refresh: "Refresh Models" button forces model list update with completion time (solves [BUG] Force update the ollama models? #10795)
- Connection Settings: Collapsible section with configurable timeouts, retries, and logging
Type System Extensions
- Added OllamaModelWithTools interface for table display data
- Added OllamaModelsDiscoveryResult interface for discovery results
- Extended ProviderSettings with new configuration options:
  - ollamaRequestTimeout (default: 60 min, max: 120 min)
  - ollamaModelDiscoveryTimeout (default: 10 sec, max: 10 min)
  - ollamaMaxRetries (default: 0, max: 10)
  - ollamaRetryDelay (default: 1 sec)
  - ollamaEnableLogging (default: false)

Design Choices:

Separate timeouts for model discovery vs. LLM requests (discovery should be fast, LLM requests can be long)
Default to 0 retries (users can enable if needed) to avoid unexpected behavior
Table format for tools-support models provides better information density than radio list
Informational display of non-tools models provides transparency without cluttering selectable options

Reviewer Attention:

Check null handling in parseOllamaModel and discoverOllamaModelsWithSorting - we use != null checks to handle both null and undefined
Verify Axios timeout configuration is properly applied via createOllamaAxiosInstance
Confirm UI state management for modelsWithTools array matches backend OllamaModelWithTools[] structure
Test the "Refresh Models" button actually triggers model discovery and updates the UI

Test Procedure

Unit Tests:

All tests are located in src/api/providers/fetchers/__tests__/ollama.test.ts. To run:

cd src && npx vitest run api/providers/fetchers/__tests__/ollama.test.ts

Test Coverage (20 tests, all passing):

✅ parseOllamaModel - Handles null/undefined model_info gracefully
✅ getOllamaModels - Fetches models with tools capability filtering
✅ getOllamaModels - Filters out models without tools capability
✅ getOllamaModels - Handles /api/tags call failures
✅ getOllamaModels - Handles ECONNREFUSED errors
✅ getOllamaModels - Handles models with null families
✅ getOllamaModels - Includes Authorization header when API key provided
✅ getOllamaModels - Uses custom timeout configuration
✅ getOllamaModels - Handles timeout errors during discovery
✅ getOllamaModels - Handles ECONNABORTED timeout errors
✅ discoverOllamaModelsWithSorting - Handles null model_info gracefully
✅ discoverOllamaModelsWithSorting - Handles undefined model_info gracefully
✅ discoverOllamaModelsWithSorting - Handles empty model_info object gracefully
✅ discoverOllamaModelsWithSorting - Sorts models correctly into tools and non-tools groups
✅ discoverOllamaModelsWithSorting - Handles partial failures gracefully (some models succeed, others fail)
✅ discoverOllamaModelsWithSorting - Handles models with both tools and vision capabilities
✅ discoverOllamaModelsWithSorting - Handles timeout errors during /api/tags call
✅ discoverOllamaModelsWithSorting - Handles timeout errors gracefully for individual /api/show calls
✅ discoverOllamaModelsWithSorting - Uses custom timeout configuration
✅ discoverOllamaModelsWithSorting - Verifies totalCount matches sum of both groups

Manual Testing Steps:

Model Discovery & Refresh:
- Open Roo Code Settings → Providers → Ollama
- Click "Refresh Models" button
- Verify models are discovered and displayed in "Tools Support" table
- Verify models without tools support appear in "No Tools Support" section
- Verify completion time is displayed after refresh
- Add a new model to Ollama (e.g., ollama pull llama3.2)
- Click "Refresh Models" again
- Verify new model appears in appropriate section
Connection Testing:
- Enter valid Ollama Base URL (e.g., http://localhost:11434)
- Click "Test" button
- Verify success message with timing information
- Enter invalid URL
- Click "Test" button
- Verify error message
Model Selection:
- Verify only models in "Tools Support" table are selectable (radio buttons work)
- Select a model from the table
- Verify model ID field updates
- Verify selected model persists after page refresh
Configuration Settings:
- Expand "Connection Settings" section
- Modify Request Timeout, verify validation (1000-7200000 range)
- Modify Model Discovery Timeout, verify validation (1000-600000 range)
- Modify Max Retries, verify validation (0-10 range)
- Modify Retry Delay, verify validation (100-10000 range)
- Toggle "Enable Request Logging"
- Verify settings persist after saving
Error Handling:
- Stop Ollama service
- Click "Refresh Models"
- Verify graceful error handling (no crashes)
- Start Ollama service
- Click "Refresh Models" again
- Verify models are discovered successfully

Testing Environment:

NixOS 26.05 (unstable)
Ollama running locally on http://localhost:11434
Multiple models installed (9 with tools support, 5 without)
Roo Code version: 3.41.1+

Pre-Submission Checklist

Issue Linked: This PR is linked to an approved GitHub Issue (see "Related GitHub Issue" above).
Scope: My changes are focused on the linked issue (one major feature/fix per PR).
Self-Review: I have performed a thorough self-review of my code.
Testing: New and/or updated tests have been added to cover my changes (if applicable).
Documentation Impact: I have considered if my changes require documentation updates (see "Documentation Updates" section below).
Contribution Guidelines: I have read and agree to the Contributor Guidelines.

Screenshots / Videos

The video for this pull request is (updated): https://youtu.be/IqmIjSklBe8

Before:

Simple text input for Model ID with no way to refresh the model list
No visibility into which models support tools vs. don't
No connection testing capability

After:

"Refresh Models" button that updates the model list with completion time
"Tools Support" table showing selectable models with detailed metadata (Context, Size, Quantization, Family, Images)
"No Tools Support" section showing non-selectable models for reference
"Test" button for Base URL validation
"Connection Settings" section with configurable timeouts, retries, and logging

Documentation Updates

No documentation updates are required.
Yes, documentation updates are required.

Documentation Updates Needed:

This change actually makes the current default configuration much more obvious, so this is partially self documenting.

Ollama Provider Documentation (https://docs.roocode.com/providers/ollama):
- Add section explaining the "Refresh Models" button and when to use it
- Document the new "Connection Settings" section and available configuration options
- Explain the difference between "Tools Support" and "No Tools Support" model groups
- Document the table columns (Context, Size, Quantization, Family, Images)
- Add information about configurable timeouts and when to adjust them
Settings Reference:
- Document new Ollama configuration options:
  - ollamaRequestTimeout (default: 3600000 ms)
  - ollamaModelDiscoveryTimeout (default: 10000 ms)
  - ollamaMaxRetries (default: 0)
  - ollamaRetryDelay (default: 1000 ms)
  - ollamaEnableLogging (default: false)

Additional Notes

Implementation Notes:

Null Safety: The Ollama API can return model_info as null or undefined. We use explicit != null checks (which handles both) instead of truthy checks to avoid Object.keys(null) errors.
Zod Schema Validation: The validation is intentionally lenient - if Zod validation fails but essential fields (family, parameter_size) are present, we proceed with the raw data. This allows the code to work with minimal mock data in tests while still validating real API responses.
Axios Timeout Configuration: Timeouts are configured at the Axios instance level, not per-request. This ensures consistent behavior across all API calls.
Model Discovery Performance: The parallel /api/show calls significantly improve discovery speed compared to sequential calls. With 14 models, this reduces discovery time from ~14 seconds to ~2-3 seconds.
Backward Compatibility: All new configuration options have sensible defaults, so existing configurations continue to work without modification.
Test Coverage: The test suite includes comprehensive coverage for:
- Success paths
- Failure modes (timeouts, connection errors, partial failures)
- Edge cases (null/undefined values, empty objects, mixed capabilities)
- Configuration validation

Questions for Reviewers:

Should we add a loading indicator during model discovery? (Currently shows "Refreshing..." on the button)
Should the "No Tools Support" section be collapsible to reduce UI clutter?
Are the default timeout values appropriate? (60 min for requests, 10 sec for discovery)

Get in Touch

Discord: randomizedcoder (or @randomizedcoder)

Important

Enhances Ollama provider with model discovery, UI improvements, and configurable settings, including timeouts and retries, with comprehensive test coverage.

Behavior:
- Adds discoverOllamaModelsWithSorting for model discovery with sorting into tools and non-tools groups.
- Implements connection testing and model refresh in webviewMessageHandler.ts.
- Adds UI elements for testing connection and refreshing models in Ollama.tsx.
Configuration:
- Adds configurable timeouts, retries, and logging in provider-settings.ts.
- Updates Ollama.tsx to handle new configuration options.
UI Enhancements:
- Redesigns model display with a table format in Ollama.tsx.
- Adds advanced connection settings section in Ollama.tsx.
Testing:
- Adds unit tests in ollama.test.ts and ollama-axios-config.spec.ts for new functionalities.
Misc:
- Updates settings.json for new UI text and descriptions.
- Adds createOllamaAxiosInstance for centralized Axios configuration in ollama.ts.

^{This description was created by}^{for 77a2cae. You can customize this summary. It will automatically update as commits are pushed.}

… improved UI

roomote · 2026-01-25T01:59:40Z

Rooviewer See task on Roo Cloud

All issues resolved. Latest commit (05ae911) completes the internationalization of the Ollama settings page with translations for all 18 supported languages and proper plural form handling.

~~Dead code/duplicate file ollama-axios-config.ts~~ - Fixed in 5bfb9dc
~~Table headers not internationalized~~ - Fixed in 05ae911
~~Backend messages not internationalized~~ - Fixed in 05ae911 (using translateMessage helper)
~~"Completed in" message not internationalized~~ - Fixed in 05ae911

Previous reviews

3fc92d4: Review #1

87ccbe1: Review #2

dea2b72: Review #3

5bfb9dc: Review #4

77a2cae: Review #5

_{Mention @roomote in a comment to request specific changes to this pull request or fix all unresolved issues.}

roomote · 2026-01-25T02:03:08Z

src/api/providers/fetchers/ollama-axios-config.ts

@@ -0,0 +1,119 @@
+import axios, { AxiosInstance, AxiosError, InternalAxiosRequestConfig, AxiosResponse } from "axios"


This file is unused and contains duplicate code. The exact same implementation exists in ollama.ts (lines 19-135):

createOllamaAxiosInstance function

setupRetryInterceptor function

setupLoggingInterceptor function

This file should be removed to avoid duplication and potential maintenance issues where changes to one file might not be reflected in the other.

roomote

Review Summary

Overall, this is a solid PR with valuable functionality for Ollama model discovery. The code is well-tested with comprehensive test coverage (28 tests passing).

One issue needs to be addressed:

The file src/api/providers/fetchers/ollama-axios-config.ts is dead code. It contains the exact same implementation as lines 19-135 of ollama.ts (createOllamaAxiosInstance, setupRetryInterceptor, setupLoggingInterceptor) and is not imported anywhere in the codebase.

Please remove this duplicate file before merging.

Once this is addressed, the PR is ready to merge.

mrubens · 2026-01-25T03:56:56Z

webview-ui/src/components/settings/providers/Ollama.tsx

+								<thead>
+									<tr className="border-b border-vscode-foreground/10">
+										<th className="text-left py-2 px-3 font-medium text-vscode-foreground">
+											Model Name


Can we update this table to use the internationalized strings?

mrubens · 2026-01-25T03:58:00Z

src/core/webview/webviewMessageHandler.ts

+					provider.postMessageToWebview({
+						type: "ollamaModelsRefreshResult",
+						success: true,
+						message: `Found ${result.modelsWithTools.length} model(s) with tools support (${result.totalCount} total)`,


Can we internationalize these messages too?

mrubens · 2026-01-25T03:58:20Z

webview-ui/src/components/settings/providers/Ollama.tsx

+					}`}>
+					<div>{testResult.message}</div>
+					{testResult.durationMs !== undefined && (
+						<div className="text-xs mt-1 opacity-80">Completed in {testResult.durationMs}ms</div>


This one too

mrubens · 2026-01-25T03:58:43Z

webview-ui/src/components/settings/providers/Ollama.tsx

+								</thead>
+								<tbody>
+									{modelsWithTools.map((model) => {
+										const formatSize = (bytes?: number): string => {


I think we probably already have a helper for this somewhere

randomizedcoder · 2026-01-25T06:12:13Z

@mrubens

Thanks for the feedback! On it! 🚀

Also fixed the Kdenlive render ( av1 apparently doesn't work, so did h265 )

https://youtu.be/IqmIjSklBe8

dreness · 2026-01-25T08:50:07Z

I tried this, and it works - however it didn't seem to honor a non-default ollama port, if configured. Also noticed that the first time through (perhaps in the first-time-user flow, after being asked if I want to create a roo account or use a 3rd party provider, and I choose 3rd party provider), the ollama settings view didn't seem to scroll far enough, so the content was clipped partway through the list of models with no tools support. As soon as I got to the regular API provider config UI (i.e. not Roo's first-run flow), all the ollama settings UI was accessible.

randomizedcoder · 2026-01-26T00:04:02Z

@dreness

Thank you! Yes you found a bug! Awesome. The "Test" button wasn't passing the URL correctly. Fix has been pushed.

I tested this on my local machine by moving ollama to 11435

[das@l:~/nixos/desktop/l]$ netstat -an | grep 11435
tcp6       0      0 :::11435                :::*                    LISTEN

Before with bug

Fix applied

randomizedcoder · 2026-01-26T02:19:50Z

Ok, have done most of the work on the internationalization.

I did Indonesian at high school, so this was my test. The first iteration wasn't great, because there were too many English words, but I think it's looking pretty good now. -> as for the other languages and the translation quality, well, I ran it by Gemini also, and Google is pretty good at internationalization, so I think it should be ok

... I'll review this again, and push the code tomorrow

randomizedcoder · 2026-01-26T20:48:57Z

@mrubens - wow. added i18n was quite a lot of work. it's done, and I think it looks pretty good.

Example of Spanish, including the "Update models" text

feat(ollama): add tools support filtering, configurable timeouts, and…

77a2cae

… improved UI

randomizedcoder requested review from cte, jr and mrubens as code owners January 25, 2026 01:59

github-project-automation bot added this to Roo Code Roadmap and Roo Code Roadmap Jan 25, 2026

github-project-automation bot moved this to Triage in Roo Code Roadmap Jan 25, 2026

github-project-automation bot moved this to New in Roo Code Roadmap Jan 25, 2026

dosubot bot added size:XXL This PR changes 1000+ lines, ignoring generated files. Documentation Improvements or additions to documentation Enhancement New feature or request labels Jan 25, 2026

randomizedcoder mentioned this pull request Jan 25, 2026

[BUG] Force update the ollama models? #10795

Open

roomote bot reviewed Jan 25, 2026

View reviewed changes

roomote bot requested changes Jan 25, 2026

View reviewed changes

refactor(ollama): remove duplicate ollama-axios-config files

5bfb9dc

roomote bot approved these changes Jan 25, 2026

View reviewed changes

revert: remove esbuild.mjs change from PR

dea2b72

roomote bot approved these changes Jan 25, 2026

View reviewed changes

mrubens reviewed Jan 25, 2026

View reviewed changes

fix(ollama): pass baseUrl from UI when testing connection

87ccbe1

roomote bot approved these changes Jan 26, 2026

View reviewed changes

fix(ollama): use Base URL for Refresh Models and sort table

3fc92d4

roomote bot approved these changes Jan 26, 2026

View reviewed changes

feat(i18n): translate Ollama settings page

05ae911

roomote bot approved these changes Jan 26, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(ollama): add tools support filtering, configurable timeouts, and… #10947

feat(ollama): add tools support filtering, configurable timeouts, and… #10947

Uh oh!

randomizedcoder commented Jan 25, 2026 •

edited

Loading

Uh oh!

roomote bot commented Jan 25, 2026 •

edited

Loading

Uh oh!

roomote bot Jan 25, 2026

Uh oh!

roomote bot left a comment

Uh oh!

mrubens Jan 25, 2026

Uh oh!

mrubens Jan 25, 2026

Uh oh!

mrubens Jan 25, 2026

Uh oh!

mrubens Jan 25, 2026

Uh oh!

randomizedcoder commented Jan 25, 2026

Uh oh!

dreness commented Jan 25, 2026

Uh oh!

randomizedcoder commented Jan 26, 2026

Uh oh!

randomizedcoder commented Jan 26, 2026

Uh oh!

randomizedcoder commented Jan 26, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		@@ -0,0 +1,119 @@
		import axios, { AxiosInstance, AxiosError, InternalAxiosRequestConfig, AxiosResponse } from "axios"

feat(ollama): add tools support filtering, configurable timeouts, and… #10947

Are you sure you want to change the base?

feat(ollama): add tools support filtering, configurable timeouts, and… #10947

Uh oh!

Conversation

randomizedcoder commented Jan 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

feat(ollama): add tools support filtering, configurable timeouts, and improved UI

Related GitHub Issue

Description

Test Procedure

Pre-Submission Checklist

Screenshots / Videos

Documentation Updates

Additional Notes

Get in Touch

Uh oh!

roomote bot commented Jan 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

roomote bot Jan 25, 2026

Choose a reason for hiding this comment

Uh oh!

roomote bot left a comment

Choose a reason for hiding this comment

Review Summary

Uh oh!

mrubens Jan 25, 2026

Choose a reason for hiding this comment

Uh oh!

mrubens Jan 25, 2026

Choose a reason for hiding this comment

Uh oh!

mrubens Jan 25, 2026

Choose a reason for hiding this comment

Uh oh!

mrubens Jan 25, 2026

Choose a reason for hiding this comment

Uh oh!

randomizedcoder commented Jan 25, 2026

Uh oh!

dreness commented Jan 25, 2026

Uh oh!

randomizedcoder commented Jan 26, 2026

Uh oh!

randomizedcoder commented Jan 26, 2026

Uh oh!

randomizedcoder commented Jan 26, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

randomizedcoder commented Jan 25, 2026 •

edited

Loading

roomote bot commented Jan 25, 2026 •

edited

Loading