@mak-98/dirvi-app 0.11.0-beta.6 → 0.11.0-beta.7

package/dist/application/create-app-api.d.ts

@@ -1,4 +1,4 @@
-import { type SerializableKey, type AppApi } from 'dirvi-lib';
+import { SerializableKey, AppApi } from 'dirvi-lib';
 import type { AppApiApplicator, AppDefinition, AppDefinitionApplicator } from 'dirvi-apis';
 /**
  * Turns a plugin-owned app definition into a host-owned runtime AppApi.

package/dist/application/create-app-api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-app-api.d.ts","sourceRoot":"","sources":["../../src/application/create-app-api.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,MAAM,EAMZ,MAAM,WAAW,CAAC;AACnB,OAAO,KAAK,EAAE,gBAAgB,EAAkB,aAAa,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAE3G;;;;;GAKG;AACH,wBAAgB,sBAAsB,CACpC,uBAAuB,EAAE,uBAAuB,GAC/C,gBAAgB,CAQlB;AAED,wBAAgB,YAAY,CAC1B,EAAE,SAAS,eAAe,EAC1B,KAAK,EACL,aAAa,EAAE,aAAa,CAAC,EAAE,EAAE,KAAK,CAAC,GAAG,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,CAyB5D"}
+{"version":3,"file":"create-app-api.d.ts","sourceRoot":"","sources":["../../src/application/create-app-api.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,MAAM,EACP,MAAM,WAAW,CAAC;AAKnB,OAAO,KAAK,EAAE,gBAAgB,EAAkB,aAAa,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAE3G;;;;;GAKG;AACH,wBAAgB,sBAAsB,CACpC,uBAAuB,EAAE,uBAAuB,GAC/C,gBAAgB,CAQlB;AAED,wBAAgB,YAAY,CAC1B,EAAE,SAAS,eAAe,EAC1B,KAAK,EACL,aAAa,EAAE,aAAa,CAAC,EAAE,EAAE,KAAK,CAAC,GAAG,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,CAiE5D"}

package/dist/application/create-app-api.js

@@ -1,4 +1,5 @@
-import { createCursorApi, createFoldsApi, createNavNodeApi, createStateApi, createTreeNodeApi, } from 'dirvi-lib';
+import { createFoldMethods, createCursorMethods, createUnorderedNavMethods, createOrderedNavMethods, } from 'dirvi-lib';
+import { createTreeMethods, createStateApi, } from 'dirvi-lib';
 /**
  * Turns a plugin-owned app definition into a host-owned runtime AppApi.
  *
@@ -12,22 +13,48 @@ export function createAppApiApplicator(appDefinitionApplicator) {
     });
 }
 export function createAppApi(appDefinition) {
-    const treeNodeApi = createTreeNodeApi();
-    const foldTreeNodeApi = createTreeNodeApi();
-    const foldsApi = createFoldsApi(foldTreeNodeApi);
-    const cursorApi = createCursorApi();
-    const stateApi = createStateApi(treeNodeApi, cursorApi);
-    const navNodeApi = createNavNodeApi(treeNodeApi, foldsApi, cursorApi, appDefinition.createNavNodeApiOptions);
+    const treeMethods = createTreeMethods();
+    const foldTreeMethods = createTreeMethods();
+    const foldMethods = createFoldMethods(foldTreeMethods);
+    const cursorMethods = createCursorMethods();
+    const stateApi = createStateApi(treeMethods, foldMethods, cursorMethods);
+    const navMethods = appDefinition.semanticOrder ?
+        createOrderedNavMethods(treeMethods, foldMethods, cursorMethods) :
+        createUnorderedNavMethods(treeMethods, foldMethods, cursorMethods);
+    async function loadChildren(path) {
+        const children = await appDefinition.loadChildren(path);
+        const seenIds = new Set();
+        return children.map((child) => {
+            if (seenIds.has(child.id)) {
+                throw new Error('Application returned duplicate sibling IDs');
+            }
+            seenIds.add(child.id);
+            switch (child.kind) {
+                case 'leaf':
+                    return treeMethods.createLeaf(child.id, child.value);
+                case 'unloaded-branch':
+                    return treeMethods.createUnloadedBranch(child.id, child.value);
+                default:
+                    // Also protects against invalid output from JavaScript plugins.
+                    throw new Error('Application returned an invalid child kind');
+            }
+        });
+    }
     return {
         name: appDefinition.displayName,
-        rootId: appDefinition.rootId,
-        createRoot: () => appDefinition.createRoot(treeNodeApi),
-        loadBranches: (path) => appDefinition.loadChildren(treeNodeApi, path),
+        loadChildren: (path) => loadChildren(path),
+        loadRoot: async () => {
+            const rootData = await appDefinition.loadRoot();
+            const children = await loadChildren([]);
+            const root = treeMethods.createLoadedBranch(rootData.id, rootData.value, children);
+            if (root === undefined) {
+                throw new Error('Cannot create root: duplicate child IDs');
+            }
+            return root;
+        },
+        presentNode: (id, isBranch) => appDefinition.presentNode(id, isBranch),
         subscribeToResync: appDefinition.subscribeToResync,
-        treeNodeApi,
-        foldsApi,
-        cursorApi,
         stateApi,
-        navNodeApi,
+        navMethods,
     };
 }

package/dist/application/init-runtime.d.ts

@@ -1,28 +1,40 @@
 import type { Initialization } from '../domain/initialization.js';
 import type { PublicInitApi } from '../domain/public-init-api.js';
 /**
- * Collects startup configuration registrations while init.mjs is evaluated.
+ * A session for collecting and resolving initialization-script registrations.
  *
- * The application exposes `api` to the script, then calls `finish()` once
- * evaluation completes to seal registration and obtain the validated Config.
+ * Expose `api` while evaluating `init.mjs`, then call `finish()` after module
+ * evaluation completes. Finishing validates the collected state and returns an
+ * immutable-by-contract snapshot of the resolved initialization.
  */
 export type InitRuntime = {
+    /** The temporary API made available to `init.mjs` during evaluation. */
     readonly api: PublicInitApi;
+    /**
+     * Validates and seals this session, returning its resolved startup state.
+     *
+     * The session is sealed only after successful validation. Once sealed,
+     * further API calls and calls to `finish()` throw
+     * `InitializationAlreadyFinishedError`.
+     */
     readonly finish: () => Initialization;
 };
 /**
- * Creates an isolated startup configuration session.
+ * Creates an isolated session for evaluating one `init.mjs` script.
  *
- * The returned API is exposed to `init.mjs` while the script is evaluated.
- * Registration calls validate their runtime inputs, and option updates validate
- * the merged configuration. The session keeps its mutable state private.
+ * Option patches are merged with the current config and the complete result is
+ * validated. App and command registrations are checked as they are made.
  *
- * Call `finish()` after evaluating `init.mjs` to seal the session and obtain
- * the validated initialization. A successful call can happen only once; later
- * API calls and calls to `finish()` throw an error.
+ * The runtime keeps its working state inside the closure and exposes it only
+ * through `api` and `finish`. finish() returns new maps, so later changes to
+ * the runtime’s maps cannot alter the returned maps.
  *
- * @returns A fresh initialization runtime with a public registration API and
- *          a function for sealing the session.
+ * If no startup app is selected explicitly, the most recently registered app
+ * is chosen. At least one app must be registered before the session can finish.
+ *
+ * @returns A fresh initialization API and its corresponding `finish` function.
+ * @throws {InitRuntimeError} If a registration is invalid, validation fails,
+ *   no app was registered, or the session has already been finished.
  */
 export declare function createInitRuntime(): InitRuntime;
 //# sourceMappingURL=init-runtime.d.ts.map

