119e18c810
- Extract atlas/ into 15 focused modules (hook, event handler, tool policies, types, etc.) - Split auto-update-checker into checker/ and hook/ subdirectories with single-purpose files - Decompose session-recovery into separate recovery strategy files per error type - Extract todo-continuation-enforcer from monolith to directory with dedicated modules - Split background-task/tools.ts into individual tool creator files - Extract command-executor, tmux-utils into focused sub-modules - Split config/schema.ts into domain-specific schema files - Decompose cli/config-manager.ts into focused modules - Rollback skill-mcp-manager, model-availability, index.ts splits that broke tests - Fix all import path depths for moved files (../../ -> ../../../) - Add explicit type annotations to resolve TS7006 implicit any errors Typecheck: 0 errors Tests: 2359 pass, 5 fail (all pre-existing)
67 lines
2.3 KiB
TypeScript
67 lines
2.3 KiB
TypeScript
import type { PluginInput } from "@opencode-ai/plugin"
|
|
import { HOOK_NAME, NON_INTERACTIVE_ENV, SHELL_COMMAND_PATTERNS } from "./constants"
|
|
import { log, buildEnvPrefix } from "../../shared"
|
|
|
|
export * from "./constants"
|
|
export * from "./detector"
|
|
export * from "./types"
|
|
|
|
const BANNED_COMMAND_PATTERNS = SHELL_COMMAND_PATTERNS.banned
|
|
.filter((command) => !command.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.
|
|
|
|
// The bash tool always runs in a Unix-like shell (bash/sh), even on Windows
|
|
// (via Git Bash, WSL, etc.), so always use unix export syntax.
|
|
const envPrefix = buildEnvPrefix(NON_INTERACTIVE_ENV, "unix")
|
|
output.args.command = `${envPrefix} ${command}`
|
|
|
|
log(`[${HOOK_NAME}] Prepended non-interactive env vars to git command`, {
|
|
sessionID: input.sessionID,
|
|
envPrefix,
|
|
})
|
|
},
|
|
}
|
|
}
|