@north-light/crouter 0.3.227 → 0.3.228

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

@@ -5,29 +5,9 @@
 // (registered in CANVAS_EXTENSIONS, src/core/runtime/launch.ts). INERT when
 // CRTR_NODE_ID is absent (a plain pi session or legacy job agent loads it as a no-op).
 //
-// It owns the substrate's pi hooks:
-//
-//   1. before_agent_start — the BOOT system-prompt half. Splices the rendered
-//      `<memory kind="preference">` block (memory-usage guidance + preferences)
-//      into `event.systemPrompt`, right after pi's native "Available tools" list
-//      (before the `\n\nGuidelines:` anchor), so the substrate's standing
-//      directives sit in the tool-selection frame the agent reads while choosing
-//      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` 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
-// stop surfacing docs. The pure render lives in core/substrate/ (render.ts +
-// on-read.ts); this file is only the pi-hook plumbing.
+// before_agent_start splices the context's frozen preference snapshot after the
+// native tool list. Successful read/bash results append matching memory through
+// the shared context exposure state. Pure rendering lives in core/substrate/.
 //
 // Plain TS-with-types — NO imports from @earendil-works/* (a local structural
 // PiLike interface stands in), so it compiles inside crouter's own tsc build
@@ -38,7 +18,7 @@ import { brokerExtensionState } from '../core/runtime/broker/daemon-ops.js';
 import { renderPreferencesFromState } from '../core/runtime/broker-extension-render.js';
 import { renderOnCommandDocsForSubject, renderOnReadDocsForSubject } from '../core/substrate/on-read.js';
 import { clearSessionCache } from '../core/substrate/session-cache.js';
-import { loadInjectedDocs, mergeInjectedDocs, saveInjectedDocs, sharedInjectedDocs } from '../core/substrate/injected-store.js';
+import { cloneContextExposureState, exposureTarget, freezePreferenceSnapshot, loadContextExposureState, mergeContextExposureState, replaceContextExposureState, saveContextExposureState, sharedContextExposureState, } from '../core/substrate/injected-store.js';
 import { autoLoadedContextInner, mergeAutoLoadedContext } from './envelope-merge.js';
 // ---------------------------------------------------------------------------
 // Extension
@@ -48,120 +28,73 @@ import { autoLoadedContextInner, mergeAutoLoadedContext } from './envelope-merge
  *  to reach for while reading the tools, so memory docs/preferences must sit
  *  there, not far below. Falls back to appending if absent. */
 const TOOLS_ANCHOR = '\n\nGuidelines:';
