@inharness-ai/claude4spec 1.0.21 → 1.0.22

package/dist/server/core/plugin-host/overlay-loader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"overlay-loader.js","sourceRoot":"","sources":["../../../../src/server/core/plugin-host/overlay-loader.ts"],"names":[],"mappings":"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"}

package/dist/server/core/plugin-host/plugin-watcher.d.ts

@@ -0,0 +1,41 @@
+/**
+ * M33 — plugin-pool hot-reload watcher.
+ *
+ * The main `PagesWatcher` is rooted OUTSIDE `.claude4spec/`, so plugin sources
+ * are watched by this dedicated watcher instead. It is the *mechanism only* —
+ * the reload pipeline (cache-bust import → onUnregister old → register new →
+ * invalidate ProjectContext → broadcast) is supplied by the caller via
+ * `onReload`. There is deliberately no projection store (no `byPath` map, no
+ * SQLite): the live `PluginRegistry` (base) + `ProjectPluginOverlay` (overlay)
+ * ARE the index (divergence from M29 — only the watcher is reused).
+ *
+ * Two callers wire it differently:
+ *   - overlay: one watcher per `ProjectContext` over `<cwd>/.claude4spec/plugins/`,
+ *     mounted only behind the `trustProjectPlugins` gate; closed on dispose.
+ *   - base: one process-global watcher over the resolved workspace package dirs.
+ */
+export type PluginWatcherCallback = (changedPaths: string[]) => void;
+export declare class PluginWatcher {
+    private readonly roots;
+    private readonly onReload;
+    private readonly debounceMs;
+    private watcher;
+    private timer;
+    private pending;
+    private suppressUntil;
+    /**
+     * @param roots   absolute directories to watch (empty ⇒ `start()` is a no-op).
+     * @param onReload invoked (debounced) with the de-duplicated changed paths.
+     */
+    constructor(roots: string[], onReload: PluginWatcherCallback, debounceMs?: number);
+    start(): void;
+    /**
+     * Call BEFORE a reload-initiated write into a watched dir so the resulting
+     * chokidar event does not re-trigger the pipeline (reload → write → reload).
+     * Keyed by absolute path.
+     */
+    suppress(absPath: string): void;
+    private queue;
+    private flush;
+    close(): Promise<void>;
+}

package/dist/server/core/plugin-host/plugin-watcher.js

