Skip to content

fix(web): unwrap windows shell command wrappers #1719

Merged
juliusmarminge merged 7 commits intopingdotgg:mainfrom
justsomelegs:fix-1671-command-activity-summary
Apr 6, 2026
Merged

fix(web): unwrap windows shell command wrappers #1719
juliusmarminge merged 7 commits intopingdotgg:mainfrom
justsomelegs:fix-1671-command-activity-summary

Conversation

@justsomelegs
Copy link
Copy Markdown
Contributor

@justsomelegs justsomelegs commented Apr 3, 2026

What Changed

Fixes #1671.

This PR normalizes command activity previews so the UI shows the meaningful inner command instead of the shell wrapper used to launch it.

Specifically:

  • command preview extraction now unwraps common shell launcher patterns such as PowerShell -Command, cmd /c, and POSIX shell -c / -lc
  • Windows full-path PowerShell launches like "C:\Program Files\PowerShell\7\pwsh.exe" -NoLogo -NoProfile -Command ... now display just the inner command
  • command activity preview extraction now falls back to normalized detail text for command_execution items when structured command metadata is missing

I also added focused regression coverage for:

  • quoted full-path PowerShell wrapper commands
  • argv-style PowerShell command payloads
  • the screenshot-style case where the wrapper only appears in payload.detail

Why

On Windows, Codex command activity can be reported through a shell wrapper such as:

"C:\Program Files\PowerShell\7\pwsh.exe" -Command "rg ..."

The UI was surfacing that raw wrapper command directly in the activity preview, which hides the actual command the user cares about.

This change keeps execution untouched and only fixes the display layer. The normalization lives in session-logic.ts, where work log entries are already derived for rendering, so the UI can consistently show the real command without changing provider/runtime behavior.

UI Changes

Screenshot 2026-04-03 182701 image

Checklist

  • This PR is small and focused
  • I explained what changed and why
  • I included before/after screenshots for any UI changes
  • I included a video for animation/interaction changes

Note

Unwrap Windows shell command wrappers in work log entry command extraction

  • Adds normalizeCommandValue logic to strip known shell wrappers (e.g. PowerShell -Command, cmd /c) so displayed commands reflect the underlying invoked command rather than the wrapper.
  • Extends extractToolCommand in session-logic.ts to support argv-style inputs, fall back to detail text for command_execution items, and return both a normalized command and an optional rawCommand when they differ.
  • Adds rawCommand to the WorkLogEntry interface and propagates it through toDerivedWorkLogEntry and mergeDerivedWorkLogEntries.
  • Shows the raw (pre-normalization) command in a tooltip on hover in SimpleWorkEntryRow when rawCommand differs from the displayed command.

Macroscope summarized 5c398b4.

@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Apr 3, 2026

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 0d9e2ba2-08c8-4d43-94d3-5c63ffe95cff

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actions github-actions bot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:L 100-499 changed lines (additions + deletions). labels Apr 3, 2026
@macroscopeapp
Copy link
Copy Markdown
Contributor

macroscopeapp bot commented Apr 3, 2026

Approvability

Verdict: Approved

This PR improves command display in the UI by unwrapping shell wrapper commands (PowerShell, cmd, bash) to show cleaner text while preserving the original in a tooltip. The changes are purely presentational string parsing with comprehensive test coverage and no runtime behavior impact.

You can customize Macroscope's approvability policy. Learn more.

@juliusmarminge
Copy link
Copy Markdown
Member

i feel like we should surface the full command somewhere, perhaps as a tooltip when you hover or something? sometimes you get weird states where the agent saying certain commands are not recognizable etc and then it's useful knowing the full command it ran so you can tell more about the shell env etc

macroscopeapp[bot]
macroscopeapp bot previously approved these changes Apr 4, 2026
@macroscopeapp macroscopeapp bot dismissed their stale review April 4, 2026 15:53

Dismissing prior approval to re-evaluate 1ad9158

@justsomelegs
Copy link
Copy Markdown
Contributor Author

justsomelegs commented Apr 4, 2026

added that tooltip on hover of formatted commands
image

