@zhin.js/runtime 1.1.2 → 1.1.4

package/lib/config-composer.d.ts

@@ -1,6 +1,570 @@
 import type { RuntimeConfigDocument } from '@zhin.js/plugin-runtime';
 import type { PluginId } from '@zhin.js/plugin-runtime';
 import type { ProjectGraph } from './project-graph.js';
+export declare const HOST_CONFIG_SCHEMA: {
+    $schema: string;
+    type: string;
+    additionalProperties: boolean;
+    properties: {
+        http: {
+            type: string;
+            additionalProperties: boolean;
+            description: string;
+            "x-descriptionZh": string;
+            properties: {
+                readiness: {
+                    type: string;
+                    additionalProperties: boolean;
+                    description: string;
+                    "x-descriptionZh": string;
+                    properties: {
+                        database: {
+                            type: string;
+                            default: boolean;
+                            description: string;
+                            "x-descriptionZh": string;
+                        };
+                        endpoints: {
+                            type: string;
+                            uniqueItems: boolean;
+                            description: string;
+                            "x-descriptionZh": string;
+                            items: {
+                                type: string;
+                                additionalProperties: boolean;
+                                required: string[];
+                                properties: {
+                                    owner: {
+                                        type: string;
+                                        pattern: string;
+                                    };
+                                    name: {
+                                        type: string;
+                                        minLength: number;
+                                        pattern: string;
+                                    };
+                                };
+                            };
+                        };
+                        agents: {
+                            type: string;
+                            uniqueItems: boolean;
+                            items: {
+                                type: string;
+                                minLength: number;
+                            };
+                            description: string;
+                            "x-descriptionZh": string;
+                        };
+                    };
+                };
+            };
+        };
+        database: {
+            type: string;
+            additionalProperties: boolean;
+            description: string;
+            "x-descriptionZh": string;
+        };
+        ai: {
+            type: string;
+            additionalProperties: boolean;
+            description: string;
+            "x-descriptionZh": string;
+            properties: {
+                workroom: {
+                    type: string;
+                    additionalProperties: boolean;
+                    description: string;
+                    "x-descriptionZh": string;
+                    properties: {
+                        trustedPackPublishers: {
+                            type: string;
+                            items: {
+                                type: string;
+                                minLength: number;
+                            };
+                            uniqueItems: boolean;
+                            description: string;
+                            "x-descriptionZh": string;
+                        };
+                        disclosure: {
+                            type: string;
+                            additionalProperties: boolean;
+                            description: string;
+                            "x-descriptionZh": string;
+                            properties: {
+                                tenantId: {
+                                    type: string;
+                                    minLength: number;
+                                };
+                                modelProviders: {
+                                    type: string;
+                                    additionalProperties: {
+                                        type: string;
+                                        additionalProperties: boolean;
+                                        required: string[];
+                                        properties: {
+                                            endpoint: {
+                                                type: string;
+                                                minLength: number;
+                                            };
+                                            owner: {
+                                                type: string;
+                                                minLength: number;
+                                            };
+                                            trustDomain: {
+                                                type: string;
+                                                minLength: number;
+                                            };
+                                            processingRegions: {
+                                                type: string;
+                                                minItems: number;
+                                                uniqueItems: boolean;
+                                                items: {
+                                                    type: string;
+                                                    minLength: number;
+                                                };
+                                            };
+                                            maxConfidentiality: {
+                                                type: string;
+                                                enum: string[];
+                                            };
+                                            external: {
+                                                type: string;
+                                            };
+                                            noTraining: {
+                                                type: string;
+                                            };
+                                            loggingMode: {
+                                                type: string;
+                                                enum: string[];
+                                            };
+                                            maximumRetentionSeconds: {
+                                                type: string;
+                                                minimum: number;
+                                            };
+                                            allowsRedisclosure: {
+                                                type: string;
+                                            };
+                                            supportsDeletion: {
+                                                type: string;
+                                            };
+                                        };
+                                    };
+                                };
+                            };
+                        };
+                    };
+                };
+                agent: {
+                    type: string;
+                    additionalProperties: boolean;
+                    description: string;
+                    "x-descriptionZh": string;
+                    properties: {
+                        inboundQueue: {
+                            type: string;
+                            additionalProperties: boolean;
+                            description: string;
+                            "x-descriptionZh": string;
+                            properties: {
+                                groupMode: {
+                                    type: string;
+                                    enum: string[];
+                                    description: string;
+                                    "x-descriptionZh": string;
+                                };
+                            };
+                        };
+                        execSecurity: {
+                            type: string;
+                            enum: string[];
+                            description: string;
+                            "x-descriptionZh": string;
+                        };
+                        execPreset: {
+                            type: string;
+                            enum: string[];
+                            description: string;
+                            "x-descriptionZh": string;
+                        };
+                        execApprovalMode: {
+                            type: string;
+                            enum: string[];
+                            description: string;
+                            "x-descriptionZh": string;
+                        };
+                        subagentExecApprovalMode: {
+                            type: string;
+                            enum: string[];
+                            description: string;
+                            "x-descriptionZh": string;
+                        };
+                        workerExecApprovalMode: {
+                            type: string;
+                            enum: string[];
+                            description: string;
+                            "x-descriptionZh": string;
+                        };
+                        taskExecApprovalMode: {
+                            type: string;
+                            enum: string[];
+                            description: string;
+                            "x-descriptionZh": string;
+                        };
+                        toolExecution: {
+                            type: string;
+                            enum: string[];
+                            description: string;
+                            "x-descriptionZh": string;
+                        };
+                        modelSizeHint: {
+                            type: string;
+                            enum: string[];
+                            description: string;
+                            "x-descriptionZh": string;
+                        };
+                        promptCacheRetention: {
+                            type: string;
+                            enum: string[];
+                            description: string;
+                            "x-descriptionZh": string;
+                        };
+                        steeringMode: {
+                            type: string;
+                            enum: string[];
+                            description: string;
+                            "x-descriptionZh": string;
+                        };
+                        followUpMode: {
+                            type: string;
+                            enum: string[];
+                            description: string;
+                            "x-descriptionZh": string;
+                        };
+                        outputSchema: {
+                            anyOf: ({
+                                type: string;
+                                enum?: undefined;
+                            } | {
+                                type: string;
+                                enum: string[];
+                            })[];
+                            description: string;
+                            "x-descriptionZh": string;
+                        };
+                        schedule: {
+                            type: string;
+                            additionalProperties: boolean;
+                            description: string;
+                            "x-descriptionZh": string;
+                            properties: {
+                                security: {
+                                    type: string;
+                                    additionalProperties: boolean;
+                                    description: string;
+                                    "x-descriptionZh": string;
+                                    properties: {
+                                        execPreset: {
+                                            type: string;
+                                            enum: string[];
+                                            description: string;
+                                            "x-descriptionZh": string;
+                                        };
+                                    };
+                                };
+                            };
+                        };
+                    };
+                };
+            };
+        };
+        mcp: {
+            type: string;
+            additionalProperties: boolean;
+            description: string;
+            "x-descriptionZh": string;
+        };
+        a2a: {
+            type: string;
+            additionalProperties: boolean;
+            description: string;
+            "x-descriptionZh": string;
+        };
+        speech: {
+            type: string;
+            additionalProperties: boolean;
+            description: string;
+            "x-descriptionZh": string;
+        };
+        htmlRenderer: {
+            type: string;
+            additionalProperties: boolean;
+            description: string;
+            "x-descriptionZh": string;
+            properties: {
+                width: {
+                    type: string;
+                    minimum: number;
+                    maximum: number;
+                    description: string;
+                    "x-descriptionZh": string;
+                };
+                defaultWidth: {
+                    type: string;
+                    minimum: number;
+                    maximum: number;
+                    description: string;
+                    "x-descriptionZh": string;
+                };
+                viewport: {
+                    type: string;
+                    additionalProperties: boolean;
+                    description: string;
+                    "x-descriptionZh": string;
+                    properties: {
+                        width: {
+                            type: string;
+                            minimum: number;
+                            maximum: number;
+                            description: string;
+                            "x-descriptionZh": string;
+                        };
+                        height: {
+                            type: string;
+                            minimum: number;
+                            maximum: number;
+                            description: string;
+                            "x-descriptionZh": string;
+                        };
+                    };
+                };
+                backgroundColor: {
+                    type: string;
+                    description: string;
+                    "x-descriptionZh": string;
+                };
+                defaultBackgroundColor: {
+                    type: string;
+                    description: string;
+                    "x-descriptionZh": string;
+                };
+                scale: {
+                    type: string;
+                    minimum: number;
+                    maximum: number;
+                    description: string;
+                    "x-descriptionZh": string;
+                };
+                type: {
+                    type: string;
+                    enum: string[];
+                    description: string;
+                    "x-descriptionZh": string;
+                };
+                quality: {
+                    type: string;
+                    minimum: number;
+                    maximum: number;
+                    description: string;
+                    "x-descriptionZh": string;
+                };
+                timeout: {
+                    type: string;
+                    minimum: number;
+                    maximum: number;
+                    description: string;
+                    "x-descriptionZh": string;
+                };
+                waitUntil: {
+                    type: string;
+                    enum: string[];
+                    description: string;
+                    "x-descriptionZh": string;
+                };
+                fontFamily: {
+                    type: string;
+                    description: string;
+                    "x-descriptionZh": string;
+                };
+                maxImageHeight: {
+                    type: string;
+                    minimum: number;
+                    maximum: number;
+                    description: string;
+                    "x-descriptionZh": string;
+                };
+                sliceCompression: {
+                    type: string;
+                    minimum: number;
+                    maximum: number;
+                    description: string;
+                    "x-descriptionZh": string;
+                };
+                allowFileAccess: {
+                    type: string;
+                    description: string;
+                    "x-descriptionZh": string;
+                };
+                takeOverHtmlSegments: {
+                    type: string;
+                    description: string;
+                    "x-descriptionZh": string;
+                };
+                cacheDir: {
+                    type: string;
+                    description: string;
+                    "x-descriptionZh": string;
+                };
+                cacheMaxBytes: {
+                    type: string;
+                    minimum: number;
+                    description: string;
+                    "x-descriptionZh": string;
+                };
+                userAgent: {
+                    type: string;
+                    description: string;
+                    "x-descriptionZh": string;
+                };
+                idleTimeoutMs: {
+                    type: string;
+                    minimum: number;
+                    maximum: number;
+                    description: string;
+                    "x-descriptionZh": string;
+                };
+                logStats: {
+                    type: string;
+                    description: string;
+                    "x-descriptionZh": string;
+                };
+                mode: {
+                    type: string;
+                    enum: string[];
+                    description: string;
+                    "x-descriptionZh": string;
+                };
+                aiTextAsImage: {
+                    anyOf: ({
+                        type: string;
+                        additionalProperties?: undefined;
+                        description?: undefined;
+                        "x-descriptionZh"?: undefined;
+                        properties?: undefined;
+                    } | {
+                        type: string;
+                        additionalProperties: boolean;
+                        description: string;
+                        "x-descriptionZh": string;
+                        properties: {
+                            enabled: {
+                                type: string;
+                                description: string;
+                                "x-descriptionZh": string;
+                            };
+                            onlyAdapters: {
+                                type: string;
+                                items: {
+                                    type: string;
+                                    minLength: number;
+                                };
+                                uniqueItems: boolean;
+                                description: string;
+                                "x-descriptionZh": string;
+                            };
+                            minLength: {
+                                type: string;
+                                minimum: number;
+                                description: string;
+                                "x-descriptionZh": string;
+                            };
+                            maxLength: {
+                                type: string;
+                                minimum: number;
+                                description: string;
+                                "x-descriptionZh": string;
+                            };
+                            skipIfRich: {
+                                type: string;
+                                description: string;
+                                "x-descriptionZh": string;
+                            };
+                            width: {
+                                type: string;
+                                minimum: number;
+                                maximum: number;
+                                description: string;
+                                "x-descriptionZh": string;
+                            };
+                            height: {
+                                type: string;
+                                minimum: number;
+                                maximum: number;
+                                description: string;
+                                "x-descriptionZh": string;
+                            };
+                            backgroundColor: {
+                                type: string;
+                                description: string;
+                                "x-descriptionZh": string;
+                            };
+                            fontSize: {
+                                type: string;
+                                minimum: number;
+                                description: string;
+                                "x-descriptionZh": string;
+                            };
+                            color: {
+                                type: string;
+                                description: string;
+                                "x-descriptionZh": string;
+                            };
+                            padding: {
+                                type: string;
+                                minimum: number;
+                                description: string;
+                                "x-descriptionZh": string;
+                            };
+                            scale: {
+                                type: string;
+                                minimum: number;
+                                maximum: number;
+                                description: string;
+                                "x-descriptionZh": string;
+                            };
+                            fileName: {
+                                type: string;
+                                minLength: number;
+                                description: string;
+                                "x-descriptionZh": string;
+                            };
+                        };
+                    })[];
+                    description: string;
+                    "x-descriptionZh": string;
+                };
+            };
+        };
+        assistant: {
+            type: string;
+            additionalProperties: boolean;
+            description: string;
+            "x-descriptionZh": string;
+        };
+        log_level: {
+            type: string[];
+            description: string;
+            "x-descriptionZh": string;
+        };
+        plugin: {
+            type: string;
+            description: string;
+            "x-descriptionZh": string;
+        };
+    };
+};
 /** Host configuration keys consumed by Runtime composition and Host installers. */
 export declare const HOST_CONFIG_KEYS: readonly string[];
 export type JsonSchema = Readonly<Record<string, unknown>>;

