clideck 1.30.8 → 1.31.0

package/README.md

@@ -39,6 +39,12 @@ Open [localhost:4000](http://localhost:4000). Click **+**, pick an agent, start
 
 Or just run it once with `npx clideck`. Works on macOS and Windows. Node 18+. Linux: untested - if you try it, [open an issue](https://github.com/rustykuntz/clideck/issues).
 
+If port `4000` is already in use:
+
+```bash
+clideck --port 4001
+```
+
 ## What makes it useful
 
 **Live status** - see which agent is working and which is waiting. Status detection for Claude Code, Codex, Gemini CLI, and OpenCode.

package/clideck-ask-cli.js

@@ -20,7 +20,8 @@ function parseDuration(value) {
 }
 
 function parseArgs(args) {
-  const out = { timeoutMs: 10 * 60 * 1000, url: process.env.CLIDECK_URL || 'http://127.0.0.1:4000' };
+  const port = process.env.CLIDECK_PORT || process.env.PORT || '4000';
+  const out = { timeoutMs: 10 * 60 * 1000, url: process.env.CLIDECK_URL || `http://127.0.0.1:${port}` };
   const positional = [];
   for (let i = 0; i < args.length; i++) {
     const arg = args[i];

package/handlers.js

@@ -7,6 +7,7 @@ const sessions = require('./sessions');
 const themes = require('./themes');
 const presets = JSON.parse(readFileSync(join(__dirname, 'agent-presets.json'), 'utf8'));
 const { listDirs, binName, defaultShell } = require('./utils');
+const { PORT } = require('./runtime');
 for (const p of presets) if (p.presetId === 'shell') p.command = defaultShell;
 function isPresetEnabled(preset) {
   if (!preset?.enabledIfEnv) return true;
@@ -150,7 +151,7 @@ function codexConfigLooksHealthy(content, port) {
 
 function detectTelemetryConfig(c) {
   const home = os.homedir();
-  const port = '4000';
+  const port = String(PORT);
   let changed = false;
   const attemptedRepairs = new Set();
 
@@ -555,7 +556,7 @@ function onConnection(ws) {
 
 // Deterministic telemetry config writers per agent — no AI, no YOLO
 function applyTelemetryConfig(preset) {
-  const port = '4000';
+  const port = String(PORT);
   const home = os.homedir();
 
   try {
@@ -595,9 +596,10 @@ function applyTelemetryConfig(preset) {
       let content = '';
       if (existsSync(configPath)) content = readFileSync(configPath, 'utf8');
       const hasOtel = content.includes('[otel]');
+      const hasCurrentOtel = content.includes(`localhost:${port}`);
       const hasNotify = /^\s*notify\s*=.*notify-helper/m.test(content);
       const hasWrongOtel = content.includes(`endpoint = "http://localhost:${port}/v1/logs"`);
-      if (hasOtel && hasNotify && !hasWrongOtel && !existsSync(hooksPath) && !/(^|\n)\[features\][\s\S]*?codex_hooks\s*=/.test(content)) {
+      if (hasOtel && hasCurrentOtel && hasNotify && !hasWrongOtel && !existsSync(hooksPath) && !/(^|\n)\[features\][\s\S]*?codex_hooks\s*=/.test(content)) {
         return { success: true, message: 'Already configured' };
       }
       const notifyHelperPath = join(__dirname, 'bin', 'notify-helper.js').replace(/\\/g, '/');
@@ -619,20 +621,26 @@ function applyTelemetryConfig(preset) {
       const hooks = settings.hooks || {};
       const helperPath = join(__dirname, 'bin', 'gemini-hook.js').replace(/\\/g, '/');
       const nodePath = process.execPath.replace(/\\/g, '/');
+      const hookCmd = (route) => `"${nodePath}" "${helperPath}" ${port} ${route}`;
       const geminiHook = (route) => ({
         matcher: '*',
-        hooks: [{ type: 'command', command: `"${nodePath}" "${helperPath}" ${port} ${route}`, name: `clideck-${route}`, timeout: 5000 }],
+        hooks: [{ type: 'command', command: hookCmd(route), name: `clideck-${route}`, timeout: 5000 }],
       });
-      const has = (arr, route) => arr?.some(h => h.hooks?.some(x => x.command?.includes('gemini-hook.js') && x.command?.includes(` ${route}`)));
+      const has = (arr, route) => arr?.some(h => h.hooks?.some(x => x.command === hookCmd(route)));
       if (has(hooks.BeforeAgent, 'start') && has(hooks.AfterAgent, 'stop') && has(hooks.SessionEnd, 'stop') && has(hooks.BeforeTool, 'menu')) {
         return { success: true, message: 'Already configured' };
       }
+      const stripOld = (arr) => (arr || []).filter(h => !h.hooks?.some(x => x.command?.includes('gemini-hook.js')));
+      hooks.BeforeAgent = stripOld(hooks.BeforeAgent);
+      hooks.AfterAgent = stripOld(hooks.AfterAgent);
+      hooks.SessionEnd = stripOld(hooks.SessionEnd);
+      hooks.BeforeTool = stripOld(hooks.BeforeTool);
       if (!has(hooks.BeforeAgent, 'start')) hooks.BeforeAgent = [...(hooks.BeforeAgent || []), geminiHook('start')];
       if (!has(hooks.AfterAgent, 'stop')) hooks.AfterAgent = [...(hooks.AfterAgent || []), geminiHook('stop')];
       if (!has(hooks.SessionEnd, 'stop')) hooks.SessionEnd = [...(hooks.SessionEnd || []), geminiHook('stop')];
       if (!has(hooks.BeforeTool, 'menu')) hooks.BeforeTool = [...(hooks.BeforeTool || []), geminiHook('menu')];
       settings.hooks = hooks;
-      if (settings.telemetry?.target === 'local' && String(settings.telemetry?.otlpEndpoint || '').includes(`localhost:${port}`)) delete settings.telemetry;
+      if (settings.telemetry?.target === 'local' && /localhost:\d+/.test(String(settings.telemetry?.otlpEndpoint || ''))) delete settings.telemetry;
       mkdirSync(dirname(configPath), { recursive: true });
       writeFileSync(configPath, JSON.stringify(settings, null, 2) + '\n');
       return { success: true, message: 'Added CliDeck hooks to ~/.gemini/settings.json' };
@@ -700,7 +708,7 @@ function removeTelemetryConfig(preset) {
         if (!settings.hooks[event].length) delete settings.hooks[event];
       }
       if (settings.hooks && !Object.keys(settings.hooks).length) delete settings.hooks;
-      if (settings.telemetry?.target === 'local' && String(settings.telemetry?.otlpEndpoint || '').includes('localhost:4000')) delete settings.telemetry;
+      if (settings.telemetry?.target === 'local' && /localhost:\d+/.test(String(settings.telemetry?.otlpEndpoint || ''))) delete settings.telemetry;
       writeFileSync(configPath, JSON.stringify(settings, null, 2) + '\n');
       return { success: true, message: 'Removed CliDeck hooks from ~/.gemini/settings.json' };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clideck",
-  "version": "1.30.8",
+  "version": "1.31.0",
   "description": "One screen for all your AI coding agents — run, monitor, and manage multiple CLI agents from a single browser tab",
   "main": "server.js",
   "bin": {

package/plugins/trim-clip/clideck-plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "trim-clip",
   "name": "Trim Clip",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "author": "CliDeck",
   "description": "Copy selected terminal text with trailing whitespace trimmed",
   "icon": "<svg class=\"w-4 h-4\" fill=\"none\" viewBox=\"0 0 24 24\" stroke=\"currentColor\" stroke-width=\"1.5\" stroke-linecap=\"round\" stroke-linejoin=\"round\"><circle cx=\"6\" cy=\"6\" r=\"3\"/><circle cx=\"6\" cy=\"18\" r=\"3\"/><line x1=\"20\" y1=\"4\" x2=\"8.12\" y2=\"15.88\"/><line x1=\"14.47\" y1=\"14.48\" x2=\"20\" y2=\"20\"/><line x1=\"8.12\" y1=\"8.12\" x2=\"12\" y2=\"12\"/></svg>",
@@ -11,6 +11,13 @@
       "label": "Enabled",
       "type": "toggle",
       "default": true
+    },
+    {
+      "key": "hotkey",
+      "label": "Trim Key",
+      "type": "text",
+      "default": "F8",
+      "description": "Key to copy selected terminal text with whitespace trimmed (e.g. F8, Ctrl+Shift+C)"
     }
   ]
 }

package/plugins/trim-clip/client.js

@@ -1,31 +1,53 @@
 let enabled = true;
 let btnEl = null;
+let apiRef = null;
+let currentHotkey = null;
+
+async function trimAndCopy() {
+  if (!enabled) return;
+  const text = apiRef.getTerminalSelection();
+  if (!text || !text.trim()) { apiRef.toast('Select text to copy & trim', { type: 'warn' }); return; }
+  const trimmed = text
+    .split('\n')
+    .map(l => l.trimEnd())
+    .join('\n')
+    .replace(/^\n+/, '').replace(/\n+$/, '');
+  try {
+    await navigator.clipboard.writeText(trimmed);
+    const saved = text.length - trimmed.length;
+    apiRef.toast(saved ? `Copied & trimmed ${saved} char${saved !== 1 ? 's' : ''}` : 'Copied', { type: 'success' });
+  } catch {
+    apiRef.toast('Clipboard access denied — allow it in browser site settings', { type: 'error' });
+  }
+}
+
+function bindHotkey(hotkey) {
+  const next = hotkey || 'F8';
+  if (next === currentHotkey) return;
+  const prev = currentHotkey;
+  if (prev) apiRef.unregisterHotkey(prev);
+  if (apiRef.registerHotkey(next, trimAndCopy)) {
+    currentHotkey = next;
+  } else if (prev) {
+    apiRef.registerHotkey(prev, trimAndCopy);
+    apiRef.toast(`Hotkey "${next}" is taken, keeping "${prev}"`, { type: 'warn' });
+  } else {
+    apiRef.toast(`Hotkey "${next}" is unavailable`, { type: 'warn' });
+  }
+}
 
 export function init(api) {
+  apiRef = api;
   api.onMessage('settings', (msg) => {
     enabled = msg.enabled !== false;
     if (btnEl) btnEl.style.display = enabled ? '' : 'none';
+    bindHotkey(msg.hotkey || 'F8');
   });
   api.send('getSettings');
 
   btnEl = api.addToolbarButton({
     title: 'Trim & Copy',
     icon: '<svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><circle cx="6" cy="6" r="3"/><circle cx="6" cy="18" r="3"/><path d="M20 4 8.12 15.88M14.47 14.48 20 20M8.12 8.12 12 12"/></svg>',
-    async onClick() {
-      const text = api.getTerminalSelection();
-      if (!text || !text.trim()) { api.toast('Select text to copy & trim', { type: 'warn' }); return; }
-      const trimmed = text
-        .split('\n')
-        .map(l => l.trimEnd())
-        .join('\n')
-        .replace(/^\n+/, '').replace(/\n+$/, '');
-      try {
-        await navigator.clipboard.writeText(trimmed);
-        const saved = text.length - trimmed.length;
-        api.toast(saved ? `Copied & trimmed ${saved} char${saved !== 1 ? 's' : ''}` : 'Copied', { type: 'success' });
-      } catch {
-        api.toast('Clipboard access denied — allow it in browser site settings', { type: 'error' });
-      }
-    }
+    onClick: trimAndCopy,
   });
 }

package/runtime.js

@@ -0,0 +1,29 @@
+function argValue(name) {
+  const idx = process.argv.indexOf(name);
+  if (idx < 0) return '';
+  const value = process.argv[idx + 1];
+  return value && !value.startsWith('-') ? value : '';
+}
+
+function parsePort(value) {
+  const port = Number.parseInt(String(value || ''), 10);
+  return Number.isInteger(port) && port > 0 && port <= 65535 ? port : null;
+}
+
+const PORT = parsePort(argValue('--port'))
+  || parsePort(process.env.CLIDECK_PORT)
+  || parsePort(process.env.PORT)
+  || 4000;
+
+const HOST = (() => {
+  const idx = process.argv.indexOf('--host');
+  const value = idx >= 0 ? process.argv[idx + 1] : '';
+  if (idx < 0) return '127.0.0.1';
+  return value && !value.startsWith('-') ? value : '0.0.0.0';
+})();
+
+function localUrl(host = HOST, port = PORT) {
+  return `http://${host === '0.0.0.0' ? 'localhost' : host}:${port}`;
+}
+
+module.exports = { PORT, HOST, localUrl };

package/server.js

@@ -3,6 +3,7 @@ const { readFileSync, existsSync } = require('fs');
 const { join, extname, resolve } = require('path');
 const { WebSocketServer } = require('ws');
 const { ensurePtyHelper } = require('./utils');
+const { PORT, HOST, localUrl } = require('./runtime');
 
 function terminalLink(url, text = url) {
   return `\u001B]8;;${url}\u0007${text}\u001B]8;;\u0007`;
@@ -63,10 +64,6 @@ require('./opencode-bridge').init(sessions.broadcast, sessions.getSessions);
 const config = require('./config');
 plugins.init(sessions.broadcast, sessions.getSessions, () => require('./handlers').getConfig(), (cfg) => config.save(cfg), sessions.input, sessions.createProgrammatic, sessions.close);
 
-const PORT = 4000;
-const hostIdx = process.argv.indexOf('--host');
-const hostArg = hostIdx >= 0 ? process.argv[hostIdx + 1] : undefined;
-const HOST = hostIdx < 0 ? '127.0.0.1' : (hostArg && !hostArg.startsWith('-') ? hostArg : '0.0.0.0');
 const MIME = { '.html': 'text/html', '.css': 'text/css', '.js': 'application/javascript', '.png': 'image/png', '.svg': 'image/svg+xml', '.mp3': 'audio/mpeg' };
 const ALIASES = {
   '/xterm.css':    join(__dirname, 'node_modules/@xterm/xterm/css/xterm.css'),
@@ -293,7 +290,7 @@ process.on('SIGTERM', onShutdown);
 
 server.listen(PORT, HOST, () => {
   const v = require('./package.json').version;
-  const url = `http://${HOST === '0.0.0.0' ? 'localhost' : HOST}:${PORT}`;
+  const url = localUrl();
   const clickableUrl = terminalLink(url);
   const urlHint = openUrlHint();
   console.log(`

package/sessions.js

@@ -10,7 +10,7 @@ const plugins = require('./plugin-loader');
 
 const THEMES = require('./themes');
 const MAX_BUFFER = 200 * 1024;
-const PORT = 4000;
+const { PORT, localUrl } = require('./runtime');
 const ANSI_RE = /\x1b\[[0-9;?]*[ -/]*[@-~]|\x1b\].*?(?:\x07|\x1b\\)|\x1b./g;
 const PRESETS = JSON.parse(require('fs').readFileSync(join(__dirname, 'agent-presets.json'), 'utf8'));
 for (const p of PRESETS) if (p.presetId === 'shell') p.command = defaultShell;
@@ -62,7 +62,7 @@ function buildTelemetryEnv(id, cmd) {
   const bin = binName(cmd.command);
   const preset = PRESETS.find(p => binName(p.command) === bin);
   const telemetryEnabled = cmd.telemetryEnabled ?? (preset?.presetId === 'claude-code');
-  const env = { CLIDECK_SESSION_ID: id };
+  const env = { CLIDECK_SESSION_ID: id, CLIDECK_PORT: String(PORT), CLIDECK_URL: localUrl() };
   if (!preset?.telemetryEnv || !telemetryEnabled) return env;
   for (const [k, v] of Object.entries(preset.telemetryEnv)) {
     env[k] = v.replace('{{port}}', String(PORT));