@north-light/crouter 0.3.196 → 0.3.197

package/dist/commands/human/prompts.js

@@ -10,7 +10,6 @@ import { extname, join } from 'node:path';
 import { randomBytes } from 'node:crypto';
 import { rmSync } from 'node:fs';
 import { readConfig } from '../../core/config.js';
-import { tmuxServerReachable } from '../../core/spawn.js';
 import { markStopSignal } from '../../core/runtime/stop-signals.js';
 import { atomicWriteJson } from '../../core/human/convention.js';
 import { ticketDir } from '../../core/human/root.js';
@@ -313,22 +312,17 @@ export const humanShow = defineLeaf({
         const path = input['path'];
         const windowArg = input['window'];
         const window = windowArg !== undefined ? windowArg : 'auto';
-        // `human show` must never fail the caller: any display error degrades to
-        // {pane_id:null, reason} with exit 0 (matches crouter renderer display semantics).
-        let paneId;
+        // `human show` always reports display failures in its result rather than
+        // turning a passive screen surface into a failed agent turn.
         try {
-            const r = display(path, { window, maxPanes: resolveMaxPanes() });
-            paneId = r.paneId;
+            const result = display(path, { window, maxPanes: resolveMaxPanes() });
+            return result.paneId !== undefined
+                ? { pane_id: result.paneId, reason: null }
+                : { pane_id: null, reason: result.reason };
         }
-        catch {
-            paneId = undefined;
+        catch (error) {
+            const reason = error instanceof Error ? error.message : String(error);
+            return { pane_id: null, reason: `display failed: ${reason}` };
         }
-        if (paneId !== undefined) {
-            return { pane_id: paneId, reason: null };
-        }
-        const reason = tmuxServerReachable()
-            ? 'renderer unavailable (termrender/uv missing)'
-            : 'not in tmux';
-        return { pane_id: null, reason };
     },
 });

package/dist/core/termrender/display.d.ts

@@ -6,7 +6,11 @@ export interface DisplayOpts {
     /** Pane budget per window before `'auto'` opens a new window. Default 3. */
     maxPanes?: number;
 }