package/lib/config-composer.js

@@ -10,7 +10,7 @@ function deepFreeze(value) {
     }
     return value;
 }
-const HOST_CONFIG_SCHEMA = deepFreeze(hostConfigSchema);
+export const HOST_CONFIG_SCHEMA = deepFreeze(hostConfigSchema);
 /** Host configuration keys consumed by Runtime composition and Host installers. */
 export const HOST_CONFIG_KEYS = Object.freeze(Object.keys(HOST_CONFIG_SCHEMA.properties));
 export class ConfigSchemaCollisionError extends Error {

package/lib/hmr-coordinator.js

@@ -1,3 +1,4 @@
+import { normalizeSourcePath } from './source-path.js';
 import { InvalidationPlanner, } from './invalidation-planner.js';
 export class HmrCoordinator {
     options;
@@ -21,7 +22,7 @@ export class HmrCoordinator {
         if (!this.options.modules.watch) {
             throw new Error('ModuleRuntime does not provide a file watcher');
         }
-        this.#syncWatchRoots();
+        this.#syncModuleState();
         this.#unwatch = this.options.modules.watch((source) => {
             void this.enqueue(source).catch(() => undefined);
         });
@@ -31,11 +32,28 @@ export class HmrCoordinator {
         if (this.#stopResult)
             return this.#stopResult;
         this.#closing = true;
-        this.#unwatch?.();
+        const unwatch = this.#unwatch;
         this.#unwatch = undefined;
-        this.#stopResult = (async () => {
-            await this.#draining;
-        })();
+        this.#stopResult = Promise.resolve().then(async () => {
+            const errors = [];
+            try {
+                await unwatch?.();
+            }
+            catch (error) {
+                errors.push(error);
+            }
+            // Watcher disposal failure must not bypass already admitted reloads.
+            try {
+                await this.#draining;
+            }
+            catch (error) {
+                errors.push(error);
+            }
+            if (errors.length === 1)
+                throw errors[0];
+            if (errors.length > 1)
+                throw new AggregateError(errors, 'HMR stop failed');
+        });
         return this.#stopResult;
     }
     enqueue(source) {
@@ -45,7 +63,7 @@ export class HmrCoordinator {
         if (this.#restartRequired) {
             return Promise.reject(new Error('HMR coordinator requires a process restart'));
         }
-        this.#pending.add(source);
+        this.#pending.add(normalizeSourcePath(source));
         const completed = new Promise((resolve, reject) => {
             this.#waiters.push({ resolve, reject });
         });
@@ -99,21 +117,23 @@ export class HmrCoordinator {
                 if (plan.kind === 'none')
                     continue;
                 const startedAt = performance.now();
-                for (const source of plan.changed) {
-                    await this.options.modules.invalidate?.(source);
-                }
-                const restart = await this.options.runtime.reload(plan);
-                if (restart) {
-                    this.#restartRequired = true;
-                    this.#pending.clear();
-                    this.#notifyRestart(restart);
-                    break;
-                }
-                else {
+                try {
+                    this.options.modules.beginGeneration?.();
+                    for (const source of plan.changed) {
+                        await this.options.modules.invalidate?.(source);
+                    }
+                    const restart = await this.options.runtime.reload(plan);
+                    if (restart) {
+                        this.options.modules.rollbackGeneration?.();
+                        this.#restartRequired = true;
+                        this.#pending.clear();
+                        this.#notifyRestart(restart);
+                        break;
+                    }
                     // reload resolves only after RootController has committed the new
-                    // generation. Read ownership now so failed transactions never make
-                    // newly discovered workspace packages observable to the watcher.
-                    this.#syncWatchRoots();
+                    // generation. Commit module metadata and ownership together so a
+                    // failed transaction keeps the previous dependency graph intact.
+                    this.#syncModuleState();
                     const durationMs = Number((performance.now() - startedAt).toFixed(1));
                     try {
                         await this.options.onReload?.(plan, durationMs);
@@ -128,6 +148,10 @@ export class HmrCoordinator {
                         }
                     }
                 }
+                catch (error) {
+                    this.options.modules.rollbackGeneration?.();
+                    throw error;
+                }
             }
             this.#resolveWaiters();
         }
@@ -158,8 +182,10 @@ export class HmrCoordinator {
         for (const waiter of this.#waiters.splice(0))
             waiter.reject(error);
     }
-    #syncWatchRoots() {
-        this.options.modules.updateWatchRoots?.(this.options.ownership().watchRoots());
+    #syncModuleState() {
+        const ownership = this.options.ownership();
+        this.options.modules.updateWatchRoots?.(ownership.watchRoots());
+        this.options.modules.commitGeneration?.(ownership.moduleSources());
     }
     #notifyRestart(plan) {
         // Restart is a committed control outcome. Invoke the observer without