YeonGyu-Kim
13e1d7cbd7
The shellType was hardcoded to 'unix' which breaks on native Windows shells (cmd.exe, PowerShell) when running without Git Bash or WSL. This change uses the existing detectShellType() function to dynamically determine the correct shell type, enabling proper env var syntax for all supported shell environments.
69 lines
2.5 KiB
TypeScript
69 lines
2.5 KiB
TypeScript
import type { PluginInput } from "@opencode-ai/plugin"
|
|
import { HOOK_NAME, NON_INTERACTIVE_ENV, SHELL_COMMAND_PATTERNS } from "./constants"
|
|
import { log, buildEnvPrefix, detectShellType } from "../../shared"
|
|
|
|
export * from "./constants"
|
|
export * from "./detector"
|
|
export * from "./types"
|
|
|
|
const BANNED_COMMAND_PATTERNS = SHELL_COMMAND_PATTERNS.banned
|
|
.filter((cmd) => !cmd.includes("("))
|
|
.map((cmd) => new RegExp(`\\b${cmd}\\b`))
|
|
|
|
function detectBannedCommand(command: string): string | undefined {
|
|
for (let i = 0; i < BANNED_COMMAND_PATTERNS.length; i++) {
|
|
if (BANNED_COMMAND_PATTERNS[i].test(command)) {
|
|
return SHELL_COMMAND_PATTERNS.banned[i]
|
|
}
|
|
}
|
|
return undefined
|
|
}
|
|
|
|
export function createNonInteractiveEnvHook(_ctx: PluginInput) {
|
|
return {
|
|
"tool.execute.before": async (
|
|
input: { tool: string; sessionID: string; callID: string },
|
|
output: { args: Record<string, unknown>; message?: string }
|
|
): Promise<void> => {
|
|
if (input.tool.toLowerCase() !== "bash") {
|
|
return
|
|
}
|
|
|
|
const command = output.args.command as string | undefined
|
|
if (!command) {
|
|
return
|
|
}
|
|
|
|
const bannedCmd = detectBannedCommand(command)
|
|
if (bannedCmd) {
|
|
output.message = `Warning: '${bannedCmd}' is an interactive command that may hang in non-interactive environments.`
|
|
}
|
|
|
|
// Only prepend env vars for git commands (editor blocking, pager, etc.)
|
|
const isGitCommand = /\bgit\b/.test(command)
|
|
if (!isGitCommand) {
|
|
return
|
|
}
|
|
|
|
// NOTE: We intentionally removed the isNonInteractive() check here.
|
|
// Even when OpenCode runs in a TTY, the agent cannot interact with
|
|
// spawned bash processes. Git commands like `git rebase --continue`
|
|
// would open editors (vim/nvim) that hang forever.
|
|
// The env vars (GIT_EDITOR=:, EDITOR=:, etc.) must ALWAYS be injected
|
|
// for git commands to prevent interactive prompts.
|
|
|
|
// Detect the shell type dynamically to support native Windows shells
|
|
// (cmd.exe, PowerShell) in addition to Unix-like shells (bash, zsh).
|
|
// Fixes Windows compatibility issues when running without Git Bash/WSL.
|
|
const shellType = detectShellType()
|
|
const envPrefix = buildEnvPrefix(NON_INTERACTIVE_ENV, shellType)
|
|
output.args.command = `${envPrefix} ${command}`
|
|
|
|
log(`[${HOOK_NAME}] Prepended non-interactive env vars to git command`, {
|
|
sessionID: input.sessionID,
|
|
envPrefix,
|
|
})
|
|
},
|
|
}
|
|
}
|