@north-light/crouter 0.3.208 → 0.3.210

package/dist/pi-extensions/canvas-context-intro.d.ts

@@ -1,4 +1,5 @@
 import { CONTEXT_INTRO_CUSTOM_TYPE } from '../shared/generated-context.js';
+import { type InjectedDocs } from '../core/substrate/injected-store.js';
 /** The `customType` stamped on the injected session message. Used both to write
  *  the entry and to detect it on resume (the idempotency guard). Defined beside
  *  the block builder in `core/runtime/bearings.ts` because the warm-pool claim's
@@ -68,7 +69,7 @@ interface PiLike {
 }
 /** Build the full bearings baseline for a conversation without inherited
  *  crouter context. Exported for testing. */
-export declare function buildContextIntro(nodeId: string, seen?: Set<string>): Promise<string>;
+export declare function buildContextIntro(nodeId: string, seen?: InjectedDocs): Promise<string>;
 /** Build the compact node-scoped update for a fork whose copied branch already
  *  carries a full crouter baseline. Exported for testing. */
 export declare function buildForkContextIntro(nodeId: string): Promise<string>;

package/dist/pi-extensions/canvas-doc-substrate.d.ts

@@ -17,7 +17,8 @@ interface ToolResultEventLike {
     toolName: string;
     isError?: boolean;
     /** The tool's resolved input. For `read` it carries the file path under
-     *  `path` (or the legacy `file_path`). Typed loosely; narrowed at use. */
+     *  `path` (or the legacy `file_path`); for `bash`, the command string under
+     *  `command`. Typed loosely; narrowed at use. */
     input?: unknown;
     content: ContentBlockLike[];
 }

package/dist/pi-extensions/canvas-doc-substrate.js

@@ -15,12 +15,14 @@
 //      a capability. Falls back to appending when the anchor is absent. (The `<memory kind="knowledge">`
 //      catalog rides the bearings message instead — see core/substrate/render.ts.)
 //
-//   2. tool_result (gated on `read`) — the ON-READ half. For each non-error
-//      `read`, evaluates explicit `applies-to` globs (plus `read-when` metadata)
-//      across the resolved corpus and any project stores enclosing the read
-//      file. Matches render at their file-read rung in `<auto-loaded-context>`
-//      before the file contents. A transcript-scoped realpath set deduplicates
-//      repeated reads and resumed broker processes.
+//   2. tool_result (gated on `read` and `bash`) — the EVENT half. For each
+//      non-error `read`, evaluates the read file against every doc's `read`
+//      surfaces entries across the resolved corpus and any project stores
+//      enclosing the read file; for each non-error `bash`, evaluates the
+//      executed command string against every doc's `command` entries. Matches
+//      render at their matched rung in `<auto-loaded-context>` before the
+//      tool output. A transcript-scoped (realpath → rung) map deduplicates
+//      repeated deliveries and resumed broker processes.
 //
 // Both handler bodies are wrapped in try/catch and degrade to INERT on error —
 // a substrate bug must never brick node boot or break a `read`, only quietly
@@ -34,9 +36,9 @@ import { homedir } from 'node:os';
 import { join, resolve } from 'node:path';
 import { brokerExtensionState } from '../core/runtime/broker/daemon-ops.js';
 import { renderPreferencesFromState } from '../core/runtime/broker-extension-render.js';
-import { renderOnReadDocsForSubject } from '../core/substrate/on-read.js';
+import { renderOnCommandDocsForSubject, renderOnReadDocsForSubject } from '../core/substrate/on-read.js';
 import { clearSessionCache } from '../core/substrate/session-cache.js';
-import { loadInjectedDocs, saveInjectedDocs, sharedInjectedDocs } from '../core/substrate/injected-store.js';
+import { loadInjectedDocs, mergeInjectedDocs, saveInjectedDocs, sharedInjectedDocs } from '../core/substrate/injected-store.js';
 import { autoLoadedContextInner, mergeAutoLoadedContext } from './envelope-merge.js';
 // ---------------------------------------------------------------------------
 // Extension
