@north-light/crouter 0.3.222 → 0.3.223

package/dist/core/substrate/surface-match.d.ts

@@ -1,4 +1,5 @@
 import { type Rung, type SubstrateDoc, type SurfaceEntry } from './schema.js';
+import type { NodeConfigSubject } from './subject-fields.js';
 /** The project directory owning a doc's store: the path segment stack above
  *  the doc's `.crouter` dir. `null` when the doc's path carries no `.crouter`
  *  segment (builtin docs). */
@@ -13,20 +14,20 @@ export declare function underOwningRoot(doc: Pick<SubstrateDoc, 'path'>, absFile
  *  realpathed. `readFrontmatter` is the read file's own parsed YAML (empty
  *  for non-markdown files); an empty record never satisfies
  *  `matchFrontmatter`. */
-export declare function matchesReadEntry(entry: SurfaceEntry, doc: Pick<SubstrateDoc, 'path' | 'scope'>, absReadFile: string, readFrontmatter: Record<string, unknown>): boolean;
+export declare function matchesReadEntry(entry: SurfaceEntry, doc: Pick<SubstrateDoc, 'path' | 'scope'>, subject: NodeConfigSubject, absReadFile: string, readFrontmatter: Record<string, unknown>): boolean;
 /** Does a `memory-read` entry on the doc named `carrierName` fit a resolved
  *  read of a doc known by `targetNames`? */
-export declare function matchesMemoryReadEntry(entry: SurfaceEntry, carrierName: string, targetNames: string[]): boolean;
+export declare function matchesMemoryReadEntry(entry: SurfaceEntry, carrierName: string, subject: NodeConfigSubject | null, targetNames: string[]): boolean;
 /** Does a `command` entry fit the executed command string? */
-export declare function matchesCommandEntry(entry: SurfaceEntry, command: string): boolean;
+export declare function matchesCommandEntry(entry: SurfaceEntry, subject: NodeConfigSubject, command: string): boolean;
 /** The doc's delivery rung for a read of `absReadFile` (already realpathed). */
-export declare function readDeliveryRung(doc: Pick<SubstrateDoc, 'surfaces' | 'path' | 'scope'>, absReadFile: string, readFrontmatter: Record<string, unknown>): Rung;
+export declare function readDeliveryRung(doc: Pick<SubstrateDoc, 'surfaces' | 'path' | 'scope'>, subject: NodeConfigSubject, absReadFile: string, readFrontmatter: Record<string, unknown>): Rung;
 /** The doc's workspace-open rung. Presence of an entry is the match; callers
  *  scope the corpus to project stores mounted by the subject's cwd/profile. */
-export declare function workspaceOpenRung(doc: Pick<SubstrateDoc, 'surfaces'>): Rung;
+export declare function workspaceOpenRung(doc: Pick<SubstrateDoc, 'surfaces'>, subject: NodeConfigSubject): Rung;
 /** The doc's delivery rung for a `crtr memory read` that resolved a doc
  *  known by `targetNames` (canonical name, plus the mount-stripped name for
  *  plugin-mounted docs). The doc's own `name` anchors `./` globs. */
-export declare function memoryReadDeliveryRung(doc: Pick<SubstrateDoc, 'surfaces' | 'name'>, targetNames: string[]): Rung;
+export declare function memoryReadDeliveryRung(doc: Pick<SubstrateDoc, 'surfaces' | 'name'>, subject: NodeConfigSubject | null, targetNames: string[]): Rung;
 /** The doc's delivery rung for an executed command string. */
-export declare function commandDeliveryRung(doc: Pick<SubstrateDoc, 'surfaces'>, command: string): Rung;
+export declare function commandDeliveryRung(doc: Pick<SubstrateDoc, 'surfaces'>, subject: NodeConfigSubject, command: string): Rung;

package/dist/core/substrate/surface-match.js

@@ -13,6 +13,7 @@ import { basename, isAbsolute, matchesGlob, relative, sep } from 'node:path';
 import { CRTR_DIR_NAME } from '../../types.js';
 import { realpathOrSelf } from '../fs-utils.js';
 import { evalCondition } from '../predicate.js';
+import { surfaceEntryGatePasses } from './gate.js';
 import { rungRank } from './schema.js';
 /** The project directory owning a doc's store: the path segment stack above
  *  the doc's `.crouter` dir. `null` when the doc's path carries no `.crouter`
@@ -62,8 +63,8 @@ function readGlobMatches(glob, doc, absReadFile) {
  *  realpathed. `readFrontmatter` is the read file's own parsed YAML (empty
  *  for non-markdown files); an empty record never satisfies
  *  `matchFrontmatter`. */
