agentp 0.1.2 → 0.3.0

package/AGENTS.md

@@ -1,38 +1,48 @@
 # agentp — agent notes
 
-## What it is
+## Two binaries, both registered
 
-Single-file Node.js CLI (`bin/agentp`) that pipes stdin into a running OpenCode TUI session and streams the assistant answer to stdout. Zero npm dependencies, CommonJS, no build step.
+- `bin/agentp` (Node.js) — registered in `package.json` `"bin"` — pipes stdin → opencode TUI
+- `bin/ocmux` (Node.js) — registered in `package.json` `"bin"` — manages opencode tmux sessions
 
-## Entrypoint
+## Package facts
 
-`bin/agentp` — the only source file. No other modules.
+- **Zero npm dependencies.** Both scripts use only Node.js stdlib (`http`, `readline`, `url`, `child_process`, `fs`, `path`, `crypto`, `os`).
+- **No tests, no CI, no lint, no formatter.** `npm test` is a stub that exits 1.
+- **No lockfile.** Versions resolve at install time.
+- **`"type": "commonjs"`**, requires Node >= 18.
+- **Linux and macOS compatible.** Both tools use portable Node.js APIs only.
 
-## Commands
+## `.ocmux.json`
 
-| Action | Command |
-|---|---|
-| Dev install | `npm link` or `npm install -g .` |
-| Run | `printf "prompt" \| agentp` |
+Runtime state file created by `bin/ocmux` (contains URL, log path, and window index). **Not in `.gitignore`** — avoid committing it.
 
-No tests, no lint, no typecheck, no codegen. `npm test` is a noop placeholder.
+## OpenCode HTTP protocol (agentp)
 
-## Requirements
+These endpoints are consumed but not documented elsewhere in the repo:
 
-- Node.js 18+
-- `opencode --serve` running locally (default port `4096`). See `.ocmux.json` for the local server URL/log path.
-- `opencode --attach` optional but useful to monitor conversations.
+- `POST /tui/clear-prompt`
+- `POST /tui/append-prompt`
+- `POST /tui/submit-prompt`
+- `GET /event` (SSE stream)
 
-## Architecture
+## OpenCode tmux session model (ocmux)
 
-- Communicates with OpenCode via HTTP: `/tui/clear-prompt`, `/tui/append-prompt`, `/tui/submit-prompt`, `/event` (SSE).
-- Default server `http://localhost:4096`; override as positional arg with a port number (`agentp 4097`) or full URL (`agentp http://host:4096`)
-- `--qa` flag prints human/agent separator rows before streaming output.
-- Streams assistant `text` parts from SSE, filters out user echo by tracking `message.updated` events with role `user`.
-- Stops on `session.idle` event.
+- Single tmux session named `"Opencode"`
+- Windows named by full project directory path
+- Server pane runs `opencode serve --port 0`, TUI pane runs `opencode attach --continue`
+- Per-project `.ocmux.json` with upward directory search (git-like)
+- Auto-restarts dead TUI panes on switch
+- Auto-zooms TUI pane on switch/create
 
-## Gotchas
+## Commands
 
-- Stdin is consumed line-byline via `readline`. Each line is sent as a separate `append-prompt` request (no batching).
-- The script does NOT handle OpenCode not being running — it will crash with a connection error.
-- No test suite exists; manual testing via `printf "hi" | node bin/agentp`.
+| Command | What |
+|---|---|
+| `npm link` | local dev install |
+| `npm install -g .` | alternative local install |
+| `agentp [--qa] [port]` | pipe stdin → opencode TUI, stream answer to stdout |
+| `ocmux new [dir]` | start opencode serve in a tmux window |
+| `ocmux kill [dir]` | kill server + tmux window |
+| `ocmux list [-l]` | list running servers |
+| `ocmux [dir]` | switch to existing opencode tmux window |

package/README.md

