@crouton-kit/crouter 0.3.47 → 0.3.48

package/dist/core/runtime/bearings.js

@@ -13,10 +13,15 @@
 //     the source's whole conversation and then impersonates it. A non-fork
 //     node's bearings are its FIRST entry, so there is nothing earlier to
 //     disown; it gets only the declarative identity line. The message also
-//     carries the <project_context> block (buildProjectContextBlock) — the
-//     AGENTS.md/CLAUDE.md project instructions, moved OUT of the system prompt
-//     (pi's copy is suppressed via noContextFiles in broker.ts) so they ride
-//     this user message instead;
+//     carries the <project_context> block (buildProjectContextBlock) — now just
+//     the cwd/git <environment> snapshot. Project instructions (what used to be
+//     a re-rendered AGENTS.md/CLAUDE.md here) come from the document substrate
+//     instead: `crtr sys sync` migrates each CLAUDE.md/AGENTS.md into that
+//     dir's own `.crouter/memory/AGENTS.md` at content/content, so it rides the
+//     <memory kind="knowledge"> block below (renderKnowledgeBlock) via the
+//     profile-widened boot render, exactly like any other substrate doc — no
+//     parallel re-implementation of pi's project-context loader lives here
+//     anymore (see `crtr memory read taste/document-substrate`);
 //   • promote.ts folds orchestratorContextNote() into the promotion guidance
 //     dump, so a node that becomes an orchestrator MID-LIFE gets the
 //     orchestrator framing it never received at spawn — it spawned as a base
@@ -36,78 +41,10 @@
 // This across-cycles note is the ONE thing a terminal worker's bearings drop.
 import { contextDir, getNode, fullName, subscriptionsOf, } from '../canvas/index.js';
 import { execSync } from 'node:child_process';
-import { existsSync, readFileSync, readdirSync } from 'node:fs';
-import { homedir } from 'node:os';
-import { join, resolve } from 'node:path';
+import { readdirSync } from 'node:fs';
 import { cadenceDisplay } from '../wake.js';
 import { renderKnowledgeBlock } from '../substrate/index.js';
 import { loadProfileManifest } from '../profiles/manifest.js';
-// ---------------------------------------------------------------------------
-// Project context (<project_context>) — the AGENTS.md/CLAUDE.md files pi would
-// otherwise inject into its SYSTEM PROMPT, rendered here so they ride the
-// first-message bearings instead (pi's copy is suppressed via
-// resourceLoaderOptions.noContextFiles in broker.ts). We re-implement pi's
-// loadProjectContextFiles + getAgentDir (resource-loader.js / config.js) rather
-// than IMPORT pi: bearings.ts is statically imported by the thin daemon (crtrd,
-// for wakeOriginFrom), so a static @earendil-works import would pull the whole
-// pi engine into the supervisor. The discovery is a stable convention + pure fs.
-// ---------------------------------------------------------------------------
-/** pi's getAgentDir(): the global agent config dir holding a user-wide context
- *  file. Honors PI_CODING_AGENT_DIR (tilde-expanded), else ~/.pi/agent (pi's
- *  piConfig.configDir is ".pi"). */
-function piAgentDir() {
-    const env = process.env['PI_CODING_AGENT_DIR'];
-    if (env !== undefined && env !== '') {
-        return env.startsWith('~') ? join(homedir(), env.slice(1)) : env;
-    }
-    return join(homedir(), '.pi', 'agent');
-}
-/** Per-dir context-file candidates, in pi's precedence order (first match wins). */
-const CONTEXT_FILE_CANDIDATES = ['AGENTS.md', 'AGENTS.MD', 'CLAUDE.md', 'CLAUDE.MD'];
-function loadContextFileFromDir(dir) {
-    for (const name of CONTEXT_FILE_CANDIDATES) {
-        const p = join(dir, name);
-        if (existsSync(p)) {
-            try {
-                return { path: p, content: readFileSync(p, 'utf8') };
-            }
-            catch {
-                // Unreadable candidate — skip, mirroring pi (best-effort).
-            }
-        }
-    }
-    return null;
-}
-/** Mirror of pi's loadProjectContextFiles: the global agent-dir file first, then
- *  every AGENTS.md/CLAUDE.md up the cwd's ancestry, ordered root→cwd (so the
- *  most-specific project file reads last). Deduped by absolute path. */
-function loadProjectContextFiles(cwd) {
-    const files = [];
-    const seen = new Set();
-    const global = loadContextFileFromDir(piAgentDir());
-    if (global !== null) {
-        files.push(global);
-        seen.add(global.path);
-    }
-    const ancestors = [];
-    let dir = resolve(cwd);
-    const root = resolve('/');
-    for (;;) {
-        const f = loadContextFileFromDir(dir);
-        if (f !== null && !seen.has(f.path)) {
-            ancestors.unshift(f);
-            seen.add(f.path);
-        }
-        if (dir === root)
-            break;
-        const parent = resolve(dir, '..');
-        if (parent === dir)
-            break;
-        dir = parent;
-    }
-    files.push(...ancestors);
-    return files;
-}
 function escapeAttribute(value) {
     return value.replaceAll('&', '&amp;').replaceAll('"', '&quot;').replaceAll('<', '&lt;').replaceAll('>', '&gt;');
 }
