Quote the apiKeyHelper path, and say why the helper failed
apiKeyHelper is a shell command line, not a path, so the raw value written into settings.json was split at the first space. A Windows profile named "Mohammed Ahmed" produced an attempt to run C:\Users\Mohammed, surfacing as "your apiKeyHelper script is failing" with nothing to go on. Quote the value when it contains anything a shell cares about, and leave it bare otherwise so no existing settings.json churns on the next switch. The POSIX port had the same bug against a /Users/First Last home; shlex.quote has exactly the wanted "leave ordinary paths alone" behaviour. doctor could not see any of this. It quoted the path itself before running it, so it exercised a command line Claude Code never uses and passed while the real one failed. It now reads the string out of settings.json, reports it when it is not what a switch would write, and runs that string through a shell. The helper itself exited 1 in silence on four distinct faults - no state, no preset, no key, undecryptable key - collapsing them into one indistinguishable message. Each now names itself on stderr, which is what /status displays. The DPAPI case says what it actually means: a key stored by a different Windows account than the one Claude Code runs as. Success paths stay silent, so stdout still carries the key and nothing else. Also make install.ps1 survive a Restricted execution policy: piped through iex it is not subject to the policy, but invoking the installed script for the key prompt is, which is where a fresh install died. Set Process scope for the install, offer to set CurrentUser to RemoteSigned, and clear the mark-of-the-web that Expand-Archive can leave on the extracted scripts. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -13,15 +13,31 @@
|
||||
|
||||
$ErrorActionPreference = 'Stop'
|
||||
|
||||
# Claude Code surfaces a failing helper as "your apiKeyHelper script is failing"
|
||||
# and shows this stream under /status. Exiting 1 in silence turns four different
|
||||
# faults into one indistinguishable message, so every failure path says which it
|
||||
# was. Success paths stay silent - stdout carries the key and nothing else.
|
||||
function Fail {
|
||||
param([string] $Message)
|
||||
[Console]::Error.WriteLine("claude-key-helper: $Message")
|
||||
exit 1
|
||||
}
|
||||
|
||||
try {
|
||||
$root = Join-Path $env:USERPROFILE '.claude-mode'
|
||||
$state = Get-Content -LiteralPath (Join-Path $root 'state.json') -Raw -Encoding UTF8 | ConvertFrom-Json
|
||||
$root = Join-Path $env:USERPROFILE '.claude-mode'
|
||||
$statePath = Join-Path $root 'state.json'
|
||||
if (-not (Test-Path -LiteralPath $statePath)) {
|
||||
Fail "no state.json at $statePath - claude-mode is not installed for this Windows account. Run install.ps1"
|
||||
}
|
||||
$state = Get-Content -LiteralPath $statePath -Raw -Encoding UTF8 | ConvertFrom-Json
|
||||
|
||||
if ($state.mode -eq 'anthropic') { exit 0 }
|
||||
if (-not $state.preset) { exit 0 }
|
||||
|
||||
$presetPath = Join-Path $root ('presets\' + $state.preset + '.json')
|
||||
if (-not (Test-Path -LiteralPath $presetPath)) { exit 1 }
|
||||
if (-not (Test-Path -LiteralPath $presetPath)) {
|
||||
Fail "state.json names preset '$($state.preset)' but $presetPath does not exist. Run: claude-mode presets"
|
||||
}
|
||||
$preset = Get-Content -LiteralPath $presetPath -Raw -Encoding UTF8 | ConvertFrom-Json
|
||||
|
||||
$authMode = 'vault'
|
||||
@@ -34,15 +50,24 @@ try {
|
||||
if ($authMode -ne 'vault') { exit 0 } # inline token: nothing for us to emit
|
||||
|
||||
$credPath = Join-Path $root ('vault\' + $keyRef + '.cred')
|
||||
if (-not (Test-Path -LiteralPath $credPath)) { exit 1 }
|
||||
if (-not (Test-Path -LiteralPath $credPath)) {
|
||||
Fail "no key stored for ref '$keyRef'. Run: claude-mode set-key $keyRef"
|
||||
}
|
||||
|
||||
$secure = ConvertTo-SecureString (Get-Content -LiteralPath $credPath -Raw).Trim()
|
||||
$bstr = [Runtime.InteropServices.Marshal]::SecureStringToBSTR($secure)
|
||||
try {
|
||||
$secure = ConvertTo-SecureString (Get-Content -LiteralPath $credPath -Raw).Trim()
|
||||
} catch {
|
||||
# DPAPI is CurrentUser scope, so this is almost always a key stored by a
|
||||
# different Windows account than the one Claude Code is running as -
|
||||
# typically set-key run from an elevated or "run as" shell.
|
||||
Fail "cannot decrypt $credPath as $env:USERDOMAIN\$env:USERNAME. The key is DPAPI-encrypted for whichever account stored it; re-run 'claude-mode set-key $keyRef' as this user, unelevated."
|
||||
}
|
||||
$bstr = [Runtime.InteropServices.Marshal]::SecureStringToBSTR($secure)
|
||||
try {
|
||||
[Console]::Out.Write([Runtime.InteropServices.Marshal]::PtrToStringBSTR($bstr))
|
||||
} finally {
|
||||
[Runtime.InteropServices.Marshal]::ZeroFreeBSTR($bstr)
|
||||
}
|
||||
} catch {
|
||||
exit 1
|
||||
Fail $_.Exception.Message
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user