opencode-mux 1.2.0 → 1.3.0

package/README.md

@@ -9,7 +9,7 @@ matter what your tmux is configured to look like.
 
 When a session running inside opencode-mux spawns a subagent, a new tmux pane
 opens showing that session live. When the subagent finishes, the pane closes
-itself. The subagent panes use opencode's `mini` frontend by default (configurable via `--pane-command` or `pane_command` in the config file) — no tab bar, no agent switcher.
+itself and the remaining subagent panes re-tile to share the space evenly. The subagent panes use opencode's `mini` frontend by default (configurable via `--pane-command` or `pane_command` in the config file) — no tab bar, no agent switcher.
 
 ```
 ┌──────────────────────────────────────────┬──────────────┐
@@ -27,6 +27,8 @@ itself. The subagent panes use opencode's `mini` frontend by default (configurab
   your `~/.tmux.conf`, `~/.config/opencode/cli.json`, or `tui.json`.
 - **Coherent look** — pane borders are styled to match your active opencode
   theme, and the session opts are scoped to the mux session only.
+- **Concurrent instances** — one mux per project, each with its own tmux
+  session and its own subagent panes.
 
 ## Requirements
 
@@ -48,7 +50,7 @@ To use it as your default `opencode`:
 alias opencode="opencode-mux"
 ```
 
-(binaries are `opencode-mux`, version `1.2.0`)
+(binaries are `opencode-mux`, version `1.3.0`)
 
 ## Usage
 
@@ -71,6 +73,9 @@ opencode-mux --layout tiled --model fast
 # Running inside an existing tmux session also works — subagent panes are
 # opened in the session you're already in, and already-running subagents are
 # adopted without a startup flash.