@@ -0,0 +1,95 @@
+/**
+ * M33 — plugin-pool hot-reload watcher.
+ *
+ * The main `PagesWatcher` is rooted OUTSIDE `.claude4spec/`, so plugin sources
+ * are watched by this dedicated watcher instead. It is the *mechanism only* —
+ * the reload pipeline (cache-bust import → onUnregister old → register new →
+ * invalidate ProjectContext → broadcast) is supplied by the caller via
+ * `onReload`. There is deliberately no projection store (no `byPath` map, no
+ * SQLite): the live `PluginRegistry` (base) + `ProjectPluginOverlay` (overlay)
+ * ARE the index (divergence from M29 — only the watcher is reused).
+ *
+ * Two callers wire it differently:
+ *   - overlay: one watcher per `ProjectContext` over `<cwd>/.claude4spec/plugins/`,
+ *     mounted only behind the `trustProjectPlugins` gate; closed on dispose.
+ *   - base: one process-global watcher over the resolved workspace package dirs.
+ */
+import chokidar from 'chokidar';
+import path from 'node:path';
+const DEFAULT_DEBOUNCE_MS = 300;
+const SUPPRESS_WINDOW_MS = 600;
+export class PluginWatcher {
+    roots;
+    onReload;
+    debounceMs;
+    watcher = null;
+    timer = null;
+    pending = new Set();
+    suppressUntil = new Map();
+    /**
+     * @param roots   absolute directories to watch (empty ⇒ `start()` is a no-op).
+     * @param onReload invoked (debounced) with the de-duplicated changed paths.
+     */
+    constructor(roots, onReload, debounceMs = DEFAULT_DEBOUNCE_MS) {
+        this.roots = roots;
+        this.onReload = onReload;
+        this.debounceMs = debounceMs;
+    }
+    start() {
+        if (this.roots.length === 0 || this.watcher)
+            return;
+        this.watcher = chokidar.watch(this.roots, {
+            ignoreInitial: true,
+            awaitWriteFinish: { stabilityThreshold: 80, pollInterval: 20 },
+        });
+        const onEvent = (p) => this.queue(p);
+        this.watcher.on('add', onEvent);
+        this.watcher.on('change', onEvent);
+        this.watcher.on('unlink', onEvent);
+        this.watcher.on('addDir', onEvent);
+        this.watcher.on('unlinkDir', onEvent);
+    }
+    /**
+     * Call BEFORE a reload-initiated write into a watched dir so the resulting
+     * chokidar event does not re-trigger the pipeline (reload → write → reload).
+     * Keyed by absolute path.
+     */
+    suppress(absPath) {
+        this.suppressUntil.set(path.resolve(absPath), Date.now() + SUPPRESS_WINDOW_MS);
+    }
+    queue(absPath) {
+        const resolved = path.resolve(absPath);
+        const until = this.suppressUntil.get(resolved);
+        if (until && Date.now() < until) {
+            this.suppressUntil.delete(resolved);
+            return;
+        }
+        this.pending.add(resolved);
+        if (this.timer)
+            clearTimeout(this.timer);
+        this.timer = setTimeout(() => this.flush(), this.debounceMs);
+    }
+    flush() {
+        this.timer = null;
+        if (this.pending.size === 0)
+            return;
+        const paths = [...this.pending];
+        this.pending.clear();
+        try {
+            this.onReload(paths);
+        }
+        catch (err) {
+            console.warn('[plugin-watcher] onReload threw:', err.message);
+        }
+    }
+    async close() {
+        if (this.timer) {
+            clearTimeout(this.timer);
+            this.timer = null;
+        }
+        this.pending.clear();
+        await this.watcher?.close();
+        this.watcher = null;
+    }
+}
+//# sourceMappingURL=plugin-watcher.js.map

package/dist/server/core/plugin-host/plugin-watcher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"plugin-watcher.js","sourceRoot":"","sources":["../../../../src/server/core/plugin-host/plugin-watcher.ts"],"names":[],"mappings":"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"}

package/dist/server/core/plugin-host/project-host.d.ts

@@ -5,22 +5,28 @@
  */
 import type { Database } from 'better-sqlite3';
 import type { McpServerInstance } from '@inharness-ai/agent-adapters';
-import type { BackendModule, MountContext, PluginRegistry, ProjectPluginHost } from './types.js';
+import type { BackendModule, MountContext, PluginRegistry, ProjectPluginHost, ProjectPluginOverlay, ShadowedType } from './types.js';
 import type { PluginActivationState } from '../../../shared/plugin-host/types.js';
