@north-light/crouter 0.3.165 → 0.3.166

package/dist/builtin-memory/internal/plugins.md

@@ -69,7 +69,7 @@ The `<plugin-name>` directory IS the plugin. The manifest's `name` field must ma
 | `source` | recommended | Git URL where the plugin lives. Used by `crtr pkg plugin update --name <name>`. |
 | `owner` | optional | Author info. |
 | `commands` | optional | Plugin-root-relative path to a `commands.json` command manifest. It must appear with `transport`; together they make the plugin contribute `crtr` commands — see [Plugin commands](#plugin-commands). |
-| `transport` | optional | Required exactly when `commands` is present. `{ "kind": "exec", "executable": "bin/cmd.js" }` runs a local executable; `{ "kind": "http", "endpoint": "https://…", "authEnv": "TOKEN_NAME" }` calls a remote HTTP command surface. |
+| `transport` | optional | Required exactly when `commands` is present. `{ "kind": "exec", "executable": "bin/cmd.js" }` runs executable leaves; a passthrough-only exec manifest may omit `executable`. `{ "kind": "http", "endpoint": "https://…", "authEnv": "TOKEN_NAME" }` calls a remote HTTP command surface. |
 
 ## Scopes
 
@@ -183,7 +183,7 @@ An HTTP-transport plugin replaces that declaration with:
 "transport": { "kind": "http", "endpoint": "https://example.com/v1/cli/manifest", "authEnv": "DEPLOY_TOKEN" }
 ```
 
-For `exec`, `executable` is plugin-root-relative, resolves inside the plugin root to a regular file, and carries the POSIX exec bit. For `http`, `endpoint` is an absolute endpoint and `authEnv` is optional. crtr stores only the environment variable **name**, never its credential; it reads the credential when fetching the manifest or invoking a leaf.
+For `exec`, `executable` is required when the manifest has any executable leaf; a passthrough-only manifest omits it. When declared, it is plugin-root-relative, resolves inside the plugin root to a regular file, and carries the POSIX exec bit. For `http`, `endpoint` is an absolute endpoint and `authEnv` is optional. crtr stores only the environment variable **name**, never its credential; it reads the credential when fetching the manifest or invoking a leaf.
 
 Only an installed, **enabled** plugin's command manifest contributes. Discovery is per-invocation: enable, disable, update, and remove take effect on the next `crtr` call — no daemon restart or cache clearing.
 
@@ -246,7 +246,7 @@ For an exec leaf, crtr writes exactly one JSON request to the executable's stdin
 crtr validates command manifests statically; it never executes an exec binary to inspect its command surface:
 
 - `crtr pkg plugin show <name>` inventories the plugin manifest, command-manifest path, accepted top-level command names, and validation issues (each with received/expected/next).
-- `crtr sys doctor` validates the command manifest and transport declaration for every effective plugin, including executable-path checks for exec transport, and reports structured remediation (disable, update, remove). `--fix` never chmods or rewrites plugin content.
+- `crtr sys doctor` validates the command manifest and transport declaration for every effective plugin, including executable-path checks when exec manifests declare executable leaves, and reports structured remediation (disable, update, remove). `--fix` never chmods or rewrites plugin content.
 - `crtr pkg plugin install` and `update` report accepted top-level command names and validation issues.
 
 Core always wins a path collision. A cross-plugin collision drops every claimant with a `command_collision` issue. A fixed manifest goes live on the next invocation; there is nothing to restart.

package/dist/clients/attach/__tests__/context-message.test.js

@@ -7,20 +7,49 @@ import { readFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import test from 'node:test';
 import { fileURLToPath } from 'node:url';
+import { UserMessageComponent } from '@earendil-works/pi-coding-agent';
+import { Container } from '@earendil-works/pi-tui';
+import { applyTheme, attachMarkdownTheme } from '../config.js';
+import { ChatView } from '../render/chat-view.js';
 import { ContextMessageComponent } from '../render/context-message.js';
+import { styleAttachMarkdownHeadings } from '../render/markdown-headings.js';
 import { CONTEXT_NUDGE_CUSTOM_TYPE, REVIVE_KICKOFF_SENTINEL, generatedContextPresentation, } from '../../../shared/generated-context.js';
 const HERE = dirname(fileURLToPath(import.meta.url));
 const CHAT_VIEW = readFileSync(join(HERE, '..', 'render/chat-view.ts'), 'utf8');
 const identity = (s) => s;
+applyTheme();
 test('collapsed by default: body text is not rendered until expanded', () => {
     const body = '<situational-context>\nthe user is mid-checkout\n</situational-context>';
     const collapsed = new ContextMessageComponent(body, false, identity, identity, 'situational context', ' hint');
-    const collapsedLines = collapsed.render(80).join('\n');
+    const collapsedRender = collapsed.render(80);
+    const collapsedLines = collapsedRender.join('\n');
+    assert.equal(collapsedRender.length, 1, 'a collapsed row has no surrounding blank line');
     assert.match(collapsedLines, /\[situational context\]/);
     assert.doesNotMatch(collapsedLines, /mid-checkout/, 'collapsed state must never leak the body');
     collapsed.setExpanded(true);
-    const expandedLines = collapsed.render(80).join('\n');
+    const expandedRender = collapsed.render(80);
+    const expandedLines = expandedRender.join('\n');
     assert.match(expandedLines, /mid-checkout/, 'expanded state (Ctrl+O) still shows the full body — the LLM-visible content is never lost, only the default view folds it');
+    const normalUserRender = new UserMessageComponent(styleAttachMarkdownHeadings(body), attachMarkdownTheme()).render(80);
+    assert.deepEqual(expandedRender.slice(0, -1), normalUserRender, 'expanded generated context uses the ordinary user-message surface');
+    assert.equal(expandedRender.at(-1), '', 'an expanded block leaves one blank line below its body');
+});
+test('generated rows add no leading spacer after prior transcript content', async () => {
+    const container = new Container();
+    const tui = { requestRender() { }, terminal: { rows: 40 } };
+    const view = new ChatView(tui, container, { toolOutputExpanded: false });
+    await view.applySnapshot({
+        messages: [
+            { role: 'assistant', content: [{ type: 'text', text: 'before' }], stopReason: 'stop' },
+            { role: 'user', content: `${REVIVE_KICKOFF_SENTINEL} — full disk bearings` },
+        ],
+        stats: {},
+        state: { isStreaming: false },
+    });
+    const lines = container.render(80).map((line) => line.replace(/\x1b\[[0-9;]*m/g, ''));
+    const generatedIndex = lines.findIndex((line) => line.includes('[crtr revive]'));
+    assert.notEqual(generatedIndex, -1);
+    assert.match(lines[generatedIndex - 1] ?? '', /before/, 'the collapsed row follows prior content directly');
 });
 test('the crtr-context label/hint keep their defaults when callers omit the new params', () => {
     const bearings = new ContextMessageComponent('some bearings body', false, identity, identity);

package/dist/clients/attach/render/chat-view.js

@@ -872,8 +872,6 @@ export class ChatView {
         if (generated !== null &&
             (message.role !== 'custom' || message.display === true)) {
             this.pushTranscriptText(generated.body);
-            if (message.role === 'user' && this.chatChildCount() > 0)
-                this.append(new Spacer(1));
             this.append(new ContextMessageComponent(generated.body, this.toolOutputExpanded, this.dimStyle, (s) => this.spinnerStyle(this.labelStyle(s)), generated.label, ` ${generated.summary} — ctrl+o to expand`));
             return;
         }

package/dist/clients/attach/render/context-message.d.ts

@@ -1,11 +1,11 @@
 import { type Component } from '@earendil-works/pi-tui';
 export declare class ContextMessageComponent implements Component {
-    private readonly body;
     private readonly dim;
     private readonly label;
     private readonly labelText;
     private readonly collapsedHint;
     private expanded;
+    private readonly expandedBody;
     constructor(body: string, expanded: boolean, dim: (s: string) => string, label: (s: string) => string, labelText?: string, collapsedHint?: string);
     /** Ctrl+O global tool-output toggle (ChatView.isExpandable duck-type). */
     setExpanded(expanded: boolean): void;

package/dist/clients/attach/render/context-message.js

@@ -2,48 +2,32 @@
 // crouter-generated context. Session bearings, situational updates, fresh-revive
 // kickoffs, context-size nudges, and node inbox digests retain their full model-visible body and
 // runtime role, while this display-only component presents them consistently:
-// collapsed → one dim line; expanded (Ctrl+O) → label + full wrapped body. It
-// implements `setExpanded`, so the global tool-display cycle folds these blocks
-// alongside tool output. Classification lives in shared/generated-context.ts;
-// this component only renders the presentation it is handed.
+// collapsed → one dim line; expanded (Ctrl+O) → the ordinary user-message
+// surface, regardless of the message's runtime role. It implements
+// `setExpanded`, so the global tool-display cycle folds these blocks alongside
+// tool output. Classification lives in shared/generated-context.ts; this
+// component only renders the presentation it is handed.
+import { UserMessageComponent } from '@earendil-works/pi-coding-agent';
 import { truncateToWidth, visibleWidth } from '@earendil-works/pi-tui';
+import { attachMarkdownTheme } from '../config.js';
+import { styleAttachMarkdownHeadings } from './markdown-headings.js';
 /** Default label/hint for the `crtr-context` bearings block. */
 const LABEL = 'crtr context';
 const COLLAPSED_HINT = ' orienting bearings — ctrl+o to expand';
-/** Char-based wrap that never emits an over-width line (pi-tui hard-crashes on
- *  one). Visible-width aware so wide glyphs in the bearings tree count right. */
-function wrapLine(line, width) {
-    if (line === '')
-        return [''];
-    const out = [];
-    let cur = '';
-    for (const ch of line) {
-        if (cur !== '' && visibleWidth(cur + ch) > width) {
-            out.push(cur);
-            cur = ch;
-        }
-        else {
-            cur += ch;
-        }
-    }
-    if (cur !== '')
-        out.push(cur);
-    return out;
-}
 export class ContextMessageComponent {
-    body;
     dim;
     label;
     labelText;
     collapsedHint;
     expanded;
+    expandedBody;
     constructor(body, expanded, dim, label, labelText = LABEL, collapsedHint = COLLAPSED_HINT) {
-        this.body = body;
         this.dim = dim;
         this.label = label;
         this.labelText = labelText;
         this.collapsedHint = collapsedHint;
         this.expanded = expanded;
+        this.expandedBody = new UserMessageComponent(styleAttachMarkdownHeadings(body), attachMarkdownTheme());
     }
     /** Ctrl+O global tool-output toggle (ChatView.isExpandable duck-type). */
     setExpanded(expanded) {
@@ -63,11 +47,9 @@ export class ContextMessageComponent {
                 return [this.label(truncateToWidth(labelTag, w, '…'))];
             return [this.label(labelTag) + this.dim(truncateToWidth(rest, w - labelW, '…'))];
         }
-        const lines = [this.label(truncateToWidth(`[${this.labelText}]`, w, '…')), ''];
-        for (const raw of this.body.split('\n')) {
-            for (const seg of wrapLine(raw, w))
-                lines.push(seg);
-        }
+        const lines = this.expandedBody.render(w);
+        if (lines.at(-1) !== '')
+            lines.push('');
         return lines;
     }
     invalidate() {