@lardexx/arenacode 2.11.5 → 2.11.6

package/README.md

@@ -110,6 +110,7 @@ How the copy is built and tested: [`docs/TUI.md`](docs/TUI.md).
 | `enter` | send · `shift+enter` newline |
 | `esc` | interrupt the turn · clear the input · quit |
 | `tab` | switch mode: Build → Plan → Computer |
+| `/sessions` (or `ctrl+x l`) | switch between sessions: every timeline is a slot, `n` opens a new one |
 | `ctrl+p` | command palette (`↑↓` select, `enter` run, `esc` close) |
 | `/` | slash commands with an inline list above the prompt |
 | `@file` | attach a file from the open folder (uploaded to `uploads/`) |
@@ -118,7 +119,7 @@ How the copy is built and tested: [`docs/TUI.md`](docs/TUI.md).
 | `!command` | run a command locally |
 | `↑` / `↓` | prompt history (or move through the slash list) |
 | `pgup` / `pgdn` | scroll the transcript |
-| `ctrl+x` then | `q` quit · `n` new session · `l` task queue · `t` theme · `a` Ask and Proceed / Proceed · `d` tool output · `s` stop |
+| `ctrl+x` then | `q` quit · `n` new session · `l` switch session · `t` theme · `a` Ask and Proceed / Proceed · `d` tool output · `s` stop |
 | `ctrl+c` | interrupt, then quit |
 
 **The same four flows as the desktop client.** The Windows app is the reference for how a task reaches the bridge,
@@ -220,8 +221,8 @@ Later, `/settings` (or the command palette, `ctrl+p`) reopens them inside the in
 | `arenacode --help` | the options below |
 | `arenacode --version` | the version of the installed package |
 
