fix(ai-agent): 修复 Codex 调用与安装流程兼容性

mudssky · mudssky · commit 6f9da970d09b · 2026-04-26T23:41:37.000+08:00
diff --git a/install.ps1 b/install.ps1
@@ -354,9 +354,11 @@ catch {
     Write-Warning "同步脚本失败: $($_.Exception.Message)"
 }
 
-# 3. 构建 Bash 脚本工具集
-if (-not (Install-BashScripts -RootPath $ProjectRoot)) {
-    exit 1
+if (-not $IsWindows) {
+    # 3. 构建 Bash 脚本工具集
+    if (-not (Install-BashScripts -RootPath $ProjectRoot)) {
+        exit 1
+    }
 }
 
 # 4. 安装 Node.js 脚本 (跨平台)
diff --git a/scripts/pwsh/ai/agent-runner/agents/codex.ps1 b/scripts/pwsh/ai/agent-runner/agents/codex.ps1
@@ -31,6 +31,7 @@ function New-CodexAgentCommandSpec {
     $workDir = if ($Config.ContainsKey('work_dir')) { [string]$Config.work_dir } else { (Get-Location).Path }
     $args = New-Object 'System.Collections.Generic.List[string]'
     $args.Add('exec') | Out-Null
+    $args.Add('--ephemeral') | Out-Null
 
     if ($Config.ContainsKey('model')) {
         $args.Add('--model') | Out-Null
@@ -51,7 +52,7 @@ function New-CodexAgentCommandSpec {
 
     $args.Add('-C') | Out-Null
     $args.Add($workDir) | Out-Null
-    $args.Add($Prompt) | Out-Null
+    $args.Add('-') | Out-Null
 
-    return New-AiAgentCommandSpec -FilePath 'codex' -ArgumentList $args.ToArray() -WorkingDirectory $workDir -Prompt $Prompt
+    return New-AiAgentCommandSpec -FilePath 'codex' -ArgumentList $args.ToArray() -WorkingDirectory $workDir -Prompt $Prompt -InputText $Prompt
 }
diff --git a/scripts/pwsh/ai/agent-runner/core/process.ps1 b/scripts/pwsh/ai/agent-runner/core/process.ps1
@@ -21,6 +21,9 @@ $ErrorActionPreference = 'Stop'
 .PARAMETER Prompt
     原始 prompt 文本，仅用于统计长度，不在预览中明文打印。
 
+.PARAMETER InputText
+    需要写入外部命令 stdin 的文本。
+
 .PARAMETER UnsupportedOptions
     当前 agent 不支持的统一配置字段。
 
@@ -41,6 +44,8 @@ function New-AiAgentCommandSpec {
 
         [string]$Prompt = '',
 
+        [string]$InputText = '',
+
         [string[]]$UnsupportedOptions = @()
     )
 
@@ -49,6 +54,7 @@ function New-AiAgentCommandSpec {
         ArgumentList       = @($ArgumentList)
         WorkingDirectory   = $WorkingDirectory
         Prompt             = $Prompt
+        InputText          = $InputText
         UnsupportedOptions = @($UnsupportedOptions)
     }
 }
@@ -80,6 +86,9 @@ function Format-AiAgentCommandPreview {
         if ($arg -eq $prompt -and -not [string]::IsNullOrEmpty($prompt)) {
             $parts.Add('<PROMPT>') | Out-Null
         }
+        elseif ($arg -eq '-' -and -not [string]::IsNullOrEmpty([string]$Spec.InputText)) {
+            $parts.Add('<PROMPT_STDIN>') | Out-Null
+        }
         else {
             $parts.Add([string]$arg) | Out-Null
         }
@@ -88,6 +97,97 @@ function Format-AiAgentCommandPreview {
     return ("{0} {1}`nWorkDir={2}`nPromptChars={3}" -f $Spec.FilePath, ($parts -join ' '), $Spec.WorkingDirectory, $prompt.Length)
 }
 
+<#
+.SYNOPSIS
+    解析真实调用的 agent CLI 路径。
+
+.DESCRIPTION
+    Windows 上 npm 等工具常同时生成 `.ps1` 与 `.cmd` 包装器。PowerShell 脚本再次调用 `.ps1`
+    包装器时，可能把标准流识别成非终端并触发 agent 的 TTY 检查错误；因此执行前优先选择
+    `.cmd`、`.exe`、`.bat` 形式的应用包装器。预览仍保留原始命令名，避免泄露本机安装路径。
+
+.PARAMETER FilePath
+    命令规格中的外部 CLI 名称或路径。
+
+.OUTPUTS
+    string
+    返回实际用于 `&` 调用的命令路径或名称。
+#>
+function Resolve-AiAgentInvocationFilePath {
+    [CmdletBinding()]
+    param(
+        [Parameter(Mandatory)]
+        [string]$FilePath
+    )
+
+    $runsOnWindows = [System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform(
+        [System.Runtime.InteropServices.OSPlatform]::Windows
+    )
+    if (-not $runsOnWindows) {
+        return $FilePath
+    }
+
+    if ([System.IO.Path]::IsPathRooted($FilePath) -or -not [string]::IsNullOrWhiteSpace([System.IO.Path]::GetExtension($FilePath))) {
+        return $FilePath
+    }
+
+    foreach ($extension in @('.cmd', '.exe', '.bat')) {
+        $candidate = Get-Command -Name "$FilePath$extension" -CommandType Application -ErrorAction SilentlyContinue |
+            Select-Object -First 1
+        if ($null -ne $candidate) {
+            return $candidate.Source
+        }
+    }
+
+    return $FilePath
+}
+
+<#
+.SYNOPSIS
+    执行外部 agent 命令并转发输出。
+
+.DESCRIPTION
+    PowerShell 函数会把外部命令 stdout 合并到自身成功输出流。runner 顶层需要用函数返回对象读取
+    ExitCode，因此这里把 stdout 写到 host，避免 agent 日志污染结构化返回值。
+
+.PARAMETER FilePath
+    实际调用的外部 CLI 路径或名称。
+
+.PARAMETER ArgumentList
+    传递给外部 CLI 的参数数组。
+
+.PARAMETER InputText
+    需要写入外部命令 stdin 的文本。为空时不主动写入 stdin。
+
+.OUTPUTS
+    int
+    返回外部命令的退出码。
+#>
+function Invoke-AiAgentNativeCommand {
+    [CmdletBinding()]
+    param(
+        [Parameter(Mandatory)]
+        [string]$FilePath,
+
+        [string[]]$ArgumentList = @(),
+
+        [string]$InputText = ''
+    )
+
+    if ([string]::IsNullOrEmpty($InputText)) {
+        & $FilePath @ArgumentList | ForEach-Object {
+            Write-Host $_
+        }
+    }
+    else {
+        $InputText | & $FilePath @ArgumentList | ForEach-Object {
+            Write-Host $_
+        }
+    }
+
+    return $LASTEXITCODE
+}
+
 <#
 .SYNOPSIS
     检查外部 agent CLI 是否可用。
@@ -109,7 +209,7 @@ function Assert-AiAgentCommandAvailable {
         [string]$FilePath
     )
 
-    if (-not (Get-Command -Name $FilePath -ErrorAction SilentlyContinue)) {
+    if (-not (Test-Path -LiteralPath $FilePath -PathType Leaf) -and -not (Get-Command -Name $FilePath -ErrorAction SilentlyContinue)) {
         throw "未找到 $FilePath，请先安装并完成登录。"
     }
 }
diff --git a/scripts/pwsh/ai/agent-runner/main.ps1 b/scripts/pwsh/ai/agent-runner/main.ps1
@@ -161,11 +161,12 @@ function Invoke-AiAgentRunnerCommand {
         return [pscustomobject]@{ ExitCode = 0; Output = Format-AiAgentCommandPreview -Spec $spec }
     }
 
-    Assert-AiAgentCommandAvailable -FilePath $spec.FilePath
+    $invocationFilePath = Resolve-AiAgentInvocationFilePath -FilePath $spec.FilePath
+    Assert-AiAgentCommandAvailable -FilePath $invocationFilePath
     Push-Location $spec.WorkingDirectory
     try {
-        & $spec.FilePath @($spec.ArgumentList)
-        return [pscustomobject]@{ ExitCode = $LASTEXITCODE; Output = '' }
+        $exitCode = Invoke-AiAgentNativeCommand -FilePath $invocationFilePath -ArgumentList @($spec.ArgumentList) -InputText ([string]$spec.InputText)
+        return [pscustomobject]@{ ExitCode = $exitCode; Output = '' }
     }
     finally {
         Pop-Location
diff --git a/tests/AiAgentRunner.Tests.ps1 b/tests/AiAgentRunner.Tests.ps1
@@ -28,13 +28,15 @@ Describe 'AI agent command specs' {
         $spec.WorkingDirectory | Should -Be '/repo'
         $spec.ArgumentList | Should -Be @(
             'exec',
+            '--ephemeral',
             '--model', 'gpt-5.4',
             '-c', 'model_reasoning_effort="medium"',
             '--json',
             '--full-auto',
             '-C', '/repo',
-            '修复测试'
+            '-'
         )
+        $spec.InputText | Should -Be '修复测试'
     }
 
     It 'builds claude print args and ignores reasoning effort' {
@@ -82,6 +84,50 @@ Describe 'AI agent command specs' {
         $preview | Should -Match 'PromptChars=13'
         $preview | Should -Not -Match 'secret prompt'
     }
+
+    It 'prefers Windows application wrappers over PowerShell shims for invocation' -Skip:(-not $IsWindows) {
+        $toolsDir = Join-Path $TestDrive 'agent-bin'
+        New-Item -ItemType Directory -Path $toolsDir -Force | Out-Null
+        Set-Content -LiteralPath (Join-Path $toolsDir 'codex.ps1') -Encoding utf8NoBOM -Value "Write-Output 'ps1'"
+        Set-Content -LiteralPath (Join-Path $toolsDir 'codex.cmd') -Encoding ascii -Value "@echo off`r`necho cmd"
+
+        $originalPath = $env:PATH
+        try {
+            $env:PATH = "$toolsDir;$originalPath"
+
+            $resolved = Resolve-AiAgentInvocationFilePath -FilePath 'codex'
+
+            $resolved | Should -Be (Join-Path $toolsDir 'codex.cmd')
+        }
+        finally {
+            $env:PATH = $originalPath
+        }
+    }
+
+    It 'returns native exit codes without adding stdout to the function result' {
+        $pwshPath = (Get-Command pwsh -ErrorAction Stop).Source
+
+        $exitCode = Invoke-AiAgentNativeCommand -FilePath $pwshPath -ArgumentList @(
+            '-NoProfile',
+            '-Command',
+            "Write-Output 'native output'; exit 7"
+        ) 6>$null
+
+        $exitCode | Should -Be 7
+    }
+
+    It 'writes native stdin when input text is provided' {
+        $pwshPath = (Get-Command pwsh -ErrorAction Stop).Source
+        $inputText = "第一行`n第二行"
+
+        $exitCode = Invoke-AiAgentNativeCommand -FilePath $pwshPath -ArgumentList @(
+            '-NoProfile',
+            '-Command',
+            '$text = [Console]::In.ReadToEnd(); if ($text -match "第一行" -and $text -match "第二行") { exit 0 } else { exit 9 }'
+        ) -InputText $inputText 6>$null
+
+        $exitCode | Should -Be 0
+    }
 }
 
 Describe 'AI agent runner prompt and config' {
@@ -194,7 +240,7 @@ Describe 'AI agent runner public script' {
         $LASTEXITCODE | Should -Be 0
         ($output -join "`n") | Should -Match 'codex exec'
         ($output -join "`n") | Should -Match 'model_reasoning_effort="high"'
-        ($output -join "`n") | Should -Match '<PROMPT>'
+        ($output -join "`n") | Should -Match '<PROMPT_STDIN>'
         ($output -join "`n") | Should -Not -Match '检查当前 Git 变更'
     }
 
@@ -212,7 +258,7 @@ Describe 'AI agent runner public script' {
         $appendChars = [int]([regex]::Match($appendText, 'PromptChars=(\d+)').Groups[1].Value)
 
         $appendChars | Should -BeGreaterThan $baseChars
-        $appendText | Should -Match '<PROMPT>'
+        $appendText | Should -Match '<PROMPT_STDIN>'
         $appendText | Should -Not -Match '只提交暂存区'
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -354,9 +354,11 @@ catch {`
`354`	`354`	`Write-Warning "同步脚本失败: $($_.Exception.Message)"`
`355`	`355`	`}`
`356`	`356`
`357`		`-# 3. 构建 Bash 脚本工具集`
`358`		`-if (-not (Install-BashScripts -RootPath $ProjectRoot)) {`
`359`		`- exit 1`
	`357`	`+if (-not $IsWindows) {`
	`358`	`+ # 3. 构建 Bash 脚本工具集`
	`359`	`+ if (-not (Install-BashScripts -RootPath $ProjectRoot)) {`
	`360`	`+ exit 1`
	`361`	`+ }`
`360`	`362`	`}`
`361`	`363`
`362`	`364`	`# 4. 安装 Node.js 脚本 (跨平台)`