agentp 0.2.0 → 0.4.0

package/README.md

@@ -1,5 +1,10 @@
 # agentp
 
+[![npm version](https://img.shields.io/npm/v/agentp.svg)](https://www.npmjs.com/package/agentp)
+[![npm license](https://img.shields.io/npm/l/agentp.svg)](https://www.npmjs.com/package/agentp)
+[![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)
+
 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
@@ -34,23 +39,25 @@ 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.
+- If the OpenCode server is password-protected (`OPENCODE_SERVER_PASSWORD`), both `agentp` and `ocmux` automatically send the required HTTP Basic Auth credentials.
 
 ## Usage
 
 ```bash
-agentp [options] [port]
+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:
 
-- `port`: OpenCode TUI port (defaults to `4096`)
+- `url`: OpenCode TUI server URL or port number (defaults to `4096`). Examples: `4096`, `http://localhost:4096`, `http://192.168.1.50:4096`
 
 ## Examples
 
@@ -73,10 +80,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:
@@ -85,13 +92,19 @@ Capture answer to a file:
 cat prompt.txt | agentp > answer.txt
 ```
 
+Connect to a remote OpenCode server:
+
+```bash
+cat prompt.txt | agentp http://192.168.1.50:4096
+```
+
 From Vim/Neovim, send the current visual selection and replace it in place with the assistant answer:
 
 ```vim
 :'<,'>!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
@@ -109,9 +122,23 @@ Without arguments, searches upward from `<directory>` (default: `$PWD`) for `.oc
 
 Subcommands:
 
-- **`new [dir]`** — Create a new server in `dir` (default: `$PWD`). Errors if one already exists there. Warns if a parent directory already has a server.
+- **`serve [--git|--GIT] [dir]`** — Create a server in `dir` (default: `$PWD`) and attach a TUI pane. Aliased as `new` for backwards compatibility. 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 [-l]`** — List all running servers with their directories, URLs, and status.
+- **`list`** — List all running servers with their directories, URLs, and status.
+
+Options:
+
+- `-l`: long output for default/serve 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
 
@@ -133,7 +160,7 @@ Subcommands:
 
 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

@@ -4,12 +4,26 @@ const http = require('http');
 const { URL } = require('url');
 const { version } = require('../package.json');
 
+function getAuthHeaders() {
+  const password = process.env.OPENCODE_SERVER_PASSWORD;
+  if (!password) return {};
+  const username = process.env.OPENCODE_SERVER_USERNAME || 'opencode';
+  const encoded = Buffer.from(`${username}:${password}`).toString('base64');
+  return { 'Authorization': `Basic ${encoded}` };
+}
+
 function makeRequest(options, data) {
   return new Promise((resolve, reject) => {
     const req = http.request(options, (res) => {
       let body = '';
       res.on('data', (chunk) => { body += chunk; });
-      res.on('end', () => resolve({ status: res.statusCode, body }));
+      res.on('end', () => {
+        if (res.statusCode === 401) {
+          reject(new Error('OpenCode server authentication failed. Set OPENCODE_SERVER_PASSWORD to match the server password.'));
+        } else {
+          resolve({ status: res.statusCode, body });
+        }
+      });
     });
     req.on('error', reject);
     if (data) req.write(data);
@@ -26,7 +40,8 @@ function buildJsonRequest(url, method, body) {
     method: method,
     headers: {
       'Content-Type': 'application/json',
-      'Content-Length': Buffer.byteLength(body)
+      'Content-Length': Buffer.byteLength(body),
+      ...getAuthHeaders()
     }
   };
 }
@@ -47,8 +62,7 @@ async function submitPrompt(server) {
   await makeRequest(buildJsonRequest(url, 'POST', '{}'), '{}');
 }
 
-async function sendPrompt(port) {
-  const server = `http://localhost:${port}`;
+async function sendPrompt(server) {
   let promptText = '';
 
   await clearPrompt(server);
@@ -71,9 +85,9 @@ const HUMAN_ROW = '👤: ￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣
 const AGENT_ROW = '🤖: ￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣\n'
 const FINAL_ROW = '￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣\n';
 
-function listenForFinalAnswer(port, showFinalRow) {
+function listenForFinalAnswer(server, showFinalRow) {
   return new Promise((resolve, reject) => {
-    const url = `http://localhost:${port}/event`;
+    const url = `${server}/event`;
     const parsed = new URL(url);
 
     const req = http.request({
@@ -81,8 +95,13 @@ function listenForFinalAnswer(port, showFinalRow) {
       port: parsed.port,
       path: parsed.pathname,
       method: 'GET',
-      headers: { 'Accept': 'text/event-stream' }
+      headers: { 'Accept': 'text/event-stream', ...getAuthHeaders() }
     }, (res) => {
+      if (res.statusCode === 401) {
+        res.resume();
+        reject(new Error('OpenCode server authentication failed. Set OPENCODE_SERVER_PASSWORD to match the server password.'));
+        return;
+      }
       let buffer = '';
       const userMessageIDs = new Set();
 
@@ -155,7 +174,7 @@ function listenForFinalAnswer(port, showFinalRow) {
 }
 
 async function main() {
-  let port = 4096;
+  let serverBase = 'http://localhost:4096';
   let qaMode = false;
 
   const args = process.argv.slice(2);
@@ -164,33 +183,37 @@ async function main() {
       console.log(version);
       process.exit(0);
     } else if (args[i] === '--help') {
-      console.error('Usage: agentp [options] [port]');
+      console.error('Usage: agentp [options] [url]');
       console.error('');
-      console.error('Pipe prompt text to an OpenCode TUI session running on localhost.');
-      console.error('The assistant response is streamed to stdout.');
+      console.error('Pipe prompt text to an OpenCode TUI session and stream the assistant response to stdout.');
       console.error('');
       console.error('Options:');
       console.error('  --version  Show version');
-      console.error('  --qa       Print question/answer separators before streaming output');
+      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('  port       OpenCode TUI port (default: 4096)');
+      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 4096');
+      console.error('  # Vim/Neovim filter, preserving prompt + answer:');
+      console.error("  :'<,'>!agentp --qa");
       process.exit(0);
     } else if (args[i] === '--qa') {
       qaMode = true;
-    } else if (!isNaN(args[i]) && /^\d+$/.test(args[i])) {
-      port = parseInt(args[i], 10);
+    } else if (args[i].includes('://')) {
+      serverBase = args[i].replace(/\/+$/, '');
+    } else if (/^\d+$/.test(args[i])) {
+      serverBase = 'http://localhost:' + args[i];
     }
   }
 
-  const promptText = await sendPrompt(port);
+  const promptText = await sendPrompt(serverBase);
 
   if (qaMode) {
     process.stdout.write(HUMAN_ROW);
@@ -198,7 +221,12 @@ async function main() {
     process.stdout.write(AGENT_ROW);
   }
 
-  await listenForFinalAnswer(port, qaMode);
+  await listenForFinalAnswer(serverBase, qaMode);
+
+  if (!process.env.OPENCODE_SERVER_PASSWORD) {
+    process.stderr.write('\n');
+    process.stderr.write('🔓 ⚠️  Server is not password-protected! Set OPENCODE_SERVER_PASSWORD for better security.\n');
+  }
 }
 
 main().catch((err) => {

package/bin/ocmux

@@ -66,6 +66,52 @@ function findParentStatefile(startDir) {
   }
 }
 
+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} serve' 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;
@@ -187,9 +233,13 @@ function printHelp() {
   console.error('that session is used.');
   console.error('');
   console.error('Subcommands:');
-  console.error('  new     Create a new server in <directory> (default: $PWD).');
+  console.error('  serve   Create a server in <directory> (default: $PWD) and attach a TUI.');
+  console.error('          Aliased as "new" for backwards compatibility.');
   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.');
@@ -198,7 +248,7 @@ function printHelp() {
   console.error('            a subcommand name (e.g. "ocmux -- kill").');
   console.error('');
   console.error('Options:');
-  console.error('  -l       Long output: append " → <dir>" after the URL.');
+  console.error('  -l       Long output: append " → <dir>" after the URL (serve/default).');
   console.error('  --version  Show version');
   console.error('  -h       Show this help');
   console.error('');
@@ -226,7 +276,7 @@ function cmdSwitch(statefile, longMode) {
     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.");
+      console.error("Run 'ocmux serve' to create a new server.");
       process.exit(1);
     }
     winIdx = found;
@@ -344,13 +394,25 @@ function doNew(targetDir, longMode) {
 
   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}'`]);
+  // Create window with interactive shell so .bashrc/.zshrc is sourced
+  const rc = tmux(['new-window', '-d', '-t', SESSION, '-n', targetDir, '-c', targetDir]);
   if (rc.status !== 0) {
     console.error(`Error: failed to create tmux window: ${rc.stderr}`);
     process.exit(1);
   }
 
+  const winIdx = windowByDir(targetDir);
+  if (winIdx == null) {
+    console.error('Error: window was not created properly');
+    process.exit(1);
+  }
+
+  pinWindowName(winIdx);
+
+  // Send the command to the interactive shell (like typing it manually)
+  tmux(['send-keys', '-t', `${SESSION}:${winIdx}.0`,
+    `opencode serve --port 0 2>&1 | tee '${lf}'`, 'Enter']);
+
   // Wait up to 10s for the URL in the logfile
   let url = null;
   for (let i = 0; i < 50; i++) {
@@ -367,21 +429,16 @@ function doNew(targetDir, longMode) {
     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}'`]);
+  const splitResult = tmux(['split-window', '-v', '-P', '-F', '#{pane_id}', '-t', `${SESSION}:${winIdx}`, '-c', targetDir]);
+  const tuiPane = splitResult.stdout.trim();
+  sleep(0.2);
+  tmux(['send-keys', '-t', tuiPane,
+    `opencode attach --continue '${url}'`, 'Enter']);
   sleep(0.5);
-  ensureTuiZoomed(winIdx);
+  if (tuiPane) tmux(['resize-pane', '-Z', '-t', tuiPane]);
 
   const activeWin = activeWindowIndex();
   if (activeWin !== winIdx) {
@@ -439,12 +496,25 @@ function cmdKill(statefile) {
 
 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);
@@ -453,8 +523,10 @@ function main() {
     } 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.`);
+      if (arg === '--new') {
+        console.error("Error: '--new' is no longer a flag. Use 'ocmux serve' instead.");
+      } else if (arg === '--kill') {
+        console.error("Error: '--kill' is no longer a flag. Use 'ocmux kill' instead.");
       } else {
         console.error(`Error: unknown option '${arg}'`);
         console.error(`Run '${SCRIPT} -h' for help.`);
@@ -476,7 +548,7 @@ function main() {
         process.exit(1);
       }
       targetDir = resolveDir(arg);
-    } else if (arg === 'new' || arg === 'kill' || arg === 'list') {
+    } else if (arg === 'serve' || arg === 'new' || arg === 'kill' || arg === 'list') {
       if (subcommand) {
         console.error(`Error: multiple subcommands specified: '${subcommand}' and '${arg}'`);
         process.exit(1);
@@ -495,27 +567,43 @@ function main() {
 
   // Dispatch
   if (subcommand === 'list') {
+    if (gitMode) {
+      console.error("Error: '--git' and '--GIT' are only valid with 'serve'.");
+      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 'serve'.");
+      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.");
+      console.error("Run 'ocmux serve' to create a new server.");
       process.exit(1);
     }
     cmdKill(sf);
-  } else if (subcommand === 'new') {
+  } else if (subcommand === 'serve' || 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 'serve'.");
+      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.");
+      console.error("Run 'ocmux serve' to create a new server.");
       process.exit(1);
     }
     ensureSession();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentp",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "description": "Pipe prompts into a running OpenCode TUI session and stream the final answer",
   "bin": {
     "agentp": "bin/agentp",