@north-light/crouter 0.3.276 → 0.3.278

package/dist/clients/attach/input/capabilities.js

@@ -74,7 +74,7 @@ export function viewerOperationForFrame(frame) {
 export function viewerOperationForSlash(name, builtin, canvas) {
     if (canvas) {
         switch (name) {
-            case 'resume-node': return 'canvas-resume';
+            case 'resume': return 'canvas-resume';
             case 'context':
             case 'node-metadata': return 'local-canvas-inspect';
             // `/plugins` configures the local machine, not this node; observers and
@@ -84,6 +84,7 @@ export function viewerOperationForSlash(name, builtin, canvas) {
             case 'clear':
             case 'promote':
             case 'rename':
+            case 'resume-session':
             case 'mcp': return 'engine-drive';
             default: return undefined;
         }

package/dist/clients/attach/slash/dispatch.js

@@ -38,7 +38,8 @@ export const CANVAS_SLASH_COMMANDS = [
     { name: 'graph', description: 'Toggle the canvas GRAPH view (your local subscription tree)' },
     { name: 'inbox', description: 'Toggle the human inbox — pending asks and reviews for you' },
     { name: 'promote', description: 'Promote this node to an orchestrator — /promote, or /promote <kind> to specialize' },
-    { name: 'resume-node', description: 'Open the canvas navigator and focus the chosen node; parked residents wake only on submitted input' },
+    { name: 'resume', description: 'Open the canvas navigator and swap THIS pane onto the chosen node; parked residents wake only on submitted input' },
+    { name: 'resume-session', description: 'Switch this node onto one of its saved pi sessions — picker, or /resume-session <session-path>' },
     { name: 'context', description: 'Browse this node + its subscriptions’ context dirs in a read-only nvim popup' },
     { name: 'plugins', description: 'Open the interactive plugin browser for this machine' },
     { name: 'node-metadata', description: 'Inspect this node — identity, lifecycle, runtime, graph, artifacts, paths, and agent surfaces' },
@@ -51,7 +52,11 @@ export const CANVAS_SLASH_COMMANDS = [
     { name: 'copy-transcript', description: 'Copy every copyable transcript block' },
     { name: 'fold-tools', description: 'View setting — fold every FINISHED tool call to its single call line (Alt+C → z → f)' },
 ];
-const CANVAS_NAMES = new Set(CANVAS_SLASH_COMMANDS.map((c) => c.name));
+/** Prior names still dispatched natively but kept OUT of autocomplete, so
+ *  muscle memory keeps working while the palette shows one canonical entry.
+ *  Normalized to the canonical name before any gate or dispatch runs. */
+const CANVAS_ALIASES = new Map([['resume-node', 'resume']]);
+const CANVAS_NAMES = new Set([...CANVAS_SLASH_COMMANDS.map((c) => c.name), ...CANVAS_ALIASES.keys()]);
 /** tmux named colours accepted by `/color` (plus `colourN`/`#rrggbb`, validated
  *  by pattern). Mirrors tmux's colour-name table so a typo is rejected with the
  *  options rather than silently ignored by tmux. */
@@ -119,7 +124,8 @@ export function dispatchSlashCommand(text, ctx) {
     const command = parseSlashCommand(text);
     if (command === undefined)
         return false;
-    const { name, arg } = command;
+    const { arg } = command;
+    const name = CANVAS_ALIASES.get(command.name) ?? command.name;
     if (SCOPED_OUT.has(name)) {
         ctx.notify(`/${name} is not supported in attach (Phase 4)`);
         return true;
@@ -189,11 +195,6 @@ export function dispatchSlashCommand(text, ctx) {
                 return openOrHint(ctx.openModelPicker, ctx, 'model', '/model <provider/id>');
             ctx.send({ type: 'set_model', model: arg });
             return true;
-        case 'resume':
-            if (!arg)
-                return openOrHint(ctx.openSessionPicker, ctx, 'session', '/resume <session-path>');
-            ctx.send({ type: 'switch_session', path: arg });
-            return true;
         case 'fork':
             if (!arg)
                 return openOrHint(ctx.openForkPicker, ctx, 'fork point', '/fork <entryId>');
@@ -277,12 +278,24 @@ export function dispatchSlashCommand(text, ctx) {
  *  omitted rather than offered-then-blocked, so autocomplete never advertises a
  *  command `dispatchCanvasCommand` would refuse to run. */
 function withCanvasCommands(commands, capabilities) {
-    const seen = new Set(commands.map((c) => c.name));
-    const offerable = CANVAS_SLASH_COMMANDS.filter((command) => {
-        const operation = viewerOperationForSlash(command.name, false, true);
+    const permitted = (name) => {
+        const operation = viewerOperationForSlash(name, false, true);
         return operation === undefined || capabilities.permits(operation);
+    };
+    const offerable = CANVAS_SLASH_COMMANDS.filter((command) => permitted(command.name));
+    // A canvas command that REPURPOSES a builtin name (`/resume`) keeps that name's
+    // slot in the incoming list but carries the canvas description and the canvas
+    // capability gate — so autocomplete never advertises pi's meaning for a command
+    // this viewer redefines, and never offers one it would refuse to run.
+    const canvasByName = new Map(CANVAS_SLASH_COMMANDS.map((command) => [command.name, command]));
+    const merged = commands.flatMap((command) => {
+        const canvas = canvasByName.get(command.name);
+        if (canvas === undefined)
+            return [command];
+        return permitted(command.name) ? [canvas] : [];
     });
-    return [...commands, ...offerable.filter((command) => !seen.has(command.name))];
+    const seen = new Set(commands.map((c) => c.name));
+    return [...merged, ...offerable.filter((command) => !seen.has(command.name))];
 }
 /** Build slash-command autocomplete entries from the merged command list (the
  *  broker's `get_commands` result, which T7 may inject) — defaults to the
@@ -326,10 +339,19 @@ function dispatchCanvasCommand(name, arg, ctx) {
         case 'promote':
             promoteNode(arg, ctx);
             return true;
-        case 'resume-node':
-            // Open the full-screen canvas navigator as a popup; on Enter it focuses the
-            // chosen node back into THIS pane via `crtr surface node focus`.
+        case 'resume':
+            // Open the full-screen canvas navigator as a popup; on Enter it swaps THIS
+            // pane onto the chosen node via `crtr surface node focus --in-place`.
+            if (arg)
+                return usage(ctx, '/resume — no argument; use /resume-session <path> to switch pi sessions');
             return resumeNode(ctx);
+        case 'resume-session':
+            // The pi session picker: rebind THIS node onto a different saved session
+            // file (recovering a conversation the node cycled away from).
+            if (!arg)
+                return openOrHint(ctx.openSessionPicker, ctx, 'session', '/resume-session <session-path>');
+            ctx.send({ type: 'switch_session', path: arg });
+            return true;
         case 'mcp':
             // MCP server status panel — viewer-local reads of the adapter's on-disk
             // config sources/cache (see overlays/mcp.ts); the actions (connect /
@@ -556,13 +578,14 @@ function colorNode(arg, ctx) {
     ctx.notify(clear ? 'Node color cleared' : `Node colored ${value}${inTmux ? '' : ' (chip only — no tmux pane)'}`);
     return true;
 }
-/** `/resume-node`. Opens `crtr canvas browse` as a tmux popup, initially scoped
- *  to this node's profile (with all dirs visible); on Enter it focuses the chosen
- *  node back into this pane via `crtr surface node focus --pane`. */
+/** `/resume`. Opens `crtr canvas browse` as a tmux popup, initially scoped to
+ *  this node's profile (with all dirs visible); on Enter the navigator respawns
+ *  THIS pane onto the chosen node (`crtr surface node focus --pane --in-place`),
+ *  so resuming replaces the viewer you invoked it from. */
 function resumeNode(ctx) {
     const origPane = process.env['TMUX_PANE'];
     if (process.env['TMUX'] === undefined || origPane === undefined || origPane === '') {
-        ctx.notify('/resume-node needs tmux');
+        ctx.notify('/resume needs tmux');
         return true;
     }
     const cwd = shellQuote(ctx.cwd ?? process.cwd());