@@ -5,7 +5,10 @@
 [![npm downloads](https://img.shields.io/npm/dm/agentp.svg)](https://www.npmjs.com/package/agentp)
 [![node version](https://img.shields.io/node/v/agentp.svg)](https://www.npmjs.com/package/agentp)
 
-`agentp` is a tiny CLI that pipes prompt text into a running OpenCode TUI session and streams the assistant final answer back to stdout.
+This package provides two CLI tools:
+
+- **`agentp`** — pipes prompt text into a running OpenCode TUI session and streams the assistant final answer back to stdout
+- **`ocmux`** — manages OpenCode server + TUI sessions in tmux (create, switch, kill, list)
 
 It is designed for prompt-driven workflows where you want to do things like:
 
@@ -36,8 +39,8 @@ npm link
 Notes:
 
 - `agentp` connects to the OpenCode event endpoint over HTTP.
-- In practice this means running `opencode --serve` (or equivalent serve mode) so the port is open.
-- `opencode --attach` is optional but useful to monitor the full conversation in another terminal/tmux pane.
+- In practice this means running `opencode serve` (or equivalent serve mode) so the port is open.
+- `opencode attach` is optional but useful to monitor the full conversation in another terminal/tmux pane.
 
 ## Usage
 
@@ -47,7 +50,8 @@ agentp [options] [url]
 
 Options:
 
-- `--qa`: print question/answer separators around the streamed answer
+- `--qa`: print the original prompt and answer with labels (useful when used as a filter)
+- `--version`: show version
 - `--help`: show help message
 
 Arguments:
@@ -75,10 +79,10 @@ Send a multi-line prompt from a file:
 cat prompt.txt | agentp
 ```
 
-Use QA separators and explicit port:
+Use an explicit port:
 
 ```bash
-cat prompt.txt | agentp --qa 4096
+cat prompt.txt | agentp 4096
 ```
 
 Capture answer to a file:
@@ -99,13 +103,53 @@ From Vim/Neovim, send the current visual selection and replace it in place with
 :'<,'>!agentp
 ```
 
-From Vim/Neovim, send the current visual selection and keep QA separators in the same file:
+From Vim/Neovim, send the current visual selection and keep the prompt with the answer:
 
 ```vim
 :'<,'>!agentp --qa
 ```
 
-## How It Works
+## ocmux
+
+Manage OpenCode server + TUI in tmux for project directories.
+
+```bash
+ocmux [-l] [<subcommand>] [<directory>]
+```
+
+Without arguments, searches upward from `<directory>` (default: `$PWD`) for `.ocmux.json` and switches to that server's tmux window.
+
+Subcommands:
+
+- **`new [--git|--GIT] [dir]`** — Create a new server in `dir` (default: `$PWD`). Errors if one already exists there. Warns if a parent directory already has a server.
+  - `--git` resolves `dir` to the nearest parent with a `.git` entry (file or dir); errors if none is found.
+  - `--GIT` resolves `dir` to the nearest parent with a `.git` directory only; errors if none is found.
+- **`kill [dir]`** — Kill the server found upward from `dir`. Removes its tmux window and state file.
+- **`list`** — List all running servers with their directories, URLs, and status.
+
+Options:
+
+- `-l`: long output for default/new commands (append `→ <dir>` after the URL)
+- `--version`: show version
+- `-h`: show help message
+- `--`: treat the next argument as a directory even if it matches a subcommand name
+
+Notes:
+
+- If `<directory>` is not a valid path, `ocmux` tries to match it against the basenames of existing sessions (exact unique match).
+- When using `--git`/`--GIT`, `ocmux` refuses to create a new server above an existing `.ocmux.json` found while searching for the git root.
+
+### Requirements
+
+- Node.js 18+
+- [tmux](https://github.com/tmux/tmux) — session multiplexer
+- `opencode` binary in PATH (the OpenCode CLI)
+
+### State file
+
+`ocmux` stores per-project state in `.ocmux.json` (contains URL, log path, window index). It searches upward from the target directory, similar to git.
+
+## How agentp Works
 
 1. Clears the current TUI prompt input.
 2. Appends each line from stdin to the TUI prompt.
@@ -115,7 +159,7 @@ From Vim/Neovim, send the current visual selection and keep QA separators in the
 
 Operational hint:
 
-- You can keep a separate `opencode --attach` view open to see the full run context while `agentp` is used from shell scripts or editor buffers.
+- You can keep a separate `opencode attach` view open to see the full run context while `agentp` is used from shell scripts or editor buffers.
 
 ## License
 

package/bin/agentp

@@ -2,6 +2,7 @@
 
 const http = require('http');
 const { URL } = require('url');
+const { version } = require('../package.json');
 
 function makeRequest(options, data) {
   return new Promise((resolve, reject) => {
@@ -158,23 +159,30 @@ async function main() {
 
   const args = process.argv.slice(2);
   for (let i = 0; i < args.length; i++) {
-    if (args[i] === '--help') {
+    if (args[i] === '--version') {
+      console.log(version);
+      process.exit(0);
+    } else if (args[i] === '--help') {
       console.error('Usage: agentp [options] [url]');
       console.error('');
       console.error('Pipe prompt text to an OpenCode TUI session and stream the assistant response to stdout.');
       console.error('');
       console.error('Options:');
-      console.error('  --qa       Print question/answer separators before streaming output');
+      console.error('  --version  Show version');
+      console.error('  --qa       Print the original prompt and answer with labels (useful as a filter)');
       console.error('  --help     Show this help message');
       console.error('');
       console.error('Arguments:');
       console.error('  url        OpenCode TUI server URL or port number (default: 4096)');
       console.error('             Examples: 4096, http://localhost:4096, http://192.168.1.50:4096');
       console.error('');
+      console.error('See also: ocmux -- manage OpenCode tmux sessions (ocmux --help)');
+      console.error('');
       console.error('Examples:');
       console.error('  printf "Summarize this file" | agentp');
-      console.error('  cat prompt.txt | agentp --qa 4096');
-      console.error('  cat prompt.txt | agentp http://192.168.1.50:4096');
+      console.error('  cat prompt.txt | agentp 4096');
+      console.error('  # Vim/Neovim filter, preserving prompt + answer:');
+      console.error("  :'<,'>!agentp --qa");
       process.exit(0);
     } else if (args[i] === '--qa') {
       qaMode = true;

package/bin/ocmux

@@ -0,0 +1,604 @@
+#!/usr/bin/env node
+
+const fs = require('fs');
+const path = require('path');
+const crypto = require('crypto');
+const readline = require('readline');
+const { spawnSync, execSync } = require('child_process');
+const os = require('os');
+
+// ---------------------------------------------------------------------------
+// Constants
+// ---------------------------------------------------------------------------
+
+const { version } = require('../package.json');
+
+const SESSION = 'Opencode';
+const SCRIPT = path.basename(process.argv[1] || 'ocmux');
+const HOME = os.homedir();
+const URL_RE = /opencode server listening on (http:\/\/[^\s]*)/;
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+function tmux(args) {
+  const result = spawnSync('tmux', args, { encoding: 'utf8', maxBuffer: 1024 * 1024 });
+  if (result.error && result.error.code === 'ENOENT') {
+    console.error('Error: tmux is not installed or not in PATH');
+    process.exit(1);
+  }
+  return result;
+}
+
+function sleep(seconds) {
+  execSync(`sleep ${seconds}`, { stdio: 'ignore' });
+}
+
+function hashDir(dir) {
+  return crypto.createHash('md5').update(dir).digest('hex').slice(0, 12);
+}
+
+function logfileFor(dir) {
+  return `/tmp/opencode-serve-${hashDir(dir)}.log`;
+}
+
+function statefileFor(dir) {
+  return path.join(dir, '.ocmux.json');
+}
+
+function readState(file) {
+  try {
+    return JSON.parse(fs.readFileSync(file, 'utf8'));
+  } catch {
+    return null;
+  }
+}
+
+function findParentStatefile(startDir) {
+  let dir = path.resolve(startDir);
+  while (true) {
+    if (fs.existsSync(path.join(dir, '.ocmux.json'))) {
+      return path.join(dir, '.ocmux.json');
+    }
+    if (dir === HOME || dir === path.dirname(dir)) return null;
+    dir = path.dirname(dir);
+  }
+}
+
+function findParentGitDir(startDir, requireDir) {
+  let dir = path.resolve(startDir);
+  let stateDir = null;
+  while (true) {
+    if (!stateDir && fs.existsSync(path.join(dir, '.ocmux.json'))) {
+      stateDir = dir;
+    }
+
+    const gitPath = path.join(dir, '.git');
+    if (fs.existsSync(gitPath)) {
+      if (!requireDir) {
+        return { dir, stateDir, gitPath };
+      }
+      try {
+        if (fs.statSync(gitPath).isDirectory()) {
+          return { dir, stateDir, gitPath };
+        }
+      } catch {
+        // ignore stat errors
+      }
+    }
+
+    if (dir === HOME || dir === path.dirname(dir)) return { dir: null, stateDir, gitPath: null };
+    dir = path.dirname(dir);
+  }
+}
+
+function resolveGitDir(startDir, requireDir, flagLabel) {
+  const result = findParentGitDir(startDir, requireDir);
+  if (!result.dir) {
+    const label = requireDir ? '.git directory' : '.git entry';
+    console.error(`Error: no ${label} found in ${startDir} or any of its parents.`);
+    console.error(`Run '${SCRIPT} new' without ${flagLabel} to create a server in the current directory.`);
+    process.exit(1);
+  }
+
+  if (result.stateDir && result.stateDir !== result.dir) {
+    console.error(`Error: found an existing ocmux server in ${result.stateDir}.`);
+    console.error(`Refusing to create a new server at ${result.dir} because it is above that session.`);
+    console.error(`Move outside ${result.stateDir} or pass an explicit directory.`);
+    process.exit(1);
+  }
+
+  return result.dir;
+}
+
+function windowByDir(dir) {
+  const r = tmux(['list-windows', '-t', SESSION, '-F', '#{window_index}\t#{window_name}']);
+  if (r.status !== 0) return null;
+  for (const line of r.stdout.trim().split('\n').filter(Boolean)) {
+    const [idx, name] = line.split('\t');
+    if (name === dir) return parseInt(idx, 10);
+  }
+  return null;
+}
+
+function windowNameByIndex(idx) {
+  const r = tmux(['list-windows', '-t', SESSION, '-F', '#{window_index}\t#{window_name}']);
+  if (r.status !== 0) return null;
+  for (const line of r.stdout.trim().split('\n').filter(Boolean)) {
+    const [wi, name] = line.split('\t');
+    if (parseInt(wi, 10) === idx) return name;
+  }
+  return null;
+}
+
+function activeWindowIndex() {
+  const r = tmux(['list-windows', '-t', SESSION, '-F', '#{window_index} #{window_active}']);
+  if (r.status !== 0) return null;
+  for (const line of r.stdout.trim().split('\n').filter(Boolean)) {
+    const [idx, active] = line.split(' ');
+    if (active === '1') return parseInt(idx, 10);
+  }
+  return null;
+}
+
+function tuiPaneId(windowIndex) {
+  const r = tmux(['list-panes', '-t', `${SESSION}:${windowIndex}`, '-F', '#{pane_id}\t#{pane_current_command}']);
+  if (r.status !== 0) return null;
+  for (const line of r.stdout.trim().split('\n').filter(Boolean)) {
+    const [paneId, cmd] = line.split('\t');
+    if (cmd === 'node') return paneId;
+  }
+  return null;
+}
+
+function paneCount(windowIndex) {
+  const r = tmux(['list-panes', '-t', `${SESSION}:${windowIndex}`, '-F', '#{pane_id}']);
+  if (r.status !== 0) return 0;
+  return r.stdout.trim().split('\n').filter(Boolean).length;
+}
+
+function findWindowsByBasename(name) {
+  const r = tmux(['list-windows', '-t', SESSION, '-F', '#{window_name}']);
+  if (r.status !== 0) return [];
+  return r.stdout.trim().split('\n').filter(Boolean).filter(w => path.basename(w) === name);
+}
+
+function resolveDir(arg) {
+  const resolved = path.resolve(arg);
+  try {
+    if (fs.statSync(resolved).isDirectory()) return resolved;
+  } catch {
+    // not a valid path or inaccessible
+  }
+
+  if (!arg.includes('/')) {
+    const matches = findWindowsByBasename(arg);
+    if (matches.length === 1) return matches[0];
+    if (matches.length > 1) {
+      console.error(`Error: more than one match for '${arg}':`);
+      for (const m of matches) console.error(`  ${m}`);
+      process.exit(1);
+    }
+  }
+
+  console.error(`Error: invalid directory '${arg}'`);
+  console.error(`Run '${SCRIPT} -h' for help.`);
+  process.exit(1);
+}
+
+function ensureTuiZoomed(windowIndex) {
+  const r = tmux(['list-windows', '-t', SESSION, '-F', '#{window_index}|#{window_zoomed_flag}']);
+  if (r.status !== 0) return;
+  for (const line of r.stdout.trim().split('\n').filter(Boolean)) {
+    const [wi, zoomed] = line.split('|');
+    if (parseInt(wi, 10) === windowIndex && zoomed === '1') return;
+  }
+  const paneId = tuiPaneId(windowIndex);
+  if (paneId) tmux(['resize-pane', '-Z', '-t', paneId]);
+}
+
+function pinWindowName(windowIndex) {
+  tmux(['set-window-option', '-t', `${SESSION}:${windowIndex}`, 'automatic-rename', 'off']);
+}
+
+function ensureSession() {
+  const r = tmux(['has-session', '-t', SESSION]);
+  if (r.status !== 0) {
+    const rc = tmux(['new-session', '-d', '-s', SESSION]);
+    if (rc.status !== 0) {
+      console.error('Error: failed to create tmux session');
+      process.exit(1);
+    }
+  }
+}
+
+function outputUrl(url, dir, longMode) {
+  if (longMode) {
+    console.log(`${url} → ${dir}`);
+  } else {
+    console.log(url);
+  }
+}
+
+function printHelp() {
+  console.error(`Usage: ${SCRIPT} [-l] [<subcommand>] [<directory>]`);
+  console.error('');
+  console.error('Manage opencode server + TUI in tmux for project directories.');
+  console.error('');
+  console.error('Without arguments, searches upward from <directory> (default: $PWD)');
+  console.error("for .ocmux.json and switches to that server's tmux window.");
+  console.error('If <directory> is not a valid path, ocmux will match it against the');
+  console.error("basenames of existing sessions' directories. If exactly one matches,");
+  console.error('that session is used.');
+  console.error('');
+  console.error('Subcommands:');
+  console.error('  new     Create a new server in <directory> (default: $PWD).');
+  console.error('          Errors if one already exists there.');
+  console.error('          Warns if a parent directory already has a server.');
+  console.error('          --git  Use the nearest parent with a .git entry (file or dir).');
+  console.error('          --GIT  Use the nearest parent with a .git directory only.');
+  console.error('          Refuses to create above an existing .ocmux.json found while searching.');
+  console.error('  kill    Kill the server found upward from <directory>.');
+  console.error('          Removes its tmux window and state file.');
+  console.error('  list    List all running servers with their directories and URLs.');
+  console.error('');
+  console.error('  --         Treat the next argument as a directory even if it matches');
+  console.error('            a subcommand name (e.g. "ocmux -- kill").');
+  console.error('');
+  console.error('Options:');
+  console.error('  -l       Long output: append " → <dir>" after the URL (new/default).');
+  console.error('  --version  Show version');
+  console.error('  -h       Show this help');
+  console.error('');
+  console.error('See also: agentp -- pipe prompts into OpenCode from stdin');
+  process.exit(0);
+}
+
+// ---------------------------------------------------------------------------
+// Subcommand: default — switch to an existing server
+// ---------------------------------------------------------------------------
+
+function cmdSwitch(statefile, longMode) {
+  const serverDir = path.dirname(statefile);
+  const state = readState(statefile);
+
+  if (!state || !state.url || state.window_index == null) {
+    console.error(`Error: invalid state file ${statefile}`);
+    process.exit(1);
+  }
+
+  let { url, window_index: winIdx } = state;
+
+  const actualName = windowNameByIndex(winIdx);
+  if (actualName !== serverDir) {
+    const found = windowByDir(serverDir);
+    if (found == null) {
+      console.error(`Error: tmux window for ${serverDir} not found`);
+      console.error("Run 'ocmux new' to create a new server.");
+      process.exit(1);
+    }
+    winIdx = found;
+  }
+
+  pinWindowName(winIdx);
+
+  const tuiPane = tuiPaneId(winIdx);
+  if (!tuiPane) {
+    console.error('TUI pane is dead, restarting...');
+    const count = paneCount(winIdx);
+    if (count >= 2) {
+      const panesR = tmux(['list-panes', '-t', `${SESSION}:${winIdx}`, '-F', '#{pane_id}']);
+      const panes = panesR.stdout.trim().split('\n').filter(Boolean);
+      const lastPane = panes[panes.length - 1];
+      const respawnR = tmux(['respawn-pane', '-k', '-t', lastPane, `opencode attach --continue '${url}'`]);
+      if (respawnR.status !== 0) {
+        tmux(['send-keys', '-t', lastPane, `opencode attach --continue '${url}'`, 'Enter']);
+      }
+    } else {
+      tmux(['split-window', '-v', '-t', `${SESSION}:${winIdx}`, '-c', serverDir,
+        `opencode attach --continue '${url}'`]);
+    }
+  }
+
+  const activeWin = activeWindowIndex();
+  if (activeWin !== winIdx) {
+    tmux(['select-window', '-t', `${SESSION}:${winIdx}`]);
+  }
+
+  ensureTuiZoomed(winIdx);
+  outputUrl(url, serverDir, longMode);
+}
+
+// ---------------------------------------------------------------------------
+// Subcommand: list
+// ---------------------------------------------------------------------------
+
+function cmdList() {
+  const sessionR = tmux(['has-session', '-t', SESSION]);
+  if (sessionR.status !== 0) {
+    console.log('No opencode servers running.');
+    return;
+  }
+
+  const listR = tmux(['list-windows', '-t', SESSION, '-F', '#{window_index}\t#{window_name}']);
+  if (listR.status !== 0 || !listR.stdout.trim()) {
+    console.log('No opencode servers running.');
+    return;
+  }
+
+  const rows = [];
+  for (const line of listR.stdout.trim().split('\n').filter(Boolean)) {
+    const [idx, dir] = line.split('\t');
+    const sf = path.join(dir, '.ocmux.json');
+    if (!fs.existsSync(sf)) continue;
+    const state = readState(sf);
+    if (!state || !state.url) continue;
+    const tui = tuiPaneId(parseInt(idx, 10));
+    rows.push({ url: state.url, dir, status: tui ? 'alive' : 'dead' });
+  }
+
+  if (rows.length === 0) {
+    console.log('No opencode servers running.');
+    return;
+  }
+
+  const urlW = Math.max(...rows.map(r => r.url.length), 3);
+  const dirW = Math.max(...rows.map(r => r.dir.length), 9);
+  const stsW = Math.max(...rows.map(r => r.status.length), 6);
+
+  const pad = (s, w) => s + ' '.repeat(Math.max(0, w - s.length));
+
+  console.log(`${pad('URL', urlW)}  ${pad('Directory', dirW)}  ${pad('Status', stsW)}`);
+  for (const row of rows) {
+    console.log(`${pad(row.url, urlW)}  ${pad(row.dir, dirW)}  ${pad(row.status, stsW)}`);
+  }
+}
+
+// ---------------------------------------------------------------------------
+// Subcommand: new
+// ---------------------------------------------------------------------------
+
+function cmdNew(targetDir, longMode) {
+  const sf = path.join(targetDir, '.ocmux.json');
+  if (fs.existsSync(sf)) {
+    console.error(`Error: a server already exists in ${targetDir}.`);
+    console.error("Run 'ocmux' without arguments to switch to it, or 'ocmux kill' to stop it first.");
+    process.exit(1);
+  }
+
+  const parent = findParentStatefile(path.dirname(targetDir));
+  if (parent) {
+    const parentDir = path.dirname(parent);
+    console.error(`Warning: there is already an opencode server in ${parentDir}.`);
+    console.error("Running 'ocmux' without arguments would switch to that server.");
+
+    const rl = readline.createInterface({ input: process.stdin, output: process.stderr });
+    rl.question('Are you sure you want to create a new server here? [y/N] ', (answer) => {
+      rl.close();
+      if (!/^[yY]([eE][sS])?$/.test(answer.trim())) {
+        console.error('Cancelled.');
+        process.exit(0);
+      }
+      doNew(targetDir, longMode);
+    });
+  } else {
+    doNew(targetDir, longMode);
+  }
+}
+
+function doNew(targetDir, longMode) {
+  ensureSession();
+  const lf = logfileFor(targetDir);
+
+  console.error(`Starting opencode server for ${targetDir}...`);
+
+  const rc = tmux(['new-window', '-d', '-t', SESSION, '-n', targetDir, '-c', targetDir,
+    `opencode serve --port 0 2>&1 | tee '${lf}'`]);
+  if (rc.status !== 0) {
+    console.error(`Error: failed to create tmux window: ${rc.stderr}`);
+    process.exit(1);
+  }
+
+  // Wait up to 10s for the URL in the logfile
+  let url = null;
+  for (let i = 0; i < 50; i++) {
+    sleep(0.2);
+    const log = (() => { try { return fs.readFileSync(lf, 'utf8'); } catch { return ''; } })();
+    const m = log.match(URL_RE);
+    if (m) { url = m[1]; break; }
+  }
+
+  if (!url) {
+    console.error('Error: opencode server did not start within 10 seconds');
+    const wi = windowByDir(targetDir);
+    if (wi != null) tmux(['kill-window', '-t', `${SESSION}:${wi}`]);
+    process.exit(1);
+  }
+
+  const winIdx = windowByDir(targetDir);
+  if (winIdx == null) {
+    console.error('Error: window was not created properly');
+    process.exit(1);
+  }
+
+  pinWindowName(winIdx);
+
+  const state = { url, logfile: lf, window_index: winIdx };
+  fs.writeFileSync(path.join(targetDir, '.ocmux.json'), JSON.stringify(state) + '\n');
+
+  tmux(['split-window', '-v', '-t', `${SESSION}:${winIdx}`, '-c', targetDir,
+    `opencode attach --continue '${url}'`]);
+  sleep(0.5);
+  ensureTuiZoomed(winIdx);
+
+  const activeWin = activeWindowIndex();
+  if (activeWin !== winIdx) {
+    tmux(['select-window', '-t', `${SESSION}:${winIdx}`]);
+  }
+
+  outputUrl(url, targetDir, longMode);
+}
+
+// ---------------------------------------------------------------------------
+// Subcommand: kill
+// ---------------------------------------------------------------------------
+
+function cmdKill(statefile) {
+  const serverDir = path.dirname(statefile);
+  const state = readState(statefile);
+
+  if (!state || !state.url || state.window_index == null) {
+    console.error(`Error: invalid state file ${statefile}`);
+    process.exit(1);
+  }
+
+  let { window_index: winIdx } = state;
+
+  console.error(`Stopping server and removing window for ${serverDir}...`);
+
+  const sessionR = tmux(['has-session', '-t', SESSION]);
+  if (sessionR.status === 0) {
+    const actualName = windowNameByIndex(winIdx);
+    if (actualName !== serverDir) {
+      const found = windowByDir(serverDir);
+      if (found != null) winIdx = found;
+    }
+
+    if (winIdx != null) {
+      tmux(['select-window', '-t', `${SESSION}:${winIdx}`]);
+      tmux(['send-keys', '-t', `${SESSION}:${winIdx}.0`, 'C-c']);
+      sleep(0.3);
+      tmux(['kill-window', '-t', `${SESSION}:${winIdx}`]);
+      console.error('Window removed.');
+    } else {
+      console.error(`Tmux window not found for ${serverDir} (cleaning up state file).`);
+    }
+  } else {
+    console.error("No tmux session '" + SESSION + "' found (cleaning up state file).");
+  }
+
+  fs.unlinkSync(statefile);
+  console.error('Done.');
+}
+
+// ---------------------------------------------------------------------------
+// Argument parsing
+// ---------------------------------------------------------------------------
+
+function main() {
+  let longMode = false;
+  let gitMode = null;
+  const positional = [];
+  let dirIsForced = false;
+
+  for (const arg of process.argv.slice(2)) {
+    if (arg === '-l') {
+      longMode = true;
+    } else if (arg === '--git') {
+      if (gitMode && gitMode !== 'nearest') {
+        console.error("Error: cannot combine '--git' with '--GIT'.");
+        process.exit(1);
+      }
+      gitMode = 'nearest';
+    } else if (arg === '--GIT') {
+      if (gitMode && gitMode !== 'root') {
+        console.error("Error: cannot combine '--git' with '--GIT'.");
+        process.exit(1);
+      }
+      gitMode = 'root';
+    } else if (arg === '--version') {
+      console.log(version);
+      process.exit(0);
+    } else if (arg === '-h' || arg === '--help') {
+      printHelp();
+    } else if (arg === '--') {
+      dirIsForced = true;
+    } else if (arg.startsWith('-')) {
+      if (arg === '--new' || arg === '--kill') {
+        console.error(`Error: '${arg}' is no longer a flag. Use 'ocmux ${arg.slice(2)}' instead.`);
+      } else {
+        console.error(`Error: unknown option '${arg}'`);
+        console.error(`Run '${SCRIPT} -h' for help.`);
+      }
+      process.exit(1);
+    } else {
+      positional.push(arg);
+    }
+  }
+
+  let subcommand = null;
+  let targetDir = null;
+
+  for (const arg of positional) {
+    if (dirIsForced) {
+      dirIsForced = false;
+      if (targetDir) {
+        console.error(`Error: unexpected argument '${arg}'`);
+        process.exit(1);
+      }
+      targetDir = resolveDir(arg);
+    } else if (arg === 'new' || arg === 'kill' || arg === 'list') {
+      if (subcommand) {
+        console.error(`Error: multiple subcommands specified: '${subcommand}' and '${arg}'`);
+        process.exit(1);
+      }
+      subcommand = arg;
+    } else {
+      if (targetDir) {
+        console.error(`Error: unexpected argument '${arg}'`);
+        process.exit(1);
+      }
+      targetDir = resolveDir(arg);
+    }
+  }
+
+  if (!targetDir) targetDir = process.cwd();
+
+  // Dispatch
+  if (subcommand === 'list') {
+    if (gitMode) {
+      console.error("Error: '--git' and '--GIT' are only valid with 'new'.");
+      process.exit(1);
+    }
+    if (targetDir !== process.cwd()) {
+      console.error("Error: 'list' does not accept a directory path.");
+      process.exit(1);
+    }
+    cmdList();
+  } else if (subcommand === 'kill') {
+    if (gitMode) {
+      console.error("Error: '--git' and '--GIT' are only valid with 'new'.");
+      process.exit(1);
+    }
+    const sf = findParentStatefile(targetDir);
+    if (!sf) {
+      console.error(`Error: no opencode server found in ${targetDir} or any of its parents.`);
+      console.error("Run 'ocmux new' to create a new server.");
+      process.exit(1);
+    }
+    cmdKill(sf);
+  } else if (subcommand === 'new') {
+    if (gitMode) {
+      const flagLabel = gitMode === 'root' ? '--GIT' : '--git';
+      targetDir = resolveGitDir(targetDir, gitMode === 'root', flagLabel);
+    }
+    cmdNew(targetDir, longMode);
+  } else {
+    if (gitMode) {
+      console.error("Error: '--git' and '--GIT' are only valid with 'new'.");
+      process.exit(1);
+    }
+    // Default mode
+    const sf = findParentStatefile(targetDir);
+    if (!sf) {
+      console.error(`Error: no opencode server found in ${targetDir} or any of its parents.`);
+      console.error("Run 'ocmux new' to create a new server.");
+      process.exit(1);
+    }
+    ensureSession();
+    cmdSwitch(sf, longMode);
+  }
+}
+
+main();

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "agentp",
-  "version": "0.1.2",
+  "version": "0.3.0",
   "description": "Pipe prompts into a running OpenCode TUI session and stream the final answer",
   "bin": {
-    "agentp": "bin/agentp"
+    "agentp": "bin/agentp",
+    "ocmux": "bin/ocmux"
   },
   "keywords": [
     "ai",

package/.ocmux.json

@@ -1 +0,0 @@
-{"url":"http://127.0.0.1:4096","logfile":"/tmp/opencode-serve-6cdb98e4626e.log","window_index":1}