-/**
- * Register the document substrate's pi hooks on `pi`.
- *
- * Returns immediately (inert) when CRTR_NODE_ID is absent — a non-canvas pi
- * session gets no hooks. Each handler is independently wrapped so a failure
- * degrades to a no-op (boot proceeds, the read returns) rather than bricking.
- */
 export function registerCanvasDocSubstrate(pi) {
     const nodeId = process.env['CRTR_NODE_ID'];
     if (nodeId === undefined || nodeId.trim() === '')
         return; // not a canvas node — inert
-    // Per-TRANSCRIPT set of injected doc realpaths → a doc surfaces at most once
-    // across the node's conversation, EVEN across a dormancy → revive(resume)
-    // cycle. A resume reuses the same .jsonl transcript in a NEW pi process, so
-    // the set is REHYDRATED from disk at process start (not started empty) and is
-    // NOT cleared on session_start — a resume continues the transcript, so the
-    // dedup must carry forward. The one launch path that begins a FRESH transcript
-    // (reviveNode with resume=false) deletes the file, so a new conversation
-    // rehydrates empty here. See core/substrate/injected-store.ts.
-    //
-    // The set is the PROCESS-SHARED instance (sharedInjectedDocs), so the
-    // context-intro extension's workspace-open render grows the same set this
-    // hook dedups against — a front door delivered at boot never re-delivers on
-    // a later read beneath its store.
-    const injectedDocs = sharedInjectedDocs(nodeId);
+    // One in-place state object is shared with context-intro and rehydrated on a
+    // strict resume. New-context launch paths clear it before baseline assembly.
+    const contextExposure = sharedContextExposureState(nodeId);
     pi.on('session_start', () => {
-        // Only the per-session substrate PARSE cache resets each session (so the
-        // corpus is re-scanned, picking up memory writes). injectedDocs is
-        // transcript-scoped, not session-scoped — deliberately NOT cleared here.
         clearSessionCache();
     });
-    // 1. BOOT system-prompt half — splice the `<memory kind="preference">` block
-    //    (memory-usage guidance + preferences). The guidance frame is always
-    //    present for a canvas node (the memory system always exists), so the block
-    //    is never empty even when no preference is eligible. (The knowledge catalog
-    //    does not enter the system prompt — it rides the bearings message via
-    //    renderKnowledgeBlock.)
     pi.on('before_agent_start', async (event) => {
-        try {
+        mergeContextExposureState(contextExposure, loadContextExposureState(nodeId));
+        let block = contextExposure.preferenceSnapshot;
+        if (block === null) {
             const state = await brokerExtensionState(nodeId);
-            // 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);
-            if (idx === -1) {
-                return { systemPrompt: `${event.systemPrompt}\n\n${block}` };
-            }
-            return {
-                systemPrompt: `${event.systemPrompt.slice(0, idx)}\n\n${block}${event.systemPrompt.slice(idx)}`,
-            };
-        }
-        catch {
-            return; // inert on error — never brick node boot
+            const next = cloneContextExposureState(contextExposure);
+            block = freezePreferenceSnapshot(next, renderPreferencesFromState(state, exposureTarget(next, 'system')));
+            saveContextExposureState(nodeId, next);
+            replaceContextExposureState(contextExposure, next);
         }
+        if (block === '')
+            return;
+        const idx = event.systemPrompt.indexOf(TOOLS_ANCHOR);
+        if (idx === -1)
+            return { systemPrompt: `${event.systemPrompt}\n\n${block}` };
+        return {
+            systemPrompt: `${event.systemPrompt.slice(0, idx)}\n\n${block}${event.systemPrompt.slice(idx)}`,
+        };
     });
-    // 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.isError === true)
-                return;
-            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 {
+        if (event.isError === true)
+            return;
+        let readFile = null;
+        let command = null;
+        if (event.toolName === 'read') {
+            const input = event.input;
+            const rawPath = input?.path ?? input?.file_path;
+            if (rawPath === undefined || rawPath === '')
                 return;
-            }
-            if (injected === '')
-                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 hooks;
-            // otherwise prepend one quiet block ahead of the tool output.
-            const inner = autoLoadedContextInner(injected);
-            if (inner === null)
+            const cwd = typeof ctx?.cwd === 'string' && ctx.cwd !== '' ? ctx.cwd : process.cwd();
+            const expanded = rawPath.startsWith('~') ? join(homedir(), rawPath.slice(1)) : rawPath;
+            readFile = resolve(cwd, expanded);
+        }
+        else if (event.toolName === 'bash') {
+            const input = event.input;
+            if (typeof input?.command !== 'string' || input.command.trim() === '')
                 return;
-            return { content: mergeAutoLoadedContext([inner], event.content) };
+            command = input.command;
         }
-        catch {
-            return; // inert on error — a bug must degrade a tool result, never break it
+        else {
+            return;
         }
+        const state = await brokerExtensionState(nodeId);
+        mergeContextExposureState(contextExposure, loadContextExposureState(nodeId));
+        const next = cloneContextExposureState(contextExposure);
+        const target = exposureTarget(next, 'transcript');
+        const injected = readFile !== null
+            ? renderOnReadDocsForSubject(state.subject, readFile, target)
+            : renderOnCommandDocsForSubject(state.subject, command, target);
+        if (injected === '')
+            return;
+        const inner = autoLoadedContextInner(injected);
+        if (inner === null)
+            throw new Error('substrate renderer returned an invalid auto-loaded context block');
+        saveContextExposureState(nodeId, next);
+        replaceContextExposureState(contextExposure, next);
+        return { content: mergeAutoLoadedContext([inner], event.content) };
     });
 }
 export default registerCanvasDocSubstrate;