@@ -175,18 +112,19 @@ function parseWorktrees(lines) {
     }
     return worktrees;
 }
-/** The `<project_context>` block for the files discovered from `cwd`, plus the
- *  cwd/git environment snapshot that now rides at the end of the wrapper.
- *  Always emits the wrapper because the environment snapshot is always present
- *  even when no project instructions exist. Exported for testing. */
+/** The `<project_context>` block — now just the cwd/git `<environment>`
+ *  snapshot (dir listing + git status/worktrees). This USED to also carry a
+ *  `<project_instructions>` block re-rendering the node's AGENTS.md/CLAUDE.md;
+ *  that machinery is gone (hard cut, 2026-07-06) — project guidance now lives
+ *  in the document substrate (`crtr sys sync` migrates each CLAUDE.md/AGENTS.md
+ *  into that dir's own `.crouter/memory/AGENTS.md` at content/content, so it
+ *  surfaces via the `<memory kind="knowledge">` block instead). Always emits
+ *  the wrapper because the environment snapshot is always present. Exported
+ *  for testing. */
 export function buildProjectContextBlock(cwd) {
-    const files = loadProjectContextFiles(cwd);
     const envLines = directoryListingLines(cwd);
     const git = gitSnapshot(cwd);
-    let out = '<project_context>\n\nProject-specific instructions and guidelines:\n\n';
-    for (const { path, content } of files) {
-        out += `<project_instructions path="${path}">\n${content}\n</project_instructions>\n\n`;
-    }
+    let out = '<project_context>\n\n';
     out += `<environment cwd="${escapeAttribute(cwd)}">\n`;
     out += `Directory:\n${envLines.map((line) => `  ${line}`).join('\n')}\n`;
     out += `${git.lines.map((line) => `${line}`).join('\n')}\n`;
@@ -432,9 +370,12 @@ export function buildWakeBearings(origin) {
  *      from.
  *   2. `<memory kind="knowledge">` — the consultable catalog, a SIBLING of the
  *      bearings (never nested under the context dir). Dropped when empty.
- *   3. `<project_context>` — the AGENTS.md/CLAUDE.md instructions + the cwd/git
- *      environment snapshot, moved OUT of the system prompt (pi's copy is
- *      suppressed via noContextFiles in broker.ts) so it rides this message. */
+ *   3. `<project_context>` — the cwd/git environment snapshot. pi's own
+ *      AGENTS.md/CLAUDE.md system-prompt injection stays suppressed
+ *      (noContextFiles in broker.ts); project guidance instead rides the
+ *      `<memory kind="knowledge">` block above via the document substrate
+ *      (`crtr sys sync` migrates each CLAUDE.md/AGENTS.md into that dir's own
+ *      `.crouter/memory/AGENTS.md`). */
 export function buildContextBearings(nodeId) {
     const node = getNode(nodeId);
     const bearings = ['<crtr-bearings>', buildIdentityAssertion(nodeId)];

package/dist/core/runtime/broker.js

@@ -1706,10 +1706,11 @@ export async function buildBrokerSession(engine, cfg) {
             resourceLoaderOptions: {
                 additionalExtensionPaths: cfg.extensionPaths,
                 appendSystemPrompt: cfg.appendSystemPromptPath !== undefined ? [cfg.appendSystemPromptPath] : undefined,
-                // Suppress pi's <project_context> in the SYSTEM PROMPT — crouter
-                // re-renders the same AGENTS.md/CLAUDE.md files into the first-message
-                // <crtr-context> bearings instead (buildProjectContextBlock), so all
-                // project instructions ride the user message, not the system prompt.
+                // Suppress pi's <project_context> AGENTS.md/CLAUDE.md injection in the
+                // SYSTEM PROMPT unconditionally — crouter reads project guidance through
+                // the document substrate instead (a migrated AGENTS.md doc rides the
+                // <memory kind="knowledge"> block in the first-message bearings; see
+                // bearings.ts and `crtr sys sync`), never pi's own file-based loader.
                 noContextFiles: true,
             },
         });

package/dist/core/substrate/on-read.js

@@ -9,10 +9,12 @@
 //   • POSITIONAL — walk the read file's ancestor dirs; any doc living in an
 //     ancestor PROJECT `.crouter/memory/` surfaces (a doc surfaces when a file
 //     beside/under its own project scope dir is read), UNLESS it carries an
-//     explicit read-trigger (see D5 below). This mirrors nested-context's
-//     `.claude/rules` ancestor walk, but keyed on `.crouter/memory/`. The
-//     user-global `~/.crouter/memory/` store is NOT positional; user docs only
-//     fire on reads through explicit `applies-to` / `read-when` triggers.
+//     explicit read-trigger (see D5 below). This is the substrate's own
+//     ancestor walk keyed on `.crouter/memory/` — the same shape the retired
+//     nested-context pi-extension used for `.claude/rules` before that path
+//     was migrated into substrate docs (`crtr sys sync`). The user-global
+//     `~/.crouter/memory/` store is NOT positional; user docs only fire on
+//     reads through explicit `applies-to` / `read-when` triggers.
 //   • applies-to GLOB — any RESOLVED substrate doc (user/project/builtin scope)
 //     whose `appliesTo` glob matches the read file path surfaces, regardless of
 //     where the read file sits relative to the doc.
@@ -63,8 +65,9 @@ import { cachedSubstrateDocs } from './session-cache.js';
 // is the segment we explicitly join onto each surviving ancestor).
 const JUNK_DIRS = new Set(['node_modules', '.git', 'dist', 'build', '.next', '.cache', '.yalc']);
 // ---------------------------------------------------------------------------
-// Small path helpers (mirror the on-read precedent — nested-context /
-// frontmatter-rules — so the injected envelope matches their faithful shape).
+// Small path helpers (mirror the on-read precedent — frontmatter-rules, and
+// the retired nested-context extension — so the injected envelope matches
+// their faithful shape).
 // ---------------------------------------------------------------------------
 function realpathOrSelf(p) {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crouton-kit/crouter",
-  "version": "0.3.47",
+  "version": "0.3.48",
   "description": "crtr — agent runtime with memory, plugins, and marketplaces",
   "type": "module",
   "main": "dist/index.js",
@@ -47,7 +47,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@crouton-kit/humanloop": "^0.3.22",
+    "@crouton-kit/humanloop": "^0.3.25",
     "@earendil-works/pi-agent-core": "0.80.2",
     "@earendil-works/pi-ai": "0.80.3",
     "@earendil-works/pi-coding-agent": "0.80.2",

package/dist/builtin-pi-packages/pi-crtr-extensions/extensions/nested-context.ts

@@ -1,327 +0,0 @@
-/**
- * Nested Context Loader
- *
- * Pi only loads AGENTS.md / CLAUDE.md from the cwd's ancestor chain at startup.
- * Anything *below* the launch dir (subproject CLAUDE.md files, .claude/rules/)
- * is never pulled in. This extension fills that gap:
- *
- * When the `read` tool reads a file, we walk from that file's directory up to
- * the session cwd and surface, appended to the read result:
- *   1. Each directory's CLAUDE.md / AGENTS.md (first match per dir).
- *   2. Each directory's .claude/rules/*.md — unconditionally if the rule has no
- *      `paths:` frontmatter, or only when the read file matches one of its
- *      `paths:` globs.
- *
- * Guarantees:
- *   - No duplicates. A `seen` set tracks every absolute path already loaded,
- *     including the files pi loaded at startup (seeded in session_start) and any
- *     context/rule file the agent reads directly.
- *   - Bounded. Anchored to the file's own parent chain (not the session cwd),
- *     stops at $HOME, and skips generated/dependency dirs (node_modules, ...).
- *
- * Install: drop in ~/.pi/agent/extensions/ (global) or .pi/extensions/ (project).
- */
-
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import * as fs from "node:fs";
-import * as os from "node:os";
-import * as path from "node:path";
-
-// First-match-per-dir order mirrors pi's own loader (AGENTS.md wins over CLAUDE.md).
-const CONTEXT_FILENAMES = ["AGENTS.md", "AGENTS.MD", "CLAUDE.md", "CLAUDE.MD"];
-
-// Directory names we never descend into / load context from.
-const JUNK_DIRS = new Set([
-	"node_modules",
-	".git",
-	".venv",
-	"venv",
-	"dist",
-	"build",
-	".next",
-	".cache",
-	".yalc",
-	".sisyphus",
-	".crouter",
-]);
-
-interface RuleFile {
-	name: string;
-	paths: string[];
-	body: string;
-}
-
-function realpathOrSelf(p: string): string {
-	try {
-		return fs.realpathSync(p);
-	} catch {
-		return p;
-	}
-}
-
-function isJunkPath(absDir: string): boolean {
-	return absDir.split(path.sep).some((seg) => JUNK_DIRS.has(seg));
-}
-
-// Nearest enclosing git repo root for a path (walk up looking for `.git`).
-function gitRoot(p: string): string | null {
-	let d = p;
-	const root = path.parse(d).root;
-	while (true) {
-		if (fs.existsSync(path.join(d, ".git"))) return d;
-		if (d === root) return null;
-		const parent = path.dirname(d);
-		if (parent === d) return null;
-		d = parent;
-	}
-}
-
-// Display paths relative to the nearest git repo root, else absolute.
-function disp(p: string): string {
-	const root = gitRoot(p);
-	if (!root) return p;
-	const rel = path.relative(root, p);
-	return rel === "" ? "." : rel;
-}
-
-// Escape a value for use inside an XML-ish attribute in the injected block.
-function attr(s: string): string {
-	return s
-		.replace(/&/g, "&")
-		.replace(/"/g, """)
-		.replace(/</g, "&lt;")
-		.replace(/>/g, "&gt;");
-}
-
-const AUTO_CONTEXT_RE = /<auto-loaded-context(?:\s[^>]*)?>\n([\s\S]*?)\n<\/auto-loaded-context>/;
-
-function mergeAutoLoadedContext(items: string[], content: Array<{ type: string; text?: string }>) {
-	const existingText = content.map((block) => block.text ?? "").join("\n");
-	const fresh = items.map((item) => item.trim()).filter((item) => item !== "" && !existingText.includes(item));
-	if (fresh.length === 0) return content;
-	const inner = fresh.join("\n");
-
-	const existingIdx = content.findIndex((block) => typeof block.text === "string" && AUTO_CONTEXT_RE.test(block.text));
-	if (existingIdx !== -1) {
-		return content.map((block, idx) => {
-			if (idx !== existingIdx || typeof block.text !== "string") return block;
-			return {
-				...block,
-				text: block.text.replace(AUTO_CONTEXT_RE, (_whole, current: string) => {
-					const trimmed = String(current).trim();
-					return `<auto-loaded-context>\n${inner}${trimmed === "" ? "" : `\n${trimmed}`}\n</auto-loaded-context>`;
-				}),
-			};
-		});
-	}
-
-	return [{ type: "text" as const, text: `<auto-loaded-context>\n${inner}\n</auto-loaded-context>` }, ...content];
-}
-
-function firstContextFile(dir: string): string | null {
-	for (const name of CONTEXT_FILENAMES) {
-		const fp = path.join(dir, name);
-		if (fs.existsSync(fp) && fs.statSync(fp).isFile()) return fp;
-	}
-	return null;
-}
-
-function findMarkdown(dir: string): string[] {
-	const out: string[] = [];
-	let entries: fs.Dirent[];
-	try {
-		entries = fs.readdirSync(dir, { withFileTypes: true });
-	} catch {
-		return out;
-	}
-	for (const e of entries) {
-		const fp = path.join(dir, e.name);
-		if (e.isDirectory()) out.push(...findMarkdown(fp));
-		else if (e.isFile() && e.name.endsWith(".md")) out.push(fp);
-	}
-	return out;
-}
-
-// Minimal frontmatter parse: pulls `name` and the `paths:` list. Avoids a YAML dep.
-function parseRule(filePath: string): RuleFile {
-	let raw = "";
-	try {
-		raw = fs.readFileSync(filePath, "utf-8");
-	} catch {
-		return { name: path.basename(filePath, ".md"), paths: [], body: "" };
-	}
-	const fm = raw.match(/^---\n([\s\S]*?)\n---\n?([\s\S]*)$/);
-	if (!fm) return { name: path.basename(filePath, ".md"), paths: [], body: raw };
-
-	const [, front, body] = fm;
-	const lines = front.split("\n");
-	let name = path.basename(filePath, ".md");
-	const paths: string[] = [];
-	let inPaths = false;
-
-	const clean = (s: string) => s.trim().replace(/^["']|["']$/g, "");
-	for (const line of lines) {
-		const nameMatch = line.match(/^name:\s*(.+)$/);
-		if (nameMatch) {
-			name = clean(nameMatch[1]);
-			inPaths = false;
-			continue;
-		}
-		const pathsInline = line.match(/^paths:\s*(.*)$/);
-		if (pathsInline) {
-			const rest = pathsInline[1].trim();
-			if (rest === "" || rest === "[]") {
-				inPaths = true; // YAML list form follows on subsequent lines
-			} else {
-				// Inline form: a single glob or a comma/space-separated list,
-				// optionally wrapped in [ ... ].
-				inPaths = false;
-				for (const part of rest.replace(/^\[|\]$/g, "").split(/[,]/)) {
-					const g = clean(part);
-					if (g) paths.push(g);
-				}
-			}
-			continue;
-		}
-		if (inPaths) {
-			const item = line.match(/^\s*-\s*(.+)$/);
-			if (item) {
-				paths.push(clean(item[1]));
-				continue;
-			}
-			if (/^\S/.test(line)) inPaths = false; // dedented to next key
-		}
-	}
-	return { name, paths, body: body.trim() };
-}
-
-function ruleMatches(absFile: string, baseDir: string, globs: string[]): boolean {
-	if (globs.length === 0) return true; // unconditional rule
-	const rel = path.relative(baseDir, absFile);
-	return globs.some((g) => {
-		try {
-			return path.matchesGlob(rel, g) || path.matchesGlob(absFile, g);
-		} catch {
-			return false;
-		}
-	});
-}
-
-export default function nestedContext(pi: ExtensionAPI) {
-	const seen = new Set<string>();
-
-	// Seed `seen` with everything pi already loaded at startup: the global
-	// agent file plus every CLAUDE.md/AGENTS.md on the cwd ancestor chain.
-	pi.on("session_start", async (_event, ctx) => {
-		const globalDir = path.join(os.homedir(), ".pi", "agent");
-		const globalCtx = firstContextFile(globalDir);
-		if (globalCtx) seen.add(realpathOrSelf(globalCtx));
-
-		let dir = path.resolve(ctx.cwd);
-		const root = path.parse(dir).root;
-		while (true) {
-			const cf = firstContextFile(dir);
-			if (cf) seen.add(realpathOrSelf(cf));
-			if (dir === root) break;
-			const parent = path.dirname(dir);
-			if (parent === dir) break;
-			dir = parent;
-		}
-	});
-
-	pi.on("tool_result", async (event, ctx) => {
-		if (event.toolName !== "read") return;
-		if (event.isError) return;
-
-		const rawPath = (event.input as { path?: string; file_path?: string })?.path
-			?? (event.input as { file_path?: string })?.file_path;
-		if (!rawPath) return;
-
-		const cwd = path.resolve(ctx.cwd);
-		// The model often passes a leading ~ ; pi's read tool expands it but
-		// event.input keeps the raw form, so expand it ourselves before resolving.
-		const expanded = rawPath.startsWith("~")
-			? path.join(os.homedir(), rawPath.slice(1))
-			: rawPath;
-		const absFile = realpathOrSelf(path.resolve(cwd, expanded));
-
-		// Anchor to the FILE's own location, not the session cwd: walk its parent
-		// chain up to the home directory (or filesystem root if outside home).
-		const home = os.homedir();
-		const fsRoot = path.parse(absFile).root;
-
-		// If the agent read a context/rule file directly, mark it loaded so we
-		// never re-inject it later, and don't append it to its own read.
-		seen.add(absFile);
-
-		type Block = { order: number; text: string };
-		const blocks: Block[] = [];
-
-		let dir = path.dirname(absFile);
-		let depth = 0;
-		while (true) {
-			if (!isJunkPath(dir)) {
-				// 1) Directory context file.
-				const cf = firstContextFile(dir);
-				if (cf) {
-					const real = realpathOrSelf(cf);
-					if (!seen.has(real)) {
-						seen.add(real);
-						try {
-							const content = fs.readFileSync(cf, "utf-8").trim();
-							blocks.push({
-								order: depth,
-								text:
-									`<project-guidance src="${attr(disp(cf))}" scope="${attr(`${disp(dir)}/`)}">\n` +
-									`${content}\n` +
-									`</project-guidance>`,
-							});
-						} catch {
-							/* unreadable; skip */
-						}
-					}
-				}
-
-				// 2) .claude/rules for this directory.
-				const rulesDir = path.join(dir, ".claude", "rules");
-				for (const rf of findMarkdown(rulesDir)) {
-					// Skip stray context files living inside a rules dir; they are not rules.
-					if (CONTEXT_FILENAMES.includes(path.basename(rf))) continue;
-					const real = realpathOrSelf(rf);
-					if (seen.has(real)) continue;
-					const rule = parseRule(rf);
-					if (!ruleMatches(absFile, dir, rule.paths)) continue; // may match on a later read
-					seen.add(real);
-					blocks.push({
-						order: depth,
-						text:
-							`<rule name="${attr(rule.name)}" src="${attr(disp(rf))}">\n` +
-							`${rule.body}\n` +
-							`</rule>`,
-					});
-				}
-			}
-
-			if (dir === home || dir === fsRoot) break;
-			const parent = path.dirname(dir);
-			if (parent === dir) break;
-			dir = parent;
-			depth += 1;
-		}
-
-		if (blocks.length === 0) return;
-
-		// Outermost-first, so the most specific (nearest) guidance reads last/closest
-		// to the file content that follows it.
-		blocks.sort((a, b) => b.order - a.order);
-		const merged = mergeAutoLoadedContext(blocks.map((b) => b.text), event.content);
-		if (merged === event.content) return;
-
-		if (ctx.hasUI) {
-			ctx.ui.notify(`Loaded ${blocks.length} nested context file(s)`, "info");
-		}
-
-		// Prepend or merge, so the governing guidance appears before the file output.
-		return { content: merged };
-	});
-}