@markii/host 0.17.0-next.5 → 0.17.0-next.6

package/dist/host/pack-trust-behavior.d.ts

@@ -1,5 +1,6 @@
 import type { PackTrustList } from '../packs/pack-trust.js';
 import type { HostAdapter } from './adapter.js';
+import type { DisablePackOutcome, EnablePackOutcome } from './create-host.js';
 /** One installed pack this device has enabled. */
 export interface EnabledPack {
     readonly namespace: string;
@@ -33,47 +34,23 @@ export declare function trustedPackFolders(adapter: HostAdapter): Promise<readon
  * Never throws; a refused write is reported on the diagnostics surface.
  */
 export declare function trustInstalledPack(adapter: HostAdapter, namespace: string, installedDir: string): Promise<void>;
-export type EnablePackOutcome = {
-    readonly kind: 'enabled';
-    readonly namespace: string;
-} | {
-    readonly kind: 'declined';
-    readonly namespace: string;
-} | {
-    readonly kind: 'not-installed';
-    readonly namespace: string;
-} | {
-    readonly kind: 'reserved';
-    readonly namespace: string;
-} | {
-    readonly kind: 'invalid';
-    readonly reason: string;
-} | {
-    readonly kind: 'failed';
-    readonly reason: string;
-};
-export type DisablePackOutcome = {
-    readonly kind: 'disabled';
-    readonly namespace: string;
-} | {
-    readonly kind: 'not-enabled';
-    readonly namespace: string;
-} | {
-    readonly kind: 'invalid';
-    readonly reason: string;
-} | {
-    readonly kind: 'failed';
-    readonly reason: string;
-};
+/** What one enable attempt produced, before the host adds `unsupported`. */
+export type EnablePackAttempt = Exclude<EnablePackOutcome, {
+    readonly kind: 'unsupported';
+}>;
+/** What one disable attempt produced, before the host adds `unsupported`. */
+export type DisablePackAttempt = Exclude<DisablePackOutcome, {
+    readonly kind: 'unsupported';
+}>;
 /** Never throws. The caller checks `usesPackTrust` first. */
-export declare function enablePackViaAdapter(adapter: HostAdapter, namespace: string): Promise<EnablePackOutcome>;
+export declare function enablePackViaAdapter(adapter: HostAdapter, namespace: string): Promise<EnablePackAttempt>;
 /** Never throws. The caller checks `usesPackTrust` first. The folder stays on disk. */
-export declare function disablePackViaAdapter(adapter: HostAdapter, namespace: string): Promise<DisablePackOutcome>;
+export declare function disablePackViaAdapter(adapter: HostAdapter, namespace: string): Promise<DisablePackAttempt>;
 /** Withdraws a namespace's trust entry after a removal. A no-op for a host without trust. Never throws. */
 export declare function forgetPackTrust(adapter: HostAdapter, namespace: string): Promise<void>;
 export declare function enablePackMessage(outcome: EnablePackOutcome): string;
-export declare function enablePackDiagnosticLine(outcome: EnablePackOutcome): string;
+export declare function enablePackDiagnosticLine(outcome: EnablePackAttempt): string;
 export declare function disablePackMessage(outcome: DisablePackOutcome): string;
-export declare function disablePackDiagnosticLine(outcome: DisablePackOutcome): string;
+export declare function disablePackDiagnosticLine(outcome: DisablePackAttempt): string;
 /** One line per folder that is present in the install root but not enabled on this device. Informational, not a failure. */
 export declare function notEnabledPackDiagnosticLine(namespace: string, deviceNoun: string): string;

package/dist/host/pack-trust-behavior.js

@@ -68,8 +68,25 @@ export async function listInstalledPacks(adapter) {
             .map((entry) => entry.name)
             .sort();
     }
-    catch {
+    catch (error) {
         names = [];
+        // A missing install root is the ordinary state before the first
+        // install. Any other failure is reported, so it is not mute.
+        let rootExists = false;
+        try {
+            rootExists = await adapter.exists(installRoot);
+        }
+        catch {
+            rootExists = true;
+        }
+        if (rootExists) {
+            try {
+                adapter.diagnostics(`could not list installed packs: ${error instanceof Error ? error.message : String(error)}`);
+            }
+            catch {
+                // the diagnostics surface itself is what failed
+            }
+        }
     }
     return selectEnabledPacks(installRoot, names, readPackTrust(adapter));
 }
@@ -202,6 +219,8 @@ export async function forgetPackTrust(adapter, namespace) {
 // --- wording ---------------------------------------------------------------
 export function enablePackMessage(outcome) {
     switch (outcome.kind) {
+        case 'unsupported':
+            return 'Markii: enabling packs is not available on this host. Nothing was enabled.';
         case 'enabled':
             return `Markii: enabled the pack ${outcome.namespace}.`;
         case 'declined':
@@ -234,6 +253,8 @@ export function enablePackDiagnosticLine(outcome) {
 }
 export function disablePackMessage(outcome) {
     switch (outcome.kind) {
+        case 'unsupported':
+            return 'Markii: disabling packs is not available on this host. Nothing changed.';
         case 'disabled':
             return `Markii: disabled the pack ${outcome.namespace}. Its folder was left in place.`;
         case 'not-enabled':

package/dist/host/run-behavior.d.ts

@@ -2,34 +2,25 @@
  * The `run` behavior's host-shaped seams, built from a `HostAdapter`:
  * the grant prompts and the isolate spawn live here once for every host.
  *
- * A1: `apps/vscode/src/preview-panel.ts`'s `promptHostAdapter` /
- * `promptUnknownHostsAdapter` / `promptManyHostsAdapter`,
- * `apps/obsidian/src/run-modals.ts`'s `promptHostModal` /
- * `promptUnknownHostsModal` / `promptManyHostsModal`, and
- * `apps/cli/src/prompts.ts`'s three closures all did the same thing: call
- * one of `@markii/host`'s exported message builders and turn the answer
- * into a `boolean` through a host-specific UI primitive. `promptsFromAdapter`
- * below collapses all nine into three calls to the ONE `adapter.prompt`
- * method every `HostAdapter` already has.
+ * `promptsFromAdapter` routes the three grant prompts through the one
+ * `adapter.prompt` method every `HostAdapter` has, so a host writes no
+ * per-prompt code. Each prompt carries the wording the grant flow's message
+ * builders produce.
  *
- * A6: `apps/vscode/src/preview-panel.ts:spawnRun` and
- * `apps/cli/src/run-note.ts:spawnRun` were the same five-line function —
- * the CLI's own doc comment said outright it was "mirroring
- * apps/vscode/src/preview-panel.ts's identical function". `spawnRunViaAdapter`
- * below is that function, written once, dispatching on `HostAdapter.isolate`'s
- * discriminated union instead of assuming a Node worker path.
+ * `spawnRunViaAdapter` starts the run in the isolate the adapter names. It
+ * dispatches on `HostIsolate`'s discriminated union, so a Node worker path
+ * and a browser spawner go through the same call.
  *
- * `runViaAdapter` composes both of these around `../run/run-flow.ts`'s
- * `runOnce` (the existing, already-shared grant-flow-plus-spawn
- * orchestration) and writes the `RunTrace` through `adapter.now()` rather
- * than `Date.now()`, so a fixed clock in a test fake makes the trace
- * byte-stable.
+ * `runViaAdapter` composes both around `../run/run-flow.ts`'s `runOnce`,
+ * the shared grant-flow-plus-spawn orchestration. It writes the `RunTrace`
+ * through `adapter.now()` rather than `Date.now()`, so a fixed clock in a
+ * test fake makes the trace byte-stable.
  */
-import type { RunTrigger } from '@markii/runtime';
 import { type PromptHost, type PromptManyHosts, type PromptUnknownHosts } from '../run/grant-flow.js';
 import { type RunResult, type SpawnRunRequest } from '../run/run-host.js';
-import { type RunOnceOptions, type RunOnceResult } from '../run/run-flow.js';
+import { type RunOnceResult } from '../run/run-flow.js';
 import { type RunTrace } from '../run/run-trace.js';
+import type { RunRequest } from './create-host.js';
 import type { HostAdapter, HostIsolate } from './adapter.js';
 /**
  * External wall-clock budget for one run, matching the figure both
@@ -60,17 +51,6 @@ export declare function promptsFromAdapter(adapter: HostAdapter): {
  * disposed once this run's spawner has been used.
  */
 export declare function spawnRunViaAdapter(isolate: HostIsolate | undefined, options: SpawnRunRequest): Promise<RunResult>;
-export interface RunViaAdapterRequest {
-    /** Stable identity for the note this run belongs to. */
-    readonly documentKey: string;
-    readonly text: string;
-    readonly trigger: RunTrigger;
-    readonly netPolicy?: RunOnceOptions['netPolicy'];
-    readonly bundle?: RunOnceOptions['bundle'];
-    readonly packModules?: RunOnceOptions['packModules'];
-    readonly onValue?: RunOnceOptions['onValue'];
-    readonly timeoutMs?: number;
-}
 /** A run's result plus the `RunTrace` it just recorded, so a host can show its in-note marker from the same value the shared path persisted. */
 export type RunViaAdapterResult = RunOnceResult & {
     readonly trace: RunTrace;
@@ -79,6 +59,13 @@ export type RunViaAdapterResult = RunOnceResult & {
     /** How many of this run's values came back with the value store's `error` status. */
     readonly errorCount: number;
 };
+/** What one run produced: the result, or the reason it could not complete. Never thrown. */
+export type RunAttemptOutcome = ({
+    readonly kind: 'ran';
+} & RunViaAdapterResult) | {
+    readonly kind: 'failed';
+    readonly reason: string;
+};
 /**
  * Runs one manual, auto, or scheduled pass of `request.text`'s scripts,
  * exactly as `runOnce` already does (the grant flow prompts only on a
@@ -89,4 +76,4 @@ export type RunViaAdapterResult = RunOnceResult & {
  * `Date.now()` directly, so a fixed clock in a test fake makes the trace
  * byte-stable.
  */
-export declare function runViaAdapter(adapter: HostAdapter, request: RunViaAdapterRequest, overrideSpawnRun?: (options: SpawnRunRequest) => Promise<RunResult>): Promise<RunViaAdapterResult>;
+export declare function runViaAdapter(adapter: HostAdapter, request: RunRequest, overrideSpawnRun?: (options: SpawnRunRequest) => Promise<RunResult>): Promise<RunAttemptOutcome>;

package/dist/host/run-behavior.js

@@ -1,6 +1,24 @@
+/**
+ * The `run` behavior's host-shaped seams, built from a `HostAdapter`:
+ * the grant prompts and the isolate spawn live here once for every host.
+ *
+ * `promptsFromAdapter` routes the three grant prompts through the one
+ * `adapter.prompt` method every `HostAdapter` has, so a host writes no
+ * per-prompt code. Each prompt carries the wording the grant flow's message
+ * builders produce.
+ *
+ * `spawnRunViaAdapter` starts the run in the isolate the adapter names. It
+ * dispatches on `HostIsolate`'s discriminated union, so a Node worker path
+ * and a browser spawner go through the same call.
+ *
+ * `runViaAdapter` composes both around `../run/run-flow.ts`'s `runOnce`,
+ * the shared grant-flow-plus-spawn orchestration. It writes the `RunTrace`
+ * through `adapter.now()` rather than `Date.now()`, so a fixed clock in a
+ * test fake makes the trace byte-stable.
+ */
 import { ALLOW_LABEL, DONT_ALLOW_LABEL, UNKNOWN_HOSTS_PROMPT_MESSAGE, hostPromptMessage, manyHostsPromptMessage, } from '../run/grant-flow.js';
 import { spawnRun as spawnRunHost, } from '../run/run-host.js';
-import { runOnce, } from '../run/run-flow.js';
+import { runOnce } from '../run/run-flow.js';
 import { writeLastRunTrace } from '../run/run-trace.js';
 import { runCrashDiagnosticLine, runDiagnosticLines, } from './run-diagnostics.js';
 import { BROWSER_ISOLATE_ENTRY } from './adapter.js';
@@ -153,8 +171,8 @@ export async function runViaAdapter(adapter, request, overrideSpawnRun) {
     }
     catch (err) {
         // A run that threw is still a failure with two homes: the diagnostics
-        // line and a failed trace for the in-note marker. The caller keeps its
-        // own visible surface (a notice), so the error is rethrown.
+        // line and a failed trace for the in-note marker. The caller gets the
+        // reason as a `failed` outcome and keeps its own visible surface.
         const detail = err instanceof Error ? err.message : String(err);
         adapter.diagnostics(runCrashDiagnosticLine(request.trigger, detail));
         await writeLastRunTrace(adapter.memento, request.documentKey, {
@@ -163,7 +181,7 @@ export async function runViaAdapter(adapter, request, overrideSpawnRun) {
             ok: false,
             reason: detail,
         }).then(undefined, () => { });
-        throw err;
+        return { kind: 'failed', reason: detail };
     }
     // The failure's second home (AGENTS.md, "clean is not silent"): one line
     // per failed script and per declaration mismatch, written here once so no
@@ -193,5 +211,5 @@ export async function runViaAdapter(adapter, request, overrideSpawnRun) {
         else if (value.status === 'error')
             errorCount += 1;
     }
-    return { ...result, trace, freshCount, errorCount };
+    return { kind: 'ran', ...result, trace, freshCount, errorCount };
 }

package/dist/index.d.ts

@@ -1,8 +1,6 @@
 export type { ValuesFailure } from './values-failure.js';
-export type { RunJob, RunResult, RunFailure, SpawnRunOptions, SpawnRunRequest, } from './run/run-host.js';
 export type { IsolateSpawner, RunIsolate, SpawnIsolateOptions, } from './run/isolate.js';
-export type { RunOnceOptions, RunOnceResult } from './run/run-flow.js';
-export type { GrantMemento, PromptHost, PromptManyHosts, PromptUnknownHosts, Thenable, } from './run/grant-flow.js';
+export type { GrantMemento, Thenable } from './run/grant-flow.js';
 export type { BuildBundleSnapshotOptions, BundleSnapshotResult, } from './run/bundle-run.js';
 export { buildBundleSnapshot } from './run/bundle-run.js';
 export type { RunTrace } from './run/run-trace.js';
@@ -10,24 +8,21 @@ export type { HtmlExportEngine, ExportBodyRenderer, ExportBodyResult, ExportPack
 export type { EmbeddedImageReport, ExportImageReader, ExportImageResult, ImageSkipReason, SkippedImage, } from './export/image-embed.js';
 export type { PinPolicy } from './run/net-pinning.js';
 export type { PackModulesMap } from './run/lua-resolver.js';
-export type { DiscoveredPack, DiscoverPacksResult, EngineUnsupportedPack, PackDirectoryLister, SkippedPackFolder, } from './packs/discover.js';
-export { discoverPacks } from './packs/discover.js';
+export type { DiscoveredPack, EngineUnsupportedPack, SkippedPackFolder, } from './packs/discover.js';
 export type { BuildRenderRegistryResult, DuplicateComposedName, PackRegistryEngine, QueuedPackRegistration, } from './packs/pack-render-registry.js';
 export { buildRenderRegistry } from './packs/pack-render-registry.js';
 export { buildComponentCatalog } from './insert/component-catalog.js';
 export type { HostAdapter, HostDirEntry, HostEditor, HostExportCapabilities, HostExportFormat, HostIsolate, HostLabels, HostPackSource, HostPromptRequest, HostTextEdit, } from './host/adapter.js';
-export type { RunViaAdapterRequest, RunViaAdapterResult, } from './host/run-behavior.js';
 export { installPackMessage } from './host/pack-install.js';
-export type { PackDiscoveryIo } from './host/pack-load.js';
 export type { TerminalPackScript } from './host/terminal-packs.js';
-export type { RemovePackOutcome } from './host/pack-remove.js';
-export type { DisablePackOutcome, EnabledPack, EnablePackOutcome, InstalledPacksListing, } from './host/pack-trust-behavior.js';
+export type { EnabledPack, InstalledPacksListing, } from './host/pack-trust-behavior.js';
 export { disablePackMessage, enablePackMessage, } from './host/pack-trust-behavior.js';
 export { removePackMessage } from './host/pack-remove.js';
 export { exportResultMessage } from './host/export-behavior.js';
 export { cascadeResultMessage } from './host/cascade-export-behavior.js';
 export type { CascadeLinkResolver, CascadeTruncation, } from './export/cascade.js';
+export type { NoteLink } from './export/note-links.js';
 export type { CascadeExportedNote, UnreadableCascadeNote, } from './host/cascade-export-behavior.js';
 export { createMarkiiHost } from './host/create-host.js';
-export type { CompleteOutcome, EditorPositionRequest, ExportLinkedSetOutcome, ExportLinkedSetRequest, ExportOutcome, ExportRequest, HoverOutcome, InsertComponentRequest, InstallPackOutcome, InstallPackRequest, LoadPacksOutcome, LoadTerminalPacksOutcome, MarkiiHost, MarkiiHostOptions, OpenOutcome, OpenRequest, RemovePackResult, DisablePackResult, EnablePackResult, InstalledPacksOutcome, RunOutcome, RunRequest, Unsupported, } from './host/create-host.js';
+export type { CompleteOutcome, DisablePackOutcome, EditorPositionRequest, EnablePackOutcome, ExportLinkedSetOutcome, ExportLinkedSetRequest, ExportOutcome, ExportRenderOptions, ExportRequest, HoverOutcome, InsertComponentRequest, InsertOutcome, InstallPackOutcome, InstallPackRequest, InstalledPacksOutcome, LastRunOutcome, LoadPacksOutcome, LoadTerminalPacksOutcome, MarkiiHost, MarkiiHostOptions, OpenOutcome, OpenRequest, RemovePackOutcome, RunOutcome, RunRequest, Unsupported, } from './host/create-host.js';
 export { netRefusal } from './run/net-refusal.js';

package/dist/index.js

@@ -14,7 +14,6 @@
 // address pinning, the terminatable-isolate watchdog): one copy lives here
 // so no app grows a drifting second one.
 export { buildBundleSnapshot } from './run/bundle-run.js';
-export { discoverPacks } from './packs/discover.js';
 export { buildRenderRegistry } from './packs/pack-render-registry.js';
 export { buildComponentCatalog } from './insert/component-catalog.js';
 export { installPackMessage } from './host/pack-install.js';

package/dist/internal.d.ts

@@ -1,12 +1,19 @@
+export { createMarkiiHostWithSeams } from './host/create-host.js';
+export type { MarkiiHostSeams } from './host/create-host.js';
+export type { RunJob, RunResult, RunFailure, SpawnRunOptions, SpawnRunRequest, } from './run/run-host.js';
+export type { RunOnceOptions, RunOnceResult } from './run/run-flow.js';
+export type { PromptHost, PromptManyHosts, PromptUnknownHosts, } from './run/grant-flow.js';
+export type { DiscoverPacksResult, PackDirectoryLister, } from './packs/discover.js';
+export { discoverPacks } from './packs/discover.js';
+export type { PackDiscoveryIo } from './host/pack-load.js';
 export { mergeArrivingValue } from './values-merge.js';
 export { isRunProgress } from './run/run-progress.js';
 export { isNetBridgeRequest, serveNetRequest } from './run/net-bridge.js';
 export type { NetBridgeReply } from './run/net-bridge.js';
 export { MAX_VALUES_SNAPSHOT_BYTES, readPersistedValues, runOnce, valuesStorageKeyFor, } from './run/run-flow.js';
-export { ALLOW_LABEL, DONT_ALLOW_LABEL, clearGrantForDocument, } from './run/grant-flow.js';
+export { ALLOW_LABEL, DONT_ALLOW_LABEL } from './run/grant-flow.js';
 export { decodeBundleCacheFromStorage, encodeBundleCacheForStorage, withPersistedCache, } from './run/bundle-run.js';
 export { isBundleName, resolveBundleDocumentPath, } from './run/bundle-document.js';
-export { readLastRunTrace } from './run/run-trace.js';
 export { staleValuesForRehydration } from './run/stale-values.js';
 export { MARK_EXTENSION, buildNoteHtmlExport, composeNoteHtmlExport, noteHasScripts, exportBaseName, exportedSiblingPath, } from './export/note-export.js';
 export { EMPTY_IMAGE_REPORT, MAX_EMBEDDED_IMAGE_BYTES, embedImagesInHtml, } from './export/image-embed.js';

package/dist/internal.js

@@ -3,14 +3,15 @@
 // here can change or disappear in any release. An outside host should use
 // the main entry. Environment-neutral like the main entry
 // (`src/neutral-entries.probe.test.ts` bundles it for a browser).
+export { createMarkiiHostWithSeams } from './host/create-host.js';
+export { discoverPacks } from './packs/discover.js';
 export { mergeArrivingValue } from './values-merge.js';
 export { isRunProgress } from './run/run-progress.js';
 export { isNetBridgeRequest, serveNetRequest } from './run/net-bridge.js';
 export { MAX_VALUES_SNAPSHOT_BYTES, readPersistedValues, runOnce, valuesStorageKeyFor, } from './run/run-flow.js';
-export { ALLOW_LABEL, DONT_ALLOW_LABEL, clearGrantForDocument, } from './run/grant-flow.js';
+export { ALLOW_LABEL, DONT_ALLOW_LABEL } from './run/grant-flow.js';
 export { decodeBundleCacheFromStorage, encodeBundleCacheForStorage, withPersistedCache, } from './run/bundle-run.js';
 export { isBundleName, resolveBundleDocumentPath, } from './run/bundle-document.js';
-export { readLastRunTrace } from './run/run-trace.js';
 export { staleValuesForRehydration } from './run/stale-values.js';
 export { MARK_EXTENSION, buildNoteHtmlExport, composeNoteHtmlExport, noteHasScripts, exportBaseName, exportedSiblingPath, } from './export/note-export.js';
 export { EMPTY_IMAGE_REPORT, MAX_EMBEDDED_IMAGE_BYTES, embedImagesInHtml, } from './export/image-embed.js';

package/dist/node-worker.js

@@ -5466,6 +5466,9 @@ bundle.write = function(path, data) return __smd_bundle_write_blocked(path, data
   };
 }
 
+// ../markii-lua/src/sandbox.ts
+var import_wasmoon4 = __toESM(require_dist(), 1);
+
 // ../markii-lua/src/doc.ts
 function buildDoc(config) {
   const view = config.doc;
@@ -5790,7 +5793,6 @@ end
 }
 
 // ../markii-lua/src/sandbox.ts
-var import_wasmoon4 = __toESM(require_dist(), 1);
 var WALL_CLOCK_GUARD_SLACK_MS = 250;
 function describeError(err) {
   if (err instanceof Error) return err.message;

package/dist/node.d.ts

@@ -1,5 +1,4 @@
-export type { SpawnRunOptions } from './run/run-host.js';
 export type { NodeHostIsolateOptions } from './run/node-isolate.js';
-export { createNodeHostIsolate, workerThreadIsolate, } from './run/node-isolate.js';
+export { createNodeHostIsolate } from './run/node-isolate.js';
 export { createNetProvider } from './run/net-provider.js';
 export { createNodeDirectoryLister, createNodeFileReader, createNodePackDiscoveryIo, createNodeReader as createNodePackScriptsReader, } from './node-fs.js';

package/dist/node.js

@@ -9,6 +9,6 @@
 // `@markii/host/html-engine`, so importing this one needs no optional peer.
 //
 // A Node host imports from both entries. No browser bundle imports this one.
-export { createNodeHostIsolate, workerThreadIsolate, } from './run/node-isolate.js';
+export { createNodeHostIsolate } from './run/node-isolate.js';
 export { createNetProvider } from './run/net-provider.js';
 export { createNodeDirectoryLister, createNodeFileReader, createNodePackDiscoveryIo, createNodeReader as createNodePackScriptsReader, } from './node-fs.js';

package/dist/run/node-isolate.d.ts

@@ -8,8 +8,12 @@ import type { IsolateSpawner } from './isolate.js';
  */
 export declare const workerThreadIsolate: IsolateSpawner;
 export interface NodeHostIsolateOptions {
-    /** The worker entry on disk. Defaults to `node-worker.js` in the package's `dist/`. */
-    workerPath?: string;
+    /**
+     * The worker entry on disk, or a function that finds it when a run asks.
+     * A function may throw, and that run then reports the worker as missing.
+     * Defaults to `node-worker.js` in the package's `dist/`.
+     */
+    workerPath?: string | (() => string);
 }
 /**
  * A `HostIsolate` of kind `node`: each run starts a `worker_threads` worker

package/dist/run/node-isolate.js

@@ -55,6 +55,8 @@ export function createNodeHostIsolate(options = {}) {
     return {
         kind: 'node',
         workerPath: () => {
+            if (typeof options.workerPath === 'function')
+                return options.workerPath();
             if (options.workerPath !== undefined)
                 return options.workerPath;
             const packaged = fileURLToPath(new URL('../node-worker.js', import.meta.url));

package/dist/run/run-host.d.ts

@@ -57,8 +57,8 @@ export interface SpawnRunOptions {
     /**
      * The KIND of isolate this run spawns. Required: this module has no
      * default so it stays free of `node:*`. A Node host passes
-     * `workerThreadIsolate` from `@markii/host/node` (the only kind that
-     * accepts a V8 heap cap); a host whose runtime cannot create worker
+     * the worker-thread isolate that `createNodeHostIsolate()` from
+     * `@markii/host/node` carries (the only kind that accepts a V8 heap cap); a host whose runtime cannot create worker
      * threads, such as an Electron renderer, supplies a Web Worker one. See
      * `./isolate.ts` for the constraints an implementation must meet, and
      * for what a Web Worker cannot bound that a worker thread can.

package/dist/run/worker-entry-browser.d.ts

@@ -40,13 +40,18 @@ interface WorkerGlobal {
  * - `importScripts` becomes a function that throws. It stays a function
  *   because the Lua engine's start-up detects a worker by
  *   `typeof importScripts`.
+ * - Each of these names is replaced on the global and on every prototype
+ *   the global inherits from, because a browser defines some of them
+ *   (`fetch`) on `WorkerGlobalScope.prototype`.
  * - `fetch` keeps working for exactly one URL, the `glue.wasm` the job
  *   named, because the engine loads its WebAssembly through it for every
  *   script. Any other URL is refused.
  *
  * Net traffic is unaffected: it goes to the host with `postMessage`.
  * Idempotent. Covered by `worker-entry-browser.test.ts` and, in a real
- * browser, by the e2e suite.
+ * browser, by `e2e/browser-host/tests/worker-isolation.spec.ts`: the
+ * removed globals, a refused `fetch` to any other URL, and a prototype chain
+ * with no second `fetch`, `XMLHttpRequest` or `WebSocket`.
  */
 export declare function lockdownWorkerGlobals(scope: object, wasmUri: string | undefined): void;
 /**

package/dist/run/worker-entry-browser.js

@@ -68,13 +68,18 @@ function requestUrl(input, base) {
  * - `importScripts` becomes a function that throws. It stays a function
  *   because the Lua engine's start-up detects a worker by
  *   `typeof importScripts`.
+ * - Each of these names is replaced on the global and on every prototype
+ *   the global inherits from, because a browser defines some of them
+ *   (`fetch`) on `WorkerGlobalScope.prototype`.
  * - `fetch` keeps working for exactly one URL, the `glue.wasm` the job
  *   named, because the engine loads its WebAssembly through it for every
  *   script. Any other URL is refused.
  *
  * Net traffic is unaffected: it goes to the host with `postMessage`.
  * Idempotent. Covered by `worker-entry-browser.test.ts` and, in a real
- * browser, by the e2e suite.
+ * browser, by `e2e/browser-host/tests/worker-isolation.spec.ts`: the
+ * removed globals, a refused `fetch` to any other URL, and a prototype chain
+ * with no second `fetch`, `XMLHttpRequest` or `WebSocket`.
  */
 export function lockdownWorkerGlobals(scope, wasmUri) {
     const target = scope;
@@ -83,6 +88,7 @@ export function lockdownWorkerGlobals(scope, wasmUri) {
     const base = target.location?.href ?? 'http://localhost/';
     const allowed = wasmUri === undefined ? undefined : requestUrl(wasmUri, base);
     const realFetch = target.fetch;
+    const realImport = target['importScripts'];
     const shadow = (name, value) => {
         try {
             Object.defineProperty(scope, name, {
@@ -101,13 +107,39 @@ export function lockdownWorkerGlobals(scope, wasmUri) {
             }
         }
     };
+    /**
+     * Also replaces `name` on every prototype the scope inherits from. A
+     * browser defines `fetch` on `WorkerGlobalScope.prototype`, so shadowing
+     * only the global's own property would leave
+     * `Object.getPrototypeOf(self).fetch` as a way around the lockdown.
+     */
+    const shadowOnChain = (name, value) => {
+        for (let proto = Object.getPrototypeOf(scope); proto !== null && proto !== Object.prototype; proto = Object.getPrototypeOf(proto)) {
+            if (!Object.hasOwn(proto, name))
+                continue;
+            try {
+                Object.defineProperty(proto, name, {
+                    value,
+                    configurable: false,
+                    writable: false,
+                });
+            }
+            catch {
+                // A frozen prototype keeps its member, and nothing more can be done.
+            }
+        }
+    };
+    const lock = (name, value) => {
+        shadow(name, value);
+        shadowOnChain(name, value);
+    };
     for (const name of REMOVED_GLOBALS)
-        shadow(name, undefined);
-    shadow('importScripts', () => {
+        lock(name, undefined);
+    lock('importScripts', () => {
         throw new Error('importScripts is not available in the run isolate');
     });
     if (typeof realFetch === 'function') {
-        shadow('fetch', (input, init) => {
+        lock('fetch', (input, init) => {
             const url = requestUrl(input, base);
             if (allowed !== undefined && url === allowed) {
                 return realFetch.call(scope, input, init);
@@ -115,6 +147,31 @@ export function lockdownWorkerGlobals(scope, wasmUri) {
             return Promise.reject(new TypeError('network access is not available in the run isolate'));
         });
     }
+    // Fail closed: a name that could not be replaced, on the global or on a
+    // prototype, means the isolate is not locked, so the run must not start.
+    const live = [];
+    const isLive = (holder, name) => {
+        const descriptor = Object.getOwnPropertyDescriptor(holder, name);
+        if (descriptor === undefined)
+            return false;
+        if (descriptor.get !== undefined || descriptor.set !== undefined) {
+            return true;
+        }
+        if (name === 'fetch')
+            return descriptor.value === realFetch;
+        if (name === 'importScripts')
+            return descriptor.value === realImport;
+        return descriptor.value !== undefined;
+    };
+    for (let holder = scope; holder !== null && holder !== Object.prototype; holder = Object.getPrototypeOf(holder)) {
+        for (const name of [...REMOVED_GLOBALS, 'importScripts', 'fetch']) {
+            if (isLive(holder, name))
+                live.push(name);
+        }
+    }
+    if (live.length > 0) {
+        throw new Error(`the run isolate could not be locked (${[...new Set(live)].join(', ')})`);
+    }
     Object.defineProperty(scope, '__markiiLocked', { value: true });
 }
 function start(scope) {
@@ -141,9 +198,9 @@ function start(scope) {
                 return;
             }
             const job = message;
-            lockdownWorkerGlobals(scope, job.wasmUri);
             let result;
             try {
+                lockdownWorkerGlobals(scope, job.wasmUri);
                 result = await runJob(job, {
                     createNet: () => bridge.provider,
                     wasmUri: job.wasmUri,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@markii/host",
-  "version": "0.17.0-next.5",
+  "version": "0.17.0-next.6",
   "description": "Shared, host-neutral script-running layer for Markii hosts: tier gating, the grant model, address pinning, and the terminatable-isolate watchdog, plus the HostAdapter contract and createMarkiiHost. Entries: the neutral main entry, /internal (no semver promise), /node, /html-engine, /browser, /browser-worker-classic, /conformance.",
   "keywords": [
     "markdown",
@@ -71,20 +71,20 @@
     "build:dist": "rm -rf dist && tsc -p tsconfig.build.json && node scripts/build-dist-assets.mjs"
   },
   "dependencies": {
-    "@markii/bundle": "^0.17.0-next.5",
-    "@markii/core": "^0.17.0-next.5",
-    "@markii/lua": "^0.17.0-next.5",
-    "@markii/pack": "^0.17.0-next.5",
-    "@markii/runtime": "^0.17.0-next.5",
-    "@markii/stdlib": "^0.17.0-next.5",
+    "@markii/bundle": "^0.17.0-next.6",
+    "@markii/core": "^0.17.0-next.6",
+    "@markii/lua": "^0.17.0-next.6",
+    "@markii/pack": "^0.17.0-next.6",
+    "@markii/runtime": "^0.17.0-next.6",
+    "@markii/stdlib": "^0.17.0-next.6",
     "fflate": "^0.8.3"
   },
   "files": [
     "dist"
   ],
   "peerDependencies": {
-    "@markii/html": "^0.17.0-next.5",
-    "@markii/react": "^0.17.0-next.5"
+    "@markii/html": "^0.17.0-next.6",
+    "@markii/react": "^0.17.0-next.6"
   },
   "peerDependenciesMeta": {
     "@markii/html": {
@@ -95,8 +95,8 @@
     }
   },
   "devDependencies": {
-    "@markii/html": "^0.17.0-next.5",
-    "@markii/react": "^0.17.0-next.5",
+    "@markii/html": "^0.17.0-next.6",
+    "@markii/react": "^0.17.0-next.6",
     "esbuild": "^0.28.2"
   },
   "publishConfig": {