fix(ui): show grep search parameters in pending tool state by LarsArtmann · Pull Request #2070 · charmbracelet/crush

LarsArtmann · 2026-01-31T03:41:45Z

Video

OLD — Crush v0.88.1 (https://vhs.charm.sh/vhs-2qd1GGwcD2e6KaecbheOXm.gif)

NEW (https://vhs.charm.sh/vhs-3oraVxwIQ9M6BJH1KPy79i.gif)

Problem

When the grep tool is running, the pending state only showed ● Grep with an animation — hiding the search pattern, path, include filter, and literal mode from the user. There was no way to know what was being searched while the tool was in progress.

Solution

Move parameter parsing (JSON unmarshal) before the pending check in GrepToolRenderContext.RenderTool(), then render the pending state with the full tool header (pattern + params) followed by the animation.

Before

● Grep ▋                                          ← pending (no params visible)
● Grep pattern path=. include=*.go                ← completed

After

● Grep pattern path=. include=*.go literal=true ▋ ← pending (full params + animation)
● Grep pattern path=. include=*.go                ← completed (unchanged)

Still applicable

Checked against current main (v0.97.x, 2026-09-29): GrepToolRenderContext.RenderTool in internal/ui/chat/search.go still early-returns the bare pendingTool while the tool runs, so the params stay hidden without this change.

Merge conflict resolution

Rebased against latest main to adopt the refactored toolHeader signature (now takes *ToolRenderOpts instead of bool).

Test plan

go build ./... passes
go test ./internal/ui/chat/... passes
go test ./internal/agent/tools/... passes
Manually verify pending state shows full params with animation
Manually verify completed state is unchanged

💘 Generated with Crush

Re-applies the unmerged upstream PR #2070 which was temporarily removed during the v0.47.2 update due to hash computation issues. ## What the patch does Displays grep search parameters (pattern, path, include filters, literal mode) in the pending state UI instead of just showing "● Grep" with animation. This provides better UX transparency when grep tool is running. ## Technical details - Patch URL: https://github.com/charmbracelet/crush/commit/e4aa1742699db27c2ccd5e9c2b9f4d0948870581.patch - Patch hash: sha256-3G73sqv4UdwNZHs6HKr9mCYO8WWplJAnLrurDpEiK20= - PR status: Still open (awaiting review) - Applies cleanly to v0.47.2 ## Changes - Added `fetchpatch` to imports - Added patches array with PR #2070 commit patch ## Verification - Build succeeds: `nix build .#crush-patched` - Version output: `crush version v0.47.2` - Flake check passes: `nix flake check --no-build` ## Related - PR #2070: charmbracelet/crush#2070 - Previous commits: 6fc7606, 65f79fb (hash fixes for v0.47.2) 💘 Generated with Crush Assisted-by: Claude via Crush <crush@charm.land>

LarsArtmann · 2026-08-12T20:59:27Z

This PR is now MERGEABLE again. 😃

meowgorithm · 2026-08-12T21:07:48Z

Oh this looks nice!

LarsArtmann · 2026-08-12T21:22:35Z

Oh this looks nice!

Looks nice in the Terminal, then the screenshot somehow

@meowgorithm thing so too :)

LarsArtmann · 2026-08-12T22:28:45Z

It's hard to show the difference but I tried.
See description Gifs

LarsArtmann · 2026-09-29T22:45:24Z

Try merging main again. Merged what I hope is a fix for that this afternoon.

Rebased and green again (verified against current main). The gap itself is still there though — GrepToolRenderContext.RenderTool in internal/ui/chat/search.go still returns the bare pendingTool while grep runs, so the search params stay hidden without this PR.

andrinoff

Just small changes! Thank you!

andrinoff · 2026-10-01T06:47:11Z

-	}
-
 	var params tools.GrepParams
 	if err := json.Unmarshal([]byte(opts.ToolCall.Input), &params); err != nil {


The pending check now runs after the input is parsed, but while a tool call is still streaming its input is usually incomplete. That means users will briefly see an "Invalid parameters" error instead of the loading spinner. The pending branch should fall back to the old spinner when parsing fails, rather than showing an error. Can you test this out?

Good catch — a partial input like {"pattern":"fo indeed flashed "Invalid parameters" while streaming.

Now falls back to the old pendingTool spinner when the input doesn't parse yet and the call is still pending. Covered by a test feeding the streaming prefixes "", "{", "{"pattern":"fo" in both compact modes.

Went one step further here: while the input streams, a token walk (json.Decoder.Token) now recovers every field that already closed — the pattern shows up as soon as its quote arrives, path/include pop in as they complete, spinner until then. Covered in TestGrepToolMessageItem_PendingPartialInputShowsCompleteFields + TestPartialJSONFields.

I am thinking of stream parsing it instead though (WIP)

Stream parsing landed: after the token walk, the raw tail is matched for the value still streaming, so the pattern grows character by character (cut escapes like a trailing \ or short \u are trimmed). Covered in TestPartialJSONFields.

andrinoff · 2026-10-01T06:48:00Z

 		toolParams = append(toolParams, "literal", "true")
 	}

+	if opts.IsPending() {


The old pending view respected opts.Compact (nested tools get a different style), but the new one ignores it. Grep calls inside sub-agents will now look different from the rest while loading

The old pending view respected opts.Compact (nested tools get a different style), but the new one ignores it.

I think this one is actually covered — toolHeader applies the nested style itself:

nested := opts != nil && opts.Compact // tools.go, toolHeader

Same NameNested that pendingTool used. Rendered both byte-for-byte and the icon+name prefix is identical, compact or not — only the params differ, which is the feature. (NameNormal and NameNested even render identically in every current theme.) The spinner fallback from the other thread uses pendingTool directly, so it stays compact-aware too.

LarsArtmann · 2026-10-09T23:48:42Z

@andrinoff I think the PR is ready for a new review.

andrinoff · 2026-10-12T07:01:38Z

Are animations all well?

LarsArtmann · 2026-10-14T13:13:00Z

@andrinoff I tested a local build of the last commit for a couple of hours and it looks all fine too me. I would merge it.

… "Working.." Previously, when the grep tool was running (pending state), the UI only displayed "● Grep" with an animation, hiding what the tool was actually searching for. This was frustrating for users who wanted to see the search pattern, path, include filters, and literal mode setting while the grep was in progress. The root cause was that the tool parameters were parsed AFTER the pending check, so they weren't available when rendering the pending state. This commit moves the parameter parsing before the pending check, ensuring the full tool header with all parameters is available during execution. Changes: - Moved parameter parsing before the pending check in GrepToolRenderContext - Updated pending state to call toolHeader with the parsed parameters - Added animation rendering to the tool header in pending state - Maintains consistency with non-pending state rendering The user now sees: "● Grep A9041!eAD$80@a9 path=. include=*.go literal=true ..." with animation instead of just "● Grep ... animation", providing complete context about what the grep tool is searching for while it's running. File: internal/ui/chat/search.go:95-140 Function: GrepToolRenderContext.RenderTool 💘 Generated with Crush Assisted-by: GLM-4.7 via Crush <crush@charm.land>

💘 Generated with Crush Assisted-by: Crush:glm-5.3

LarsArtmann · 2026-10-14T16:29:03Z

I only tested on Linux. Now the CI/CD for mac should work too.

…elet#2070) * fix(ui): show grep search parameters in pending state instead of just "Working.." Previously, when the grep tool was running (pending state), the UI only displayed "● Grep" with an animation, hiding what the tool was actually searching for. This was frustrating for users who wanted to see the search pattern, path, include filters, and literal mode setting while the grep was in progress. The root cause was that the tool parameters were parsed AFTER the pending check, so they weren't available when rendering the pending state. This commit moves the parameter parsing before the pending check, ensuring the full tool header with all parameters is available during execution. Changes: - Moved parameter parsing before the pending check in GrepToolRenderContext - Updated pending state to call toolHeader with the parsed parameters - Added animation rendering to the tool header in pending state - Maintains consistency with non-pending state rendering The user now sees: "● Grep A9041!eAD$80@a9 path=. include=*.go literal=true ..." with animation instead of just "● Grep ... animation", providing complete context about what the grep tool is searching for while it's running. File: internal/ui/chat/search.go:95-140 Function: GrepToolRenderContext.RenderTool 💘 Generated with Crush Assisted-by: GLM-4.7 via Crush <crush@charm.land> * fix(ui): fall back to spinner while grep input is still streaming 💘 Generated with Crush Assisted-by: Crush:glm-5.3 * feat(ui): render partially streamed grep params while pending 💘 Generated with Crush Assisted-by: Crush:glm-5.3 * feat(ui): grow grep pattern live while its value streams 💘 Generated with Crush Assisted-by: Crush:glm-5.3 (cherry picked from commit c89ef9d)

LarsArtmann requested a review from a team as a code owner January 31, 2026 03:41

LarsArtmann requested review from kujtimiihoxha and meowgorithm and removed request for a team January 31, 2026 03:41

LarsArtmann mentioned this pull request Jan 31, 2026

fix(ui): show grep search parameters in pending state instead of just "Working.." #2071

Closed

1 of 2 tasks

LarsArtmann changed the title ~~fix(ui): show grep search parameters in pending state instead of just 'Working..'~~ fix(ui): show grep search parameters in pending tool state Aug 12, 2026

meowgorithm removed the request for review from kujtimiihoxha August 12, 2026 21:07

LarsArtmann commented Aug 12, 2026

View reviewed changes

Comment thread internal/ui/chat/search.go Resolved

LarsArtmann force-pushed the fix/grep-show-search-params branch from 72fadb4 to 0d16f0d Compare August 25, 2026 01:56

LarsArtmann force-pushed the fix/grep-show-search-params branch from 0d16f0d to 53ad6a0 Compare September 15, 2026 08:06

meowgorithm requested review from andrinoff and removed request for meowgorithm September 30, 2026 13:30

LarsArtmann force-pushed the fix/grep-show-search-params branch from 53ad6a0 to 4e6c9f2 Compare September 30, 2026 13:51

andrinoff requested changes Oct 1, 2026

View reviewed changes

LarsArtmann force-pushed the fix/grep-show-search-params branch 3 times, most recently from ec61117 to d80bcfd Compare October 9, 2026 15:37

This comment was marked as low quality.

Sign in to view

LarsArtmann requested a review from andrinoff October 10, 2026 00:00

andrinoff approved these changes Oct 12, 2026

View reviewed changes

LarsArtmann force-pushed the fix/grep-show-search-params branch from d80bcfd to 2c1562b Compare October 12, 2026 08:49

andrinoff enabled auto-merge (squash) October 14, 2026 13:14

LarsArtmann added 4 commits October 14, 2026 18:10

fix(ui): fall back to spinner while grep input is still streaming

f9be07d

💘 Generated with Crush Assisted-by: Crush:glm-5.3

feat(ui): render partially streamed grep params while pending

8a55a16

💘 Generated with Crush Assisted-by: Crush:glm-5.3

feat(ui): grow grep pattern live while its value streams

4d9b67d

💘 Generated with Crush Assisted-by: Crush:glm-5.3

auto-merge was automatically disabled October 14, 2026 16:13
Head branch was pushed to by a user without write access

LarsArtmann force-pushed the fix/grep-show-search-params branch from 2c1562b to 4d9b67d Compare October 14, 2026 16:13

andrinoff enabled auto-merge (squash) October 15, 2026 11:49

andrinoff merged commit c89ef9d into charmbracelet:main Oct 15, 2026
15 checks passed

LarsArtmann deleted the fix/grep-show-search-params branch October 15, 2026 19:45

Conversation

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

Uh oh!

Video

Problem

Solution

Before

After

Still applicable

Merge conflict resolution

Test plan

Uh oh!

LarsArtmann commented Aug 12, 2026

Uh oh!

meowgorithm commented Aug 12, 2026

Uh oh!

LarsArtmann commented Aug 12, 2026

Uh oh!

Uh oh!

LarsArtmann commented Aug 12, 2026

Uh oh!

LarsArtmann commented Sep 29, 2026

Uh oh!

andrinoff left a comment

Choose a reason for hiding this comment

Uh oh!

andrinoff Oct 1, 2026

Choose a reason for hiding this comment

Uh oh!

LarsArtmann Oct 3, 2026

Choose a reason for hiding this comment

Uh oh!

LarsArtmann Oct 4, 2026

Choose a reason for hiding this comment

Uh oh!

LarsArtmann Oct 4, 2026

Choose a reason for hiding this comment

Uh oh!

LarsArtmann Oct 9, 2026

Choose a reason for hiding this comment

Uh oh!

andrinoff Oct 1, 2026

Choose a reason for hiding this comment

Uh oh!

LarsArtmann Oct 3, 2026 • 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!

This comment was marked as low quality.

LarsArtmann commented Oct 9, 2026

Uh oh!

andrinoff commented Oct 12, 2026

Uh oh!

LarsArtmann commented Oct 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

LarsArtmann commented Oct 14, 2026

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

LarsArtmann commented Jan 31, 2026 •

edited

Loading

LarsArtmann Oct 3, 2026 •

edited

Loading

LarsArtmann commented Oct 14, 2026 •

edited

Loading