stacklok / toolhive / 32154873936

70%

Build Type

push

github

Committed by web-flow

Commit Message

Use an absolute thv path in the Claude Desktop helper shim (#6354)

* Use an absolute thv path in POSIX token helpers

The bare "thv llm token" token helper never runs for GUI-launched
clients. macOS GUI apps inherit launchd's environment, not the user's
shell PATH, and thv installs to ~/.toolhive/bin, which launchd's
default PATH does not include. Claude Desktop is broken
unconditionally since it is only ever GUI-launched; its setup still
reports success and the failure surfaces later as an auth error.
Claude Code is broken whenever it is started from the Dock or
Spotlight. The same PATH dependency also lets any writable directory
earlier on PATH shadow thv and return an attacker-chosen token.

Single-quote the absolute path from os.Executable() on POSIX. Quoting
is what the previous attempt could not do portably, but the two
consumers here only ever run through /bin/sh, where single-quoting is
a total transform: no byte inside a single-quoted run is special, so
no path needs rejecting and the shim's metacharacter blocklist is
deleted rather than widened. Claude Desktop's shim switches to the
TokenHelperPath already plumbed to it and previously ignored.

Windows keeps the bare command. cmd.exe has no equivalent quoting for
backslash-bearing paths, and leaving that branch byte-identical to
what ships today means it cannot regress; Dock-equivalent launches
there still need thv on the GUI PATH.

* Keep the bare thv command for direct-mode clients

Scope the absolute-path fix to Claude Desktop, which is the only
client that cannot use a PATH-resolved command: it is exclusively
GUI-launched, so it inherits launchd's environment and never finds
thv on PATH.

Claude Code keeps the bare "thv llm token". It is terminal-oriented,
and the bare form re-resolves on every invocation, so upgrading or
relocating thv keeps working without re-running "thv llm setup".
This also drops the platform branch: with no direct-mode client
interpolating a path, there is nothing... (continued)

Coverage Stats

16 of 17 new or added lines in 1 file covered. (94.12%)

1564 existing lines in 10 files now uncovered.

85514 of 121348 relevant lines covered (70.47%)

97.37 hits per line