Add Claude Code provider support by Ghvstcode · Pull Request #13 · meltylabs/chorus

Ghvstcode · 2025-12-15T08:16:02Z

Adds Claude Code as an AI model provider to Chorus.

Summary

Created ProviderClaudeCode.ts module to handle Claude Code model integration
Updated model management to include Claude Code in the model picker
Added necessary backend command support for Claude Code API calls
Updated database schema to store Claude Code specific configuration
Added proxy utility functions for Claude Code requests

Test Plan

Claude Code appears in the model picker
Can select Claude Code model for use in chat
Can send messages to Claude Code and receive responses
Claude Code responses appear correctly formatted in chat history
Existing Claude, Gemini, and OpenAI models still work as expected

Adds integration with Claude Code as an AI model provider, enabling users to chat with Claude Code alongside other AI models in Chorus.

greptile-apps

Additional Comments (3)

src-tauri/src/command.rs, line 789-790 (link)

syntax: HOME env var doesn't exist on Windows, use USERPROFILE instead
src-tauri/src/command.rs, line 841-843 (link)

syntax: HOME env var doesn't exist on Windows, use USERPROFILE instead
src/core/chorus/ModelProviders/ProviderClaudeCode.ts, line 68-75 (link)

syntax: The return type of streamResponse should be Promise<ModelDisabled | void> to match the IProvider interface, but this implementation only returns Promise<void>

_{8 files reviewed, 3 comments}

_{Edit Code Review Agent Settings | Greptile}

bcongdon

This is exciting!

Trying it out locally: It's very possible that I'm "holding it wrong", but even with a logged-in claude code instance I wasn't able to get the output to show up in the Chorus dev. I do get valid stream-json output from running claude -p --output-format stream-json --verbose --permission-mode bypassPermissions "hello" in the same terminal window though

bcongdon · 2025-12-16T03:19:47Z

