@bramblex/codex-workbench 0.1.6 → 0.1.8

package/README.md

@@ -125,6 +125,9 @@ Common keys:
 - `d`: delete the selected session
 - `Tab`: switch focus between projects, sessions, and details
 - `Left`/`Right` or `h`/`l`: move between panes
+- `0`: show all sources
+- `1`-`9`: jump to a source
+- `[`/`]`: switch to the previous or next source
 - `q`, `Esc`, or `Ctrl+C`: quit
 
 In the directory picker, use `Up`/`Down` or `j`/`k` to move, `Left`/`h` for the parent directory, `Right`/`l` for the selected child directory, `n` to create a child directory, and `Enter` to choose the selected directory.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bramblex/codex-workbench",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Terminal workbench for browsing and managing local and SSH Codex sessions.",
   "license": "MIT",
   "repository": {
@@ -32,7 +32,7 @@
     "LICENSE"
   ],
   "scripts": {
-    "test": "node -e \"const fs=require('fs'),{spawnSync}=require('child_process');function files(d){return fs.readdirSync(d,{withFileTypes:true}).flatMap(e=>e.isDirectory()?files(d+'/'+e.name):e.name.endsWith('.js')?[d+'/'+e.name]:[])}for(const f of files('src')){const r=spawnSync(process.execPath,['--check',f],{stdio:'inherit'});if(r.status)process.exit(r.status)}\" && node --check bin/codex-workbench && node --check scripts/pty-codex.js && node --check scripts/tui-pty-codex.js && node --check scripts/blessed-xterm-codex.js && node test/codex-bin.test.js && node test/session-sources.test.js && node test/smoke.js",
+    "test": "node -e \"const fs=require('fs'),{spawnSync}=require('child_process');function files(d){return fs.readdirSync(d,{withFileTypes:true}).flatMap(e=>e.isDirectory()?files(d+'/'+e.name):e.name.endsWith('.js')?[d+'/'+e.name]:[])}for(const f of files('src')){const r=spawnSync(process.execPath,['--check',f],{stdio:'inherit'});if(r.status)process.exit(r.status)}\" && node --check bin/codex-workbench && node --check scripts/pty-codex.js && node --check scripts/tui-pty-codex.js && node --check scripts/blessed-xterm-codex.js && node test/codex-bin.test.js && node test/blessed-compat.test.js && node test/session-sources.test.js && node test/smoke.js",
     "pty:codex": "node scripts/pty-codex.js",
     "tui:codex": "node scripts/tui-pty-codex.js",
     "xterm:codex": "node scripts/blessed-xterm-codex.js"

package/src/ui/blessed-compat.js

@@ -0,0 +1,21 @@
+'use strict';
+
+const Tput = require('blessed/lib/tput');
+
+function patchBlessedTerminfo() {
+  if (Tput.prototype._codexWorkbenchPatched) return;
+
+  const compile = Tput.prototype._compile;
+  Tput.prototype._compile = function patchedCompile(info, key, str) {
+    if (key === 'plab_norm') return () => '';
+    return compile.call(this, info, key, str);
+  };
+
+  Tput.prototype._codexWorkbenchPatched = true;
+}
+
+patchBlessedTerminfo();
+
+module.exports = {
+  patchBlessedTerminfo,
+};

package/src/ui/directory-picker.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const path = require('path');
+require('./blessed-compat');
 const blessed = require('blessed');
 const { createChildDirectory, directoryNameError, listDirectories } = require('../model/directories');
 

package/src/ui/workbench.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const path = require('path');
+require('./blessed-compat');
 const blessed = require('blessed');
 const { printList, printShow } = require('../cli-output');
 const { deleteSessionFile } = require('../model/session-store');
@@ -190,11 +191,26 @@ async function runWorkbench() {
     return `${group.source.label}: ${group.cwd}`;
   };
 
+  const sourceShortcut = (source) => {
+    const index = sources.findIndex((item) => item.id === source.id);
+    return index >= 0 && index < 9 ? String(index + 1) : '';
+  };
+
+  const machineLabel = (source, count) => {
+    const shortcut = sourceShortcut(source);
+    const prefix = shortcut ? `${shortcut} ` : '';
+    const maxLabel = Math.max(8, projectWidth - 18);
+    const text = `${prefix}${truncate(source.label, maxLabel)} (${count})`;
+    const width = Math.max(12, projectWidth - 4);
+    const head = `- ${text} `;
+    return `${head}${'-'.repeat(width)}`.slice(0, width);
+  };
+
   const projectLabel = (group) => {
-    if (group.kind === 'all') return `All (${sessions.length})`;
+    if (group.kind === 'all') return `0 All (${sessions.length})`;
     if (group.kind === 'source') {
       const count = sessionsForSource(group.source.id).length;
-      return `${truncate(group.source.label, Math.max(10, projectWidth - 6))} (${count})`;
+      return machineLabel(group.source, count);
     }
     const count = sessions.filter((session) => session.sourceId === group.source.id && session.cwd === group.cwd).length;
     const base = path.basename(group.cwd) || group.cwd;
@@ -409,11 +425,11 @@ async function runWorkbench() {
 
     const firstLine = message || 'Ready';
     if (projectFocused) {
-      status.setContent(`${firstLine}\nProjects: ↑/↓ select project  n new project  →/Enter sessions  Tab focus  q quit`);
+      status.setContent(`${firstLine}\nSources: ↑/↓ select  0 all  1-9 machine  [/] prev/next  n new  → sessions  q quit`);
     } else if (detailFocused) {
-      status.setContent(`${firstLine}\nDetails: ↑/↓ scroll  n new session  ← sessions  → projects  Tab focus  q quit`);
+      status.setContent(`${firstLine}\nDetails: ↑/↓ scroll  1-9 machine  [/] prev/next  n new  ← sessions  q quit`);
     } else {
-      status.setContent(`${firstLine}\nSessions: ↑/↓ select  Enter resume  r rename  n new session  f fork  v view  o note  a archive  d delete  q quit`);
+      status.setContent(`${firstLine}\nSessions: ↑/↓ select  Enter resume  1-9 machine  [/] prev/next  r rename  n new  d delete`);
     }
   };
 
@@ -483,6 +499,35 @@ async function runWorkbench() {
     render();
   };
 
+  const selectSourceIndex = (sourceIndex) => {
+    const source = sources[sourceIndex];
+    if (!source) return;
+    const nextIndex = groups.findIndex((group) => group.kind === 'source' && group.source.id === source.id);
+    if (nextIndex === -1) return;
+    selectGroup(nextIndex);
+    setMessage(`Switched to ${source.label}.`);
+    render();
+  };
+
+  const currentSourceIndex = () => {
+    const group = currentGroup();
+    if (group.kind === 'source' || group.kind === 'project') {
+      return sources.findIndex((source) => source.id === group.source.id);
+    }
+    const session = selectedSession();
+    if (session) return sources.findIndex((source) => source.id === session.sourceId);
+    return -1;
+  };
+
+  const switchSource = (delta) => {
+    if (!sources.length) return;
+    const currentIndex = currentSourceIndex();
+    const nextIndex = currentIndex === -1
+      ? (delta > 0 ? 0 : sources.length - 1)
+      : (currentIndex + delta + sources.length) % sources.length;
+    selectSourceIndex(nextIndex);
+  };
+
   const runCodexAndReturn = (command, session, args = [], doneText = `${command} finished.`) => {
     screen.leave();
     let status = 0;
@@ -667,6 +712,30 @@ async function runWorkbench() {
     else focusPanel(detailBox, 'details');
   });
 
+  screen.key(['0'], () => {
+    if (promptOpen()) return;
+    selectGroup(0);
+    setMessage('Switched to all sources.');
+    render();
+  });
+
+  for (let i = 1; i <= 9; i += 1) {
+    screen.key([String(i)], () => {
+      if (promptOpen()) return;
+      selectSourceIndex(i - 1);
+    });
+  }
+
+  screen.key([']'], () => {
+    if (promptOpen()) return;
+    switchSource(1);
+  });
+
+  screen.key(['['], () => {
+    if (promptOpen()) return;
+    switchSource(-1);
+  });
+
   screen.key(['q', 'escape', 'C-c'], () => {
     if (promptOpen()) return;
     leaveScreen();