refactor(non-interactive-env): use args.env instead of command prepending

🤖 GENERATED WITH ASSISTANCE OF [OhMyOpenCode](https://github.com/code-yeongyu/oh-my-opencode)
This commit is contained in:
YeonGyu-Kim
2025-12-15 08:54:33 +09:00
parent 08481c046f
commit 7fd52e27ce
2 changed files with 7 additions and 15 deletions

View File

@@ -1,7 +1,5 @@
export const HOOK_NAME = "non-interactive-env"
export const NULL_DEVICE = process.platform === "win32" ? "NUL" : "/dev/null"
export const NON_INTERACTIVE_ENV: Record<string, string> = {
CI: "true",
DEBIAN_FRONTEND: "noninteractive",

View File

@@ -1,18 +1,10 @@
import type { PluginInput } from "@opencode-ai/plugin"
import { HOOK_NAME, NULL_DEVICE, NON_INTERACTIVE_ENV } from "./constants"
import { HOOK_NAME, NON_INTERACTIVE_ENV } from "./constants"
import { log } from "../../shared"
export * from "./constants"
export * from "./types"
function wrapWithNonInteractiveEnv(command: string): string {
const envPrefix = Object.entries(NON_INTERACTIVE_ENV)
.map(([key, value]) => `${key}=${value}`)
.join(" ")
return `${envPrefix} ${command} < ${NULL_DEVICE} 2>&1 || ${envPrefix} ${command} 2>&1`
}
export function createNonInteractiveEnvHook(_ctx: PluginInput) {
return {
"tool.execute.before": async (
@@ -28,12 +20,14 @@ export function createNonInteractiveEnvHook(_ctx: PluginInput) {
return
}
output.args.command = wrapWithNonInteractiveEnv(command)
output.args.env = {
...(output.args.env as Record<string, string> | undefined),
...NON_INTERACTIVE_ENV,
}
log(`[${HOOK_NAME}] Wrapped command with non-interactive environment`, {
log(`[${HOOK_NAME}] Set non-interactive environment variables`, {
sessionID: input.sessionID,
original: command,
wrapped: output.args.command,
env: NON_INTERACTIVE_ENV,
})
},
}