+
+# A second instance (another project, another terminal) is fine: it gets its
+# own tmux session and only panes that project's subagents.
 ```
 
 ### Mux options
@@ -84,7 +89,7 @@ opencode-mux --layout tiled --model fast
 | `--pane-command <cmd>` | Subagent pane frontend: `mini` (minimal UI) or `tui` (full TUI) | `mini` |
 | `--grace <seconds>` | Delay before a finished subagent's pane closes | `1` |
 | `--parent <id>` | Only spawn panes for children of this session | inferred from `-s`/`--session` |
-| `--session-name <name>` | Owned tmux session name (when starting outside tmux) | `mux` |
+| `--session-name <name>` | Base name for this instance's tmux session (suffixed when the name is taken) | `mux` |
 | `-h`, `--help` | Show help | |
 | `--version` | Print the version | |
 
@@ -114,14 +119,52 @@ Precedence: **CLI flags > config file > defaults**.
 
 - **Outside tmux**: opencode-mux creates a detached tmux session named
   `mux` (or `--session-name`), applies session-scoped `status off` and
-  `mouse on`, re-executes itself inside, and attaches. When the main TUI
-  exits, the owned session is cleaned up.
+  `mouse on`, re-executes itself inside, and attaches. Nothing kills that
+  session: it ends when its TUI pane exits, so detaching (`prefix+d`) keeps it
+  running for reattach, and any window you open inside it survives. Ownership
+  is never passed through tmux session environment, so a nested launch (a
+  shell tool, a second window in that session) can never tear its host down.
+  Session options and attach target the session id tmux printed at creation
+  (`new-session -P -F '#{session_id}'`, validated as `$N`), so a stale name can
+  never match another instance's session. When tmux prints no usable id, the
+  fallback targets the bare session name for `set-option` (the only form it
+  resolves) and `=name` for attach; appearance failures stay non-fatal.
 - **Inside tmux**: the wrapper runs as a watcher. It connects to the opencode
   server (same background service you're already using), listens for
   subagent-session events, opens a pane per child session via
   `opencode mini -s <id>`, styles the pane borders to match the active
   opencode theme, and closes panes once their session finishes (after the
-  grace period).
+  grace period). If the opencode daemon restarts, the watcher resubscribes
+  after about a second and re-adopts the subagents that are still running.
+  Every pane split and every pane close re-applies the configured layout, so
+  the main pane keeps its configured size and the subagent panes always split
+  the remaining space evenly.
+
+### Several instances at once
+
+Each instance owns its tmux session, so you can run one per project
+concurrently — in different terminals, all sharing the same opencode
+background service:
+
+- **Own session per instance.** Outside tmux the wrapper takes the configured
+  base name (`mux`) when it is free. If another instance (or a leftover)
+  already owns it, the next name is used and reported:
+  `mux-<project>`, then `mux-<project>-2`, and so on. A session is never
+  shared between instances, and nothing ever kills one: it ends when its own
+  TUI pane exits, so a detached session keeps running for reattach.
+- **Own panes per instance.** Without an explicit `--parent`/`-s`, a watcher
+  only panes subagents whose parent session belongs to *its* directory (the
+  cwd, or an explicit opencode `<directory>` argument). Two instances on
+  different projects therefore never mirror each other's subagents. Inside
+  one project, pin the parent with `--parent <session-id>` when you run two
+  instances side by side. A `-s` value that is not a session id is reported
+  rather than silently widening the scope.
+- **Own window per instance.** Each instance tags the panes it creates
+  (pane-scoped `@mux-instance`) and re-tiles only windows it has to itself.
+  Running two instances inside one window is not a supported layout — the
+  panes and the layout belong to the window, not to an instance — but it
+  degrades predictably instead of oscillating: the first instance keeps the
+  geometry, and a second instance never clears window-scoped border styles.
 
 ## Features
 
@@ -147,14 +190,17 @@ configured their setup to look like:
 - A `system` theme or an unknown/unresolvable theme results in **no border
   styling** — never wrong colors.
 - Config changes are re-applied live (checked on the watcher tick), and
-  borders are cleared when the theme becomes unresolvable. Zero tmux calls
-  while nothing changed.
+  borders are cleared when the theme becomes unresolvable — unless another
+  instance shares the window, in which case the clear is skipped and retried
+  on the next pane open/close instead. Zero tmux calls while nothing changed.
 
 ### Never touches your setup
 
 All tmux writes are runtime-scoped: window options are applied with `-w`
-(pane-border colors) and session options with `-t <session>` (status/mouse).
-No `-g`, no writes to `~/.tmux.conf`, no changes to your opencode configs.
+(pane-border colors), session options with `-t <session>` (status/mouse), and
+every pane this instance creates is tagged with a pane-scoped `@mux-instance`
+option, so a second instance can tell the window is shared. No `-g`, no writes
+to `~/.tmux.conf`, no changes to your opencode configs.
 
 ## Requirements & compatibility
 

package/dist/args.d.ts

@@ -5,6 +5,8 @@ export interface ParsedArgs {
     help: boolean;
     version: boolean;
     watch: boolean;
+    /** Internal `--mux-scope` paths forwarded to the watcher (project scoping). */
+    scope: string[];
     passThrough: string[];
 }
 export declare function parseArgs(argv: string[]): ParsedArgs;

package/dist/args.js

@@ -2,7 +2,7 @@ const LAYOUTS = new Set(["main-vertical", "main-horizontal", "tiled", "even-hori
 const CLOSE_MODES = new Set(["auto", "keep"]);
 const PANE_COMMANDS = new Set(["mini", "tui"]);
 export function parseArgs(argv) {
-    const out = { flags: {}, help: false, version: false, watch: false, passThrough: [] };
+    const out = { flags: {}, help: false, version: false, watch: false, scope: [], passThrough: [] };
     for (let i = 0; i < argv.length; i++) {
         const arg = argv[i];
         if (arg === "--mux-watch") {
@@ -94,6 +94,16 @@ export function parseArgs(argv) {
                 out.flags.sessionName = v;
                 break;
             }
+            case "--mux-scope": {
+                // Internal: the launcher forwards the directories this instance may be
+                // showing (cwd + an explicit opencode <directory> argument) to the
+                // watcher child, which no longer sees the pass-through args.
+                const v = value();
+                if (v === null || v === "")
+                    throw new Error("opencode-mux: --mux-scope requires a path");
+                out.scope.push(v);
+                break;
+            }
             default:
                 if (name.startsWith("--mux-")) {
                     throw new Error(`opencode-mux: unknown flag ${name}`);

package/dist/args.js.map

@@ -1 +1 @@
-{"version":3,"file":"args.js","sourceRoot":"","sources":["../src/args.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"args.js","sourceRoot":"","sources":["../src/args.ts"],"names":[],"mappings":"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"}

package/dist/cli.d.ts

@@ -43,16 +43,67 @@ export declare function parseMajorVersion(version: string): number | null;
  * Returns null for unsupported or unparseable versions.
  */
 export declare function serviceGeneration(version: string): ServiceGeneration | null;
+/** Project tag for auto-named sessions: tmux rejects spaces, dots and colons. */
+export declare function sessionNameSuffix(cwd: string): string;
+/**
+ * tmux session names for successive attempts: the configured base name first,
+ * then "<base>-<project>", then "<base>-<project>-2, -3, …".
+ *
+ * Later attempts only matter when the earlier names are taken — by another
+ * opencode-mux instance running concurrently, or by a session left over from a
+ * crash. Colliding instead of sharing is deliberate: two TUIs must not share
+ * one window, and each instance's session is independent — nothing kills it,
+ * it simply ends when its own TUI pane exits (AGENTS.md invariant 7).
+ */
+export declare function sessionNameCandidate(base: string, cwd: string, attempt: number): string;
+/** True when tmux refused `new-session` because the session name is taken. */
+export declare function isSessionNameTaken(result: SpawnResult): boolean;
+/**
+ * Directories this instance may be showing: its working directory plus at most
+ * one explicit opencode `<directory>` argument from the pass-through args
+ * (opencode chdirs there, so its sessions belong to that directory, not our
+ * cwd). Used to keep concurrent instances' subagents in their own windows.
+ *
+ * Only a *positional* argument counts as that directory: it must not start
+ * with "-" **and** its predecessor must not be a flag token. We cannot know
+ * which opencode flags take a value, so `--some-opt /tmp/other /real/project`
+ * must treat `/tmp/other` as that flag's value (treating it as the directory
+ * would silently scope the watcher to a foreign project — hiding our own
+ * subagents *and* paning theirs). opencode's `<directory>` is documented as a
+ * positional argument; if it could legitimately follow a flag, that flag would
+ * need an explicit rule here rather than widening this one.
+ *
+ * Only the *first* accepted directory is kept: any other positional is far
+ * more likely to be a prompt that happens to name a path, and adding it would
+ * widen the watcher's scope again.
+ */
+export declare function scopeDirectories(passThrough: string[], cwd: string): string[];
 /** Re-emits resolved CLI flags as mux argv (for the watcher child process). */
 export declare function flagsToArgv(flags: CliFlags): string[];
 /** argv for the spawned watcher process: marker + config path + explicit flags. */
 export declare function buildWatcherArgv(opts: {
     configPath?: string;
     flags: CliFlags;
+    scope?: string[];
 }): string[];
 /** argv the re-exec'd instance runs inside the fresh tmux session. */
 export declare function buildReexecArgv(entryPath: string, originalArgv: string[]): string[];
-/** tmux new-session argv that boots the detached session and its command. */
+/**
+ * tmux new-session argv that boots the detached session and its command.
+ *
+ * `-P -F '#{session_id}'` makes tmux print the new session's id (`$0`, …), which
+ * the caller uses as an exact `-t` target: a bare session *name* would
+ * prefix-match a sibling instance's session if ours disappeared in the
+ * meantime, and tmux session ids are exact by construction.
+ *
+ * Ownership is deliberately NOT propagated through the tmux session
+ * environment: `-e` would leak into every process in the session (and into any
+ * nested opencode-mux run), which would then kill the host session on exit.
+ * There is no ownership marker at all: the session owns itself and ends when
+ * its TUI pane exits, so no session is ever killed explicitly (AGENTS.md
+ * invariant 7 — a kill would also destroy user windows and can resolve to the
+ * wrong session).
+ */
 export declare function buildNewSessionCommand(input: {
     entryPath: string;
     originalArgv: string[];

package/dist/cli.js

@@ -1,7 +1,7 @@
 import { spawn } from "node:child_process";
-import { appendFileSync, closeSync, mkdirSync, openSync } from "node:fs";
+import { appendFileSync, closeSync, mkdirSync, openSync, statSync } from "node:fs";
 import { homedir } from "node:os";
-import { dirname, join } from "node:path";
+import { basename, dirname, join, resolve } from "node:path";
 import { parentFromPassThrough, parseArgs } from "./args.js";
 import { loadConfig } from "./config.js";
 import { nodeExec } from "./exec.js";
@@ -95,7 +95,8 @@ export function usageText() {
         "  --pane-command <cmd>  pane frontend: mini | tui (default mini)",
         "  --grace <seconds>     close delay after a session finishes (default 1)",
         "  --parent <id>         only watch children of this session",
-        "  --session-name <name> tmux session name (default mux)",
+        "  --session-name <name> base name for the owned tmux session (default mux;",
+        "                        suffixed with the project when already taken)",
         "  -h, --help            show this help and exit",
         "  --version             print the version and exit",
         "",
@@ -129,6 +130,94 @@ export function serviceGeneration(version) {
     const minor = Number(match[2]);
     return minor === 0 && Number(match[3]) < 6 ? "legacy" : "new";
 }
+/** tmux session name candidates tried before giving up (concurrent instances). */
+const MAX_SESSION_NAME_ATTEMPTS = 20;
+/** Project tag for auto-named sessions: tmux rejects spaces, dots and colons. */
+export function sessionNameSuffix(cwd) {
+    const cleaned = basename(cwd)
+        .replace(/[^A-Za-z0-9_-]+/g, "-")
+        .replace(/^-+|-+$/g, "")
+        .slice(0, 24);
+    return cleaned === "" ? "session" : cleaned;
+}
+/**
+ * tmux session names for successive attempts: the configured base name first,
+ * then "<base>-<project>", then "<base>-<project>-2, -3, …".
+ *
+ * Later attempts only matter when the earlier names are taken — by another
+ * opencode-mux instance running concurrently, or by a session left over from a
+ * crash. Colliding instead of sharing is deliberate: two TUIs must not share
+ * one window, and each instance's session is independent — nothing kills it,
+ * it simply ends when its own TUI pane exits (AGENTS.md invariant 7).
+ */
+export function sessionNameCandidate(base, cwd, attempt) {
+    if (attempt <= 0)
+        return base;
+    const tagged = `${base}-${sessionNameSuffix(cwd)}`;
+    return attempt === 1 ? tagged : `${tagged}-${attempt}`;
+}
+/** True when tmux refused `new-session` because the session name is taken. */
+export function isSessionNameTaken(result) {
+    return /duplicate session|already exists/i.test(`${result.stderr}\n${result.error ?? ""}`);
+}
+/** A tmux session id as printed by `-P -F '#{session_id}'` (`$0`, `$12`, …). */
+const SESSION_ID_PATTERN = /^\$\d+$/;
+/**
+ * The session id tmux printed at creation, or null when stdout is not exactly
+ * an id. Only trailing whitespace is ignored: leading junk, extra lines or
+ * extra text mean the format was not what we asked for, and proximity matters
+ * (a stray `$3` inside noise is not trustworthy). Measured on tmux 3.8 with an
+ * isolated server: an unsupported -F format prints *empty* stdout with rc 0,
+ * so both "no output" and "junk output" are reachable with a successful
+ * new-session.
+ */
+function printedSessionId(stdout) {
+    const printed = stdout.trimEnd();
+    return SESSION_ID_PATTERN.test(printed) ? printed : null;
+}
+/**
+ * Directories this instance may be showing: its working directory plus at most
+ * one explicit opencode `<directory>` argument from the pass-through args
+ * (opencode chdirs there, so its sessions belong to that directory, not our
+ * cwd). Used to keep concurrent instances' subagents in their own windows.
+ *
+ * Only a *positional* argument counts as that directory: it must not start
+ * with "-" **and** its predecessor must not be a flag token. We cannot know
+ * which opencode flags take a value, so `--some-opt /tmp/other /real/project`
+ * must treat `/tmp/other` as that flag's value (treating it as the directory
+ * would silently scope the watcher to a foreign project — hiding our own
+ * subagents *and* paning theirs). opencode's `<directory>` is documented as a
+ * positional argument; if it could legitimately follow a flag, that flag would
+ * need an explicit rule here rather than widening this one.
+ *
+ * Only the *first* accepted directory is kept: any other positional is far
+ * more likely to be a prompt that happens to name a path, and adding it would
+ * widen the watcher's scope again.
+ */
+export function scopeDirectories(passThrough, cwd) {
+    const dirs = [cwd];
+    for (let i = 0; i < passThrough.length; i++) {
+        const arg = passThrough[i];
+        if (arg.startsWith("-"))
+            continue;
+        // A token after a flag token may be that flag's value, never a positional.
+        const previous = passThrough[i - 1];
+        if (previous !== undefined && previous.startsWith("-"))
+            continue;
+        try {
+            if (!statSync(arg).isDirectory())
+                continue;
+            const dir = resolve(cwd, arg);
+            if (!dirs.includes(dir))
+                dirs.push(dir);
+            break;
+        }
+        catch {
+            // not an existing path (a prompt, a value, …)
+        }
+    }
+    return dirs;
+}
 /** Re-emits resolved CLI flags as mux argv (for the watcher child process). */
 export function flagsToArgv(flags) {
     const argv = [];
@@ -154,19 +243,36 @@ export function buildWatcherArgv(opts) {
         "--mux-watch",
         ...(opts.configPath !== undefined ? ["--config", opts.configPath] : []),
         ...flagsToArgv(opts.flags),
+        ...(opts.scope ?? []).flatMap((dir) => ["--mux-scope", dir]),
     ];
 }
 /** argv the re-exec'd instance runs inside the fresh tmux session. */
 export function buildReexecArgv(entryPath, originalArgv) {
     return [entryPath, ...originalArgv];
 }
-/** tmux new-session argv that boots the detached session and its command. */
+/**
+ * tmux new-session argv that boots the detached session and its command.
+ *
+ * `-P -F '#{session_id}'` makes tmux print the new session's id (`$0`, …), which
+ * the caller uses as an exact `-t` target: a bare session *name* would
+ * prefix-match a sibling instance's session if ours disappeared in the
+ * meantime, and tmux session ids are exact by construction.
+ *
+ * Ownership is deliberately NOT propagated through the tmux session
+ * environment: `-e` would leak into every process in the session (and into any
+ * nested opencode-mux run), which would then kill the host session on exit.
+ * There is no ownership marker at all: the session owns itself and ends when
+ * its TUI pane exits, so no session is ever killed explicitly (AGENTS.md
+ * invariant 7 — a kill would also destroy user windows and can resolve to the
+ * wrong session).
+ */
 export function buildNewSessionCommand(input) {
     return [
         "new-session",
         "-d",
-        "-e",
-        "MUX_OWNED_SESSION=1",
+        "-P",
+        "-F",
+        "#{session_id}",
         "-s",
         input.sessionName,
         "-c",
@@ -174,11 +280,35 @@ export function buildNewSessionCommand(input) {
         ...buildReexecArgv(input.entryPath, input.originalArgv).map(shellQuote),
     ];
 }
+/** First `-s`/`--session`/`--session=<v>` value in the pass-through args, else null. */
+function sessionPinValue(passThrough) {
+    for (let i = 0; i < passThrough.length; i++) {
+        const arg = passThrough[i];
+        if (arg === "-s" || arg === "--session") {
+            const next = passThrough[i + 1];
+            if (next !== undefined && !next.startsWith("-"))
+                return next;
+        }
+        if (arg.startsWith("--session="))
+            return arg.slice("--session=".length);
+    }
+    return null;
+}
 async function resolveConfig(parsed, env) {
     if (parsed.flags.parent === undefined) {
         const inferred = parentFromPassThrough(parsed.passThrough);
-        if (inferred !== null)
+        if (inferred !== null) {
             parsed.flags.parent = inferred;
+        }
+        else {
+            // Without a usable parent the instance watches the whole project. Say so
+            // instead of silently widening: a typo'd session id looks like "it just
+            // watches everything". Never fatal, never changes the exit code.
+            const ignored = sessionPinValue(parsed.passThrough);
+            if (ignored !== null && ignored !== "") {
+                process.stderr.write(`opencode-mux: ignoring -s value "${ignored}": not an opencode session id (watching this project instead)\n`);
+            }
+        }
     }
     return loadConfig({ path: parsed.configPath, flags: parsed.flags, env });
 }
@@ -193,7 +323,8 @@ async function runWatch(parsed, env, deps, generation) {
     mkdirSync(dirname(logFile), { recursive: true });
     const append = (line) => {
         try {
-            appendFileSync(logFile, `[${new Date().toISOString()}] ${line}\n`);
+            // Instances share one log file: pid + timestamp make every line attributable.
+            appendFileSync(logFile, `[${new Date().toISOString()}] [${process.pid}] ${line}\n`);
         }
         catch {
             // log failures are non-fatal
@@ -211,6 +342,13 @@ async function runWatch(parsed, env, deps, generation) {
         mainPaneSize: config.mainPaneSize,
         themeStyles: createThemeStyles({ env, cwd: deps.cwd ?? process.cwd() }),
         parentID: config.parent,
+        // Without an explicit parent we watch every child session; scope that to
+        // this instance's project so concurrent instances do not pane each other's
+        // subagents. The cwd is the watcher's own; extra directories (an explicit
+        // opencode <directory>) arrive via the internal --mux-scope flags.
+        projectDirectories: config.parent === null
+            ? [...new Set([deps.cwd ?? process.cwd(), ...parsed.scope])]
+            : undefined,
         paneArgv: (id) => defaultPaneArgv(id, config.paneCommand),
         tickEveryMs: 500,
     });
@@ -266,38 +404,102 @@ export async function main(argv, deps) {
     const config = await resolveConfig(parsed, env);
     const insideTmux = env.TMUX !== undefined && env.TMUX !== "" && env.TMUX_PANE !== undefined && env.TMUX_PANE !== "";
     if (!insideTmux) {
-        const created = await deps
-            .spawn(tmuxCommand, buildNewSessionCommand({
-            entryPath: deps.entryPath,
-            originalArgv: argv,
-            sessionName: config.sessionName,
-            cwd: deps.cwd ?? process.cwd(),
-        }))
-            .done;
-        if (!created.ok) {
-            process.stderr.write(`opencode-mux: failed to start tmux session: ${created.error ?? "unknown error"}\n`);
+        const cwd = deps.cwd ?? process.cwd();
+        // Concurrent instances each own their tmux session: when the configured
+        // name is taken (another instance, or a stale session), the next candidate
+        // is used. A failed `new-session` is the only race-free check — tmux
+        // refuses duplicate names atomically — so collisions are retried rather
+        // than probed.
+        let sessionName = null;
+        /** `-t` target for the session-scoped options; tmux resolves it as a target-pane. */
+        let optionTarget = null;
+        /** `-t` target for attach; the exact-match "=name" form is accepted here. */
+        let attachTarget = null;
+        let failure = null;
+        for (let attempt = 0; attempt < MAX_SESSION_NAME_ATTEMPTS; attempt++) {
+            const candidate = sessionNameCandidate(config.sessionName, cwd, attempt);
+            const created = await deps
+                .spawn(tmuxCommand, buildNewSessionCommand({
+                entryPath: deps.entryPath,
+                originalArgv: argv,
+                sessionName: candidate,
+                cwd,
+            }))
+                .done;
+            if (created.ok) {
+                sessionName = candidate;
+                // Exact handle for the later -t: tmux printed the session id (`$0`, …).
+                // When stdout is not a clean id (unsupported -F format → empty stdout
+                // with rc 0, or junk), fall back to the name itself. Measured on tmux
+                // 3.8 (isolated server): `set-option -t '=name' …` fails with
+                // "no such session: =name" (rc 1) because set-option resolves a
+                // *target-pane* and only a bare session name works there, while
+                // `attach -t '=name'` resolves fine. So the fallback uses the bare name
+                // for the options and "=name" for attach; the id works for both.
+                const id = printedSessionId(created.stdout);
+                optionTarget = id ?? candidate;
+                attachTarget = id ?? `=${candidate}`;
+                break;
+            }
+            failure = created;
+            if (!isSessionNameTaken(created))
+                break;
+        }
+        if (sessionName === null || optionTarget === null || attachTarget === null) {
+            // nodeSpawn reports `error` only when the command could not be started
+            // (ENOENT, …); a tmux that ran and failed exits non-zero with the reason
+            // on stderr (e.g. "duplicate session: mux"). Surface that instead of
+            // printing "unknown error".
+            const detail = failure === null
+                ? `no free session name after ${MAX_SESSION_NAME_ATTEMPTS} attempts`
+                : (failure.error ??
+                    (failure.stderr.trim() !== "" ? failure.stderr.trim() : `tmux exited with code ${failure.code ?? "unknown"}`));
+            process.stderr.write(`opencode-mux: failed to start tmux session: ${detail}\n`);
             return 1;
         }
+        if (sessionName !== config.sessionName) {
+            process.stderr.write(`opencode-mux: tmux session "${config.sessionName}" is taken; using "${sessionName}"\n`);
+        }
         // Session-scoped appearance, so the mux looks coherent regardless of the
         // user's global config. These touch only our own session — never -g.
         // Failures are non-fatal: attach proceeds and the exit code is unchanged.
-        await deps.spawn(tmuxCommand, ["set-option", "-t", config.sessionName, "status", "off"]).done;
-        await deps.spawn(tmuxCommand, ["set-option", "-t", config.sessionName, "mouse", "on"]).done;
-        const attached = await deps.spawn(tmuxCommand, ["attach", "-t", config.sessionName], { inherit: true }).done;
+        // The target is the session id captured at creation whenever tmux printed
+        // one: exact by construction, so it can never prefix-match a sibling. With
+        // no usable id the options target the bare session name (the only form
+        // `set-option` resolves for a session) and attach uses the exact-match
+        // "=name" form; a failing set-option there stays non-fatal, as always.
+        await deps.spawn(tmuxCommand, ["set-option", "-t", optionTarget, "status", "off"]).done;
+        await deps.spawn(tmuxCommand, ["set-option", "-t", optionTarget, "mouse", "on"]).done;
+        const attached = await deps.spawn(tmuxCommand, ["attach", "-t", attachTarget], { inherit: true }).done;
+        // No cleanup here. `attach` returns on TUI exit *and* on detach
+        // (prefix+d), and a detached session must keep running. Nothing kills the
+        // session at all: it ends by itself when its TUI pane exits.
         return attached.ok ? 0 : attached.code ?? 1;
     }
     const logFile = watchLogPath(env);
     mkdirSync(dirname(logFile), { recursive: true });
-    const watcher = deps.spawn(nodeCommand, [deps.entryPath, ...buildWatcherArgv({ configPath: parsed.configPath, flags: parsed.flags })], {
+    const cwd = deps.cwd ?? process.cwd();
+    const watcher = deps.spawn(nodeCommand, [
+        deps.entryPath,
+        ...buildWatcherArgv({
+            configPath: parsed.configPath,
+            flags: parsed.flags,
+            // Openers other than the cwd: the watcher cannot see the pass-through
+            // args, so forward the directories it must consider ours.
+            scope: scopeDirectories(parsed.passThrough, cwd).filter((dir) => dir !== cwd),
+        }),
+    ], {
         stdoutFile: logFile,
         stderrFile: logFile,
     });
     const tui = await deps.spawn(opencodeCommand, parsed.passThrough, { inherit: true }).done;
     watcher.kill();
     await watcher.done;
-    if (env.MUX_OWNED_SESSION === "1") {
-        await deps.spawn(tmuxCommand, ["kill-session", "-t", config.sessionName]).done;
-    }
+    // Never kill a session: the session terminates by itself when its TUI pane
+    // exits, this instance may be living in the user's own session, and an
+    // id-resolving kill could even target the host it runs in (without
+    // TMUX_PANE, `display-message '#{session_id}'` means tmux's "current"
+    // session). Killing would also destroy windows the user opened here.
     return tui.ok ? 0 : tui.code ?? 1;
 }
 //# sourceMappingURL=cli.js.map