agentp 0.3.0 → 0.4.0

package/README.md

@@ -41,6 +41,7 @@ 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.
+- If the OpenCode server is password-protected (`OPENCODE_SERVER_PASSWORD`), both `agentp` and `ocmux` automatically send the required HTTP Basic Auth credentials.
 
 ## Usage
 
@@ -121,7 +122,7 @@ Without arguments, searches upward from `<directory>` (default: `$PWD`) for `.oc
 
 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.
+- **`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.
@@ -129,7 +130,7 @@ Subcommands:
 
 Options:
 
-- `-l`: long output for default/new commands (append `→ <dir>` after the URL)
+- `-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

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()
     }
   };
 }
@@ -80,8 +95,13 @@ function listenForFinalAnswer(server, 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();
 
@@ -202,6 +222,11 @@ async function main() {
   }
 
   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

@@ -98,7 +98,7 @@ function resolveGitDir(startDir, requireDir, flagLabel) {
   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.`);
+    console.error(`Run '${SCRIPT} serve' without ${flagLabel} to create a server in the current directory.`);
     process.exit(1);
   }
 
@@ -233,7 +233,8 @@ 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).');
@@ -247,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 (new/default).');
+  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('');
@@ -275,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;
@@ -393,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++) {
@@ -416,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) {
@@ -515,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.`);
@@ -538,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);
@@ -558,7 +568,7 @@ function main() {
   // Dispatch
   if (subcommand === 'list') {
     if (gitMode) {
-      console.error("Error: '--git' and '--GIT' are only valid with 'new'.");
+      console.error("Error: '--git' and '--GIT' are only valid with 'serve'.");
       process.exit(1);
     }
     if (targetDir !== process.cwd()) {
@@ -568,17 +578,17 @@ function main() {
     cmdList();
   } else if (subcommand === 'kill') {
     if (gitMode) {
-      console.error("Error: '--git' and '--GIT' are only valid with 'new'.");
+      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);
@@ -586,14 +596,14 @@ function main() {
     cmdNew(targetDir, longMode);
   } else {
     if (gitMode) {
-      console.error("Error: '--git' and '--GIT' are only valid with 'new'.");
+      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.3.0",
+  "version": "0.4.0",
   "description": "Pipe prompts into a running OpenCode TUI session and stream the final answer",
   "bin": {
     "agentp": "bin/agentp",