+import type { PluginCommandContribution, PluginSettingsSection } from '../../../shared/plugin-host/manifest.js';
 import type { EntityDiff, RestoreContext, RestoreResult, SerializeContext, SnapshotData } from '../../serialization/types.js';
 export declare class ProjectPluginHostImpl implements ProjectPluginHost {
     private readonly registry;
+    private readonly overlay?;
     private activeTypes;
     private unknownTypes;
     private mcpServerFactories;
     private entityServices;
-    constructor(registry: PluginRegistry, activeWhitelist: string[] | null | undefined);
+    private readonly overlayModules;
+    constructor(registry: PluginRegistry, activeWhitelist: string[] | null | undefined, overlay?: ProjectPluginOverlay | undefined);
     listAvailable(): BackendModule[];
     listEntities(): BackendModule[];
+    listSettings(): PluginSettingsSection[];
+    listCommands(): PluginCommandContribution[];
     getEntity(type: string): BackendModule | null;
     getAvailable(type: string): BackendModule | null;
     isActive(type: string): boolean;
     partition(): PluginActivationState;
+    shadowReport(): ShadowedType[];
     mountBackend(ctx: MountContext): void;
     registerMcpServer(name: string, factory: () => McpServerInstance): void;
     buildMcpServers(): Array<{

package/dist/server/core/plugin-host/project-host.js

@@ -6,21 +6,33 @@
 import { diffEntity, restoreEntity, snapshotEntity } from '../../serialization/snapshot.js';
 export class ProjectPluginHostImpl {
     registry;
+    overlay;
     activeTypes = null; // null = all active
     unknownTypes = [];
     mcpServerFactories = new Map();
     entityServices = new Map();
-    constructor(registry, activeWhitelist) {
+    // Project-local modules of THIS context, keyed by type. Empty when
+    // `overlay === undefined` (parity with the base-only case).
+    overlayModules = new Map();
+    constructor(registry, activeWhitelist, overlay) {
         this.registry = registry;
+        this.overlay = overlay;
+        // Effective pool = base ∪ overlay. Overlay wins on cross-layer collision
+        // (shadow) — `getAvailable`/`listAvailable` consult the overlay first.
+        for (const m of overlay?.listLocal() ?? []) {
+            this.overlayModules.set(m.type, m);
+        }
         if (activeWhitelist == null) {
             this.activeTypes = null;
             this.unknownTypes = [];
             return;
         }
+        // The whitelist is applied to the merged pool, not the base alone — an
+        // overlay type is activatable exactly like a base type.
         const active = new Set();
         const unknown = [];
         for (const type of activeWhitelist) {
-            if (this.registry.getAvailable(type))
+            if (this.getAvailable(type))
                 active.add(type);
             else
                 unknown.push(type);
@@ -29,21 +41,49 @@ export class ProjectPluginHostImpl {
         this.unknownTypes = unknown;
     }
     listAvailable() {
-        return this.registry.listAvailable();
+        // Merge base + overlay; overlay shadows a same-typed base module.
+        const merged = new Map();
+        for (const m of this.registry.listAvailable())
+            merged.set(m.type, m);
+        for (const [type, m] of this.overlayModules)
+            merged.set(type, m);
+        return Array.from(merged.values()).sort((a, b) => a.displayOrder - b.displayOrder);
     }
     listEntities() {
         return this.listAvailable().filter((m) => this.isActive(m.type));
     }
+    listSettings() {
+        // Axis B (pool + trust), NOT axis A: deliberately unfiltered by
+        // `config.entities`. Base records are always loaded+trusted; the overlay is
+        // only constructed on the trusted path, so its sections are trusted too.
+        // Overlay shadows base on a name collision (parity with type shadowing).
+        const byName = new Map();
+        for (const r of this.registry.listPluginRecords()) {
+            if (r.settings.length > 0) {
+                byName.set(r.name, { name: r.name, version: r.version, fields: r.settings });
+            }
+        }
+        for (const section of this.overlay?.listSettings() ?? []) {
+            byName.set(section.name, section);
+        }
+        return Array.from(byName.values());
+    }
+    listCommands() {
+        // Same two-axis rationale as listSettings(): pool + trust, not entities.
+        const base = this.registry.listPluginRecords().flatMap((r) => r.commands);
+        return [...base, ...(this.overlay?.listCommands() ?? [])];
+    }
     getEntity(type) {
         if (!this.isActive(type))
             return null;
-        return this.registry.getAvailable(type);
+        return this.getAvailable(type);
     }
     getAvailable(type) {
-        return this.registry.getAvailable(type);
+        // Overlay shadows base on cross-layer collision.
+        return this.overlayModules.get(type) ?? this.registry.getAvailable(type) ?? null;
     }
     isActive(type) {
-        if (!this.registry.getAvailable(type))
+        if (!this.getAvailable(type))
             return false;
         if (this.activeTypes == null)
             return true;
@@ -56,6 +96,16 @@ export class ProjectPluginHostImpl {
             .map((m) => m.type);
         return { active, inactive, unknown: [...this.unknownTypes] };
     }
+    shadowReport() {
+        const out = [];
+        for (const type of this.overlayModules.keys()) {
+            // Cross-layer collision: the overlay type also exists in the base layer.
+            if (this.registry.getAvailable(type)) {
+                out.push({ type, overlayOrigin: this.overlay?.origin(type) ?? '' });
+            }
+        }
+        return out;
+    }
     mountBackend(ctx) {
         // A throwing plugin mount propagates — M31 turns it into a per-project
         // build failure (500 PROJECT_BUILD_FAILED), never a process crash.

package/dist/server/core/plugin-host/project-host.js.map

@@ -1 +1 @@
-{"version":3,"file":"project-host.js","sourceRoot":"","sources":["../../../../src/server/core/plugin-host/project-host.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"project-host.js","sourceRoot":"","sources":["../../../../src/server/core/plugin-host/project-host.ts"],"names":[],"mappings":"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"}

package/dist/server/core/plugin-host/registry.d.ts

@@ -3,12 +3,36 @@
  * singleton — the registry is immutable after `registerAllPlugins(registry)`
  * runs at process start, and `consolidate(config.entities)` is a pure factory
  * producing one ProjectPluginHost per project context.
+ *
+ * M33: the base layer is no longer process-immutable — the hot-reload
+ * pipeline mutates it via `registerPlugin` / `unregisterPlugin` and then
+ * invalidates dependent `ProjectContext`s (axis B). The registry additionally
+ * retains a per-plugin {@link RegisteredPluginRecord} so the host can surface
+ * non-entity capabilities (settings/commands) and the reload pipeline can call
+ * the old version's `onUnregister` before re-registering.
  */
-import type { BackendModule, PluginRegistry, ProjectPluginHost } from './types.js';
+import type { BackendModule, PluginRegistry, ProjectPluginHost, ProjectPluginOverlay, RegisteredPluginRecord } from './types.js';
+import type { PluginManifest, WritingStyleContribution } from '../../../shared/plugin-host/manifest.js';
 export declare class PluginRegistryImpl implements PluginRegistry {
     private modules;
+    private plugins;
     registerEntityModule(module: BackendModule): void;
+    /**
+     * Validate a manifest's shape and lower every contribution WITHOUT mutating
+     * the registry. Throws `PluginManifestError` on any structural problem (the
+     * loader/reload pipeline catches it). The hot-reload pipeline calls this
+     * BEFORE tearing the old version down, so a structurally-broken new version
+     * never leaves the pool missing a type ("old stays").
+     */
+    private validateAndLower;
+    validatePlugin(manifest: PluginManifest): void;
+    registerPlugin(manifest: PluginManifest): void;
+    unregisterPlugin(name: string): void;
+    listPluginRecords(): RegisteredPluginRecord[];
+    listWritingStyles(): WritingStyleContribution[];
     listAvailable(): BackendModule[];
     getAvailable(type: string): BackendModule | null;
-    consolidate(activeWhitelist: string[] | null | undefined): ProjectPluginHost;
+    consolidate(config: {
+        entities?: string[];
+    } | null | undefined, overlay?: ProjectPluginOverlay): ProjectPluginHost;
 }

package/dist/server/core/plugin-host/registry.js

@@ -3,24 +3,129 @@
  * singleton — the registry is immutable after `registerAllPlugins(registry)`
  * runs at process start, and `consolidate(config.entities)` is a pure factory
  * producing one ProjectPluginHost per project context.
+ *
+ * M33: the base layer is no longer process-immutable — the hot-reload
+ * pipeline mutates it via `registerPlugin` / `unregisterPlugin` and then
+ * invalidates dependent `ProjectContext`s (axis B). The registry additionally
+ * retains a per-plugin {@link RegisteredPluginRecord} so the host can surface
+ * non-entity capabilities (settings/commands) and the reload pipeline can call
+ * the old version's `onUnregister` before re-registering.
  */
 import { ProjectPluginHostImpl } from './project-host.js';
+import { PluginManifestError, lowerEntityContribution, validateWritingStyle, } from './manifest-adapter.js';
 export class PluginRegistryImpl {
     modules = new Map();
+    // M33: base-layer plugins by name, in registration order. The source
+    // of truth for `listWritingStyles` / `listPluginRecords` so a hot-reload that
+    // calls `unregisterPlugin` cleanly drops the old version's styles too.
+    plugins = new Map();
     registerEntityModule(module) {
         if (!module.type) {
             throw new Error('plugin-registry: module.type is required');
         }
         this.modules.set(module.type, module);
     }
+    /**
+     * Validate a manifest's shape and lower every contribution WITHOUT mutating
+     * the registry. Throws `PluginManifestError` on any structural problem (the
+     * loader/reload pipeline catches it). The hot-reload pipeline calls this
+     * BEFORE tearing the old version down, so a structurally-broken new version
+     * never leaves the pool missing a type ("old stays").
+     */
+    validateAndLower(manifest) {
+        if (!manifest || typeof manifest !== 'object') {
+            throw new PluginManifestError('plugin manifest must be an object');
+        }
+        if (typeof manifest.name !== 'string' || typeof manifest.version !== 'string') {
+            throw new PluginManifestError('plugin manifest requires string name + version');
+        }
+        if (manifest.contributes == null || typeof manifest.contributes !== 'object') {
+            throw new PluginManifestError(`plugin "${manifest.name}" — contributes must be an object`);
+        }
+        // Two-pass for atomicity: lower (validate) every contribution first, so a
+        // throw on a later entity/style never leaves earlier ones registered.
+        const entityModules = (manifest.contributes.entities ?? []).map(lowerEntityContribution);
+        const styles = (manifest.contributes.writingStyles ?? []).map(validateWritingStyle);
+        // `onUnregister` is a required slot from the HOST_API 1.0.0 baseline. A
+        // runtime manifest missing it is not crashed over — warn (parity with L8
+        // slot validation) and substitute a no-op so the reload pipeline still works.
+        let onUnregister;
+        if (typeof manifest.onUnregister === 'function') {
+            onUnregister = () => manifest.onUnregister();
+        }
+        else {
+            console.warn(`[plugin-registry] plugin "${manifest.name}" — required slot onUnregister is missing; using a no-op teardown`);
+            onUnregister = () => { };
+        }
+        const settings = manifest.contributes.settings ?? [];
+        const commands = manifest.contributes.commands ?? [];
+        return {
+            record: {
+                name: manifest.name,
+                version: manifest.version,
+                contributedTypes: entityModules.map((m) => m.type),
+                settings,
+                commands,
+                styles,
+                entityModules,
+                onUnregister,
+            },
+        };
+    }
+    validatePlugin(manifest) {
+        this.validateAndLower(manifest);
+    }
+    registerPlugin(manifest) {
+        const { record } = this.validateAndLower(manifest);
+        for (const module of record.entityModules) {
+            this.registerEntityModule(module);
+        }
+        // Re-registration (hot-reload) overwrites the prior record; Map keeps the
+        // first-seen insertion order, which is what we want for stable section order.
+        this.plugins.set(record.name, record);
+    }
+    unregisterPlugin(name) {
+        const record = this.plugins.get(name);
+        if (!record)
+            return;
+        try {
+            record.onUnregister();
+        }
+        catch (err) {
+            // Idempotent + non-throwing by contract — a throw is a warning, never a block.
+            console.warn(`[plugin-registry] onUnregister of "${name}" threw: ${err.message}`);
+        }
+        for (const module of record.entityModules) {
+            // Only drop the module if it is STILL the one this plugin contributed — a
+            // later same-typed registration (another base plugin contributing the same
+            // type) would have overwritten the slot, and must not be clobbered here.
+            if (this.modules.get(module.type) === module) {
+                this.modules.delete(module.type);
+            }
+        }
+        this.plugins.delete(name);
+    }
+    listPluginRecords() {
+        return Array.from(this.plugins.values()).map((r) => ({
+            name: r.name,
+            version: r.version,
+            contributedTypes: [...r.contributedTypes],
+            settings: r.settings,
+            commands: r.commands,
+            onUnregister: r.onUnregister,
+        }));
+    }
+    listWritingStyles() {
+        return Array.from(this.plugins.values()).flatMap((r) => r.styles);
+    }
     listAvailable() {
         return Array.from(this.modules.values()).sort((a, b) => a.displayOrder - b.displayOrder);
     }
     getAvailable(type) {
         return this.modules.get(type) ?? null;
     }
-    consolidate(activeWhitelist) {
-        return new ProjectPluginHostImpl(this, activeWhitelist);
+    consolidate(config, overlay) {
+        return new ProjectPluginHostImpl(this, config?.entities, overlay);
     }
 }
 //# sourceMappingURL=registry.js.map

package/dist/server/core/plugin-host/registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../../src/server/core/plugin-host/registry.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,MAAM,OAAO,kBAAkB;IACrB,OAAO,GAAG,IAAI,GAAG,EAAyB,CAAC;IAEnD,oBAAoB,CAAC,MAAqB;QACxC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAC9D,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACxC,CAAC;IAED,aAAa;QACX,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAC3C,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC,YAAY,CAC1C,CAAC;IACJ,CAAC;IAED,YAAY,CAAC,IAAY;QACvB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;IACxC,CAAC;IAED,WAAW,CAAC,eAA4C;QACtD,OAAO,IAAI,qBAAqB,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IAC1D,CAAC;CACF"}
+{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../../src/server/core/plugin-host/registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAeH,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EACL,mBAAmB,EACnB,uBAAuB,EACvB,oBAAoB,GACrB,MAAM,uBAAuB,CAAC;AAe/B,MAAM,OAAO,kBAAkB;IACrB,OAAO,GAAG,IAAI,GAAG,EAAyB,CAAC;IACnD,qEAAqE;IACrE,8EAA8E;IAC9E,uEAAuE;IAC/D,OAAO,GAAG,IAAI,GAAG,EAAgC,CAAC;IAE1D,oBAAoB,CAAC,MAAqB;QACxC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAC9D,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACxC,CAAC;IAED;;;;;;OAMG;IACK,gBAAgB,CAAC,QAAwB;QAC/C,IAAI,CAAC,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC9C,MAAM,IAAI,mBAAmB,CAAC,mCAAmC,CAAC,CAAC;QACrE,CAAC;QACD,IAAI,OAAO,QAAQ,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,QAAQ,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC9E,MAAM,IAAI,mBAAmB,CAAC,gDAAgD,CAAC,CAAC;QAClF,CAAC;QACD,IAAI,QAAQ,CAAC,WAAW,IAAI,IAAI,IAAI,OAAO,QAAQ,CAAC,WAAW,KAAK,QAAQ,EAAE,CAAC;YAC7E,MAAM,IAAI,mBAAmB,CAAC,WAAW,QAAQ,CAAC,IAAI,mCAAmC,CAAC,CAAC;QAC7F,CAAC;QACD,0EAA0E;QAC1E,sEAAsE;QACtE,MAAM,aAAa,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;QACzF,MAAM,MAAM,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAEpF,wEAAwE;QACxE,yEAAyE;QACzE,8EAA8E;QAC9E,IAAI,YAAwB,CAAC;QAC7B,IAAI,OAAO,QAAQ,CAAC,YAAY,KAAK,UAAU,EAAE,CAAC;YAChD,YAAY,GAAG,GAAG,EAAE,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC;QAC/C,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CACV,6BAA6B,QAAQ,CAAC,IAAI,mEAAmE,CAC9G,CAAC;YACF,YAAY,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;QAC1B,CAAC;QAED,MAAM,QAAQ,GAAyB,QAAQ,CAAC,WAAW,CAAC,QAAQ,IAAI,EAAE,CAAC;QAC3E,MAAM,QAAQ,GAAgC,QAAQ,CAAC,WAAW,CAAC,QAAQ,IAAI,EAAE,CAAC;QAClF,OAAO;YACL,MAAM,EAAE;gBACN,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,gBAAgB,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;gBAClD,QAAQ;gBACR,QAAQ;gBACR,MAAM;gBACN,aAAa;gBACb,YAAY;aACb;SACF,CAAC;IACJ,CAAC;IAED,cAAc,CAAC,QAAwB;QACrC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC;IAED,cAAc,CAAC,QAAwB;QACrC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACnD,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;YAC1C,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;QACpC,CAAC;QACD,0EAA0E;QAC1E,8EAA8E;QAC9E,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACxC,CAAC;IAED,gBAAgB,CAAC,IAAY;QAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,CAAC,MAAM;YAAE,OAAO;QACpB,IAAI,CAAC;YACH,MAAM,CAAC,YAAY,EAAE,CAAC;QACxB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,+EAA+E;YAC/E,OAAO,CAAC,IAAI,CAAC,sCAAsC,IAAI,YAAa,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;QAC/F,CAAC;QACD,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;YAC1C,0EAA0E;YAC1E,2EAA2E;YAC3E,yEAAyE;YACzE,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,MAAM,EAAE,CAAC;gBAC7C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IAED,iBAAiB;QACf,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACnD,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,OAAO,EAAE,CAAC,CAAC,OAAO;YAClB,gBAAgB,EAAE,CAAC,GAAG,CAAC,CAAC,gBAAgB,CAAC;YACzC,QAAQ,EAAE,CAAC,CAAC,QAAQ;YACpB,QAAQ,EAAE,CAAC,CAAC,QAAQ;YACpB,YAAY,EAAE,CAAC,CAAC,YAAY;SAC7B,CAAC,CAAC,CAAC;IACN,CAAC;IAED,iBAAiB;QACf,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IACpE,CAAC;IAED,aAAa;QACX,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAC3C,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC,YAAY,CAC1C,CAAC;IACJ,CAAC;IAED,YAAY,CAAC,IAAY;QACvB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;IACxC,CAAC;IAED,WAAW,CACT,MAAkD,EAClD,OAA8B;QAE9B,OAAO,IAAI,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IACpE,CAAC;CACF"}

package/dist/server/core/plugin-host/runtime-shims.d.ts

@@ -0,0 +1,26 @@
+/**
+ * M33 "Option B" shared-singleton shims.
+ *
+ * The host publishes its OWN already-imported module namespaces onto
+ * `window.__c4s_shared` (see client `shared-runtime.ts`). The import map points
+ * each bare peer specifier at one of these tiny server-served ESM modules, which
+ * re-export from that global. A plugin's `import "react"` therefore resolves to
+ * the host's live React reconciler — not a second copy.
+ *
+ * The named-export list per peer is enumerated from the actually-installed
+ * package at runtime (cached), so the shim never drifts from the host's exports
+ * — avoiding a brittle hand-maintained list. `@c4s/plugin-runtime` is our own
+ * fixed surface (and a browser module the server can't import), so it is listed
+ * explicitly.
+ */
+import type { SharedPeerSpecifier } from '../../../shared/plugin-host/frontend-manifest.js';
+/** Bare specifier → URL slug used in `/api/plugins/runtime/<slug>.js`. */
+export declare const PEER_SLUG: Record<SharedPeerSpecifier, string>;
+/** Build the import map injected into the page. Bare specifier → shim URL. */
+export declare function buildImportMap(): Record<string, string>;
+/**
+ * Render (and cache) the ESM shim for one runtime slug. Returns `null` for an
+ * unknown slug. Never throws — a peer whose package can't be introspected
+ * server-side falls back to a default-only shim.
+ */
+export declare function getRuntimeShim(slug: string): Promise<string | null>;

package/dist/server/core/plugin-host/runtime-shims.js

@@ -0,0 +1,96 @@
+/**
+ * M33 "Option B" shared-singleton shims.
+ *
+ * The host publishes its OWN already-imported module namespaces onto
+ * `window.__c4s_shared` (see client `shared-runtime.ts`). The import map points
+ * each bare peer specifier at one of these tiny server-served ESM modules, which
+ * re-export from that global. A plugin's `import "react"` therefore resolves to
+ * the host's live React reconciler — not a second copy.
+ *
+ * The named-export list per peer is enumerated from the actually-installed
+ * package at runtime (cached), so the shim never drifts from the host's exports
+ * — avoiding a brittle hand-maintained list. `@c4s/plugin-runtime` is our own
+ * fixed surface (and a browser module the server can't import), so it is listed
+ * explicitly.
+ */
+import { SHARED_PEER_SPECIFIERS, PLUGIN_RUNTIME_EXPORT_NAMES, PLUGIN_RUNTIME_UI_EXPORT_NAMES, } from '../../../shared/plugin-host/frontend-manifest.js';
+/** Bare specifier → URL slug used in `/api/plugins/runtime/<slug>.js`. */
+export const PEER_SLUG = {
+    react: 'react',
+    'react/jsx-runtime': 'react-jsx-runtime',
+    'react/jsx-dev-runtime': 'react-jsx-dev-runtime',
+    'react-dom': 'react-dom',
+    'react-dom/client': 'react-dom-client',
+    '@tiptap/core': 'tiptap-core',
+    '@tanstack/react-query': 'react-query',
+    '@tanstack/react-router': 'react-router',
+    '@c4s/plugin-runtime': 'plugin-runtime',
+    '@c4s/plugin-runtime/ui': 'plugin-runtime-ui',
+};
+const SLUG_PEER = Object.fromEntries(SHARED_PEER_SPECIFIERS.map((spec) => [PEER_SLUG[spec], spec]));
+/**
+ * The named exports of our own client surfaces — browser modules the server
+ * can't introspect. Single source of truth lives in shared; parity tests
+ * (plugin-runtime.test.ts, plugin-runtime-ui.test.ts) guard them against drift.
+ */
+const PLUGIN_RUNTIME_EXPORTS = PLUGIN_RUNTIME_EXPORT_NAMES;
+const PLUGIN_RUNTIME_UI_EXPORTS = PLUGIN_RUNTIME_UI_EXPORT_NAMES;
+/** Build the import map injected into the page. Bare specifier → shim URL. */
+export function buildImportMap() {
+    const map = {};
+    for (const spec of SHARED_PEER_SPECIFIERS) {
+        map[spec] = `/api/plugins/runtime/${PEER_SLUG[spec]}.js`;
+    }
+    return map;
+}
+const ID_RE = /^[A-Za-z_$][A-Za-z0-9_$]*$/;
+function renderShimSource(specifier, names) {
+    const accessor = `globalThis.__c4s_shared[${JSON.stringify(specifier)}]`;
+    const lines = [
+        `// Auto-generated host singleton shim for "${specifier}".`,
+        `const __m = ${accessor};`,
+        `if (!__m) throw new Error('c4s plugin-runtime: missing shared singleton "${specifier}" — host did not publish window.__c4s_shared');`,
+        `export default (__m && __m.default !== undefined ? __m.default : __m);`,
+    ];
+    for (const name of names) {
+        if (name === 'default' || name === '__esModule' || !ID_RE.test(name))
+            continue;
+        lines.push(`export const ${name} = __m[${JSON.stringify(name)}];`);
+    }
+    return lines.join('\n') + '\n';
+}
+const shimCache = new Map();
+/**
+ * Render (and cache) the ESM shim for one runtime slug. Returns `null` for an
+ * unknown slug. Never throws — a peer whose package can't be introspected
+ * server-side falls back to a default-only shim.
+ */
+export async function getRuntimeShim(slug) {
+    const cached = shimCache.get(slug);
+    if (cached)
+        return cached;
+    const specifier = SLUG_PEER[slug];
+    if (!specifier)
+        return null;
+    let names;
+    if (specifier === '@c4s/plugin-runtime') {
+        names = [...PLUGIN_RUNTIME_EXPORTS];
+    }
+    else if (specifier === '@c4s/plugin-runtime/ui') {
+        names = [...PLUGIN_RUNTIME_UI_EXPORTS];
+    }
+    else {
+        try {
+            const ns = (await import(specifier));
+            names = Object.keys(ns);
+        }
+        catch (err) {
+            console.warn(`[plugin-runtime] could not introspect "${specifier}" for shim exports: ${err.message}`);
+            names = [];
+        }
+    }
+    const source = renderShimSource(specifier, names);
+    shimCache.set(slug, source);
+    return source;
+}
+//# sourceMappingURL=runtime-shims.js.map

package/dist/server/core/plugin-host/runtime-shims.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"runtime-shims.js","sourceRoot":"","sources":["../../../../src/server/core/plugin-host/runtime-shims.ts"],"names":[],"mappings":"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"}