-export declare function countPanesInCurrentWindow(): number;
-export declare function display(path: string, opts?: DisplayOpts): {
-    paneId?: string;
+export type DisplayResult = {
+    paneId: string;
+    reason?: never;
+} | {
+    paneId?: never;
+    reason: string;
 };
+export declare function display(path: string, opts?: DisplayOpts): DisplayResult;

package/dist/core/termrender/display.js

@@ -1,19 +1,55 @@
 import { spawnSync } from 'node:child_process';
-import { displayInPane } from './termrender.js';
-export function countPanesInCurrentWindow() {
-    // -t '' targets the current window of the current session.
-    const result = spawnSync('tmux', ['list-panes', '-F', '#{pane_id}'], {
+import { resolve } from 'node:path';
+import { breakPane, closePane, currentTmux, paneOfNode, splitWindow, } from '../runtime/placement-tmux.js';
+import { documentWatchCommand } from './termrender.js';
+function targetPane() {
+    const callerPane = process.env['TMUX_PANE'];
+    if (callerPane !== undefined && callerPane !== '')
+        return callerPane;
+    const nodeId = process.env['CRTR_NODE_ID'];
+    if (nodeId !== undefined && nodeId !== '') {
+        const viewerPane = paneOfNode(nodeId);
+        if (viewerPane !== null)
+            return viewerPane;
+    }
+    return currentTmux()?.pane ?? null;
+}
+function countPanes(target) {
+    const result = spawnSync('tmux', ['list-panes', '-t', target, '-F', '#{pane_id}'], {
         encoding: 'utf8',
     });
     if (result.status !== 0)
-        return 0;
+        return null;
     return result.stdout.split('\n').filter((line) => line.trim() !== '').length;
 }
 export function display(path, opts) {
     const window = (opts?.window === 'split' || opts?.window === 'new') ? opts.window : 'auto';
     const maxPanes = (opts?.maxPanes !== undefined && opts.maxPanes > 0) ? opts.maxPanes : 3;
-    const newWindow = window === 'new' ||
-        (window === 'auto' && countPanesInCurrentWindow() >= maxPanes);
-    // The pane always watches the file — displayed docs are live by definition.
-    return displayInPane(path, { newWindow });
+    const command = documentWatchCommand(resolve(path));
+    if (command === null)
+        return { reason: 'renderer unavailable' };
+    const target = targetPane();
+    if (target === null)
+        return { reason: 'no pane on screen' };
+    let newWindow = window === 'new';
+    if (window === 'auto') {
+        const paneCount = countPanes(target);
+        if (paneCount === null)
+            return { reason: `tmux could not inspect target pane ${target}` };
+        newWindow = paneCount >= maxPanes;
+    }
+    const pane = splitWindow(target, {
+        cwd: process.cwd(),
+        env: {},
+        command,
+    });
+    if (pane === null)
+        return { reason: `tmux could not split target pane ${target}` };
+    if (!newWindow)
+        return { paneId: pane };
+    const opened = breakPane(pane);
+    if (opened !== null)
+        return { paneId: opened.pane };
+    closePane(pane);
+    return { reason: 'tmux could not move the document pane into a new window' };
 }

package/dist/core/termrender/termrender.d.ts

@@ -59,15 +59,6 @@ export declare function checkMarkdown(md: string): {
     ok: false;
     error: string;
 };
-export interface DisplayInPaneOpts {
-    /** Open in a new tmux window instead of splitting the current one. */
-    newWindow?: boolean;
-}
-/**
- * Spawn termrender into a live tmux pane. The pane-budget policy (whether to
- * split vs open a new window) is decided by the caller (`src/surfaces/
- * display.ts`); this is the thin managed-binary spawn it delegates to.
- */
-export declare function displayInPane(path: string, opts?: DisplayInPaneOpts): {
-    paneId?: string;
-};
+/** Shell command for a pane that live-renders `path` with crouter's pinned
+ *  termrender. Null means the managed renderer could not be provisioned. */
+export declare function documentWatchCommand(path: string): string | null;

package/dist/core/termrender/termrender.js

@@ -3,6 +3,7 @@ import { existsSync, readFileSync, writeFileSync, statSync, mkdirSync, unlinkSyn
 import { homedir } from 'node:os';
 import { join, resolve } from 'node:path';
 import stringWidth from 'string-width';
+import { shellQuote } from '../../shared/shell-quote.js';
 import { withExclusiveDirectoryLock } from '../exclusive-lock.js';
 import { TERMRENDER_VERSION } from './version.js';
 // ── The sole org-wide termrender binding ─────────────────────────────────────
@@ -703,43 +704,11 @@ export function checkMarkdown(md) {
     }
     return { ok: true };
 }
-/**
- * Spawn termrender into a live tmux pane. The pane-budget policy (whether to
- * split vs open a new window) is decided by the caller (`src/surfaces/
- * display.ts`); this is the thin managed-binary spawn it delegates to.
- */
-export function displayInPane(path, opts = {}) {
+/** Shell command for a pane that live-renders `path` with crouter's pinned
+ *  termrender. Null means the managed renderer could not be provisioned. */
+export function documentWatchCommand(path) {
     ensureRenderer();
     if (rendererState !== 'ready')
-        return {};
-    // Always watch: a displayed pane is a live view of the file by definition.
-    const args = ['pane', 'open', path, '--watch'];
-    args.push('--window', opts.newWindow ? 'new' : 'split');
-    const result = spawnSync(VENV_BIN, args, {
-        encoding: 'utf-8',
-        stdio: ['pipe', 'pipe', 'pipe'],
-    });
-    // A spawn fault (binary broke) invalidates readiness; a non-zero exit (e.g.
-    // tmux refused, bad path) is not an environment fault and must not.
-    if (result.error) {
-        invalidateRenderer('pane open');
-        return {};
-    }
-    if (result.status !== 0)
-        return {};
-    // `encoding: 'utf-8'` makes spawnSync return stdout as a string.
-    const rawStdout = result.stdout;
-    if (!rawStdout)
-        return {};
-    let parsed = null;
-    try {
-        parsed = JSON.parse(rawStdout.trim());
-    }
-    catch {
-        return {};
-    }
-    if (parsed && typeof parsed.pane_id === 'string' && parsed.pane_id) {
-        return { paneId: parsed.pane_id };
-    }
-    return {};
+        return null;
+    return `${shellQuote(VENV_BIN)} doc watch ${shellQuote(path)}`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@north-light/crouter",
-  "version": "0.3.196",
+  "version": "0.3.197",
   "description": "crtr — agent runtime with memory, plugins, and marketplaces",
   "type": "module",
   "main": "dist/index.js",

package/runtime.lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@north-light/crouter",
-  "version": "0.3.196",
+  "version": "0.3.197",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@north-light/crouter",
-      "version": "0.3.196",
+      "version": "0.3.197",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {