@ontrails/trails 1.0.0-beta.14 → 1.0.0-beta.15

package/dist/src/trails/topo-read-support.js

@@ -1,49 +1,47 @@
 /**
  * Read-only topo store consumer helpers.
  *
- * Extracted from topo-support.ts so this branch (trl-132) owns its own file,
- * keeping absorb routing clean across the stack.
+ * Extracted from topo-support.ts to isolate read-only store consumer helpers,
+ * keeping module boundaries clean.
  */
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
-import { ConflictError, createTopoStore, InternalError, NotFoundError, Result, } from '@ontrails/core';
-import { listTopoSaves } from '@ontrails/core/internal/topo-saves';
-import { openReadTrailsDb, resolveTrailsDbPath, resolveTrailsDir, } from '@ontrails/core/internal/trails-db';
-import { readTrailheadLockData } from '@ontrails/schema';
+import { ConflictError, createTopoStore, InternalError, listTopoSnapshots, NotFoundError, Result, } from '@ontrails/core';
+import { deriveTrailsDbPath, deriveTrailsDir, } from '@ontrails/core/internal/trails-db';
+import { readSurfaceLockData } from '@ontrails/schema';
 import { REPORT_CONTRACT_VERSION, REPORT_VERSION } from './topo-constants.js';
-import { createCurrentTopoSave, LOCK_PATH, resolveRootDir, } from './topo-support.js';
+import { createCurrentTopoSnapshot, deriveRootDir, LOCK_PATH, } from './topo-support.js';
 // ---------------------------------------------------------------------------
 // Store helpers
 // ---------------------------------------------------------------------------
-const topoStoreRef = (saveId) => ({ saveId });
-const hasCommittedLock = (trailsDir) => existsSync(join(trailsDir, 'trails.lock')) ||
-    existsSync(join(trailsDir, 'trailhead.lock'));
-const readTrailheadEntries = (trailheadMapJson) => JSON.parse(trailheadMapJson).entries;
-const buildBriefReportFromStore = (app, store, ref, save) => {
-    const trails = store.trails.list({ save: ref });
+const topoStoreRef = (snapshotId) => ({ snapshotId });
+const hasCommittedLock = (trailsDir) => existsSync(join(trailsDir, 'trails.lock'));
+const readSurfaceEntries = (surfaceMapJson) => JSON.parse(surfaceMapJson).entries;
+const buildBriefReportFromStore = (app, store, ref, snapshot) => {
+    const trails = store.trails.list({ snapshot: ref });
     const exportRecord = store.exports.get(ref);
     const trailEntries = exportRecord === undefined
         ? []
-        : readTrailheadEntries(exportRecord.trailheadMapJson).filter((entry) => entry.kind === 'trail');
+        : readSurfaceEntries(exportRecord.surfaceMapJson).filter((entry) => entry.kind === 'trail');
     return {
         contractVersion: REPORT_CONTRACT_VERSION,
         features: {
-            detours: trailEntries.some((entry) => (Object.keys(entry.detours ?? {}).length ?? 0) > 0),
+            detours: trailEntries.some((entry) => (entry.detours ?? []).length > 0),
             examples: trails.some((trail) => trail.hasExamples),
             outputSchemas: trails.some((trail) => trail.hasOutput),
-            provisions: save.provisionCount > 0,
-            signals: save.signalCount > 0,
+            resources: snapshot.resourceCount > 0,
+            signals: snapshot.signalCount > 0,
         },
         name: app.name,
-        provisions: save.provisionCount,
-        signals: save.signalCount,
-        trails: save.trailCount,
+        resources: snapshot.resourceCount,
+        signals: snapshot.signalCount,
+        trails: snapshot.trailCount,
         version: REPORT_VERSION,
     };
 };
 const buildSurveyListFromStore = (store, ref) => {
-    const trails = store.trails.list({ save: ref });
-    const provisions = store.provisions.list({ save: ref });
+    const trails = store.trails.list({ snapshot: ref });
+    const resources = store.resources.list({ snapshot: ref });
     return {
         count: trails.length,
         entries: trails.map((trail) => ({
@@ -52,35 +50,36 @@ const buildSurveyListFromStore = (store, ref) => {
             kind: trail.kind,
             safety: trail.safety,
         })),
-        provisionCount: provisions.length,
-        provisions: provisions.map((provision) => ({
-            description: provision.description,
-            health: provision.health,
-            id: provision.id,
-            kind: provision.kind,
-            lifetime: provision.lifetime,
-            usedBy: provision.usedBy,
+        resourceCount: resources.length,
+        resources: resources.map((resource) => ({
+            description: resource.description,
+            health: resource.health,
+            id: resource.id,
+            kind: resource.kind,
+            lifetime: resource.lifetime,
+            usedBy: resource.usedBy,
         })),
     };
 };
 const buildTrailDetailFromStore = (detail) => ({
-    crosses: [...(detail?.crosses ?? [])],
-    description: detail?.description ?? null,
-    detours: detail?.detours ?? null,
-    examples: [...(detail?.examples ?? [])],
-    id: detail?.id ?? '',
-    intent: detail?.intent ?? 'write',
-    kind: detail?.kind ?? 'trail',
-    provisions: [...(detail?.provisions ?? [])],
-    safety: detail?.safety ?? '-',
+    crosses: [...detail.crosses],
+    description: detail.description,
+    detours: detail.detours,
+    examples: [...detail.examples],
+    id: detail.id,
+    intent: detail.intent,
+    kind: detail.kind,
+    pattern: detail.pattern,
+    resources: [...detail.resources],
+    safety: detail.safety,
 });
-const buildProvisionDetailFromStore = (provision) => ({
-    description: provision.description,
-    health: provision.health,
-    id: provision.id,
-    kind: provision.kind,
-    lifetime: provision.lifetime,
-    usedBy: [...provision.usedBy],
+const buildResourceDetailFromStore = (resource) => ({
+    description: resource.description,
+    health: resource.health,
+    id: resource.id,
+    kind: resource.kind,
+    lifetime: resource.lifetime,
+    usedBy: [...resource.usedBy],
 });
 // ---------------------------------------------------------------------------
 // withCurrentTopoStore
@@ -88,52 +87,42 @@ const buildProvisionDetailFromStore = (provision) => ({
 /**
  * Run a read callback against the latest topo store state.
  *
- * Uses the most recent existing save when available, only creating a new save
- * when no prior save exists. This avoids unbounded save accumulation from
+ * Uses the most recent existing snapshot when available, only creating a new
+ * snapshot when no prior snapshot exists. This avoids unbounded snapshot
+ * accumulation from
  * read-only operations like survey, guide, and show.
  */
 const withCurrentTopoStore = (app, rootDir, read) => {
-    const dbPath = resolveTrailsDbPath({ rootDir });
-    const existingSave = existsSync(dbPath)
-        ? (() => {
-            const db = openReadTrailsDb({ rootDir });
-            try {
-                return listTopoSaves(db)[0];
-            }
-            finally {
-                db.close();
-            }
-        })()
-        : undefined;
-    const save = existingSave ?? createCurrentTopoSave(app, { rootDir });
+    const [existingSnapshot] = listTopoSnapshots({ limit: 1, rootDir });
+    const snapshot = existingSnapshot ?? createCurrentTopoSnapshot(app, { rootDir });
     const store = createTopoStore({ rootDir });
-    return read(store, topoStoreRef(save.id), save);
+    return read(store, topoStoreRef(snapshot.id), snapshot);
 };
 // ---------------------------------------------------------------------------
 // Public read-only consumers
 // ---------------------------------------------------------------------------
 export const buildTopoSummary = (app, options) => {
-    const rootDir = resolveRootDir(options?.rootDir);
-    const trailsDir = resolveTrailsDir({ rootDir });
-    return withCurrentTopoStore(app, rootDir, (store, ref, save) => ({
-        app: buildBriefReportFromStore(app, store, ref, save),
-        dbPath: resolveTrailsDbPath({ rootDir }),
+    const rootDir = deriveRootDir(options?.rootDir);
+    const trailsDir = deriveTrailsDir({ rootDir });
+    return withCurrentTopoStore(app, rootDir, (store, ref, snapshot) => ({
+        app: buildBriefReportFromStore(app, store, ref, snapshot),
+        dbPath: deriveTrailsDbPath({ rootDir }),
         list: buildSurveyListFromStore(store, ref),
         lockExists: hasCommittedLock(trailsDir),
         lockPath: LOCK_PATH,
     }));
 };
 export const buildCurrentTopoBrief = (app, options) => {
-    const rootDir = resolveRootDir(options?.rootDir);
-    return withCurrentTopoStore(app, rootDir, (store, ref, save) => buildBriefReportFromStore(app, store, ref, save));
+    const rootDir = deriveRootDir(options?.rootDir);
+    return withCurrentTopoStore(app, rootDir, (store, ref, snapshot) => buildBriefReportFromStore(app, store, ref, snapshot));
 };
 export const buildCurrentTopoList = (app, options) => {
-    const rootDir = resolveRootDir(options?.rootDir);
+    const rootDir = deriveRootDir(options?.rootDir);
     return withCurrentTopoStore(app, rootDir, (store, ref) => buildSurveyListFromStore(store, ref));
 };
 export const buildCurrentGuideEntries = (app, options) => {
-    const rootDir = resolveRootDir(options?.rootDir);
-    return withCurrentTopoStore(app, rootDir, (store, ref) => store.trails.list({ save: ref }).map((trail) => ({
+    const rootDir = deriveRootDir(options?.rootDir);
+    return withCurrentTopoStore(app, rootDir, (store, ref) => store.trails.list({ snapshot: ref }).map((trail) => ({
         description: trail.description ?? '(no description)',
         exampleCount: trail.exampleCount,
         id: trail.id,
@@ -141,29 +130,29 @@ export const buildCurrentGuideEntries = (app, options) => {
     })));
 };
 export const buildCurrentTopoDetail = (app, id, options) => {
-    const rootDir = resolveRootDir(options?.rootDir);
+    const rootDir = deriveRootDir(options?.rootDir);
     return withCurrentTopoStore(app, rootDir, (store, ref) => {
-        const trail = store.trails.get(id, { save: ref });
+        const trail = store.trails.get(id, { snapshot: ref });
         if (trail !== undefined) {
             return buildTrailDetailFromStore(trail);
         }
-        const provision = store.provisions.get(id, { save: ref });
-        return provision === undefined
+        const resource = store.resources.get(id, { snapshot: ref });
+        return resource === undefined
             ? undefined
-            : buildProvisionDetailFromStore(provision);
+            : buildResourceDetailFromStore(resource);
     });
 };
 export const verifyCurrentTopo = async (app, options) => {
-    const rootDir = resolveRootDir(options?.rootDir);
-    const committedLock = await readTrailheadLockData({
-        dir: resolveTrailsDir({ rootDir }),
+    const rootDir = deriveRootDir(options?.rootDir);
+    const committedLock = await readSurfaceLockData({
+        dir: deriveTrailsDir({ rootDir }),
     });
     if (committedLock === null) {
         return Result.err(new NotFoundError('No committed trails.lock found. Run `trails topo export` first.'));
     }
-    const currentHash = withCurrentTopoStore(app, rootDir, (store, ref) => store.exports.get(ref)?.trailheadHash);
+    const currentHash = withCurrentTopoStore(app, rootDir, (store, ref) => store.exports.get(ref)?.surfaceHash);
     if (currentHash === undefined) {
-        return Result.err(new InternalError('No stored topo export found for the current topo save'));
+        return Result.err(new InternalError('No stored topo export found for the current topo snapshot'));
     }
     if (committedLock.hash !== currentHash) {
         return Result.err(new ConflictError('trails.lock is stale. Run `trails topo export` to refresh it.'));

package/dist/src/trails/topo-read-support.js.map

@@ -1 +1 @@
-{"version":3,"file":"topo-read-support.js","sourceRoot":"","sources":["../../../src/trails/topo-read-support.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"topo-read-support.js","sourceRoot":"","sources":["../../../src/trails/topo-read-support.ts"],"names":[],"mappings":"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"}

package/dist/src/trails/topo-reports.d.ts

@@ -4,7 +4,7 @@ export interface BriefReport {
     readonly version: string;
     readonly contractVersion: string;
     readonly features: {
-        readonly provisions: boolean;
+        readonly resources: boolean;
         readonly outputSchemas: boolean;
         readonly examples: boolean;
         readonly detours: boolean;
@@ -12,7 +12,7 @@ export interface BriefReport {
     };
     readonly trails: number;
     readonly signals: number;
-    readonly provisions: number;
+    readonly resources: number;
 }
 export interface SurveyListReport {
     readonly count: number;
@@ -22,29 +22,33 @@ export interface SurveyListReport {
         readonly kind: string;
         readonly safety: string;
     }[];
-    readonly provisionCount: number;
-    readonly provisions: readonly {
+    readonly resourceCount: number;
+    readonly resources: readonly {
         readonly description: string | null;
         readonly health: 'available' | 'none';
         readonly id: string;
-        readonly kind: 'provision';
+        readonly kind: 'resource';
         readonly lifetime: 'singleton';
         readonly usedBy: readonly string[];
     }[];
 }
 export interface TrailDetailReport {
     readonly description: string | null;
-    readonly detours: Trail<unknown, unknown>['detours'] | null;
+    readonly detours: readonly {
+        readonly on: string;
+        readonly maxAttempts: number;
+    }[] | null;
     readonly examples: readonly unknown[];
     readonly crosses: readonly string[];
     readonly id: string;
     readonly intent: 'read' | 'write' | 'destroy';
     readonly kind: string;
+    readonly pattern: string | null;
     readonly safety: string;
-    readonly provisions: readonly string[];
+    readonly resources: readonly string[];
 }
-export declare const generateBriefReport: (app: Topo) => BriefReport;
-export declare const formatProvisionDetail: (app: Topo, provisionId: string) => object;
-export declare const generateSurveyList: (app: Topo) => SurveyListReport;
-export declare const generateTrailDetail: (item: Trail<unknown, unknown>) => TrailDetailReport;
+export declare const deriveBriefReport: (app: Topo) => BriefReport;
+export declare const deriveResourceDetail: (app: Topo, resourceId: string) => object;
+export declare const deriveSurveyList: (app: Topo) => SurveyListReport;
+export declare const deriveTrailDetail: (item: Trail<unknown, unknown>) => TrailDetailReport;
 //# sourceMappingURL=topo-reports.d.ts.map

package/dist/src/trails/topo-reports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"topo-reports.d.ts","sourceRoot":"","sources":["../../../src/trails/topo-reports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAIlD,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,QAAQ,EAAE;QACjB,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;QAC7B,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;QAChC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;QAC3B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;QAC1B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;KAC3B,CAAC;IACF,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,EAAE,SAAS;QACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC1B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;KACzB,EAAE,CAAC;IACJ,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,UAAU,EAAE,SAAS;QAC5B,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;QACpC,QAAQ,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,CAAC;QACtC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;QAC3B,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC;QAC/B,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;KACpC,EAAE,CAAC;CACL;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;IAC5D,QAAQ,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,CAAC;IACtC,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC;IAC9C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;CACxC;AAgCD,eAAO,MAAM,mBAAmB,GAAI,KAAK,IAAI,KAAG,WAmB/C,CAAC;AAwCF,eAAO,MAAM,qBAAqB,GAChC,KAAK,IAAI,EACT,aAAa,MAAM,KAClB,MAYF,CAAC;AAiBF,eAAO,MAAM,kBAAkB,GAAI,KAAK,IAAI,KAAG,gBA4B9C,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAC9B,MAAM,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,KAC5B,iBAgBF,CAAC"}
+{"version":3,"file":"topo-reports.d.ts","sourceRoot":"","sources":["../../../src/trails/topo-reports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAIlD,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,QAAQ,EAAE;QACjB,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;QAC5B,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;QAChC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;QAC3B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;QAC1B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;KAC3B,CAAC;IACF,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,EAAE,SAAS;QACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC1B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;KACzB,EAAE,CAAC;IACJ,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,SAAS,EAAE,SAAS;QAC3B,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;QACpC,QAAQ,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,CAAC;QACtC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;QAC1B,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC;QAC/B,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;KACpC,EAAE,CAAC;CACL;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,QAAQ,CAAC,OAAO,EACZ,SAAS;QAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;KAAE,EAAE,GAChE,IAAI,CAAC;IACT,QAAQ,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,CAAC;IACtC,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC;IAC9C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;CACvC;AAgCD,eAAO,MAAM,iBAAiB,GAAI,KAAK,IAAI,KAAG,WAmB7C,CAAC;AAwCF,eAAO,MAAM,oBAAoB,GAAI,KAAK,IAAI,EAAE,YAAY,MAAM,KAAG,MAYpE,CAAC;AAiBF,eAAO,MAAM,gBAAgB,GAAI,KAAK,IAAI,KAAG,gBA4B5C,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,MAAM,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,KAC5B,iBAuBF,CAAC"}

package/dist/src/trails/topo-reports.js

@@ -1,6 +1,6 @@
 import { REPORT_CONTRACT_VERSION, REPORT_VERSION } from './topo-constants.js';
 const trailHas = (raw, key) => {
-    if (key === 'examples') {
+    if (key === 'examples' || key === 'detours') {
         return Array.isArray(raw[key]) && raw[key].length > 0;
     }
     return Boolean(raw[key]);
@@ -11,23 +11,23 @@ const detectFeatures = (app) => {
         hasDetours: trails.some((r) => trailHas(r, 'detours')),
         hasExamples: trails.some((r) => trailHas(r, 'examples')),
         hasOutputSchemas: trails.some((r) => trailHas(r, 'output')),
-        hasProvisions: trails.some((r) => Array.isArray(r['provisions']) &&
-            r['provisions'].length > 0),
+        hasResources: trails.some((r) => Array.isArray(r['resources']) &&
+            r['resources'].length > 0),
     };
 };
-export const generateBriefReport = (app) => {
-    const { hasDetours, hasExamples, hasOutputSchemas, hasProvisions } = detectFeatures(app);
+export const deriveBriefReport = (app) => {
+    const { hasDetours, hasExamples, hasOutputSchemas, hasResources } = detectFeatures(app);
     return {
         contractVersion: REPORT_CONTRACT_VERSION,
         features: {
             detours: hasDetours,
             examples: hasExamples,
             outputSchemas: hasOutputSchemas,
-            provisions: hasProvisions,
+            resources: hasResources,
             signals: app.signals.size > 0,
         },
         name: app.name,
-        provisions: app.provisions.size,
+        resources: app.resources.size,
         signals: app.signals.size,
         trails: app.trails.size,
         version: REPORT_VERSION,
@@ -45,45 +45,45 @@ const safetyLabel = (entry) => {
     }
     return '-';
 };
-const buildProvisionUsage = (app) => {
+const buildResourceUsage = (app) => {
     const usage = new Map();
     for (const trailDef of app.list()) {
-        for (const declaredProvision of trailDef.provisions) {
-            const users = usage.get(declaredProvision.id) ?? [];
+        for (const declaredResource of trailDef.resources) {
+            const users = usage.get(declaredResource.id) ?? [];
             users.push(trailDef.id);
-            usage.set(declaredProvision.id, users);
+            usage.set(declaredResource.id, users);
         }
     }
     return new Map([...usage.entries()].map(([id, users]) => [id, users.toSorted()]));
 };
-const provisionHealthStatus = (provision) => provision.health === undefined ? 'none' : 'available';
-export const formatProvisionDetail = (app, provisionId) => {
-    const item = app.getProvision(provisionId);
-    const usedBy = buildProvisionUsage(app).get(provisionId) ?? [];
+const resourceHealthStatus = (resource) => resource.health === undefined ? 'none' : 'available';
+export const deriveResourceDetail = (app, resourceId) => {
+    const item = app.getResource(resourceId);
+    const usedBy = buildResourceUsage(app).get(resourceId) ?? [];
     return {
         description: item?.description ?? null,
-        health: item ? provisionHealthStatus(item) : 'none',
-        id: provisionId,
-        kind: 'provision',
+        health: item ? resourceHealthStatus(item) : 'none',
+        id: resourceId,
+        kind: 'resource',
         lifetime: 'singleton',
         usedBy,
     };
 };
-const formatProvisionList = (app) => {
-    const usage = buildProvisionUsage(app);
+const formatResourceList = (app) => {
+    const usage = buildResourceUsage(app);
     return app
-        .listProvisions()
-        .map((provision) => ({
-        description: provision.description ?? null,
-        health: provisionHealthStatus(provision),
-        id: provision.id,
-        kind: provision.kind,
+        .listResources()
+        .map((resource) => ({
+        description: resource.description ?? null,
+        health: resourceHealthStatus(resource),
+        id: resource.id,
+        kind: resource.kind,
         lifetime: 'singleton',
-        usedBy: usage.get(provision.id) ?? [],
+        usedBy: usage.get(resource.id) ?? [],
     }))
         .toSorted((a, b) => a.id.localeCompare(b.id));
 };
-export const generateSurveyList = (app) => {
+export const deriveSurveyList = (app) => {
     const items = app.list();
     const entries = items.map((item) => {
         const safety = safetyLabel(item);
@@ -97,25 +97,31 @@ export const generateSurveyList = (app) => {
             safety,
         };
     });
-    const provisions = formatProvisionList(app);
+    const resources = formatResourceList(app);
     return {
         count: items.length,
         entries,
-        provisionCount: provisions.length,
-        provisions,
+        resourceCount: resources.length,
+        resources,
     };
 };
-export const generateTrailDetail = (item) => {
+export const deriveTrailDetail = (item) => {
     const safety = safetyLabel(item);
     return {
         crosses: item.crosses.toSorted(),
         description: item.description ?? null,
-        detours: item.detours ?? null,
+        detours: item.detours.length > 0
+            ? item.detours.map((d) => ({
+                maxAttempts: d.maxAttempts ?? 1,
+                on: d.on.name,
+            }))
+            : null,
         examples: item.examples ?? [],
         id: item.id,
         intent: item.intent,
         kind: item.kind,
-        provisions: item.provisions.map((provision) => provision.id).toSorted(),
+        pattern: item.pattern ?? null,
+        resources: item.resources.map((resource) => resource.id).toSorted(),
         safety,
     };
 };

package/dist/src/trails/topo-reports.js.map

@@ -1 +1 @@
-{"version":3,"file":"topo-reports.js","sourceRoot":"","sources":["../../../src/trails/topo-reports.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAiD9E,MAAM,QAAQ,GAAG,CAAC,GAA4B,EAAE,GAAW,EAAW,EAAE;IACtE,IAAI,GAAG,KAAK,UAAU,EAAE,CAAC;QACvB,OAAO,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAK,GAAG,CAAC,GAAG,CAAe,CAAC,MAAM,GAAG,CAAC,CAAC;IACvE,CAAC;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;AAC3B,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CACrB,GAAS,EAMT,EAAE;IACF,MAAM,MAAM,GAAG,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CACzC,CAAC,IAAI,EAAE,EAAE,CAAC,IAA0C,CACrD,CAAC;IACF,OAAO;QACL,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;QACtD,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;QACxD,gBAAgB,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;QAC3D,aAAa,EAAE,MAAM,CAAC,IAAI,CACxB,CAAC,CAAC,EAAE,EAAE,CACJ,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;YAC7B,CAAC,CAAC,YAAY,CAAe,CAAC,MAAM,GAAG,CAAC,CAC5C;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,GAAS,EAAe,EAAE;IAC5D,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,gBAAgB,EAAE,aAAa,EAAE,GAChE,cAAc,CAAC,GAAG,CAAC,CAAC;IAEtB,OAAO;QACL,eAAe,EAAE,uBAAuB;QACxC,QAAQ,EAAE;YACR,OAAO,EAAE,UAAU;YACnB,QAAQ,EAAE,WAAW;YACrB,aAAa,EAAE,gBAAgB;YAC/B,UAAU,EAAE,aAAa;YACzB,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC;SAC9B;QACD,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,UAAU,EAAE,GAAG,CAAC,UAAU,CAAC,IAAI;QAC/B,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI;QACzB,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,IAAI;QACvB,OAAO,EAAE,cAAc;KACxB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,KAEpB,EAAU,EAAE;IACX,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAC/B,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,KAAK,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;QAC7B,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;QAC5B,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAC1B,GAAS,EAC+B,EAAE;IAC1C,MAAM,KAAK,GAAG,IAAI,GAAG,EAAoB,CAAC;IAE1C,KAAK,MAAM,QAAQ,IAAI,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC;QAClC,KAAK,MAAM,iBAAiB,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC;YACpD,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;YACpD,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YACxB,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAED,OAAO,IAAI,GAAG,CACZ,CAAC,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAU,CAAC,CAC3E,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAAC,SAE9B,EAAwB,EAAE,CACzB,SAAS,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC;AAExD,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,GAAS,EACT,WAAmB,EACX,EAAE;IACV,MAAM,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;IAE/D,OAAO;QACL,WAAW,EAAE,IAAI,EAAE,WAAW,IAAI,IAAI;QACtC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM;QACnD,EAAE,EAAE,WAAW;QACf,IAAI,EAAE,WAAW;QACjB,QAAQ,EAAE,WAAW;QACrB,MAAM;KACP,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,GAAS,EAAkC,EAAE;IACxE,MAAM,KAAK,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;IACvC,OAAO,GAAG;SACP,cAAc,EAAE;SAChB,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QACnB,WAAW,EAAE,SAAS,CAAC,WAAW,IAAI,IAAI;QAC1C,MAAM,EAAE,qBAAqB,CAAC,SAAS,CAAC;QACxC,EAAE,EAAE,SAAS,CAAC,EAAE;QAChB,IAAI,EAAE,SAAS,CAAC,IAAI;QACpB,QAAQ,EAAE,WAAoB;QAC9B,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE;KACtC,CAAC,CAAC;SACF,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAClD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,GAAS,EAAoB,EAAE;IAChE,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;IACzB,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACjC,MAAM,MAAM,GAAG,WAAW,CACxB,IAA4D,CAC7D,CAAC;QACF,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAC3B,IAA4C,CAAC,QAAQ,CACvD;YACC,CAAC,CAAE,IAA2C,CAAC,QAAQ,CAAC,MAAM;YAC9D,CAAC,CAAC,CAAC,CAAC;QAEN,OAAO;YACL,QAAQ;YACR,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,MAAM;SACP,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;IAE5C,OAAO;QACL,KAAK,EAAE,KAAK,CAAC,MAAM;QACnB,OAAO;QACP,cAAc,EAAE,UAAU,CAAC,MAAM;QACjC,UAAU;KACX,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,IAA6B,EACV,EAAE;IACrB,MAAM,MAAM,GAAG,WAAW,CACxB,IAA4D,CAC7D,CAAC;IAEF,OAAO;QACL,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;QAChC,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,IAAI;QACrC,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,IAAI;QAC7B,QAAQ,EAAE,IAAI,CAAC,QAAQ,IAAI,EAAE;QAC7B,EAAE,EAAE,IAAI,CAAC,EAAE;QACX,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE;QACvE,MAAM;KACP,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"topo-reports.js","sourceRoot":"","sources":["../../../src/trails/topo-reports.ts"],"names":[],"mappings":"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"}

package/dist/src/trails/topo-show.d.ts

@@ -1,6 +1,6 @@
 export declare const topoShowTrail: import("@ontrails/core").Trail<{
     id: string;
-    module: string;
+    module?: string | undefined;
     rootDir?: string | undefined;
 }, {
     crosses: string[];
@@ -10,14 +10,14 @@ export declare const topoShowTrail: import("@ontrails/core").Trail<{
     id: string;
     intent: "read" | "write" | "destroy";
     kind: string;
-    provisions: string[];
+    resources: string[];
     safety: string;
 } | {
     description: string | null;
     health: "available" | "none";
     id: string;
-    kind: "provision";
+    kind: "resource";
     lifetime: "singleton";
     usedBy: string[];
-}>;
+}, never>;
 //# sourceMappingURL=topo-show.d.ts.map

package/dist/src/trails/topo-show.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"topo-show.d.ts","sourceRoot":"","sources":["../../../src/trails/topo-show.ts"],"names":[],"mappings":"AA4BA,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;EA6BxB,CAAC"}
+{"version":3,"file":"topo-show.d.ts","sourceRoot":"","sources":["../../../src/trails/topo-show.ts"],"names":[],"mappings":"AA2BA,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;SA0BxB,CAAC"}

package/dist/src/trails/topo-show.js

@@ -2,7 +2,6 @@ import { NotFoundError, Result, trail } from '@ontrails/core';
 import { z } from 'zod';
 import { loadApp } from './load-app.js';
 import { buildCurrentTopoDetail } from './topo-read-support.js';
-import { DEFAULT_APP_MODULE } from './topo-support.js';
 const trailDetailOutput = z.object({
     crosses: z.array(z.string()),
     description: z.unknown().nullable(),
@@ -11,14 +10,14 @@ const trailDetailOutput = z.object({
     id: z.string(),
     intent: z.enum(['read', 'write', 'destroy']),
     kind: z.string(),
-    provisions: z.array(z.string()),
+    resources: z.array(z.string()),
     safety: z.string(),
 });
-const provisionDetailOutput = z.object({
+const resourceDetailOutput = z.object({
     description: z.string().nullable(),
     health: z.enum(['available', 'none']),
     id: z.string(),
-    kind: z.literal('provision'),
+    kind: z.literal('resource'),
     lifetime: z.literal('singleton'),
     usedBy: z.array(z.string()),
 });
@@ -30,9 +29,9 @@ export const topoShowTrail = trail('topo.show', {
         if (detail !== undefined) {
             return Result.ok(detail);
         }
-        return Result.err(new NotFoundError(`Trail or provision not found: ${input.id}`));
+        return Result.err(new NotFoundError(`Trail or resource not found: ${input.id}`));
     },
-    description: 'Show detail for a current trail or provision',
+    description: 'Show detail for a current trail or resource',
     examples: [
         {
             input: { id: 'topo' },
@@ -40,14 +39,11 @@ export const topoShowTrail = trail('topo.show', {
         },
     ],
     input: z.object({
-        id: z.string().describe('Trail or provision ID to inspect'),
-        module: z
-            .string()
-            .default(DEFAULT_APP_MODULE)
-            .describe('Path to the app module'),
+        id: z.string().describe('Trail or resource ID to inspect'),
+        module: z.string().optional().describe('Path to the app module'),
         rootDir: z.string().optional().describe('Workspace root directory'),
     }),
     intent: 'read',
-    output: z.union([trailDetailOutput, provisionDetailOutput]),
+    output: z.union([trailDetailOutput, resourceDetailOutput]),
 });
 //# sourceMappingURL=topo-show.js.map

package/dist/src/trails/topo-show.js.map

@@ -1 +1 @@
-{"version":3,"file":"topo-show.js","sourceRoot":"","sources":["../../../src/trails/topo-show.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"topo-show.js","sourceRoot":"","sources":["../../../src/trails/topo-show.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAEhE,MAAM,iBAAiB,GAAG,CAAC,CAAC,MAAM,CAAC;IACjC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC5B,WAAW,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IACnC,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IAC/B,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAC9B,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;IACd,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;IAC5C,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC9B,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;CACnB,CAAC,CAAC;AAEH,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IACrC,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;IACd,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC;IAC3B,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC;IAChC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;CAC5B,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,CAAC,WAAW,EAAE;IAC9C,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QAC1B,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,IAAI,GAAG,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QAC1D,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACjD,MAAM,MAAM,GAAG,sBAAsB,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;QAClE,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,OAAO,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;QAC3B,CAAC;QACD,OAAO,MAAM,CAAC,GAAG,CACf,IAAI,aAAa,CAAC,gCAAgC,KAAK,CAAC,EAAE,EAAE,CAAC,CAC9D,CAAC;IACJ,CAAC;IACD,WAAW,EAAE,6CAA6C;IAC1D,QAAQ,EAAE;QACR;YACE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE;YACrB,IAAI,EAAE,2BAA2B;SAClC;KACF;IACD,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC;QACd,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,iCAAiC,CAAC;QAC1D,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,wBAAwB,CAAC;QAChE,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,0BAA0B,CAAC;KACpE,CAAC;IACF,MAAM,EAAE,MAAM;IACd,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,CAAC;CAC3D,CAAC,CAAC"}