package/dist/application/init-runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init-runtime.d.ts","sourceRoot":"","sources":["../../src/application/init-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAElE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAIlE;;;;;GAKG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,CAAC,GAAG,EAAE,aAAa,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,MAAM,cAAc,CAAC;CACvC,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,wBAAgB,iBAAiB,IAAI,WAAW,CA+G/C"}
+{"version":3,"file":"init-runtime.d.ts","sourceRoot":"","sources":["../../src/application/init-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAElE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAWlE;;;;;;GAMG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,wEAAwE;IACxE,QAAQ,CAAC,GAAG,EAAE,aAAa,CAAC;IAE5B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,cAAc,CAAC;CACvC,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,iBAAiB,IAAI,WAAW,CAuI/C"}

package/dist/application/init-runtime.error.d.ts

@@ -0,0 +1,53 @@
+/** Stable categories for errors raised while collecting startup initialization. */
+export type InitRuntimeErrorCode = 'ALREADY_FINISHED' | 'INVALID_VALUE' | 'DUPLICATE_APP' | 'DUPLICATE_EX_COMMAND' | 'INVALID_EX_COMMAND_HANDLER' | 'INVALID_CONFIG' | 'INVALID_APP_PACKAGE_REFERENCE' | 'NO_APPS_REGISTERED' | 'INITIAL_APP_NOT_REGISTERED' | 'INTERNAL_INVARIANT';
+/**
+ * Base class for errors raised by the initialization runtime.
+ *
+ * Consumers can use `code` for reliable error handling without depending on
+ * message text. `cause` is set when an underlying validation error is wrapped.
+ */
+export declare class InitRuntimeError extends Error {
+    readonly code: InitRuntimeErrorCode;
+    constructor(code: InitRuntimeErrorCode, message: string, options?: ErrorOptions);
+}
+/** An initialization API was used after its runtime had been sealed. */
+export declare class InitializationAlreadyFinishedError extends InitRuntimeError {
+    constructor();
+}
+/** A registration API received a value of the wrong type or an empty string. */
+export declare class InvalidInitializationValueError extends InitRuntimeError {
+    constructor(label: string, expected: string);
+}
+/** An app ID was registered more than once. */
+export declare class DuplicateAppRegistrationError extends InitRuntimeError {
+    constructor(id: string);
+}
+/** An Ex command name was registered more than once. */
+export declare class DuplicateExCommandRegistrationError extends InitRuntimeError {
+    constructor(name: string);
+}
+/** An Ex command registration supplied a value that is not a handler function. */
+export declare class InvalidExCommandHandlerError extends InitRuntimeError {
+    constructor();
+}
+/** The initialization script supplied options that do not resolve to valid config. */
+export declare class InvalidInitializationConfigError extends InitRuntimeError {
+    constructor(cause: unknown);
+}
+/** An app registration supplied a package reference that failed validation. */
+export declare class InvalidAppPackageReferenceError extends InitRuntimeError {
+    constructor(cause: unknown);
+}
+/** Initialization completed without registering any apps. */
+export declare class NoAppsRegisteredError extends InitRuntimeError {
+    constructor();
+}
+/** The explicitly selected startup app was not registered. */
+export declare class InitialAppNotRegisteredError extends InitRuntimeError {
+    constructor(id: string);
+}
+/** An internal invariant required by the initialization runtime was violated. */
+export declare class InitRuntimeInvariantError extends InitRuntimeError {
+    constructor(message: string);
+}
+//# sourceMappingURL=init-runtime.error.d.ts.map

package/dist/application/init-runtime.error.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"init-runtime.error.d.ts","sourceRoot":"","sources":["../../src/application/init-runtime.error.ts"],"names":[],"mappings":"AAAA,mFAAmF;AACnF,MAAM,MAAM,oBAAoB,GAC5B,kBAAkB,GAClB,eAAe,GACf,eAAe,GACf,sBAAsB,GACtB,4BAA4B,GAC5B,gBAAgB,GAChB,+BAA+B,GAC/B,oBAAoB,GACpB,4BAA4B,GAC5B,oBAAoB,CAAC;AAEzB;;;;;GAKG;AACH,qBAAa,gBAAiB,SAAQ,KAAK;IAEvC,QAAQ,CAAC,IAAI,EAAE,oBAAoB;gBAA1B,IAAI,EAAE,oBAAoB,EACnC,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,YAAY;CAKzB;AAED,wEAAwE;AACxE,qBAAa,kCAAmC,SAAQ,gBAAgB;;CAOvE;AAED,gFAAgF;AAChF,qBAAa,+BAAgC,SAAQ,gBAAgB;gBACvD,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;CAG5C;AAED,+CAA+C;AAC/C,qBAAa,6BAA8B,SAAQ,gBAAgB;gBACrD,EAAE,EAAE,MAAM;CAMvB;AAED,wDAAwD;AACxD,qBAAa,mCAAoC,SAAQ,gBAAgB;gBAC3D,IAAI,EAAE,MAAM;CAMzB;AAED,kFAAkF;AAClF,qBAAa,4BAA6B,SAAQ,gBAAgB;;CAOjE;AAED,sFAAsF;AACtF,qBAAa,gCAAiC,SAAQ,gBAAgB;gBACxD,KAAK,EAAE,OAAO;CAO3B;AAED,+EAA+E;AAC/E,qBAAa,+BAAgC,SAAQ,gBAAgB;gBACvD,KAAK,EAAE,OAAO;CAO3B;AAED,6DAA6D;AAC7D,qBAAa,qBAAsB,SAAQ,gBAAgB;;CAO1D;AAED,8DAA8D;AAC9D,qBAAa,4BAA6B,SAAQ,gBAAgB;gBACpD,EAAE,EAAE,MAAM;CAMvB;AAED,iFAAiF;AACjF,qBAAa,yBAA0B,SAAQ,gBAAgB;gBACjD,OAAO,EAAE,MAAM;CAG5B"}

package/dist/application/init-runtime.error.js

@@ -0,0 +1,77 @@
+/**
+ * Base class for errors raised by the initialization runtime.
+ *
+ * Consumers can use `code` for reliable error handling without depending on
+ * message text. `cause` is set when an underlying validation error is wrapped.
+ */
+export class InitRuntimeError extends Error {
+    code;
+    constructor(code, message, options) {
+        super(message, options);
+        this.code = code;
+        this.name = new.target.name;
+    }
+}
+/** An initialization API was used after its runtime had been sealed. */
+export class InitializationAlreadyFinishedError extends InitRuntimeError {
+    constructor() {
+        super('ALREADY_FINISHED', 'Initialization has finished. Make all registrations while init.mjs is evaluated.');
+    }
+}
+/** A registration API received a value of the wrong type or an empty string. */
+export class InvalidInitializationValueError extends InitRuntimeError {
+    constructor(label, expected) {
+        super('INVALID_VALUE', `${label} ${expected}.`);
+    }
+}
+/** An app ID was registered more than once. */
+export class DuplicateAppRegistrationError extends InitRuntimeError {
+    constructor(id) {
+        super('DUPLICATE_APP', `An app with ID "${id}" was registered multiple times.`);
+    }
+}
+/** An Ex command name was registered more than once. */
+export class DuplicateExCommandRegistrationError extends InitRuntimeError {
+    constructor(name) {
+        super('DUPLICATE_EX_COMMAND', `An Ex command named "${name}" was registered multiple times.`);
+    }
+}
+/** An Ex command registration supplied a value that is not a handler function. */
+export class InvalidExCommandHandlerError extends InitRuntimeError {
+    constructor() {
+        super('INVALID_EX_COMMAND_HANDLER', 'Ex command handler must be a function.');
+    }
+}
+/** The initialization script supplied options that do not resolve to valid config. */
+export class InvalidInitializationConfigError extends InitRuntimeError {
+    constructor(cause) {
+        super('INVALID_CONFIG', `Initialization produced invalid configuration: ${getErrorMessage(cause)}`, { cause });
+    }
+}
+/** An app registration supplied a package reference that failed validation. */
+export class InvalidAppPackageReferenceError extends InitRuntimeError {
+    constructor(cause) {
+        super('INVALID_APP_PACKAGE_REFERENCE', `Invalid app package reference: ${getErrorMessage(cause)}`, { cause });
+    }
+}
+/** Initialization completed without registering any apps. */
+export class NoAppsRegisteredError extends InitRuntimeError {
+    constructor() {
+        super('NO_APPS_REGISTERED', 'Initialization did not register any apps. Call dirvi.app.register(id, appReference) at least once in init.mjs.');
+    }
+}
+/** The explicitly selected startup app was not registered. */
+export class InitialAppNotRegisteredError extends InitRuntimeError {
+    constructor(id) {
+        super('INITIAL_APP_NOT_REGISTERED', `Startup app "${id}" has not been registered.`);
+    }
+}
+/** An internal invariant required by the initialization runtime was violated. */
+export class InitRuntimeInvariantError extends InitRuntimeError {
+    constructor(message) {
+        super('INTERNAL_INVARIANT', message);
+    }
+}
+function getErrorMessage(error) {
+    return error instanceof Error ? error.message : String(error);
+}