-Everything else — URL and API key, settings, the task queue, task state and timeline, files on the bridge,
-file uploads, Stop — is inside the interface. Up to 2.11.2 these were subcommands (`init`, `config`, `ping`,
+Everything else — URL and API key (`/settings`), sessions (`/sessions`), the task queue on the bridge
+(`/queue`), Stop, file uploads — is inside the interface. Up to 2.11.2 these were subcommands (`init`, `config`, `ping`,
 `doctor`, `ask`, `chat`, `ui`, `tasks`, `status`, `events`, `stop`, `files`, `cat`, `attach`, `handshake`);
 they were removed on request, and the terminal has to be interactive: in a pipe the client prints why and exits.
 
@@ -292,6 +293,17 @@ What happens when:
 the send-once-per-session rule and the git exclusion; the integration test checks that a real task creates the
 sheet and that the bridge receives it.
 
+### Sessions
+
+Every timeline in the interface is a **session**: its own transcript, its own task id, its own mode. `/sessions`
+(or `ctrl+x l`) opens the list — the current one is marked with `●` and its label is the first instruction you
+typed in it; `enter` switches to the selected session, `n` (or the `+ new session` row) starts a fresh one.
+`ctrl+x n` is the shortcut for a new session.
+
+Sessions live in memory for the run of the client, the way the terminal client always behaved: nothing is
+written to disk, and the transcript of a session that was never used stays empty. The bridge keeps the tasks
+themselves — `/queue` shows them with their state and id.
+
 ### Shells
 
 Terminal cards run in a real shell, and which one is not fixed:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lardexx/arenacode",
-  "version": "2.11.5",
+  "version": "2.11.6",
   "description": "Terminal client for ArenaCode: talks to an arena-bridge, streams the Agent Mode timeline, and runs local commands, file operations and computer automation on your PC (windows-use.dll on Windows, Xlib/XTest on Linux, osascript on macOS). Node port of the ArenaCode desktop client.",
   "license": "MIT",
   "type": "commonjs",
@@ -20,7 +20,7 @@
     "vendor/"
   ],
   "scripts": {
-    "test": "node test/cli-surface.js && node test/shell.js && node test/context.js && node test/integration.js && node test/parity.js && node test/automation.js && node test/native.js"
+    "test": "node test/cli-surface.js && node test/sessions.js && node test/shell.js && node test/context.js && node test/integration.js && node test/parity.js && node test/automation.js && node test/native.js"
   },
   "keywords": [
     "arenacode",

package/src/cli.js

@@ -379,7 +379,6 @@ async function main(argv) {
   const { flags, positional } = parseArgs(argv);
   const command = positional[0];
 
-  // Only the flags: `arenacode help` and `arenacode version` are not subcommands either.
   if (flags.version) {
     write(VERSION);
     return 0;

package/src/tui/app.js

@@ -80,6 +80,12 @@ class App {
       lastError: null,
     };
 
+    // Sessions: every timeline is a slot the user can switch back to (`/sessions`).
+    this.sessions = [];
+    this.sessionIndex = 0;
+    this.sessionSeq = 0;
+    this.newSession({ silent: true });
+
     this.term = new Term();
     this.parser = new KeyParser((key) => this.onKey(key));
     this.localQueue = [];
@@ -279,16 +285,11 @@ class App {
       case 'q':
         return this.quit();
       case 'n':
-        st.items = [];
-        st.seqItems.clear();
-        st.taskId = null;
-        st.since = 0;
-        this.toast('new session');
-        return undefined;
+        return this.newSession();
       case 'h':
         return this.openHelp();
       case 'l':
-        return this.openTasks();
+        return this.openSessions();
       case 't': {
         const names = themeNames();
         const next = names[(names.indexOf(this.themeName) + 1) % names.length];
@@ -427,6 +428,76 @@ class App {
     return undefined;
   }
 
+  // ---------------------------------------------------------------- sessions
+
+  /** Copies the live timeline into the active session slot. */
+  saveSession() {
+    const st = this.state;
+    const slot = this.sessions[this.sessionIndex];
+    if (!slot) return;
+    slot.items = st.items;
+    slot.seqItems = st.seqItems;
+    slot.taskId = st.taskId;
+    slot.since = st.since;
+    slot.mode = st.mode;
+    if (!slot.label) {
+      const first = st.items.find((i) => i.kind === 'user' && i.text);
+      if (first) slot.label = String(first.text).replace(/@\S+/g, '').replace(/\s+/g, ' ').trim().slice(0, 48);
+    }
+  }
+
+  /** Loads a slot into the live state. */
+  applySession() {
+    const st = this.state;
+    const slot = this.sessions[this.sessionIndex];
+    st.items = slot ? slot.items : [];
+    st.seqItems = slot ? slot.seqItems : new Map();
+    st.taskId = slot ? slot.taskId : null;
+    st.since = slot ? slot.since : 0;
+    st.scroll = 0;
+    st.overlay = null;
+    st.approval = null;
+    st.status = 'idle';
+    this.invalidate();
+  }
+
+  newSession({ silent = false } = {}) {
+    this.saveSession();
+    this.sessionSeq += 1;
+    this.sessions.push({
+      id: this.sessionSeq,
+      label: '',
+      items: [],
+      seqItems: new Map(),
+      taskId: null,
+      since: 0,
+      mode: this.state.mode,
+      startedAt: Date.now(),
+    });
+    this.sessionIndex = this.sessions.length - 1;
+    this.applySession();
+    if (!silent) this.toast(`session ${this.sessionSeq} · new`);
+  }
+
+  activateSession(index) {
+    if (index < 0 || index >= this.sessions.length || index === this.sessionIndex) {
+      this.state.overlay = null;
+      this.invalidate();
+      return;
+    }
+    this.saveSession();
+    this.sessionIndex = index;
+    this.applySession();
+    const slot = this.sessions[index];
+    this.toast(`session ${slot.id}${slot.label ? ` · ${slot.label}` : ''}`);
+  }
+
+  async openSessions() {
+    this.saveSession();
+    this.state.overlay = { type: 'sessions', index: this.sessionIndex };
+    this.invalidate();
+  }
+
   // ---------------------------------------------------------------- overlays
   openPalette() {
     this.state.overlay = { type: 'palette', query: '', index: 0 };
@@ -439,7 +510,7 @@ class App {
   }
 
   async openTasks() {
-    this.state.overlay = { type: 'tasks', loading: true, tasks: [], index: 0 };
+    this.state.overlay = { type: 'queue', loading: true, tasks: [], index: 0 };
     this.invalidate();
     const res = await this.bridge.listTasks('all');
     if (res.status === 200) {
@@ -462,7 +533,8 @@ class App {
         this.state.since = 0;
         this.toast('new session');
       } },
-      { title: 'Task queue', hint: 'ctrl+x l', run: () => this.openTasks() },
+      { title: 'Sessions (switch between sessions)', hint: 'ctrl+x l', slash: '/sessions', run: () => this.openSessions() },
+      { title: 'Queue: tasks on the bridge', hint: '', slash: '/queue', run: () => this.openTasks() },
       { title: 'Toggle detail', hint: 'ctrl+x d', run: () => {
         this.state.details = !this.state.details;
         this.toast(`details ${this.state.details ? 'on' : 'off'}`);
@@ -485,13 +557,14 @@ class App {
         if (h) this.push({ kind: 'system', text: `bridge v${h.version} · ${h.executor_mode} · claimable ${h.tasks.claimable}` });
         else this.toast('bridge unreachable', 'error');
       } },
-      { title: 'Settings', slash: '/settings', hint: '', run: () => this.openSettings() },
+      { title: 'Settings: bridge URL and API key', slash: '/settings', hint: '', run: () => this.openSettings() },
       { title: 'Help', hint: 'f1', run: () => this.openHelp() },
       { title: 'Quit', hint: 'ctrl+x q', run: () => this.quit() },
-    // No slash invented from the title any more: it produced /switch-mode-build-plan-computer
-    // and a second /theme next to the one in slashCommands(). An entry gets a slash only if
-    // it declares one.
-    ].map((cmd) => ({ ...cmd, slash: cmd.slash || '', group: cmd.group || 'Commands' }));
+    ].map((cmd) => ({
+      ...cmd,
+      slash: cmd.slash || '/' + cmd.title.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/-+$/, ''),
+      group: 'Commands',
+    }));
   }
 
   /** `/help`, `/new`, `/tasks` … — opencode-style slash commands */
@@ -502,7 +575,9 @@ class App {
     };
     return [
       { slash: '/new', title: 'Start a new session', hint: 'ctrl+x n', group: 'Session', run: by('New session') },
-      { slash: '/tasks', title: 'Show the task queue', hint: 'ctrl+x l', group: 'Session', run: () => this.openTasks() },
+      { slash: '/sessions', title: 'Switch between sessions', hint: 'ctrl+x l', group: 'Session', run: () => this.openSessions() },
+      { slash: '/settings', title: 'Bridge URL and API key', hint: '', group: 'Session', run: () => this.openSettings() },
+      { slash: '/queue', title: 'Tasks on the bridge', hint: '', group: 'Session', run: () => this.openTasks() },
       { slash: '/mode', title: 'Switch agent / plan', hint: 'tab', group: 'Session', run: by('Switch mode') },
       { slash: '/ask', title: 'Ask and Proceed: ask before commands, files and plans', hint: '', group: 'Session', run: () => this.setApproval('ask') },
       { slash: '/proceed', title: 'Proceed: approve the plan and run everything without asking', hint: '', group: 'Session', run: () => this.setApproval('proceed') },
@@ -654,7 +729,23 @@ class App {
       return undefined;
     }
 
-    if (ov.type === 'tasks') {
+    if (ov.type === 'sessions') {
+      const rows = this.sessions.length + 1; // + "new session"
+      if (key.name === 'up') ov.index = Math.max(0, ov.index - 1);
+      else if (key.name === 'down') ov.index = Math.min(rows - 1, ov.index + 1);
+      else if (key.name === 'enter') {
+        if (ov.index >= this.sessions.length) this.newSession();
+        else this.activateSession(ov.index);
+        this.state.overlay = null;
+      } else if (key.name === 'n') {
+        this.state.overlay = null;
+        this.newSession();
+      }
+      this.invalidate();
+      return undefined;
+    }
+
+    if (ov.type === 'queue') {
       if (key.name === 'up') {
         ov.index = Math.max(0, ov.index - 1);
       } else if (key.name === 'down') {
@@ -699,6 +790,12 @@ class App {
     return undefined;
   }
 
+  /** A list dialog draws group rows too: the selection index must skip them. */
+  sessionRowIndex(index) {
+    const at = Math.max(0, Math.min(this.sessions.length, index));
+    return 1 + at + (at >= this.sessions.length ? 1 : 0);
+  }
+
   filteredCommands() {
     const ov = this.state.overlay;
     const all = this.commands();
@@ -818,6 +915,7 @@ class App {
     }
     st.taskId = res.json.task_id;
     session.remember(st.taskId, st.mode);
+    this.saveSession();
     st.since = 0;
     st.seqItems.clear();
   }
@@ -1445,16 +1543,11 @@ class App {
 
   slashList() {
     const q = this.state.input.slice(1).toLowerCase().split(' ')[0];
-    // slashCommands() first: it carries the opencode wording. The palette entries whose
-    // slash is already taken are dropped, so typing `/` never shows the same command twice
-    // (/settings, /theme, /help and /quit used to appear twice each).
-    const seen = new Set();
-    const all = [...this.slashCommands(), ...this.commands()].filter((c) => {
-      if (!c.slash || seen.has(c.slash)) return false;
-      seen.add(c.slash);
-      return true;
-    });
-    return all.filter((c) => !q || c.slash.replace('/', '').startsWith(q)).slice(0, 7);
+    // Only the curated list: merging commands() in brought the auto-generated names
+    // (/new-session, /bridge-status-ping …) next to the good ones and showed /settings twice.
+    return this.slashCommands()
+      .filter((c) => !q || c.slash.replace('/', '').startsWith(q))
+      .slice(0, 7);
   }
 
   overlaySlash(frame, W, H, list) {
@@ -1514,12 +1607,35 @@ class App {
         items.push({ label, hint: key, group: '' });
       }
       dialog = D.listDialog(t, { W, size: 'large', title: 'Help', filter: '', items, index: -1, footer: [['esc', 'close']] });
+    } else if (ov.type === 'sessions') {
+      const items = [{ group: 'Sessions' }];
+      this.sessions.forEach((slot, i) => {
+        const running = i === this.sessionIndex;
+        const label = slot.label || (slot.taskId ? `task ${slot.taskId}` : 'empty session');
+        const hint = `${slot.items.length ? `${slot.items.length} lines` : ''}${running ? ' · current' : ''}`.trim();
+        items.push({ label: `${running ? '●' : ' '} ${slot.id}  ${R.vclip(label, 44)}`, hint, grouped: true });
+      });
+      items.push({ group: '' });
+      items.push({ label: '+ new session', hint: 'n', grouped: true });
+      dialog = D.listDialog(t, {
+        W,
+        size: 'large',
+        title: 'Sessions',
+        filter: '',
+        items,
+        index: this.sessionRowIndex(ov.index),
+        footer: [
+          ['enter', 'switch'],
+          ['n', 'new'],
+          ['esc', 'close'],
+        ],
+      });
     } else {
       const items = [{ group: 'Queue' }];
       if (ov.loading) items.push({ label: 'loading…', dim: true });
       else if (!ov.tasks.length) items.push({ label: 'no tasks', dim: true });
       else for (const task of ov.tasks.slice(0, Math.max(4, H - 12))) items.push({ label: `${task.state}  ${R.vclip(task.id, 22)}  ${R.vclip(String(task.instruction).split('\n').slice(-1)[0], 40)}`, grouped: true });
-      dialog = D.listDialog(t, { W, size: 'large', title: 'Sessions', filter: '', items, index: -1, footer: [['esc', 'close']] });
+      dialog = D.listDialog(t, { W, size: 'large', title: 'Queue', filter: '', items, index: -1, footer: [['esc', 'close']] });
     }
 
     const y = D.dialogY(H, dialog.lines.length);
@@ -1596,7 +1712,9 @@ function HELP_ROWS() {
     ['Prompt', '!', 'run a command locally'],
     ['Prompt', 'up / down', 'history'],
     ['Session', 'ctrl+x n', 'new session'],
-    ['Session', 'ctrl+x l', 'task queue'],
+    ['Session', 'ctrl+x l', 'switch session'],
+    ['Session', '/sessions', 'switch between sessions'],
+    ['Session', '/queue', 'tasks on the bridge'],
     ['Session', 'ctrl+x a', 'Ask and Proceed / Proceed'],
     ['Session', 'ctrl+x t', 'switch theme'],
     ['Session', '/settings', 'bridge URL and API key'],