package/dist/pi-extensions/canvas-stophook.js

@@ -25,9 +25,8 @@ import { join } from 'node:path';
 import { contextDir, jobDir } from '../core/canvas/paths.js';
 import { markBusy, clearBusy, touchBusy } from '../core/runtime/busy.js';
 import { clearFault } from '../core/runtime/fault.js';
-import { personaDriftFromBrokerState } from '../core/runtime/broker-persona-guidance.js';
 import { clearStopSignals, consumeStopSignals } from '../core/runtime/stop-signals.js';
-import { bindBrokerSession, brokerExtensionState, commitBrokerPersonaAck, relaunchBrokerRoot, settleBroker } from '../core/runtime/broker/daemon-ops.js';
+import { bindBrokerSession, brokerExtensionState, relaunchBrokerRoot, settleBroker } from '../core/runtime/broker/daemon-ops.js';
 import { emitEvent } from '../core/events/emit.js';
 import { activeBackgroundBashJobs } from '../core/bash-jobs.js';
 import { CONTEXT_NUDGE_CUSTOM_TYPE, formatCard } from '../shared/generated-context.js';
@@ -376,6 +375,7 @@ export function registerCanvasStophook(pi) {
                         fields: { operation: 'relaunch_root' },
                     });
                 });
+                return;
             }
         }
         catch (error) {
@@ -584,7 +584,8 @@ export function registerCanvasStophook(pi) {
         // is a ~2-token uncached delta each turn), so the bands were unreachable and
         // the nudge never fired.
         try {
-            const node = (await brokerExtensionState(nodeId)).node;
+            const state = await brokerExtensionState(nodeId);
+            const node = state.node;
             const at = contextTokens !== null ? steerBand(contextTokens) : null;
             if (at !== null && !firedBands.has(at)) {
                 firedBands.add(at);
@@ -596,17 +597,9 @@ export function registerCanvasStophook(pi) {
                     pi.sendMessage({ customType: CONTEXT_NUDGE_CUSTOM_TYPE, content: note, display: true }, { deliverAs: 'nextTurn' });
                 }
             }
-            // Persona-transition steering. The daemon read snapshots both the
-            // expected ack and current persona; its guarded ack below can only commit
-            // exactly the transition this broker just described.
-            const drift = personaDriftFromBrokerState(node);
-            if (drift !== null) {
-                pi.sendUserMessage(formatCard('persona-transition', {}, drift.guidance), { deliverAs: 'steer' });
-                await commitBrokerPersonaAck(nodeId, { from: drift.from, to: drift.to });
-            }
         }
-        catch {
-            /* steering is best-effort */
+        catch (error) {
+            emitDaemonOperationFailure('turn_boundary', error);
         }
     });
     // Pi may emit several agent_end attempts while it compacts, retries, and

package/dist/shared/generated-context.d.ts

@@ -6,8 +6,6 @@ export declare const SITUATIONAL_CONTEXT_CUSTOM_TYPE = "crtr-situational-context
 export declare const CONTEXT_NUDGE_CUSTOM_TYPE = "crtr-context-nudge";
 /** Custom message that opens a review companion's visible transcript. */
 export declare const REVIEW_BOUNDARY_CUSTOM_TYPE = "crtr-review-boundary";
-/** Opening text of a pre-envelope fresh-revive kickoff user message. */
-export declare const REVIVE_KICKOFF_SENTINEL = "You have been revived fresh after a context refresh";
 /** Generic completion mandate issued by the terminal-node stop guard. */
 export declare const STALL_REPROMPT: string;
 /** Static recovery prompts shared by the broker producer and display classifier. */
@@ -69,4 +67,3 @@ export declare function formatDataCard(kind: string, facts: Record<string, strin
 export declare function parseCard(message: GeneratedContextMessageLike): GeneratedCard | null;
 /** Format a complete inbox card from report bodies resolved by the caller. */
 export declare function formatInboxCard(sections: readonly InboxCardSection[]): string;
-export declare function isLegacyRuntimeText(text: string): boolean;

package/dist/shared/generated-context.js

@@ -10,8 +10,6 @@ export const SITUATIONAL_CONTEXT_CUSTOM_TYPE = 'crtr-situational-context';
 export const CONTEXT_NUDGE_CUSTOM_TYPE = 'crtr-context-nudge';
 /** Custom message that opens a review companion's visible transcript. */
 export const REVIEW_BOUNDARY_CUSTOM_TYPE = 'crtr-review-boundary';
-/** Opening text of a pre-envelope fresh-revive kickoff user message. */
-export const REVIVE_KICKOFF_SENTINEL = 'You have been revived fresh after a context refresh';
 /** Generic completion mandate issued by the terminal-node stop guard. */
 export const STALL_REPROMPT = "You've stopped but you're not waiting on anyone and haven't finished. " +
     "Pipe the result to `crtr push final` through a single-quoted heredoc if the work is done, or use `crtr human send` if you are blocked or need the user.";
@@ -212,58 +210,3 @@ export function formatInboxCard(sections) {
     }).join('\n');
     return formatCard('inbox', {}, body);
 }