package/dist/application/init-runtime.js

@@ -1,18 +1,22 @@
 import { ConfigSchema, defaultConfig, merge } from '../domain/config.js';
 import { AppPackageReference } from '../domain/app-pack-ref.js';
+import { DuplicateAppRegistrationError, DuplicateExCommandRegistrationError, InitializationAlreadyFinishedError, InitRuntimeInvariantError, InvalidAppPackageReferenceError, InvalidExCommandHandlerError, InvalidInitializationConfigError, InvalidInitializationValueError, } from './init-runtime.error.js';
 /**
- * Creates an isolated startup configuration session.
+ * Creates an isolated session for evaluating one `init.mjs` script.
  *
- * The returned API is exposed to `init.mjs` while the script is evaluated.
- * Registration calls validate their runtime inputs, and option updates validate
- * the merged configuration. The session keeps its mutable state private.
+ * Option patches are merged with the current config and the complete result is
+ * validated. App and command registrations are checked as they are made.
  *
- * Call `finish()` after evaluating `init.mjs` to seal the session and obtain
- * the validated initialization. A successful call can happen only once; later
- * API calls and calls to `finish()` throw an error.
+ * The runtime keeps its working state inside the closure and exposes it only
+ * through `api` and `finish`. finish() returns new maps, so later changes to
+ * the runtime’s maps cannot alter the returned maps.
  *
- * @returns A fresh initialization runtime with a public registration API and
- *          a function for sealing the session.
+ * If no startup app is selected explicitly, the most recently registered app
+ * is chosen. At least one app must be registered before the session can finish.
+ *
+ * @returns A fresh initialization API and its corresponding `finish` function.
+ * @throws {InitRuntimeError} If a registration is invalid, validation fails,
+ *   no app was registered, or the session has already been finished.
  */
 export function createInitRuntime() {
     let config = defaultConfig;
@@ -20,98 +24,128 @@ export function createInitRuntime() {
     const registeredApps = new Map();
     const exCommands = new Map();
     let finished = false;
-    const checkFinished = () => {
+    // === Error Helpers =========================================================
+    /**
+     * Rejects API use after a successful call to `finish()`.
+     *
+     * Failed calls to `finish()` do not seal the runtime, allowing the caller to
+     * correct registrations and try again.
+     */
+    const ensureUnfinished = () => {
         if (finished) {
-            throw new Error('Initialization has finished. Make all initializations while init.mjs is evaluated.');
+            throw new InitializationAlreadyFinishedError();
         }
     };
-    const checkNonEmptyString = (value, label) => {
+    /** Validates values. */
+    const validateNonEmptyString = (value, label) => {
         if (typeof value !== 'string') {
-            throw new Error(`${label} must be a string.`);
+            throw new InvalidInitializationValueError(label, 'must be a string');
         }
         if (value.trim().length === 0) {
-            throw new Error(`${label} must not be empty.`);
+            throw new InvalidInitializationValueError(label, 'must not be empty');
         }
     };
-    return {
-        api: {
-            options: {
-                set: (patch) => {
-                    checkFinished();
-                    // Validate the complete result, not merely the patch. This preserves
-                    // domain invariants even when a patch changes nested configuration.
+    // === Public Initialization API =============================================
+    const api = {
+        options: {
+            set: (patch) => {
+                ensureUnfinished();
+                try {
+                    // Validate the merged result so patches cannot break config
+                    // invariants outside the fields they directly update.
                     config = ConfigSchema.parse(merge(config, patch));
-                },
+                }
+                catch (cause) {
+                    throw new InvalidInitializationConfigError(cause);
+                }
             },
-            app: {
-                register: (id, appReference) => {
-                    checkFinished();
-                    checkNonEmptyString(id, 'App ID');
-                    if (registeredApps.has(id)) {
-                        throw new Error(`An app with ID "${id}" was registered multiple times.`);
-                    }
+        },
+        app: {
+            register: (id, appReference) => {
+                ensureUnfinished();
+                validateNonEmptyString(id, 'App ID');
+                if (registeredApps.has(id)) {
+                    throw new DuplicateAppRegistrationError(id);
+                }
+                try {
                     registeredApps.set(id, AppPackageReference.parse(appReference));
-                },
-                initial: (appId) => {
-                    checkFinished();
-                    checkNonEmptyString(appId, 'App ID');
-                    initialAppId = appId;
-                },
+                }
+                catch (cause) {
+                    throw new InvalidAppPackageReferenceError(cause);
+                }
             },
-            ex: {
-                register: (name, execute) => {
-                    checkFinished();
-                    checkNonEmptyString(name, 'Ex command name');
-                    if (typeof execute !== 'function') {
-                        throw new Error('Ex command handler must be a function.');
-                    }
-                    if (exCommands.has(name)) {
-                        throw new Error(`An Ex command named "${name}" was registered multiple times.`);
-                    }
-                    exCommands.set(name, { name, execute });
-                },
+            initial: (appId) => {
+                ensureUnfinished();
+                validateNonEmptyString(appId, 'App ID');
+                initialAppId = appId;
             },
         },
-        finish: () => {
-            checkFinished();
-            if (registeredApps.size === 0) {
-                throw new Error('Initialization did not register any apps. Call ' +
-                    'dirvi.apps.register(id, appReference) at least once in init.mjs.');
-            }
-            let initial;
-            if (initialAppId !== undefined) {
-                if (!registeredApps.has(initialAppId)) {
-                    throw new Error(`Startup app "${initialAppId}" has not been registered.`);
+        ex: {
+            register: (name, execute) => {
+                ensureUnfinished();
+                validateNonEmptyString(name, 'Ex command name');
+                if (typeof execute !== 'function') {
+                    throw new InvalidExCommandHandlerError();
                 }
-                initial = initialAppId;
-            }
-            else {
-                initial = getLastRegisteredAppId(registeredApps);
-            }
-            finished = true;
-            return {
-                config,
-                app: {
-                    initial,
-                    registered: new Map(registeredApps),
-                },
-                exCommands: new Map(exCommands),
-            };
+                if (exCommands.has(name)) {
+                    throw new DuplicateExCommandRegistrationError(name);
+                }
+                exCommands.set(name, { name, execute });
+            },
         },
     };
+    /**
+     * === FINISH ================================================================
+     * Resolves the startup app, seals the session, and returns its snapshot.
+     *
+     * Validation happens before sealing, so a failed finish can be retried after
+     * the script corrects its registrations.
+     * ===========================================================================
+     */
+    const finish = () => {
+        ensureUnfinished();
+        if (registeredApps.size === 0) {
+            throw new Error('Initialization did not register any apps. Call ' +
+                'dirvi.apps.register(id, appReference) at least once in init.mjs.');
+        }
+        let initial;
+        if (initialAppId !== undefined) {
+            if (!registeredApps.has(initialAppId)) {
+                throw new Error(`Startup app "${initialAppId}" has not been registered.`);
+            }
+            initial = initialAppId;
+        }
+        else {
+            initial = getLastRegisteredAppId(registeredApps);
+        }
+        finished = true;
+        return {
+            config,
+            app: {
+                initial,
+                registered: new Map(registeredApps),
+            },
+            exCommands: new Map(exCommands),
+        };
+    };
+    return {
+        api,
+        finish,
+    };
 }
 /**
- * Returns the most recently registered app ID.
+ * Returns the app registered last, using `Map` insertion order.
+ *
+ * This is only the fallback when `init.mjs` does not explicitly select an
+ * initial app. Callers must check that the map is non-empty first.
  *
- * Map iteration follows registration insertion order. This is a convenience
- * fallback only; init.mjs should set initialAppId explicitly when startup
- * selection is semantically important.
+ * @throws {InitRuntimeInvariantError} If called with an empty map.
  */
 function getLastRegisteredAppId(apps) {
     const appIds = [...apps.keys()];
     const lastAppId = appIds.at(-1);
     if (lastAppId === undefined) {
-        throw new Error('Internal error: Check some app is registered before searching ids.');
+        throw new InitRuntimeInvariantError('Expected at least one registered app when selecting the startup app.');
     }
     return lastAppId;
 }

package/dist/domain/app-input.d.ts

@@ -0,0 +1,2 @@
+export type AppInput = string | undefined;
+//# sourceMappingURL=app-input.d.ts.map

package/dist/domain/app-input.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-input.d.ts","sourceRoot":"","sources":["../../src/domain/app-input.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,SAAS,CAAC"}

package/dist/domain/app-input.js

@@ -0,0 +1 @@
+export {};

package/dist/domain/initialization.d.ts

@@ -1,23 +1,24 @@
 import { Config } from './config.js';
 import { ExCommand } from './ex-command.js';
 import { AppPackageReference } from './app-pack-ref.js';
-export type AppInput = string | undefined;
 /**
- * Object set through initialization, i.e. evaluating init.mjs.
+ * Resolved startup state produced by evaluating `init.mjs`.
  *
- * Config is shared tree-UI configuration. App selection is distinct from Config
- * value. Ex commands are executable startup registrations and are therefore
- * stored separately from Config.
- *
- * initialAppId is always the ID of one app in apps: either the app explicitly
- * selected by init.mjs or the most recently registered app.
+ * The initialization script runs before the terminal UI starts. It uses the
+ * temporary `dirvi` configuration facade to set shared options, register app
+ * packages, choose the initial app, and register Ex commands.
  */
 export type Initialization = {
+    /** Dirvi-wide configuration resolved from the initialization script. */
     readonly config: Readonly<Config>;
+    /** Registered apps and the app selected for startup. */
     readonly app: {
+        /** ID of the app to open initially; must be present in `registered`. */
         initial: string;
+        /** App package references keyed by app ID. */
         registered: ReadonlyMap<string, AppPackageReference>;
     };
+    /** Ex commands registered by the initialization script, keyed by name. */
     readonly exCommands: ReadonlyMap<string, ExCommand>;
 };
 //# sourceMappingURL=initialization.d.ts.map

package/dist/domain/initialization.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"initialization.d.ts","sourceRoot":"","sources":["../../src/domain/initialization.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,SAAS,CAAC;AAE1C;;;;;;;;;GASG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IAClC,QAAQ,CAAC,GAAG,EAAE;QACZ,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,EAAE,WAAW,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;KACtD,CAAC;IACF,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CACrD,CAAC"}
+{"version":3,"file":"initialization.d.ts","sourceRoot":"","sources":["../../src/domain/initialization.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD;;;;;;GAMG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,wEAAwE;IACxE,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IAElC,wDAAwD;IACxD,QAAQ,CAAC,GAAG,EAAE;QACZ,wEAAwE;QACxE,OAAO,EAAE,MAAM,CAAC;QAEhB,8CAA8C;QAC9C,UAAU,EAAE,WAAW,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;KACtD,CAAC;IAEF,0EAA0E;IAC1E,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CACrD,CAAC"}

package/dist/domain/node-presentation.d.ts

@@ -0,0 +1,12 @@
+/**
+ * A semantic highlight name, not a concrete terminal color.
+ *
+ * Dot-separated names allow fallback to broader categories:
+ * "filesystem.directory" can fall back to "filesystem".
+ */
+export type HighlightToken = string;
+export type NodePresentation = Readonly<{
+    content: string;
+    highlight: HighlightToken;
+}>;
+//# sourceMappingURL=node-presentation.d.ts.map

package/dist/domain/node-presentation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"node-presentation.d.ts","sourceRoot":"","sources":["../../src/domain/node-presentation.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC;AAEpC,MAAM,MAAM,gBAAgB,GAAG,QAAQ,CAAC;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,cAAc,CAAC;CAC3B,CAAC,CAAC"}

package/dist/domain/node-presentation.js

@@ -0,0 +1 @@
+export {};

package/dist/domain/shell-api.d.ts

@@ -1,4 +1,4 @@
-import type { AppInput } from './initialization.js';
+import type { AppInput } from './app-input.js';
 export type ShellApi = {
     readonly openApp: (appId: string, input: AppInput) => Promise<void>;
 };

package/dist/domain/shell-api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shell-api.d.ts","sourceRoot":"","sources":["../../src/domain/shell-api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAEpD,MAAM,MAAM,QAAQ,GAAG;IACrB,QAAQ,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACrE,CAAC"}
+{"version":3,"file":"shell-api.d.ts","sourceRoot":"","sources":["../../src/domain/shell-api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE/C,MAAM,MAAM,QAAQ,GAAG;IACrB,QAAQ,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACrE,CAAC"}

package/dist/domain/theme.d.ts

@@ -1,13 +1,7 @@
 import { z } from 'zod';
-/**
- * Named ANSI foreground colors supported by Dirvi themes.
- *
- * Renderers translate these symbolic names into their own color APIs. The CLI
- * renderer currently maps them to terminal colors; another renderer does not
- * need to depend on Chalk to interpret the same theme.
- */
+import type { Theme } from 'dirvi-apis';
+/** Named ANSI colors accepted by the theme schema. */
 export declare const basicColorNames: readonly ["black", "red", "green", "yellow", "blue", "cyan", "magenta", "white", "gray", "grey", "blackBright", "redBright", "greenBright", "yellowBright", "blueBright", "cyanBright", "magentaBright", "whiteBright"];
-export type BasicColorName = (typeof basicColorNames)[number];
 export declare const ColorConfigSchema: z.ZodObject<{
     hex: z.ZodOptional<z.ZodString>;
     ansi256: z.ZodOptional<z.ZodNumber>;
@@ -32,7 +26,6 @@ export declare const ColorConfigSchema: z.ZodObject<{
         whiteBright: "whiteBright";
     }>>;
 }, z.core.$strip>;
-export type ColorConfig = z.infer<typeof ColorConfigSchema>;
 export declare const ForegroundHighlightConfigSchema: z.ZodObject<{
     fg: z.ZodObject<{
         hex: z.ZodOptional<z.ZodString>;
@@ -161,10 +154,6 @@ export declare const ForegroundBackgroundHighlightConfigSchema: z.ZodObject<{
         }>>;
     }, z.core.$strip>;
 }, z.core.$strip>;
-export type ForegroundHighlightConfig = z.infer<typeof ForegroundHighlightConfigSchema>;
-export type OptionalForegroundHighlightConfig = z.infer<typeof OptionalForegroundHighlightConfigSchema>;
-export type BackgroundHighlightConfig = z.infer<typeof BackgroundHighlightConfigSchema>;
-export type ForegroundBackgroundHighlightConfig = z.infer<typeof ForegroundBackgroundHighlightConfigSchema>;
 export declare const ThemeSchema: z.ZodObject<{
     statusBar: z.ZodDefault<z.ZodObject<{
         command: z.ZodDefault<z.ZodObject<{
@@ -531,6 +520,5 @@ export declare const ThemeSchema: z.ZodObject<{
         }, z.core.$strip>>;
     }, z.core.$strip>>;
 }, z.core.$strip>;
-export type Theme = z.infer<typeof ThemeSchema>;
 export declare const defaultTheme: Theme;
 //# sourceMappingURL=theme.d.ts.map

package/dist/domain/theme.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"theme.d.ts","sourceRoot":"","sources":["../../src/domain/theme.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAYxB;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,yNAsBlB,CAAC;AAEX,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AAI9D,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;iBAc3B,CAAC;AAEJ,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAM5D,eAAO,MAAM,+BAA+B;;;;;;;;;;;;;;;;;;;;;;;;;iBAE1C,CAAC;AAEH,eAAO,MAAM,uCAAuC;;;;;;;;;;;;;;;;;;;;;;;;;iBAElD,CAAC;AAEH,eAAO,MAAM,+BAA+B;;;;;;;;;;;;;;;;;;;;;;;;;iBAE1C,CAAC;AAEH,eAAO,MAAM,yCAAyC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAGpD,CAAC;AAEH,MAAM,MAAM,yBAAyB,GAAG,CAAC,CAAC,KAAK,CAC7C,OAAO,+BAA+B,CACvC,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG,CAAC,CAAC,KAAK,CACrD,OAAO,uCAAuC,CAC/C,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG,CAAC,CAAC,KAAK,CAC7C,OAAO,+BAA+B,CACvC,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG,CAAC,CAAC,KAAK,CACvD,OAAO,yCAAyC,CACjD,CAAC;AA6FF,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBA8CtB,CAAC;AAEH,MAAM,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,CAAC;AAEhD,eAAO,MAAM,YAAY,EAAE,KAA6B,CAAC"}
+{"version":3,"file":"theme.d.ts","sourceRoot":"","sources":["../../src/domain/theme.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAOV,KAAK,EACN,MAAM,YAAY,CAAC;AAMpB,sDAAsD;AACtD,eAAO,MAAM,eAAe,yNAsBkB,CAAC;AAU/C,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;iBAcM,CAAC;AAOrC,eAAO,MAAM,+BAA+B;;;;;;;;;;;;;;;;;;;;;;;;;iBAEK,CAAC;AAElD,eAAO,MAAM,uCAAuC;;;;;;;;;;;;;;;;;;;;;;;;;iBAEK,CAAC;AAE1D,eAAO,MAAM,+BAA+B;;;;;;;;;;;;;;;;;;;;;;;;;iBAEK,CAAC;AAElD,eAAO,MAAM,yCAAyC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAGK,CAAC;AA6F5D,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBA8CK,CAAC;AAE9B,eAAO,MAAM,YAAY,EAAE,KAA6B,CAAC"}

package/dist/domain/theme.js

@@ -1,18 +1,8 @@
 import { z } from 'zod';
 // =============================================================================
-// Terminal colors
+// Colors: Schemas
 // =============================================================================
-const HexColorSchema = z.string().regex(/^#[0-9a-fA-F]{6}$/, {
-    message: 'Expected a #rrggbb color',
-});
-const Ansi256ColorSchema = z.number().int().min(0).max(255);
-/**
- * Named ANSI foreground colors supported by Dirvi themes.
- *
- * Renderers translate these symbolic names into their own color APIs. The CLI
- * renderer currently maps them to terminal colors; another renderer does not
- * need to depend on Chalk to interpret the same theme.
- */
+/** Named ANSI colors accepted by the theme schema. */
 export const basicColorNames = [
     'black',
     'red',
@@ -34,6 +24,10 @@ export const basicColorNames = [
     'magentaBright',
     'whiteBright',
 ];
+const HexColorSchema = z.string().regex(/^#[0-9a-fA-F]{6}$/, {
+    message: 'Expected a #rrggbb color',
+});
+const Ansi256ColorSchema = z.number().int().min(0).max(255);
 const BasicColorSchema = z.enum(basicColorNames);
 export const ColorConfigSchema = z
     .object({
@@ -47,9 +41,9 @@ export const ColorConfigSchema = z
     message: 'Expected at least one terminal color profile',
 });
 // =============================================================================
-// Highlights
+// Highlights: Schemas
 // =============================================================================
-// Note: these schemas are meant to be non-strict
+// These schemas are intentionally non-strict.
 export const ForegroundHighlightConfigSchema = z.object({
     fg: ColorConfigSchema,
 });
@@ -140,7 +134,7 @@ const themeDefaults = {
     },
 };
 // =============================================================================
-// Theme schema
+// Theme: Schema
 // =============================================================================
 export const ThemeSchema = z.object({
     statusBar: z

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-export type { Theme } from './domain/theme.js';
 export type { Config } from './domain/config.js';
 export type { Initialization } from './domain/initialization.js';
 export type { PublicInitApi } from './domain/public-init-api.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC/C,YAAY,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,YAAY,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,YAAY,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,YAAY,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,YAAY,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,YAAY,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,YAAY,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,YAAY,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,YAAY,EACV,cAAc,EACd,iBAAiB,GAClB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,YAAY,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,YAAY,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,YAAY,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,YAAY,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,YAAY,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,YAAY,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,YAAY,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,YAAY,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,YAAY,EACV,cAAc,EACd,iBAAiB,GAClB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,YAAY,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC"}

package/dist/ui/App.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../src/ui/App.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACV,MAAM,EAEN,cAAc,EAEd,cAAc,EAEd,OAAO,EACP,eAAe,EACf,KAAK,EAGN,MAAM,WAAW,CAAC;AAGnB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE7D,KAAK,QAAQ,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,IAAI;IACnE,cAAc,EAAE,iBAAiB,CAAC;IAClC,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACnC,cAAc,EAAE,cAAc,CAAC;IAC/B,YAAY,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IAC/B,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IAC5B,cAAc,EAAE,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IAC1C,cAAc,EAAE,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IAC1C,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAClC,CAAC;AAEF,wBAAgB,GAAG,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,EAAE,EACvE,cAAc,EACd,QAAQ,EACR,MAAM,EACN,cAAc,EACd,YAAY,EACZ,OAAO,EACP,cAAc,EACd,cAAc,EACd,MAAM,EACN,SAAS,EACT,OAAO,GACR,EAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,+BAgW9B"}
+{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../src/ui/App.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACV,MAAM,EAEN,cAAc,EAEd,cAAc,EAEd,OAAO,EACP,eAAe,EACf,KAAK,EAGN,MAAM,WAAW,CAAC;AAGnB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE7D,KAAK,QAAQ,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,IAAI;IACnE,cAAc,EAAE,iBAAiB,CAAC;IAClC,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACnC,cAAc,EAAE,cAAc,CAAC;IAC/B,YAAY,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IAC/B,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IAC5B,cAAc,EAAE,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IAC1C,cAAc,EAAE,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IAC1C,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAClC,CAAC;AAEF,wBAAgB,GAAG,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,EAAE,EACvE,cAAc,EACd,QAAQ,EACR,MAAM,EACN,cAAc,EACd,YAAY,EACZ,OAAO,EACP,cAAc,EACd,cAAc,EACd,MAAM,EACN,SAAS,EACT,OAAO,GACR,EAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,+BAoW9B"}

package/dist/ui/App.js

@@ -9,12 +9,14 @@ export function App({ screenRenderer, shellApi, appApi, initialization, initialS
     // see current state
     stateRef.current = state;
     const navEntry = useMemo(() => {
-        const navigation = appApi.navNodeApi.from(state.root, state.folds);
+        const root = appApi.stateApi.getRoot(state);
+        const folds = appApi.stateApi.getFolds(state);
+        const navigation = appApi.navMethods.from(root, folds);
         if (navigation === undefined) {
             throw new Error('Tree-surfer state root must be a loaded branch.');
         }
         return navigation;
-    }, [appApi.navNodeApi, state.root, state.folds]);
+    }, [appApi.navMethods, appApi.stateApi, state]);
     const [inputState, setInputState] = useState({
         inputMode: 'normal',
         normalBuffer: '',
@@ -31,7 +33,7 @@ export function App({ screenRenderer, shellApi, appApi, initialization, initialS
     const feedbackApi = useMemo(() => createFeedbackApi((nextFeedback) => {
         setFeedback(nextFeedback);
     }), []);
-    const view = useView(navEntry, state, appApi.navNodeApi, appApi.cursorApi, rowCount);
+    const view = useView(navEntry, state, appApi.stateApi, appApi.navMethods, appApi.stateApi.cursorApi, rowCount, appApi.presentNode);
     // ===========================================================================
     // Resync Subscriptions
     // ===========================================================================
@@ -40,7 +42,7 @@ export function App({ screenRenderer, shellApi, appApi, initialization, initialS
         const unsubscribe = appApi.subscribeToResync(() => {
             const oldState = stateRef.current;
             void appApi.stateApi
-                .resync(oldState, appApi.loadBranches)
+                .resync(oldState, appApi.loadChildren)
                 .then((newState) => {
                 if (!active) {
                     return;
@@ -128,7 +130,7 @@ export function App({ screenRenderer, shellApi, appApi, initialization, initialS
                 return;
             case 'loadBranchEntries': {
                 void appApi
-                    .loadBranches(effect.path)
+                    .loadChildren(effect.path)
                     .then((entries) => {
                     dispatch({
                         kind: 'updateBranch',
@@ -147,7 +149,7 @@ export function App({ screenRenderer, shellApi, appApi, initialization, initialS
                 if (navigation === null) {
                     return;
                 }
-                const visibleLeavesPaths = appApi.navNodeApi.visibleLeavesPaths(navigation);
+                const visibleLeavesPaths = appApi.navMethods.visibleLeavesPaths(navigation);
                 stdout?.(JSON.stringify({
                     type: 'displayed-leaves-paths',
                     paths: visibleLeavesPaths,
@@ -207,11 +209,11 @@ export function App({ screenRenderer, shellApi, appApi, initialization, initialS
             }
             // TODO: Add descriptions with `...` truncation.
             case 'listFolds': {
-                const folds = state.folds;
-                const foldTrees = [...appApi.foldsApi.indexes(folds)].map((index) => ({
+                const folds = appApi.stateApi.getFolds(state);
+                const foldTrees = [...appApi.stateApi.foldsApi.indexes(folds)].map((index) => ({
                     index,
-                    info: appApi.foldsApi.getInfoAtIndex(folds, index),
-                    active: appApi.foldsApi.isActiveAtIndex(folds, index),
+                    info: appApi.stateApi.foldsApi.getInfoAtIndex(folds, index),
+                    active: appApi.stateApi.foldsApi.isActiveAtIndex(folds, index),
                 }));
                 const indexWidth = Math.max(...foldTrees.map(({ index }) => String(index).length));
                 const lines = foldTrees.map(({ index, info, active }) => {
@@ -230,7 +232,7 @@ export function App({ screenRenderer, shellApi, appApi, initialization, initialS
                 feedbackApi.addMessage(effect.message, 'error');
                 return;
         }
-    }, [appApi, effectToAction, feedbackApi, navEntry, state, stdout, initialization.app.registered, shellApi]);
+    }, [appApi, effectToAction, feedbackApi, navEntry, state, stdout, initialization.app.registered, shellApi, initialization.exCommands]);
     // ===========================================================================
     // Input hook
     // ===========================================================================

package/dist/ui/AppSetup.d.ts

@@ -1,4 +1,4 @@
-import type { AppApi, SerializableKey } from 'dirvi-lib';
+import { AppApi, SerializableKey } from 'dirvi-lib';
 import type { LoadingScreenRenderer } from './loading-screen-renderer.js';
 import type { AppScreenRenderer } from './app-screen-renderer.js';
 import { ShellApi } from '../domain/shell-api.js';

package/dist/ui/AppSetup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AppSetup.d.ts","sourceRoot":"","sources":["../../src/ui/AppSetup.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,eAAe,EAAS,MAAM,WAAW,CAAC;AAOhE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAGlE,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAI7D,KAAK,eAAe,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,IAAI;IAC1E,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,cAAc,EAAE,cAAc,CAAC;IAC/B,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACnC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC,CAAC;AAEF,wBAAgB,QAAQ,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,EAAE,EAC5E,iBAAiB,EACjB,qBAAqB,EACrB,cAAc,EACd,QAAQ,EACR,MAAM,EACN,MAAM,EACN,SAAS,GACV,EAAE,eAAe,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,+BAuFrC"}
+{"version":3,"file":"AppSetup.d.ts","sourceRoot":"","sources":["../../src/ui/AppSetup.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAqB,eAAe,EAAS,MAAM,WAAW,CAAC;AAO9E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAGlE,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAI7D,KAAK,eAAe,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,IAAI;IAC1E,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,cAAc,EAAE,cAAc,CAAC;IAC/B,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACnC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC,CAAC;AAkBF,wBAAgB,QAAQ,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,EAAE,EAC5E,iBAAiB,EACjB,qBAAqB,EACrB,cAAc,EACd,QAAQ,EACR,MAAM,EACN,MAAM,EACN,SAAS,GACV,EAAE,eAAe,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,+BA4FrC"}

package/dist/ui/AppSetup.js

@@ -1,42 +1,49 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useEffect, useMemo, useState } from 'react';
+import { createTreeMethods } from 'dirvi-lib';
 import { createEffectToAction, createIntentToEffect, createReducer, } from 'dirvi-lib';
 import { App } from './App.js';
 export function AppSetup({ appScreenRenderer, loadingScreenRenderer, initialization, shellApi, appApi, stdout, clipboard, }) {
+    const [loadState, setLoadState] = useState();
     const [initialState, setInitialState] = useState();
     // Loading and setting initial state.
     useEffect(() => {
         let mounted = true;
-        appApi
-            .createRoot()
-            .then((root) => {
-            if (!mounted) {
-                return;
-            }
-            setInitialState({
-                root,
-                folds: appApi.foldsApi.create(appApi.rootId, {
+        setLoadState({ status: 'loading', appApi });
+        async function initialize() {
+            try {
+                const root = await appApi.loadRoot();
+                if (!mounted) {
+                    return;
+                }
+                const rootId = createTreeMethods().id(root);
+                const folds = appApi.stateApi.foldsApi.create(rootId, {
                     name: 'default',
                     description: null,
-                }),
-                cursor: [],
-            });
-        })
-            .catch((cause) => {
-            const nextError = cause instanceof Error ? cause : new Error(String(cause));
-            if (!mounted) {
-                return;
+                });
+                const initialState = appApi.stateApi.create(root, folds, { path: [] });
+                if (initialState === undefined) {
+                    throw new Error('Cannot create initial app state');
+                }
+                setLoadState({ status: 'ready', appApi, initialState });
+            }
+            catch (cause) {
+                if (!mounted) {
+                    return;
+                }
+                const error = cause instanceof Error ? cause : new Error(String(cause));
+                setLoadState({ status: 'error', appApi, error });
             }
-            throw nextError;
-        });
+        }
+        void initialize();
         return () => {
             mounted = false;
         };
     }, [appApi]);
     // --- Pure function deps ---
-    const reducer = useMemo(() => createReducer(appApi.treeNodeApi, appApi.foldsApi), [appApi.treeNodeApi, appApi.foldsApi]);
-    const intentToEffect = useMemo(() => createIntentToEffect(new Set(initialization.exCommands.keys()), appApi.stateApi, appApi.cursorApi, appApi.treeNodeApi), [appApi.stateApi, appApi.cursorApi, appApi.treeNodeApi, initialization.exCommands]);
-    const effectToAction = useMemo(() => createEffectToAction(appApi.foldsApi, appApi.cursorApi, appApi.navNodeApi), [appApi.navNodeApi, appApi.cursorApi, appApi.foldsApi]);
+    const reducer = useMemo(() => createReducer(appApi.stateApi, appApi.navMethods), [appApi.stateApi, appApi.navMethods]);
+    const intentToEffect = useMemo(() => createIntentToEffect(new Set(initialization.exCommands.keys()), appApi.stateApi), [appApi.stateApi, initialization.exCommands]);
+    const effectToAction = useMemo(() => createEffectToAction(appApi.stateApi, appApi.navMethods), [appApi.navMethods, appApi.stateApi]);
     // --- JSX ---
     const LoadingScreenRenderer = loadingScreenRenderer;
     if (initialState === undefined) {

package/dist/ui/color-resolver.d.ts

@@ -1,3 +1,3 @@
-import type { ColorConfig } from '../domain/theme.js';
+import type { ColorConfig } from 'dirvi-apis';
 export declare function colorConfigToInkColor(colorConfig: ColorConfig, colorDepth?: number): string;
 //# sourceMappingURL=color-resolver.d.ts.map

package/dist/ui/color-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"color-resolver.d.ts","sourceRoot":"","sources":["../../src/ui/color-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAuBtD,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,WAAW,EACxB,UAAU,GAAE,MAAuC,GAClD,MAAM,CA2BR"}
+{"version":3,"file":"color-resolver.d.ts","sourceRoot":"","sources":["../../src/ui/color-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAuB9C,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,WAAW,EACxB,UAAU,GAAE,MAAuC,GAClD,MAAM,CA2BR"}

package/dist/ui/hooks/useView.d.ts

@@ -1,4 +1,4 @@
-import type { CursorApi, NavBranch, NavNodeApi, SerializableKey, State } from 'dirvi-lib';
+import type { CursorMethods, NavBranch, NavMethods, PresentNode, SerializableKey, State, StateApi } from 'dirvi-lib';
 import { View } from '../view.js';
-export declare function useView<Id extends SerializableKey, Value>(navNode: NavBranch<Id>, state: State<Id, Value>, navNodeApi: NavNodeApi<Id, Value>, cursorApi: CursorApi<Id>, rowCount: number): View;
+export declare function useView<Id extends SerializableKey, Value>(navNode: NavBranch<Id>, state: State<Id, Value>, stateApi: StateApi<Id, Value>, navNodeApi: NavMethods<Id, Value>, cursorMethods: CursorMethods<Id>, rowCount: number, presentNode: PresentNode<Id>): View;
 //# sourceMappingURL=useView.d.ts.map

package/dist/ui/hooks/useView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useView.d.ts","sourceRoot":"","sources":["../../../src/ui/hooks/useView.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,SAAS,EACT,SAAS,EACT,UAAU,EACV,eAAe,EACf,KAAK,EACN,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,IAAI,EAAgB,MAAM,YAAY,CAAC;AAMhD,wBAAgB,OAAO,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,EACvD,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC,EACtB,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,EACvB,UAAU,EAAE,UAAU,CAAC,EAAE,EAAE,KAAK,CAAC,EACjC,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC,EACxB,QAAQ,EAAE,MAAM,GACf,IAAI,CAwBN"}
+{"version":3,"file":"useView.d.ts","sourceRoot":"","sources":["../../../src/ui/hooks/useView.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,aAAa,EACb,SAAS,EACT,UAAU,EAAE,WAAW,EACvB,eAAe,EACf,KAAK,EAAE,QAAQ,EAChB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,IAAI,EAAgB,MAAM,YAAY,CAAC;AAMhD,wBAAgB,OAAO,CAAC,EAAE,SAAS,eAAe,EAAE,KAAK,EACvD,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC,EACtB,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,EACvB,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC,EAC7B,UAAU,EAAE,UAAU,CAAC,EAAE,EAAE,KAAK,CAAC,EACjC,aAAa,EAAE,aAAa,CAAC,EAAE,CAAC,EAChC,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,WAAW,CAAC,EAAE,CAAC,GAC3B,IAAI,CAyBN"}

package/dist/ui/hooks/useView.js

@@ -3,15 +3,15 @@ import { View } from '../view.js';
 const STATUS_BAR_HEIGHT = 1;
 // Hooks that keeps Ref of the viewport's start, and returns View sliced to
 // only the rows that should be visible.
-export function useView(navNode, state, navNodeApi, cursorApi, rowCount) {
+export function useView(navNode, state, stateApi, navNodeApi, cursorMethods, rowCount, presentNode) {
     const viewportStartRef = useRef(0);
     const viewportHeight = Math.max(0, rowCount - STATUS_BAR_HEIGHT);
     if (viewportHeight === 0) {
         return { rows: [] };
     }
-    const rows = View.createRows(navNode, navNodeApi, state.cursor, cursorApi);
+    const rows = View.createRows(navNode, navNodeApi, stateApi.getCursor(state), cursorMethods, presentNode);
     viewportStartRef.current = viewportStart(rows, viewportHeight, viewportStartRef.current);
-    return View.create(navNode, navNodeApi, state.cursor, cursorApi, viewportHeight, viewportStartRef.current);
+    return View.create(navNode, navNodeApi, stateApi.getCursor(state), cursorMethods, viewportHeight, viewportStartRef.current, presentNode);
 }
 function viewportStart(rows, viewportHeight, currentViewportStart) {
     const scrollMargin = 3;

package/dist/ui/view.d.ts

@@ -1,23 +1,27 @@
-import type { Cursor, CursorApi, NavBranch, NavNodeApi, SerializableKey } from 'dirvi-lib';
+import type { Cursor, HighlightToken, NavBranch, NavMethods, PresentNode, SerializableKey, CursorMethods } from 'dirvi-lib';
 type ViewRowBase = {
     id: string;
     indent: number;
     content: string;
     cursor: boolean;
     selected: boolean;
+    highlight: HighlightToken;
 };
 export type ViewRow = (ViewRowBase & {
     type: 'leaf';
 }) | (ViewRowBase & {
     type: 'branch';
     foldedCount: number;
+}) | (ViewRowBase & {
+    type: 'fold';
+    foldedCount: number;
 });
 export type View = {
     rows: ViewRow[];
 };
 export declare const View: {
-    createRows<Id extends SerializableKey, Value>(rootNode: NavBranch<Id>, navNodeApi: NavNodeApi<Id, Value>, cursor: Cursor<Id>, cursorApi: CursorApi<Id>): ViewRow[];
-    create<Id extends SerializableKey, Value>(rootNode: NavBranch<Id>, navNodeApi: NavNodeApi<Id, Value>, cursor: Cursor<Id>, cursorApi: CursorApi<Id>, viewportHeight: number, viewportStart: number): View;
+    createRows<Id extends SerializableKey, Value>(rootNode: NavBranch<Id>, navNodeApi: NavMethods<Id, Value>, cursor: Cursor<Id>, cursorMethods: CursorMethods<Id>, presentNode: PresentNode<Id>): ViewRow[];
+    create<Id extends SerializableKey, Value>(rootNode: NavBranch<Id>, navNodeApi: NavMethods<Id, Value>, cursor: Cursor<Id>, cursorMethods: CursorMethods<Id>, viewportHeight: number, viewportStart: number, presentNode: PresentNode<Id>): View;
 };
 export {};
 //# sourceMappingURL=view.d.ts.map

package/dist/ui/view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../src/ui/view.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,EACN,SAAS,EACT,SAAS,EAGT,UAAU,EACV,eAAe,EAChB,MAAM,WAAW,CAAC;AAEnB,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,OAAO,GACf,CAAC,WAAW,GAAG;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC,GACF,CAAC,WAAW,GAAG;IACb,IAAI,EAAE,QAAQ,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC,CAAC;AAEP,MAAM,MAAM,IAAI,GAAG;IACjB,IAAI,EAAE,OAAO,EAAE,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,IAAI;eACJ,EAAE,SAAS,eAAe,EAAE,KAAK,YAChC,SAAS,CAAC,EAAE,CAAC,cACX,UAAU,CAAC,EAAE,EAAE,KAAK,CAAC,UACzB,MAAM,CAAC,EAAE,CAAC,aACP,SAAS,CAAC,EAAE,CAAC,GACvB,OAAO,EAAE;WAoBL,EAAE,SAAS,eAAe,EAAE,KAAK,YAC5B,SAAS,CAAC,EAAE,CAAC,cACX,UAAU,CAAC,EAAE,EAAE,KAAK,CAAC,UACzB,MAAM,CAAC,EAAE,CAAC,aACP,SAAS,CAAC,EAAE,CAAC,kBACR,MAAM,iBACP,MAAM,GACpB,IAAI;CAOR,CAAC"}
+{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../src/ui/view.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,EACN,cAAc,EACd,SAAS,EAET,UAAU,EACV,WAAW,EACX,eAAe,EAAE,aAAa,EAC/B,MAAM,WAAW,CAAC;AAGnB,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,cAAc,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,OAAO,GACf,CAAC,WAAW,GAAG;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC,GACF,CAAC,WAAW,GAAG;IACb,IAAI,EAAE,QAAQ,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC,GACF,CAAC,WAAW,GAAG;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC,CAAC;AAEP,MAAM,MAAM,IAAI,GAAG;IACjB,IAAI,EAAE,OAAO,EAAE,CAAC;CACjB,CAAC;AASF,eAAO,MAAM,IAAI;eACJ,EAAE,SAAS,eAAe,EAAE,KAAK,YAChC,SAAS,CAAC,EAAE,CAAC,cACX,UAAU,CAAC,EAAE,EAAE,KAAK,CAAC,UACzB,MAAM,CAAC,EAAE,CAAC,iBACH,aAAa,CAAC,EAAE,CAAC,eACnB,WAAW,CAAC,EAAE,CAAC,GAC3B,OAAO,EAAE;WAwCL,EAAE,SAAS,eAAe,EAAE,KAAK,YAC5B,SAAS,CAAC,EAAE,CAAC,cACX,UAAU,CAAC,EAAE,EAAE,KAAK,CAAC,UACzB,MAAM,CAAC,EAAE,CAAC,iBACH,aAAa,CAAC,EAAE,CAAC,kBAChB,MAAM,iBACP,MAAM,eACR,WAAW,CAAC,EAAE,CAAC,GAC3B,IAAI;CAOR,CAAC"}

package/dist/ui/view.js

@@ -1,17 +1,28 @@
+function foldId(parentPath, firstId) {
+    return `fold:${JSON.stringify([...parentPath, firstId])}`;
+}
 export const View = {
-    createRows(rootNode, navNodeApi, cursor, cursorApi) {
-        const rootCursor = [];
-        const rootRow = viewRowForEntry(rootNode, null, cursorApi.equal(cursor, rootCursor), navNodeApi);
+    createRows(rootNode, navNodeApi, cursor, cursorMethods, presentNode) {
+        const rootCursor = { path: [] };
+        const inlineFoldIds = new Set();
+        if (rootNode.children !== null) {
+            for (const position of navNodeApi.cursors(rootNode.children)) {
+                if (cursorMethods.isFoldCursor(position)) {
+                    inlineFoldIds.add(foldId(position.parentPath, position.firstId));
+                }
+            }
+        }
+        const rootRow = viewRowForEntry(rootNode, null, cursorMethods.equal(cursor, rootCursor), navNodeApi, presentNode, inlineFoldIds);
         if (rootNode.children === null) {
             return [rootRow];
         }
         return [
             rootRow,
-            ...viewRowsAtNode(rootNode.children, [], navNodeApi, cursor, cursorApi),
+            ...viewRowsAtNode(rootNode.children, [], navNodeApi, cursor, cursorMethods, presentNode, inlineFoldIds),
         ];
     },
-    create(rootNode, navNodeApi, cursor, cursorApi, viewportHeight, viewportStart) {
-        const rows = View.createRows(rootNode, navNodeApi, cursor, cursorApi);
+    create(rootNode, navNodeApi, cursor, cursorMethods, viewportHeight, viewportStart, presentNode) {
+        const rows = View.createRows(rootNode, navNodeApi, cursor, cursorMethods, presentNode);
         return {
             rows: rows.slice(viewportStart, viewportStart + viewportHeight),
         };
@@ -20,52 +31,98 @@ export const View = {
 /**
  * Converts one NavNode and its descendants into display ViewRows.
  *
- * `node` is the directory currently being visited.
- *
  * `parentPath` is the path of that directory. For example:
  *
  *   []              root directory
  *   ['src']         root/src
  *   ['src', 'lib']  root/src/lib
  */
-function viewRowsAtNode(node, parentPath, navNodeApi, cursor, cursorApi) {
+function viewRowsAtNode(node, parentPath, navNodeApi, cursor, cursorMethods, presentNode, inlineFoldIds) {
     const rows = [];
     for (const entry of node.entries) {
-        const entryCursor = [...parentPath, entry.id];
-        const isCursor = cursorApi.equal(cursor, entryCursor);
-        rows.push(viewRowForEntry(entry, parentPath, isCursor, navNodeApi));
+        if (navNodeApi.entryIsFold(entry)) {
+            const firstEntry = entry.folded[0];
+            // Match navigation's guard for empty or richer future fold contents.
+            if (firstEntry === undefined || navNodeApi.entryIsFold(firstEntry)) {
+                continue;
+            }
+            const id = foldId(parentPath, firstEntry.id);
+            // Unordered summaries belong to the parent, not separate rows.
+            if (!inlineFoldIds.has(id)) {
+                continue;
+            }
+            const entryCursor = {
+                parentPath: [...parentPath],
+                firstId: firstEntry.id,
+            };
+            // Reuse the first hidden entry's highlight until folds have a presenter.
+            const { highlight } = presentNode(firstEntry.id, navNodeApi.entryIsBranch(firstEntry));
+            rows.push({
+                id,
+                indent: parentPath.length + 1,
+                content: `… ${entry.folded.length} folded`,
+                cursor: cursorMethods.equal(cursor, entryCursor),
+                selected: false,
+                highlight,
+                type: 'fold',
+                foldedCount: entry.folded.length,
+            });
+            // Hidden descendants are never rendered separately.
+            continue;
+        }
+        const entryCursor = {
+            path: [...parentPath, entry.id],
+        };
+        const isCursor = cursorMethods.equal(cursor, entryCursor);
+        rows.push(viewRowForEntry(entry, parentPath, isCursor, navNodeApi, presentNode, inlineFoldIds));
         // Case where there's no branches
         if (!navNodeApi.entryIsBranch(entry) || entry.children === null) {
             continue;
         }
-        rows.push(...viewRowsAtNode(entry.children, [...parentPath, entry.id], navNodeApi, cursor, cursorApi));
+        rows.push(...viewRowsAtNode(entry.children, [...parentPath, entry.id], navNodeApi, cursor, cursorMethods, presentNode, inlineFoldIds));
     }
     return rows;
 }
-function viewRowForEntry(entry, parentPath, cursor, navNodeApi) {
+function viewRowForEntry(entry, parentPath, cursor, navNodeApi, presentNode, inlineFoldIds) {
     const id = entryId(parentPath ?? [], entry.id);
     const indent = parentPath ? parentPath.length + 1 : 0;
     const selected = false;
     if (navNodeApi.entryIsBranch(entry)) {
-        const foldedCount = entry.children === null || entry.children.folded === null
-            ? 0
-            : entry.children.folded.entries.length;
+        const { content, highlight } = presentNode(entry.id, true);
+        const entryPath = parentPath === null ? [] : [...parentPath, entry.id];
+        const foldedCount = entry.children?.entries.reduce((count, entry) => {
+            if (!navNodeApi.entryIsFold(entry)) {
+                return count;
+            }
+            const firstEntry = entry.folded[0];
+            if (firstEntry === undefined || navNodeApi.entryIsFold(firstEntry)) {
+                return count;
+            }
+            // Ordered folds already have their own rows.
+            if (inlineFoldIds.has(foldId(entryPath, firstEntry.id))) {
+                return count;
+            }
+            return count + entry.folded.length;
+        }, 0) ?? 0;
         return {
             id,
             indent,
             selected,
             cursor,
-            content: `${String(entry.id)}/`,
+            content: content,
+            highlight,
             type: 'branch',
             foldedCount,
         };
     }
+    const { content, highlight } = presentNode(entry.id, false);
     return {
         id,
         indent,
         selected,
         cursor,
-        content: String(entry.id),
+        content,
+        highlight,
         type: 'leaf',
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mak-98/dirvi-app",
-  "version": "0.11.0-beta.6",
+  "version": "0.11.0-beta.7",
   "description": "Shared React application logic for dirvi hosts.",
   "type": "module",
   "license": "GPL-3.0-or-later",
@@ -16,8 +16,8 @@
     "dist"
   ],
   "dependencies": {
-    "dirvi-apis": "0.11.0-beta.6",
-    "dirvi-lib": "0.11.0-beta.6",
+    "dirvi-apis": "0.11.0-beta.7",
+    "dirvi-lib": "0.11.0-beta.7",
     "zod": "^4.4.3"
   },
   "peerDependencies": {