@justsomelegs justsomelegs force-pushed the fix-1671-command-activity-summary branch from 1ad9158 to 34f8ea3 Compare April 4, 2026 15:56
@juliusmarminge juliusmarminge enabled auto-merge (squash) April 6, 2026 17:12
@juliusmarminge juliusmarminge merged commit 340dbbb into pingdotgg:main Apr 6, 2026
9 checks passed
Aditya190803 pushed a commit to Aditya190803/t3code that referenced this pull request Apr 7, 2026
Chrono-byte pushed a commit to Chrono-byte/t3code that referenced this pull request Apr 7, 2026
gigq pushed a commit to gigq/t3code that referenced this pull request Apr 8, 2026
rororowyourboat added a commit to rororowyourboat/t3code that referenced this pull request Apr 9, 2026
…threadId (#2)

* Raise slow RPC ack warning threshold to 15s (pingdotgg#1760)

* Use active worktree path for workspace saves (pingdotgg#1762)

* Stream git status updates over WebSocket (pingdotgg#1763)

Co-authored-by: codex <codex@users.noreply.github.com>

* fix(web): unwrap windows shell command wrappers (pingdotgg#1719)

* Rename "Chat" to "Build" in interaction mode toggle (pingdotgg#1769)

Co-authored-by: Julius Marminge <julius0216@outlook.com>

* Assign default capabilities to Codex custom models (pingdotgg#1793)

* Add project rename support in the sidebar (pingdotgg#1798)

* Support multi-select pending user inputs (pingdotgg#1797)

* Add Zed support to Open actions via editor command aliases (pingdotgg#1303)

Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>

* Closes pingdotgg#1795 - Support building and developing in a devcontainer (pingdotgg#1791)

* Add explicit timeouts to CI and release workflows (pingdotgg#1825)

* fix(web): distinguish singular/plural in pending action submit label (pingdotgg#1826)

* Refactor web stores into atomic slices ready to split ChatView (pingdotgg#1708)

* Add VSCode Insiders and VSCodium icons (pingdotgg#1847)

* Prepare datamodel for multi-environment (pingdotgg#1765)

Co-authored-by: justsomelegs <145564979+justsomelegs@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: cursor[bot] <206951365+cursor[bot]@users.noreply.github.com>

* Implement server auth bootstrap and pairing flow (pingdotgg#1768)

Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius@macmini.local>
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: cursor[bot] <206951365+cursor[bot]@users.noreply.github.com>

* Use dev proxy for loopback auth and environment requests (pingdotgg#1853)

* Refresh local git status on turn completion (pingdotgg#1821)

Co-authored-by: codex <codex@users.noreply.github.com>

* fix(desktop): add Copy Link action for chat links (pingdotgg#1835)

* fix: map runtime modes to correct permission levels (pingdotgg#1587)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>

* Fix persisted composer image hydration typo (pingdotgg#1831)

* Clarify environment and workspace picker labels (pingdotgg#1854)

* Scope git toast state by thread ref (pingdotgg#1855)

* fix build (pingdotgg#1859)

* Stabilize keybindings toast stream setup (pingdotgg#1860)

Co-authored-by: Julius Marminge <julius@macmini.local>

* feat(web): add embeddable thread route for canvas tile hosts

Adds /embed/thread/:environmentId/:threadId — a standalone route that
renders the existing ChatView without the app sidebar chrome. This is the
iframe target for t3-canvas agent shapes (see rororowyourboat/t3-canvas#3).

- New file-based route embed.thread.\$environmentId.\$threadId.tsx
- __root.tsx bypasses AppSidebarLayout for any /embed/* pathname so the
  environment connection + websocket surface + toasts still initialize
  but the sidebar/diff/plan chrome does not render
- minimal=1 search param is parsed and wired to a data attribute on the
  container for future targeted CSS; chrome hiding (BranchToolbar,
  PlanSidebar, ThreadTerminalDrawer) stays as a follow-up pass
- routeTree.gen.ts regenerated by the @tanstack/router-plugin

---------

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: legs <145564979+justsomelegs@users.noreply.github.com>
Co-authored-by: sonder <168988030+heysonder@users.noreply.github.com>
Co-authored-by: Adem Ben Abdallah <96244394+AdemBenAbdallah@users.noreply.github.com>
Co-authored-by: Kyle Gottfried <6462596+Spitfire1900@users.noreply.github.com>
Co-authored-by: Jacob <589761+jvzijp@users.noreply.github.com>
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: cursor[bot] <206951365+cursor[bot]@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius@macmini.local>
Co-authored-by: Klemencina <56873773+Klemencina@users.noreply.github.com>
Co-authored-by: Oskar Sekutowicz <me.oski646@gmail.com>
Co-authored-by: Noxire <59626436+noxire-dev@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L 100-499 changed lines (additions + deletions). vouch:unvouched PR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug]: Ran command shows [powershell path] before that actual command.

2 participants