+        switch (modelPart) {
+            case "opus":
+            case "opus-4.5":
+                return "opus";
+            case "sonnet":
+            case "sonnet-4.5":
+                return "sonnet";
+            case "haiku":
+                return "haiku";
+            default:
+                // Let Claude CLI use its default
+                return undefined;


Any way we can make this a bit more flexible to future-proof it against future model version releases?

Good point! I have simplified this and just pass the model part directly to the Claude CLI.

bcongdon · 2025-12-16T03:25:16Z

+
+/// Check if Claude Code CLI is installed and authenticated
+#[tauri::command]
+pub fn check_claude_code_available() -> Result<serde_json::Value, String> {


nit: When attempting this locally without claude code installed, it seems like I was able to select the model and try running it, and I didn't get an error.

$ which claude claude not found

Fixed this - now you cant select the claude code option if you dont have claude code.

…el mapping - Use `which claude` to check CLI availability instead of credentials.json - Disable Claude Code in model picker when CLI not installed - Surface errors from stderr, non-zero exit codes, and error results - Simplify model name mapping to pass through directly to CLI

Ghvstcode · 2025-12-16T09:29:53Z

Trying it out locally: It's very possible that I'm "holding it wrong", but even with a logged-in claude code instance I wasn't able to get the output to show up in the Chorus dev. I do get valid stream-json output from running claude -p --output-format stream-json --verbose --permission-mode bypassPermissions "hello" in the same terminal window though

Very strange! This isn't the case for me. Will take a closer look at this and get back.

Use spawn_blocking to run process checks on a separate thread pool, preventing the sync command from blocking Tauri's async runtime (which caused SQL queries to hang).

…ode-support

Ghvstcode · 2025-12-20T07:11:29Z

This is exciting!

Trying it out locally: It's very possible that I'm "holding it wrong", but even with a logged-in claude code instance I wasn't able to get the output to show up in the Chorus dev. I do get valid stream-json output from running claude -p --output-format stream-json --verbose --permission-mode bypassPermissions "hello" in the same terminal window though

@bcongdon could you give this another spin? Should be working fine now.

bcongdon

This is pretty cool! And it's working for me now 😄

Is it expected for tool calls to show up in-band like this?

bcongdon · 2025-12-20T14:56:58Z

Looks like this has regressed to lockfileVersion: '6.0'. Can you update your pnpm so we continue using version 9.0 (e.g. at main)

bcongdon · 2025-12-20T14:58:22Z

+                -- Add Claude (via Claude Code) model
+                -- This uses the local Claude Code CLI and subscription instead of an API key
+                INSERT OR REPLACE INTO models (id, display_name, is_enabled, supported_attachment_types) VALUES
+                    ('claude-code::default', 'Claude (via Claude Code)', 1, '["text", "webpage"]');


Not sure how you plan on using this, but do you think it's worth having the different models (Sonnet, Opus) exposed here?

…output - Remove mapModelName function since we only expose one model and always use CLI default - Remove --verbose flag from Claude Code CLI invocation to prevent tool calls from showing in chat

Implements clean, collapsible UI for displaying Claude Code tool calls: - Group consecutive tool calls with summary (e.g., "Used 19 tools · Read (10×), Bash (5×)") - Individual tool blocks with JSON syntax highlighting via CodeBlock - Shared helper for extracting summaries from tool parameters - Base64-encoded data attributes for robust HTML parsing Enable Claude Code tools by removing --tools="" restriction and adding --verbose flag to expose tool_use blocks in stream output.

The tool call components were parsing and processing children on every render, causing severe performance issues during streaming when many tool calls were present. Changes: - Add useMemo to ToolCallGroup to cache parsed tool calls based on children prop - Add useMemo to ToolCallGroup summary calculation - Add useMemo to ToolCallBlock and ToolCallItem for extractToolSummary calls This prevents expensive regex matching, base64 decoding, and child traversal from running on every render, which was causing the app to freeze.

rmichelena · 2025-12-21T15:49:59Z

this is a great, wonderful idea - and we'll then need to add Codex CLI too; that way we can use our regular suscription quotas in Chorus... (similar to what Conductor does!)
keep in mind you should implement (if you haven't done so) support for "daily quota exceeded - resets at xxx.xx" messages from Claude Code, similar to what Conductor does...

Ghvstcode · 2025-12-21T17:35:01Z

@rmichelena - Thank you

this is a great, wonderful idea - and we'll then need to add Codex CLI too; that way we can use our regular suscription quotas in Chorus... (similar to what Conductor does!) keep in mind you should implement (if you haven't done so) support for "daily quota exceeded - resets at xxx.xx" messages from Claude Code, similar to what Conductor does...

Good point!

On quota exceeded handling - wouldn't that error just bubble up to the chat normally? Curious what special handling Conductor does that we'd want to replicate.

Ghvstcode · 2025-12-21T17:41:08Z

This is pretty cool! And it's working for me now 😄

Is it expected for tool calls to show up in-band like this?

@bcongdon Thanks for flagging this! Fixed now - tool calls are no longer rendered plainly.
Instead, they show as collapsible UI elements that can be expanded if you want to see the details. The implementation is fairly basic for now, but eventually I'd like to add things like a diff viewer for edit operations instead of just showing the raw tool call info.
Also snuck in another change: the tool box is now hidden when all selected models are Claude Code (since they bring their own tools).

bcongdon · 2026-01-04T12:44:57Z

Thanks for continuing to iterate on this! I haven't been able to determine why, but I seem to be getting a hanging issue again when I try to use this.

Repro steps:

Select the Sonnet 4 Claude Code model.
Ask a simple question ("Write a haiku about birds").
The model spins for a bit, then Chorus hangs into "Application Not Responding" and needs to be force quit.

High-frequency Tauri event emission caused the app to freeze. Now we collect all Claude CLI output and emit only the final assistant message, avoiding the freeze entirely.

Ghvstcode · 2026-01-26T07:16:51Z

Thanks for continuing to iterate on this! I haven't been able to determine why, but I seem to be getting a hanging issue again when I try to use this.

Repro steps:

Select the Sonnet 4 Claude Code model.

Ask a simple question ("Write a haiku about birds").

The model spins for a bit, then Chorus hangs into "Application Not Responding" and needs to be force quit.

Thanks for the repro details — that helped a lot.

I’ve narrowed this down to an issue specifically around the Tauri listen() + invoke() + event emission flow, rather than the Claude CLI itself or the way its beeing invoked.

What I was able to confirm:

If Rust emits events immediately after an invoke() call (even hardcoded test events with no CLI involved), the app can freeze.
If the frontend bypasses Tauri events entirely and calls onComplete() directly, the hang does not occur.
Adding a small delay between listen() and invoke() avoids the freeze in some cases, which suggests the listener isn’t fully ready when early events arrive.

Claude Code is the only provider that goes through Rust + Tauri events due to spawning a local CLI. Other providers stream via Fetch/SSE directly in JavaScript and don’t hit this path, which explains why the issue only appears here and not with the other providers.

Current behavior after the change:

The implementation now emits a single event only after generation completes.
This has been stable in testing, likely because the event arrives well after the listener has fully initialized.

Attempts at real-time streaming (emitting events per line of CLI output) continued to reproduce hangs, even with a delay workaround.

Add Claude Code provider support

c9c0f32

Adds integration with Claude Code as an AI model provider, enabling users to chat with Claude Code alongside other AI models in Chorus.

greptile-apps Bot reviewed Dec 15, 2025

View reviewed changes

Ghvstcode force-pushed the Ghvstcode/add-claudecode-support branch from bab23f3 to c9c0f32 Compare December 15, 2025 08:19

Ghvstcode mentioned this pull request Dec 15, 2025

Fix chat titles relying on Anthropic key #16

Merged

bcongdon reviewed Dec 16, 2025

View reviewed changes

Fix async runtime blocking in check_claude_code_available

0048658

Use spawn_blocking to run process checks on a separate thread pool, preventing the sync command from blocking Tauri's async runtime (which caused SQL queries to hang).

Ghvstcode requested a review from bcongdon December 19, 2025 13:55

Ghvstcode added 2 commits December 19, 2025 16:53

Merge remote-tracking branch 'origin/main' into Ghvstcode/add-claudec…

c5ebb2d

…ode-support

merge master

bc12de5

bcongdon reviewed Dec 20, 2025

View reviewed changes

Ghvstcode added 4 commits December 20, 2025 19:43

Address PR feedback: remove unnecessary mapModelName and fix verbose …

05769c2

…output - Remove mapModelName function since we only expose one model and always use CLI default - Remove --verbose flag from Claude Code CLI invocation to prevent tool calls from showing in chat

run pnpm install

c616dc9

updates

809cdb5

Ghvstcode added 2 commits December 21, 2025 19:11

updates

cc88ada

merge master

0fee1a9

Fix Claude Code app freeze by switching to non-streaming output

5e1969a

High-frequency Tauri event emission caused the app to freeze. Now we collect all Claude CLI output and emit only the final assistant message, avoiding the freeze entirely.

Ghvstcode requested a review from bcongdon January 26, 2026 07:17

Conversation

Ghvstcode commented Dec 15, 2025

Summary

Test Plan

Uh oh!

greptile-apps Bot left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Additional Comments (3)

Uh oh!

bcongdon left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bcongdon Dec 16, 2025

Choose a reason for hiding this comment

Uh oh!

Ghvstcode Dec 16, 2025

Choose a reason for hiding this comment

Uh oh!

bcongdon Dec 16, 2025

Choose a reason for hiding this comment

Uh oh!

Ghvstcode Dec 16, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Ghvstcode commented Dec 16, 2025

Uh oh!

Ghvstcode commented Dec 20, 2025

Uh oh!

bcongdon left a comment

Choose a reason for hiding this comment

Uh oh!

bcongdon Dec 20, 2025

Choose a reason for hiding this comment

Uh oh!

bcongdon Dec 20, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

rmichelena commented Dec 21, 2025

Uh oh!

Ghvstcode commented Dec 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Ghvstcode commented Dec 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bcongdon commented Jan 4, 2026

Uh oh!

Ghvstcode commented Jan 26, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

greptile-apps Bot left a comment •

edited

Loading

bcongdon left a comment •

edited

Loading

Ghvstcode commented Dec 21, 2025 •

edited

Loading

Ghvstcode commented Dec 21, 2025 •

edited

Loading