257b6cf951
Oracle flagged the previous commit: "omo-agents" was a shared constant, so when two plugin instances ran in the same tmux server they wrote into the same session. One instance's cleanup would then kill-session on the shared name and tear down the other instance's live attached panes. Replace the const ISOLATED_SESSION_NAME with getIsolatedSessionName(pid) which defaults to process.pid, so every opencode process owns its own "omo-agents-<pid>" session. spawnTmuxSession and cleanup both resolve the name through this helper. Discovery is straightforward from the host tmux via 'tmux list-sessions | grep omo-agents-'. Manager test covers two concurrent managers and asserts each kills a per-pid session name, proving they no longer collide on a global name.
151 lines
4.3 KiB
TypeScript
151 lines
4.3 KiB
TypeScript
import { spawn } from "bun"
|
|
import type { TmuxConfig } from "../../../config/schema"
|
|
import { getTmuxPath } from "../../../tools/interactive-bash/tmux-path-resolver"
|
|
import type { SpawnPaneResult } from "../types"
|
|
import { isInsideTmux } from "./environment"
|
|
import { isServerRunning } from "./server-health"
|
|
import { shellEscapeForDoubleQuotedCommand } from "../../shell-env"
|
|
|
|
const ISOLATED_SESSION_NAME_PREFIX = "omo-agents"
|
|
|
|
export function getIsolatedSessionName(pid: number = process.pid): string {
|
|
return `${ISOLATED_SESSION_NAME_PREFIX}-${pid}`
|
|
}
|
|
|
|
async function getWindowDimensions(
|
|
tmux: string,
|
|
sourcePaneId: string,
|
|
): Promise<{ width: number; height: number } | null> {
|
|
const proc = spawn(
|
|
[tmux, "display", "-p", "-t", sourcePaneId, "#{window_width},#{window_height}"],
|
|
{ stdout: "pipe", stderr: "pipe" },
|
|
)
|
|
const exitCode = await proc.exited
|
|
const stdout = await new Response(proc.stdout).text()
|
|
|
|
if (exitCode !== 0) return null
|
|
|
|
const [width, height] = stdout.trim().split(",").map(Number)
|
|
if (Number.isNaN(width) || Number.isNaN(height)) return null
|
|
|
|
return { width, height }
|
|
}
|
|
|
|
async function sessionExists(tmux: string, sessionName: string): Promise<boolean> {
|
|
const proc = spawn([tmux, "has-session", "-t", sessionName], {
|
|
stdout: "ignore",
|
|
stderr: "ignore",
|
|
})
|
|
return (await proc.exited) === 0
|
|
}
|
|
|
|
export async function spawnTmuxSession(
|
|
sessionId: string,
|
|
description: string,
|
|
config: TmuxConfig,
|
|
serverUrl: string,
|
|
sourcePaneId?: string,
|
|
): Promise<SpawnPaneResult> {
|
|
const { log } = await import("../../logger")
|
|
|
|
log("[spawnTmuxSession] called", {
|
|
sessionId,
|
|
description,
|
|
serverUrl,
|
|
configEnabled: config.enabled,
|
|
})
|
|
|
|
if (!config.enabled) {
|
|
log("[spawnTmuxSession] SKIP: config.enabled is false")
|
|
return { success: false }
|
|
}
|
|
if (!isInsideTmux()) {
|
|
log("[spawnTmuxSession] SKIP: not inside tmux", { TMUX: process.env.TMUX })
|
|
return { success: false }
|
|
}
|
|
|
|
const serverRunning = await isServerRunning(serverUrl)
|
|
if (!serverRunning) {
|
|
log("[spawnTmuxSession] SKIP: server not running", { serverUrl })
|
|
return { success: false }
|
|
}
|
|
|
|
const tmux = await getTmuxPath()
|
|
if (!tmux) {
|
|
log("[spawnTmuxSession] SKIP: tmux not found")
|
|
return { success: false }
|
|
}
|
|
|
|
log("[spawnTmuxSession] all checks passed, creating isolated session...")
|
|
|
|
const shell = process.env.SHELL || "/bin/sh"
|
|
const escapedUrl = shellEscapeForDoubleQuotedCommand(serverUrl)
|
|
const escapedSessionId = shellEscapeForDoubleQuotedCommand(sessionId)
|
|
const opencodeCmd = `${shell} -c "opencode attach ${escapedUrl} --session ${escapedSessionId}"`
|
|
|
|
const sizeArgs: string[] = []
|
|
if (sourcePaneId) {
|
|
const dims = await getWindowDimensions(tmux, sourcePaneId)
|
|
if (dims) {
|
|
sizeArgs.push("-x", String(dims.width), "-y", String(dims.height))
|
|
}
|
|
}
|
|
|
|
const isolatedSessionName = getIsolatedSessionName()
|
|
const sessionAlreadyExists = await sessionExists(tmux, isolatedSessionName)
|
|
|
|
const args = sessionAlreadyExists
|
|
? [
|
|
"new-window",
|
|
"-t", isolatedSessionName,
|
|
"-P",
|
|
"-F", "#{pane_id}",
|
|
opencodeCmd,
|
|
]
|
|
: [
|
|
"new-session",
|
|
"-d",
|
|
"-s", isolatedSessionName,
|
|
...sizeArgs,
|
|
"-P",
|
|
"-F", "#{pane_id}",
|
|
opencodeCmd,
|
|
]
|
|
|
|
log("[spawnTmuxSession] spawning", {
|
|
mode: sessionAlreadyExists ? "new-window" : "new-session",
|
|
sessionName: isolatedSessionName,
|
|
})
|
|
|
|
const proc = spawn([tmux, ...args], { stdout: "pipe", stderr: "pipe" })
|
|
const exitCode = await proc.exited
|
|
const stdout = await new Response(proc.stdout).text()
|
|
const paneId = stdout.trim()
|
|
|
|
if (exitCode !== 0 || !paneId) {
|
|
const stderr = await new Response(proc.stderr).text()
|
|
log("[spawnTmuxSession] FAILED", { exitCode, stderr: stderr.trim() })
|
|
return { success: false }
|
|
}
|
|
|
|
const title = `omo-subagent-${description.slice(0, 20)}`
|
|
const titleProc = spawn([tmux, "select-pane", "-t", paneId, "-T", title], {
|
|
stdout: "ignore",
|
|
stderr: "pipe",
|
|
})
|
|
const stderrPromise = new Response(titleProc.stderr).text().catch(() => "")
|
|
const titleExitCode = await titleProc.exited
|
|
if (titleExitCode !== 0) {
|
|
const titleStderr = await stderrPromise
|
|
log("[spawnTmuxSession] WARNING: failed to set pane title", {
|
|
paneId,
|
|
title,
|
|
exitCode: titleExitCode,
|
|
stderr: titleStderr.trim(),
|
|
})
|
|
}
|
|
|
|
log("[spawnTmuxSession] SUCCESS", { paneId, sessionName: isolatedSessionName })
|
|
return { success: true, paneId }
|
|
}
|