-export function matchesReadEntry(entry, doc, absReadFile, readFrontmatter) {
-    if (entry.on !== 'read')
+export function matchesReadEntry(entry, doc, subject, absReadFile, readFrontmatter) {
+    if (entry.on !== 'read' || !surfaceEntryGatePasses(entry, subject))
         return false;
     if (entry.match !== undefined && !entry.match.some((g) => readGlobMatches(g, doc, absReadFile))) {
         return false;
@@ -97,8 +98,8 @@ function memoryReadGlobMatches(glob, carrierName, targetNames) {
 }
 /** Does a `memory-read` entry on the doc named `carrierName` fit a resolved
  *  read of a doc known by `targetNames`? */
-export function matchesMemoryReadEntry(entry, carrierName, targetNames) {
-    if (entry.on !== 'memory-read' || entry.match === undefined)
+export function matchesMemoryReadEntry(entry, carrierName, subject, targetNames) {
+    if (entry.on !== 'memory-read' || entry.match === undefined || !surfaceEntryGatePasses(entry, subject))
         return false;
     return entry.match.some((g) => memoryReadGlobMatches(g, carrierName, targetNames));
 }
@@ -119,8 +120,8 @@ function commandGlobMatches(glob, command) {
     }
 }
 /** Does a `command` entry fit the executed command string? */
-export function matchesCommandEntry(entry, command) {
-    if (entry.on !== 'command' || entry.match === undefined)
+export function matchesCommandEntry(entry, subject, command) {
+    if (entry.on !== 'command' || entry.match === undefined || !surfaceEntryGatePasses(entry, subject))
         return false;
     return entry.match.some((g) => commandGlobMatches(g, command));
 }
@@ -131,10 +132,10 @@ export function matchesCommandEntry(entry, command) {
 // floor, never an authored rung).
 // ---------------------------------------------------------------------------
 /** The doc's delivery rung for a read of `absReadFile` (already realpathed). */
-export function readDeliveryRung(doc, absReadFile, readFrontmatter) {
+export function readDeliveryRung(doc, subject, absReadFile, readFrontmatter) {
     let r = 'none';
     for (const e of doc.surfaces) {
-        if (!matchesReadEntry(e, doc, absReadFile, readFrontmatter))
+        if (!matchesReadEntry(e, doc, subject, absReadFile, readFrontmatter))
             continue;
         if (rungRank(e.at) > rungRank(r))
             r = e.at;
@@ -143,10 +144,10 @@ export function readDeliveryRung(doc, absReadFile, readFrontmatter) {
 }
 /** The doc's workspace-open rung. Presence of an entry is the match; callers
  *  scope the corpus to project stores mounted by the subject's cwd/profile. */
-export function workspaceOpenRung(doc) {
+export function workspaceOpenRung(doc, subject) {
     let r = 'none';
     for (const e of doc.surfaces) {
-        if (e.on !== 'workspace-open')
+        if (e.on !== 'workspace-open' || !surfaceEntryGatePasses(e, subject))
             continue;
         if (rungRank(e.at) > rungRank(r))
             r = e.at;
@@ -156,10 +157,10 @@ export function workspaceOpenRung(doc) {
 /** The doc's delivery rung for a `crtr memory read` that resolved a doc
  *  known by `targetNames` (canonical name, plus the mount-stripped name for
  *  plugin-mounted docs). The doc's own `name` anchors `./` globs. */
-export function memoryReadDeliveryRung(doc, targetNames) {
+export function memoryReadDeliveryRung(doc, subject, targetNames) {
     let r = 'none';
     for (const e of doc.surfaces) {
-        if (!matchesMemoryReadEntry(e, doc.name, targetNames))
+        if (!matchesMemoryReadEntry(e, doc.name, subject, targetNames))
             continue;
         if (rungRank(e.at) > rungRank(r))
             r = e.at;
@@ -167,10 +168,10 @@ export function memoryReadDeliveryRung(doc, targetNames) {
     return r;
 }
 /** The doc's delivery rung for an executed command string. */
-export function commandDeliveryRung(doc, command) {
+export function commandDeliveryRung(doc, subject, command) {
     let r = 'none';
     for (const e of doc.surfaces) {
-        if (!matchesCommandEntry(e, command))
+        if (!matchesCommandEntry(e, subject, command))
             continue;
         if (rungRank(e.at) > rungRank(r))
             r = e.at;

package/package.json

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