-// LEGACY — landed 2026-08-14. Pre-envelope runtime text, kept ONLY so old
-// scrollback is not attributed to the person. Delete this section and its
-// callers one week after that date; after deletion, pre-cut scrollback
-// misattributes and that cost is accepted.
-const LEGACY_RESTART_CONTINUATION = '<runtime-restart-continuation>\ncontinue\n</runtime-restart-continuation>';
-const CONTEXT_NUDGE_PREFIX = '[crtr] Context ~';
-const PERSONA_TRANSITION_OPEN = '<persona-transition>';
-const PERSONA_TRANSITION_CLOSE = '</persona-transition>';
-const INBOX_SENDER_ID = '[a-z0-9]+(?:-[a-z0-9]+)+';
-const INBOX_HEADER_RE = new RegExp(`^From (?:(.+?) \\[(${INBOX_SENDER_ID})\\]|(${INBOX_SENDER_ID}|system|human|crtrd)) — (\\d+) update`, 'm');
-function isPersonaTransition(body) {
-    return body.startsWith(`${PERSONA_TRANSITION_OPEN}\n`) && body.endsWith(`\n${PERSONA_TRANSITION_CLOSE}`);
-}
-function isReviewApproval(body) {
-    return body.startsWith(`${REVIEW_APPROVAL_OPEN}\n`) && body.endsWith(`\n${REVIEW_APPROVAL_CLOSE}`);
-}
-function isStructuredOutputReprompt(body) {
-    if (!body.startsWith(STRUCTURED_OUTPUT_REPROMPT_PREFIX) || !body.endsWith(STRUCTURED_OUTPUT_REPROMPT_SUFFIX)) {
-        return false;
-    }
-    const schema = body.slice(STRUCTURED_OUTPUT_REPROMPT_PREFIX.length, -STRUCTURED_OUTPUT_REPROMPT_SUFFIX.length);
-    try {
-        JSON.parse(schema);
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
-const MODEL_CREDENTIAL_RECOVERY_RE = /^The previous model \([^\n]+\) had no usable provider credential, so you were automatically switched to [^\n]+\. Continue the task from where the failed turn left off\.$/;
-const MODEL_NOT_FOUND_RECOVERY_RE = /^The previous model \([^\n]+\) was unavailable \(provider 404 not_found\), so you were automatically switched to [^\n]+\. Continue the task from where the failed turn left off\.$/;
-function isModelFallbackRecovery(body) {
-    if (!body.startsWith(`${MODEL_FALLBACK_RECOVERY_OPEN}\n`) || !body.endsWith(`\n${MODEL_FALLBACK_RECOVERY_CLOSE}`)) {
-        return false;
-    }
-    const guidance = body.slice(MODEL_FALLBACK_RECOVERY_OPEN.length + 1, -(MODEL_FALLBACK_RECOVERY_CLOSE.length + 1));
-    return MODEL_CREDENTIAL_RECOVERY_RE.test(guidance) || MODEL_NOT_FOUND_RECOVERY_RE.test(guidance);
-}
-function isRecoveryBody(body) {
-    return body === AUTH_FAULT_RECOVERY_BODY
-        || body === CONNECTION_FAULT_RECOVERY_BODY
-        || body === PROVIDER_FAULT_RECOVERY_BODY
-        || body === LEGACY_RESTART_CONTINUATION
-        || isModelFallbackRecovery(body);
-}
-export function isLegacyRuntimeText(text) {
-    return text.startsWith(REVIVE_KICKOFF_SENTINEL)
-        || text.startsWith(CONTEXT_NUDGE_PREFIX)
-        || INBOX_HEADER_RE.test(text)
-        || isReviewApproval(text)
-        || isPersonaTransition(text)
-        || text === STALL_REPROMPT
-        || isStructuredOutputReprompt(text)
-        || isRecoveryBody(text);
-}

package/dist/shared/tool-groups.js

@@ -1,7 +1,7 @@
 // Shared transcript-boundary rules for broker-owned tool-group summaries.
 // Keep this independent of renderer state: both live event tracking and snapshot
 // reconstruction must agree on which prose closes a run of tools.
-import { generatedContextText, isLegacyRuntimeText, parseCard } from './generated-context.js';
+import { generatedContextText, parseCard } from './generated-context.js';
 /** Card kinds that close a run of tools instead of joining one. The broker
  * segments and the viewer folds on the same seams, so this one answer is shared;
  * everything else about a card is the display's own business. */
@@ -60,6 +60,5 @@ export function assistantVisibleText(message) {
 /** A person-authored user message closes the preceding group. Runtime-generated
  * user context retains role=user for delivery semantics but is not human prose. */
 export function isTrueUserMessage(message) {
-    const text = generatedContextText(message);
-    return message.role === 'user' && parseCard(message) === null && !isLegacyRuntimeText(text);
+    return message.role === 'user' && parseCard(message) === null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@north-light/crouter",
-  "version": "0.3.227",
+  "version": "0.3.228",
   "description": "crtr — agent runtime with memory, plugins, and marketplaces",
   "type": "module",
   "main": "dist/index.js",
@@ -81,10 +81,11 @@
     "dev": "tsx --conditions=crtr-src src/cli.ts",
     "link": "npm link",
     "prepublishOnly": "npm run build",
-    "test": "node --conditions=crtr-src --import tsx/esm --test --test-concurrency=4 --test-timeout=10000 'src/**/__tests__/*.test.ts'",
-    "test:serial": "node --conditions=crtr-src --import tsx/esm --test --test-concurrency=1 --test-timeout=60000 'src/**/__tests__/serial/*.test.ts'",
+    "test": "node --conditions=crtr-src --import tsx/esm --test --test-force-exit --test-concurrency=$(node -p 'Math.max(4, require(`node:os`).availableParallelism() - 1)') --test-timeout=10000 'src/**/__tests__/*.test.ts'",
+    "test:integration": "node --conditions=crtr-src --import tsx/esm --test --test-concurrency=$(node -p 'Math.min(8, Math.max(2, require(`node:os`).availableParallelism() - 1))') --test-timeout=60000 'src/**/__tests__/integration/*.test.ts'",
     "test:seam": "npm run build && npm run test:seam:built",
-    "test:seam:built": "node --test --test-concurrency=2 --test-timeout=180000 'dist/**/__tests__/seam/*.test.js'"
+    "test:seam:built": "node --test --test-concurrency=4 --test-timeout=180000 'dist/**/__tests__/seam/*.test.js'",
+    "test:all": "npm test && npm run test:integration && npm run test:seam"
   },
   "overrides": {
     "@earendil-works/pi-ai": "0.84.1",

package/runtime.lock.json

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