@@ -86,7 +88,13 @@ export function registerCanvasDocSubstrate(pi) {
     pi.on('before_agent_start', async (event) => {
         try {
             const state = await brokerExtensionState(nodeId);
-            const block = renderPreferencesFromState(state);
+            // Merge the on-disk set first so this save never clobbers an
+            // out-of-process delivery (the daemon's warm-spare bearings push), then
+            // seed each rendered preference at its boot rung. Boot renders every
+            // agent run and never skips; re-seeding at the same rung is idempotent.
+            mergeInjectedDocs(injectedDocs, loadInjectedDocs(nodeId));
+            const block = renderPreferencesFromState(state, injectedDocs);
+            saveInjectedDocs(nodeId, injectedDocs);
             if (block === '')
                 return; // nothing eligible — leave the prompt untouched
             const idx = event.systemPrompt.indexOf(TOOLS_ANCHOR);
@@ -101,43 +109,58 @@ export function registerCanvasDocSubstrate(pi) {
             return; // inert on error — never brick node boot
         }
     });
-    // 2. ON-READ half — augment a non-error `read` result with surfacing docs.
+    // 2. EVENT half — augment a non-error `read` with docs matched by the read
+    //    file, and a non-error `bash` with docs matched by the command string.
     pi.on('tool_result', async (event, ctx) => {
         try {
-            if (event.toolName !== 'read' || event.isError === true)
+            if (event.isError === true)
                 return;
-            const input = event.input;
-            const rawPath = input?.path ?? input?.file_path;
-            if (rawPath === undefined || rawPath === '')
+            let injected;
+            if (event.toolName === 'read') {
+                const input = event.input;
+                const rawPath = input?.path ?? input?.file_path;
+                if (rawPath === undefined || rawPath === '')
+                    return;
+                // Resolve to an absolute path (renderOnReadDocsForSubject realpaths it).
+                // pi's read tool expands a leading `~`, but event.input keeps the raw
+                // form, so expand it ourselves before resolving against the session cwd.
+                const cwd = typeof ctx?.cwd === 'string' && ctx.cwd !== '' ? ctx.cwd : process.cwd();
+                const expanded = rawPath.startsWith('~') ? join(homedir(), rawPath.slice(1)) : rawPath;
+                const absFile = resolve(cwd, expanded);
+                const state = await brokerExtensionState(nodeId);
+                // Merge the on-disk set: an out-of-process delivery (the daemon's
+                // warm-spare claim pushes bearings — including workspace-open docs —
+                // into the live session and persists what it delivered) must dedup here
+                // too. Cheap: one tiny JSON read per tool result.
+                mergeInjectedDocs(injectedDocs, loadInjectedDocs(nodeId));
+                injected = renderOnReadDocsForSubject(state.subject, absFile, injectedDocs);
+            }
+            else if (event.toolName === 'bash') {
+                const input = event.input;
+                const command = input?.command;
+                if (typeof command !== 'string' || command.trim() === '')
+                    return;
+                const state = await brokerExtensionState(nodeId);
+                mergeInjectedDocs(injectedDocs, loadInjectedDocs(nodeId));
+                injected = renderOnCommandDocsForSubject(state.subject, command, injectedDocs);
+            }
+            else {
                 return;
-            // Resolve to an absolute path (renderOnReadDocsForSubject realpaths it).
-            // pi's read tool expands a leading `~`, but event.input keeps the raw
-            // form, so expand it ourselves before resolving against the session cwd.
-            const cwd = typeof ctx?.cwd === 'string' && ctx.cwd !== '' ? ctx.cwd : process.cwd();
-            const expanded = rawPath.startsWith('~') ? join(homedir(), rawPath.slice(1)) : rawPath;
-            const absFile = resolve(cwd, expanded);
-            const state = await brokerExtensionState(nodeId);
-            // Merge the on-disk set: an out-of-process delivery (the daemon's
-            // warm-spare claim pushes bearings — including workspace-open docs —
-            // into the live session and persists what it delivered) must dedup here
-            // too. Cheap: one tiny JSON read per `read`.
-            for (const real of loadInjectedDocs(nodeId))
-                injectedDocs.add(real);
-            const injected = renderOnReadDocsForSubject(state.subject, absFile, injectedDocs);
+            }
             if (injected === '')
-                return; // nothing surfaced — pass the read through unchanged
-            // A doc surfaced → renderOnReadDocs grew injectedDocs; persist the set so
-            // the dedup survives a later dormancy → revive(resume).
+                return; // nothing surfaced — pass the result through unchanged
+            // A doc surfaced → the render grew injectedDocs; persist the set so the
+            // dedup survives a later dormancy → revive(resume).
             saveInjectedDocs(nodeId, injectedDocs);
-            // Fold into any existing auto-loaded-context block from sibling read hooks;
-            // otherwise prepend one quiet block ahead of the file contents.
+            // Fold into any existing auto-loaded-context block from sibling hooks;
+            // otherwise prepend one quiet block ahead of the tool output.
             const inner = autoLoadedContextInner(injected);
             if (inner === null)
                 return;
             return { content: mergeAutoLoadedContext([inner], event.content) };
         }
         catch {
-            return; // inert on error — a bug must degrade a read, never break it
+            return; // inert on error — a bug must degrade a tool result, never break it
         }
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@north-light/crouter",
-  "version": "0.3.208",
+  "version": "0.3.210",
   "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.208",
+  "version": "0.3.210",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@north-light/crouter",
-      "version": "0.3.208",
+      "version": "0.3.210",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {

package/dist/core/substrate/ceiling.d.ts

@@ -1,17 +0,0 @@
-import { type Rung, type SubstrateDoc } from './schema.js';
-/** The reserved basename (no extension) that marks a directory's index doc. */
-export declare const INDEX_NAME = "INDEX";
-/** Does this path-derived name denote a directory INDEX (`taste/INDEX`, or a
- *  top-level `INDEX`)? */
-export declare function isIndexName(name: string): boolean;
-/** The directory an INDEX doc represents: `taste/INDEX` → `taste`, `INDEX` → ''. */
-export declare function indexDirOf(name: string): string;
-/** Returns the display path corresponding to a canonical logical identifier. */
-export declare function displayName(name: string): string;
-/** Build the dir → governing-INDEX map. Precedence is first-occurrence-wins, so
- *  callers MUST pass docs precedence-ordered (project > user > builtin) — the
- *  highest-precedence INDEX governs a dir, mirroring the memory resolver. */
-export declare function buildCeilingIndex(docs: SubstrateDoc[]): Map<string, SubstrateDoc>;
-/** A doc's effective system-prompt rung after applying every ancestor INDEX
- * ceiling. A `none` ancestor hides the whole subtree from the boot catalog. */
-export declare function effectiveSystemPromptRung(doc: SubstrateDoc, ceil: Map<string, SubstrateDoc>): Rung;

package/dist/core/substrate/ceiling.js

@@ -1,67 +0,0 @@
-// ceiling.ts — canonical INDEX identifiers and the boot-catalog subtree ceiling.
-//
-// A directory INDEX has the canonical logical identifier `<directory>/INDEX`
-// (`INDEX` at the root). Its system-prompt rung caps every document in that
-// subtree while the boot catalog renders:
-//
-//   effective rung of a descendant = min(own rung, every ancestor INDEX's rung)
-//
-// A `preview` INDEX therefore lets its descendants surface at most at preview;
-// a `none` INDEX hides the subtree. File context does not use this ceiling:
-// every workspace/file match is an explicit `applies-to` route and renders at
-// the matched document's own file-read rung.
-import { rungRank } from './schema.js';
-/** The reserved basename (no extension) that marks a directory's index doc. */
-export const INDEX_NAME = 'INDEX';
-/** Does this path-derived name denote a directory INDEX (`taste/INDEX`, or a
- *  top-level `INDEX`)? */
-export function isIndexName(name) {
-    return name === INDEX_NAME || name.endsWith('/' + INDEX_NAME);
-}
-/** The directory an INDEX doc represents: `taste/INDEX` → `taste`, `INDEX` → ''. */
-export function indexDirOf(name) {
-    return name === INDEX_NAME ? '' : name.slice(0, name.length - INDEX_NAME.length - 1);
-}
-/** Returns the display path corresponding to a canonical logical identifier. */
-export function displayName(name) {
-    return isIndexName(name) ? indexDirOf(name) : name;
-}
-/** Build the dir → governing-INDEX map. Precedence is first-occurrence-wins, so
- *  callers MUST pass docs precedence-ordered (project > user > builtin) — the
- *  highest-precedence INDEX governs a dir, mirroring the memory resolver. */
-export function buildCeilingIndex(docs) {
-    const m = new Map();
-    for (const d of docs) {
-        if (!isIndexName(d.name))
-            continue;
-        const dir = indexDirOf(d.name);
-        if (!m.has(dir))
-            m.set(dir, d);
-    }
-    return m;
-}
-function minRung(a, b) {
-    return rungRank(a) <= rungRank(b) ? a : b;
-}
-/** Ancestor directory names of a doc, nearest-last: `a/b/c` → [`a/b`, `a`];
- *  `a` → []. An INDEX doc's OWN dir is included (a self-cap is a no-op), so a
- *  nested INDEX still inherits its parents' ceilings. */
-function ancestorDirs(name) {
-    const parts = name.split('/');
-    parts.pop(); // drop the leaf
-    const out = [];
-    for (let i = parts.length; i > 0; i--)
-        out.push(parts.slice(0, i).join('/'));
-    return out;
-}
-/** A doc's effective system-prompt rung after applying every ancestor INDEX
- * ceiling. A `none` ancestor hides the whole subtree from the boot catalog. */
-export function effectiveSystemPromptRung(doc, ceil) {
-    let rung = doc.systemPromptVisibility;
-    for (const dir of ancestorDirs(doc.name)) {
-        const idx = ceil.get(dir);
-        if (idx)
-            rung = minRung(rung, idx.systemPromptVisibility);
-    }
-    return rung;
-}