@markii/host 0.17.0-next.3 → 0.17.0-next.4

package/dist/browser.d.ts

@@ -11,7 +11,7 @@ export interface FetchNetProviderOptions {
      * every request. Entries that do not parse as an http(s) URL are ignored.
      */
     allowedOrigins?: readonly string[];
-    /** How a policy refusal is built. Defaults to a plain `Error`; the isolate bridge marks every refusal as a denial on the wire either way. */
+    /** How a policy refusal is built. Defaults to a plain `Error`. The provider marks every refusal it throws, so the isolate bridge sends it as a denial. A transport failure is never marked. */
     denial?: (message: string) => Error;
     /** The `fetch` to use. Defaults to the global one; injectable for tests. */
     fetch?: typeof fetch;

package/dist/browser.js

@@ -14,6 +14,7 @@
 // `new URL(..., import.meta.url)` references below resolve in a consumer's
 // bundler without configuration where that bundler treats them as assets.
 import { createBrowserIsolate } from './run/browser-isolate.js';
+import { netRefusal } from './run/net-refusal.js';
 function originOf(entry) {
     try {
         const url = new URL(entry);
@@ -82,7 +83,10 @@ export function createFetchNetProvider(options = {}) {
     const allowed = new Set((options.allowedOrigins ?? [])
         .map(originOf)
         .filter((origin) => origin !== undefined));
-    const denial = options.denial ?? ((message) => new Error(message));
+    const build = options.denial ?? ((message) => new Error(message));
+    // Every policy refusal is marked so the net bridge can tell it from a
+    // transport failure (a plain `Error`).
+    const denial = (message) => netRefusal(build(message));
     return (netAllowlist, maxFetchBytes, _policy, signal) => {
         // The run's granted hosts, re-checked here on the page side: the worker
         // checks them too, but the worker is the isolate a hostile script runs
@@ -110,7 +114,7 @@ export function createFetchNetProvider(options = {}) {
                 throw denial(`origin "${url.origin}" is not on the host's allowlist`);
             }
             if (signal?.aborted)
-                throw denial('the run has ended');
+                throw new Error('the run has ended');
             const doFetch = options.fetch ?? fetch;
             let response;
             try {
@@ -126,7 +130,10 @@ export function createFetchNetProvider(options = {}) {
                 });
             }
             catch (error) {
-                throw denial(`request failed: ${error instanceof Error ? error.message : String(error)}`);
+                // A transport failure (network down, connection refused, CORS,
+                // abort): an ordinary runtime failure with the reason, not a policy
+                // refusal.
+                throw new Error(`request failed: ${error instanceof Error ? error.message : String(error)}`);
             }
             if (response.type === 'opaqueredirect') {
                 throw denial('redirects are not followed in a browser');

package/dist/conformance/host/05-export-html-pack-directive/expected.json

@@ -2,6 +2,8 @@
   "outcomes": [
     {
       "kind": "exported",
+      "valueCount": 0,
+      "renderEngine": "static",
       "contains": ["mk-unknown", "ana_timeline"],
       "excludes": ["<script"]
     }

package/dist/conformance/host/06-install-pack-then-render/expected.json

@@ -1,7 +1,12 @@
 {
   "outcomes": [
     { "kind": "opened" },
-    { "kind": "installed", "namespace": "ana", "replaced": false },
+    {
+      "kind": "installed",
+      "namespace": "ana",
+      "replaced": false,
+      "installedDirName": "ana"
+    },
     { "kind": "loaded", "namespaces": ["ana"] },
     { "kind": "installed", "namespace": "ana", "replaced": true }
   ],

package/dist/conformance/host/README.md

@@ -138,8 +138,10 @@ coarse, matching each `kind`:
   compares the recorded run trace's `ok` flag.
 - `exported`: `contains`/`excludes` are substrings checked against the
   written file's content, never the whole document — the render corpora
-  already pin bytes.
-- `installed`: `namespace` and `replaced`.
+  already pin bytes. `valueCount` is how many last-run values were baked
+  in, and `renderEngine` (`static` or `react`) is which engine drew the body.
+- `installed`: `namespace` and `replaced`, and `installedDirName`, the name
+  of the folder the pack was unzipped into.
 - `declined`: `step` (`'consent'`/`'replace'`, or absent for the
   scripts-disabled synthetic outcome) and `reasonContains`, a substring of
   the user-facing reason.

package/dist/export/note-export.d.ts

@@ -71,7 +71,7 @@ export declare const EXPORT_HIDE_SCRIPT_BLOCKS_CLASS = "mk-export--hide-scripts"
 export declare const EXPORT_PAGE_CSS = "\nbody {\n  margin: 0;\n  background: #fff;\n}\n.doc {\n  box-sizing: border-box;\n  max-width: 46rem;\n  margin: 0 auto;\n  padding: 2.5rem 1.5rem 4rem;\n}\n.doc.mk-export--hide-scripts .mk-script {\n  display: none;\n}\n@page {\n  margin: 2cm;\n}\n@media print {\n  .doc {\n    max-width: none;\n    margin: 0;\n    padding: 0;\n  }\n  .doc .mk-card,\n  .doc .mk-callout,\n  .doc .mk-stat,\n  .doc .mk-figure,\n  .doc .mk-unknown,\n  .doc table {\n    break-inside: avoid;\n  }\n  /* A collapsed `details` prints as its summary alone, which loses the\n     content the author wrote. On paper there is nothing to expand, so\n     every disclosure prints open. */\n  .doc details > *:not(summary) {\n    display: block;\n  }\n  .doc .mk-script,\n  .doc .mk-preview__run-marker {\n    display: none;\n  }\n}\n";
 /**
  * The static HTML engine, injected so this module imports no renderer.
- * A host passes `createHtmlExportEngine()` from `@markii/host/node`, which
+ * A host passes `createHtmlExportEngine()` from `@markii/host/html-engine`, which
  * wraps `@markii/html`; a test may pass a stub.
  */
 export interface HtmlExportEngine {

package/dist/host/adapter.d.ts

@@ -150,7 +150,7 @@ export interface HostPackSource {
      * `authorizedFolders` names.
      */
     bundledPacks?(): readonly DiscoveredPack[];
-    /** Removes an installed pack folder. Required when `installRoot` is present. */
+    /** Removes an installed pack folder and everything under it. Required when `installRoot` is present: a replacing install clears the old folder through it, and removing a pack uses it. */
     removeFolder?(path: string): Promise<void>;
 }
 /** Every export format any host offers today. */
@@ -194,10 +194,12 @@ export interface HostLabels {
  *.
  */
 export interface HostAdapter {
-    readonly id: 'vscode' | 'obsidian' | 'cli' | (string & {});
+    /** A short name for the host, used in diagnostics wording. */
+    readonly id: string;
     readonly labels: HostLabels;
     readFile(path: string): Promise<Uint8Array>;
     exists(path: string): Promise<boolean>;
+    /** Writes `bytes` to `path` and creates any missing parent folder first. Exports and pack installs both write through it. */
     writeFile(path: string, bytes: Uint8Array): Promise<void>;
     /** A missing folder resolves to an empty list — never throws, matching the existing `PackDirectoryLister` contract. */
     listFolder(path: string): Promise<readonly HostDirEntry[]>;

package/dist/host/conformance-runner.d.ts

@@ -1,4 +1,3 @@
-import type { ArchiveExtractFs } from './pack-archive.js';
 import type { RunTrigger } from '@markii/runtime';
 import type { HostAdapter } from './adapter.js';
 /**
@@ -135,8 +134,6 @@ export interface HostScenarioRunResult {
  */
 export declare function runHostScenario(adapter: HostAdapter, scenario: HostScenario, noteText: string, scenarioDir: string, options?: {
     readonly renderAnsi?: (text: string) => Promise<string>;
-    /** Where an installed pack archive is extracted. Defaults to the Node file system, which is right for an adapter that reads and writes real files. An adapter over another store (memory, a virtual file system) passes the matching writer. */
-    readonly archiveExtractFs?: ArchiveExtractFs;
 }): Promise<HostScenarioRunResult>;
 /** `expected[i]` compared against `actual[i]` for each index up to `expected`'s own length; a length mismatch is reported once rather than index-by-index noise. */
 export declare function containsInOrder(actual: readonly string[], expected: readonly string[]): string[];

package/dist/host/conformance-runner.js

@@ -40,7 +40,6 @@ import { existsSync, readFileSync, readdirSync } from 'node:fs';
 import { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { createHtmlExportEngine } from '../html-engine.js';
-import { createNodeArchiveExtractFs } from '../node-fs.js';
 import { usesPackTrust } from './pack-trust-behavior.js';
 import { join, relative, sep } from 'node:path';
 import { zipSync } from 'fflate';
@@ -140,10 +139,7 @@ export function hostDeclaresCapability(adapter, action) {
     if (capability === 'packs') {
         if (adapter.packs === undefined)
             return false;
-        if (action.type === 'installPack') {
-            return adapter.packs.installRoot !== undefined;
-        }
-        if (action.type === 'removePack') {
+        if (action.type === 'installPack' || action.type === 'removePack') {
             return (adapter.packs.installRoot !== undefined &&
                 adapter.packs.removeFolder !== undefined);
         }
@@ -262,7 +258,6 @@ export async function runHostScenario(adapter, scenario, noteText, scenarioDir,
         // The runner is Node-only test tooling, so it supplies the real Node
         // implementations of the seams the host layer takes by injection.
         htmlEngine: createHtmlExportEngine(),
-        archiveExtractFs: options.archiveExtractFs ?? createNodeArchiveExtractFs(),
         spawnRun: (spawnOptions) => Promise.resolve(simulatedRunResult(currentSimulation, spawnOptions)),
         ...(options.renderAnsi ? { renderAnsi: options.renderAnsi } : {}),
     });
@@ -452,6 +447,16 @@ export function outcomeMismatches(actual, expected) {
             break;
         }
         case 'exported': {
+            if (expected['valueCount'] !== undefined &&
+                actualRecord['valueCount'] !== expected['valueCount']) {
+                mismatches.push(`valueCount: expected ${String(expected['valueCount'])}, got ${String(actualRecord['valueCount'])}`);
+            }
+            if (expected['renderEngine'] !== undefined) {
+                const render = actualRecord['render'];
+                if (render?.engine !== expected['renderEngine']) {
+                    mismatches.push(`render engine: expected "${String(expected['renderEngine'])}", got "${String(render?.engine)}"`);
+                }
+            }
             const content = String(actualRecord['content'] ?? '');
             for (const needle of expected['contains'] ?? []) {
                 if (!content.includes(needle)) {
@@ -466,6 +471,13 @@ export function outcomeMismatches(actual, expected) {
             break;
         }
         case 'installed': {
+            if (expected['installedDirName'] !== undefined) {
+                const dir = String(actualRecord['installedDir'] ?? '');
+                const name = dir.split(/[/\\]/).pop();
+                if (name !== expected['installedDirName']) {
+                    mismatches.push(`installedDir: expected a folder named "${String(expected['installedDirName'])}", got "${dir}"`);
+                }
+            }
             if (expected['namespace'] !== undefined &&
                 actualRecord['namespace'] !== expected['namespace']) {
                 mismatches.push(`namespace: expected "${String(expected['namespace'])}", got "${String(actualRecord['namespace'])}"`);

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

@@ -18,9 +18,9 @@ import type { StoredValue } from '@markii/runtime';
 import type { OnDiagnostic, UnavailableComponent } from '@markii/stdlib';
 import type { CompletionItem, ComponentDocumentation, LineColumn } from '@markii/stdlib/editor';
 import { type RunViaAdapterRequest, type RunViaAdapterResult } from './run-behavior.js';
-import { type ArchiveExtractFs } from './pack-archive.js';
 import { type PackDiscoveryIo } from './pack-load.js';
-import type { HtmlExportEngine } from '../export/note-export.js';
+import type { ExportBodyRenderer, ExportPackStylesheet, ExportRenderInfo, HtmlExportEngine, StaticExportReason } from '../export/note-export.js';
+import type { EmbeddedImageReport, ExportImageReader } from '../export/image-embed.js';
 import type { DiscoveredPack, SkippedPackFolder } from '../packs/discover.js';
 import { type TerminalPackScript } from './terminal-packs.js';
 import { type RemovePackOutcome } from './pack-remove.js';
@@ -61,11 +61,31 @@ export interface ExportRequest {
     readonly unavailableComponents?: readonly UnavailableComponent[];
     /** Receives the static engine's render diagnostics, such as the `no-engine-view` event. */
     readonly onDiagnostic?: OnDiagnostic;
+    /** The host's own render of the body (a React pass bound to its loaded packs). Omitted means the static engine renders, and `staticReason` says why. Used by the `html` and `pdf` formats. */
+    readonly renderBody?: ExportBodyRenderer;
+    /** Why the static engine renders when `renderBody` is omitted. Defaults to `no-packs`. */
+    readonly staticReason?: StaticExportReason;
+    /** The loaded packs' stylesheets, embedded only when `renderBody` ran. */
+    readonly packStylesheets?: readonly ExportPackStylesheet[];
+    /** How many loaded packs contributed to the render. Diagnostics only. */
+    readonly packCount?: number;
+    /** Reads one of the note's local images so the export embeds it as a `data:` URI. Omitted leaves every image source as written. */
+    readonly embedImages?: ExportImageReader;
+    /** Hides the collapsed script marker in the exported file. Defaults to `false`. */
+    readonly hideScriptBlocks?: boolean;
 }
 export type ExportOutcome = {
     readonly kind: 'exported';
     readonly path: string;
     readonly bytes: number;
+    /** How many last-run values were baked into the file. */
+    readonly valueCount: number;
+    /** `true` when the note contains a script fence. */
+    readonly hasScripts?: boolean;
+    /** Which engine rendered the body, and why when it was the static one. */
+    readonly render: ExportRenderInfo;
+    /** What image embedding did. */
+    readonly images: EmbeddedImageReport;
 } | {
     readonly kind: 'failed';
     readonly reason: string;
@@ -82,6 +102,8 @@ export interface InstallPackRequest {
 export type InstallPackOutcome = {
     readonly kind: 'installed';
     readonly namespace: string;
+    /** The folder the pack now lives in, under the adapter's install root. */
+    readonly installedDir: string;
     readonly replaced: boolean;
 } | {
     readonly kind: 'declined';
@@ -237,9 +259,7 @@ export interface MarkiiHost {
  */
 export interface MarkiiHostOptions {
     readonly spawnRun?: (options: SpawnRunRequest) => Promise<RunResult>;
-    /** The `.mkp` extraction filesystem `installPack` writes through. Required for a host that installs packs (`createNodeArchiveExtractFs()` from `@markii/host/node`); without it `installPack` is `Unsupported`. */
-    readonly archiveExtractFs?: ArchiveExtractFs;
-    /** The static HTML engine behind the `html` and `pdf` exports (`createHtmlExportEngine()` from `@markii/host/node`). Without it those formats decline, like `renderAnsi` for `ansi`. */
+    /** The static HTML engine behind the `html` and `pdf` exports (`createHtmlExportEngine()` from `@markii/host/html-engine`). Without it those formats decline, like `renderAnsi` for `ansi`. */
     readonly htmlEngine?: HtmlExportEngine;
     /** Pack discovery's file reads. Defaults to reads through the adapter's own `readFile` and `listFolder`. */
     readonly packDiscoveryIo?: PackDiscoveryIo;

package/dist/host/create-host.js

@@ -95,6 +95,24 @@ export function createMarkiiHost(adapter, options = {}) {
                 ...(request.onDiagnostic !== undefined
                     ? { onDiagnostic: request.onDiagnostic }
                     : {}),
+                ...(request.renderBody !== undefined
+                    ? { renderBody: request.renderBody }
+                    : {}),
+                ...(request.staticReason !== undefined
+                    ? { staticReason: request.staticReason }
+                    : {}),
+                ...(request.packStylesheets !== undefined
+                    ? { packStylesheets: request.packStylesheets }
+                    : {}),
+                ...(request.packCount !== undefined
+                    ? { packCount: request.packCount }
+                    : {}),
+                ...(request.embedImages !== undefined
+                    ? { embedImages: request.embedImages }
+                    : {}),
+                ...(request.hideScriptBlocks !== undefined
+                    ? { hideScriptBlocks: request.hideScriptBlocks }
+                    : {}),
             }, options.renderAnsi);
             if (outcome === undefined) {
                 adapter.diagnostics(`export declined: format "${request.format}" has no working export path on ${adapter.id} (a cancelled picker, or a missing renderer/PDF seam).`);
@@ -106,47 +124,40 @@ export function createMarkiiHost(adapter, options = {}) {
             if (outcome.kind === 'failed') {
                 return { kind: 'failed', reason: outcome.reason };
             }
-            return { kind: 'exported', path: outcome.path, bytes: outcome.bytes };
+            return {
+                kind: 'exported',
+                path: outcome.path,
+                bytes: outcome.bytes,
+                valueCount: outcome.valueCount,
+                ...(outcome.hasScripts !== undefined
+                    ? { hasScripts: outcome.hasScripts }
+                    : {}),
+                render: outcome.render,
+                images: outcome.images,
+            };
         },
         async installPack(request) {
             if (!adapter.packs?.installRoot) {
                 return unsupported(adapter, 'packs', 'this host has no pack-install destination configured.');
             }
             const archivePath = request.archivePath ?? 'the selected archive';
-            const extractFs = options.archiveExtractFs;
-            if (extractFs === undefined) {
-                return unsupported(adapter, 'packs', 'this host was given no archive extraction filesystem.');
+            const removeFolder = adapter.packs.removeFolder;
+            if (removeFolder === undefined) {
+                return unsupported(adapter, 'packs', 'this host has no way to remove an installed pack folder.');
             }
             const outcome = await installPackFromArchive(adapter, {
                 archiveBytes: request.archiveBytes,
                 archivePath,
                 installRoot: adapter.packs.installRoot(),
                 exists: (path) => adapter.exists(path),
-                extractFs,
+                removeFolder: (path) => removeFolder.call(adapter.packs, path),
                 reservedNamespaces: adapter.packs.reservedNamespaces(),
             });
             catalogCache.invalidate();
             for (const line of installPackDiagnosticLines(outcome, archivePath)) {
                 adapter.diagnostics(line);
             }
-            if (outcome.kind === 'installed') {
-                return {
-                    kind: 'installed',
-                    namespace: outcome.packName,
-                    replaced: outcome.replaced,
-                };
-            }
-            if (outcome.kind === 'declined') {
-                return {
-                    kind: 'declined',
-                    step: outcome.step,
-                    namespace: outcome.packName,
-                };
-            }
-            if (outcome.kind === 'reserved') {
-                return { kind: 'reserved', namespace: outcome.packName };
-            }
-            return { kind: 'rejected', reason: outcome.reason };
+            return outcome;
         },
         async loadPacks() {
             if (!adapter.packs) {

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

@@ -30,6 +30,7 @@ import type { OnDiagnostic, UnavailableComponent } from '@markii/stdlib';
 import type { HtmlExportEngine, ExportBodyRenderer, ExportPackStylesheet, ExportRenderInfo, StaticExportReason } from '../export/note-export.js';
 import type { EmbeddedImageReport, ExportImageReader } from '../export/image-embed.js';
 import type { HostAdapter, HostExportFormat, HostLabels } from './adapter.js';
+import type { ExportOutcome } from './create-host.js';
 /** The file name an export lands under, by format: the note's own base name with the format's own extension, so the export lands beside the note unless the host's picker says otherwise. */
 export declare function exportDefaultFileName(notePath: string, format: HostExportFormat): string;
 /** What a `'html'` or `'pdf'` export attempt produced. Every shape except `failed` means the host got a file, and every shape but `failed` carries the same diagnostics-facing detail so the two hosts' wording can share it. */
@@ -58,7 +59,7 @@ export declare function fileNameOf(path: string): string;
  * host's own diagnostics surface (`labels.diagnosticsSurface`), never at
  * a stack trace — the verbatim reason goes there instead.
  */
-export declare function exportResultMessage(outcome: NoteFileExportOutcome, labels: HostLabels): string;
+export declare function exportResultMessage(outcome: ExportOutcome, labels: HostLabels): string;
 /** One diagnostic line describing HOW an export's body was rendered: the pack-vs-static distinction, kept off the result message and put here instead. */
 export declare function renderEngineDiagnosticLine(render: ExportRenderInfo): string;
 /** `bytes`, formatted as a human-readable size (`"1.2 KB"`, `"512 bytes"`). */

package/dist/host/export-behavior.js

@@ -23,7 +23,7 @@ export function fileNameOf(path) {
  * a stack trace — the verbatim reason goes there instead.
  */
 export function exportResultMessage(outcome, labels) {
-    if (outcome.kind === 'failed') {
+    if (outcome.kind !== 'exported') {
         return `Markii: could not export this note. Open ${labels.diagnosticsSurface} for details.`;
     }
     const name = fileNameOf(outcome.path);

package/dist/host/labels.d.ts

@@ -1,20 +1,11 @@
 /**
- * `HostLabels`: the wording nouns every shared behavior module
- * (`./script-execution.ts`, `./refresh-interval.ts`) interpolates, and the
- * one concrete record per app this repo ships. Each app's `HostAdapter`
- * imports its record rather than inventing its own strings, which is what
- * lets one template serve every host.
+ * The shared wording templates a host's shared behaviors interpolate
+ * `HostLabels` into live beside each behavior. This module holds the one
+ * label sentence that has no per-host noun. Each app owns its own
+ * `HostLabels` record and passes it as `HostAdapter.labels`.
  *
- * Pure and dependency-free: re-exported from `../browser.ts` as well as
- * `../index.ts` so VS Code's Node-free webview bundle can read it too.
+ * Pure and dependency-free.
  */
-import type { HostLabels } from './adapter.js';
-/** The VS Code extension's labels, taken from its current wording (`apps/vscode/src/script-execution.ts`, `apps/vscode/src/extension.ts`'s output channel). */
-export declare const VSCODE_LABELS: HostLabels;
-/** The Obsidian plugin's labels, taken from its current wording (`apps/obsidian/src/script-execution.ts`, docs/integration.md's host checklist). */
-export declare const OBSIDIAN_LABELS: HostLabels;
-/** The `markii` command line tool's labels: it has no persistent preview panel, and its diagnostics surface is stderr, gated behind `--verbose` for anything short of a failure (`apps/cli/src/main.ts`). */
-export declare const CLI_LABELS: HostLabels;
 /**
  * The quiet marker a rendered note shows when its `uses:` list names packs
  * this host has not installed (docs/packs.md). One sentence for every host;

package/dist/host/labels.js

@@ -1,25 +1,11 @@
-/** The VS Code extension's labels, taken from its current wording (`apps/vscode/src/script-execution.ts`, `apps/vscode/src/extension.ts`'s output channel). */
-export const VSCODE_LABELS = {
-    appNoun: 'extension',
-    previewNoun: 'the Markii preview',
-    diagnosticsSurface: 'the Markii output channel',
-    deviceNoun: 'this device',
-    settingName: 'markii.scriptsDisabled',
-};
-/** The Obsidian plugin's labels, taken from its current wording (`apps/obsidian/src/script-execution.ts`, docs/integration.md's host checklist). */
-export const OBSIDIAN_LABELS = {
-    appNoun: 'plugin',
-    previewNoun: 'the Markii preview',
-    diagnosticsSurface: 'the Markii diagnostics',
-    deviceNoun: 'this device',
-};
-/** The `markii` command line tool's labels: it has no persistent preview panel, and its diagnostics surface is stderr, gated behind `--verbose` for anything short of a failure (`apps/cli/src/main.ts`). */
-export const CLI_LABELS = {
-    appNoun: 'command line tool',
-    previewNoun: 'the rendered note',
-    diagnosticsSurface: 'stderr',
-    deviceNoun: 'this device',
-};
+/**
+ * The shared wording templates a host's shared behaviors interpolate
+ * `HostLabels` into live beside each behavior. This module holds the one
+ * label sentence that has no per-host noun. Each app owns its own
+ * `HostLabels` record and passes it as `HostAdapter.labels`.
+ *
+ * Pure and dependency-free.
+ */
 /**
  * The quiet marker a rendered note shows when its `uses:` list names packs
  * this host has not installed (docs/packs.md). One sentence for every host;

package/dist/host/pack-archive.d.ts

@@ -1,14 +1,8 @@
 import type { PackArchiveContents, PackArchiveError } from '@markii/pack';
 /** One line describing why `openPackArchive` rejected an archive, for a host's install-diagnostics wording. Passes `kind: 'zip'`'s and `kind: 'missing-entry'`'s message through verbatim (already specific); summarizes a manifest failure plainly. */
 export declare function describeArchiveError(error: PackArchiveError): string;
-/** The filesystem write seam `writeArchiveContents` needs (`./pack-install.ts`). Deliberately narrow: extracting an archive only ever creates files under a directory it first clears, it never reads back or deletes anything else. */
-export interface ArchiveExtractFs {
-    /** Removes `absolutePath` and everything under it, or resolves quietly if it does not exist. Never rejects: a directory that fails to clear is treated the same as a fresh one, and the write that follows fails loudly on its own if the path is genuinely unusable. */
-    readonly removeDirectory: (absolutePath: string) => Promise<void>;
-    /** Creates a directory and any missing parents. May reject on a genuine I/O failure. */
-    readonly makeDirectory: (absolutePath: string) => Promise<void>;
-    readonly writeFile: (absolutePath: string, bytes: Uint8Array) => Promise<void>;
-}
+/** Writes one file and creates its missing parent folders: `HostAdapter.writeFile`. */
+export type ArchiveFileWriter = (absolutePath: string, bytes: Uint8Array) => Promise<void>;
 /**
  * Writes a validated archive's contents into `destinationDir`: `pack.json`
  * (the parsed manifest, re-serialized: `openPackArchive` keeps only the
@@ -17,7 +11,7 @@ export interface ArchiveExtractFs {
  * copy), `webview.js`, `webview.css` and `terminal.js` when the archive has them, and
  * `scripts/*` when it ships any. Does NOT clear `destinationDir` first;
  * a caller that needs a clean re-extract (a reinstall replacing an
- * existing pack) calls `fs.removeDirectory` itself before this.
+ * existing pack) removes the folder itself before this.
  *
  * PATH JAIL: `@markii/pack`'s `openPackArchive` has already rejected any
  * entry whose name escapes the archive (`../`, an absolute path) or
@@ -27,4 +21,4 @@ export interface ArchiveExtractFs {
  * `webview.css`, or a `scripts/`-relative Lua module name), never from
  * anything read back out of the zip's raw entry names.
  */
-export declare function writeArchiveContents(archive: PackArchiveContents, destinationDir: string, fs: ArchiveExtractFs): Promise<void>;
+export declare function writeArchiveContents(archive: PackArchiveContents, destinationDir: string, writeFile: ArchiveFileWriter): Promise<void>;

package/dist/host/pack-archive.js

@@ -1,18 +1,17 @@
 /**
  * `.mkp` pack archive handling, merged from `apps/vscode/src/packs/archive-packs.ts`
  * and `apps/obsidian/src/packs/archive-packs.ts`. It exports
- * `describeArchiveError`, `writeArchiveContents` and `ArchiveExtractFs`.
+ * `describeArchiveError`, `writeArchiveContents` and `ArchiveFileWriter`.
  *
  * This module bridges `@markii/pack`'s in-memory archive reader
  * (`openPackArchive`, never modified here) into the write a pack install
  * needs: extracting a validated archive's contents onto disk, under
  * whichever install root the calling host names (`HostPackSource.installRoot`).
  *
- * Environment-free (`ArchiveExtractFs` is an injected seam). The real
- * Node-backed one, `createNodeArchiveExtractFs`, lives in `../node-fs.ts`
- * and is exported from `@markii/host/node`.
+ * Environment-free: the write goes through the host adapter's `writeFile`,
+ * which creates any missing parent folder.
  */
-import { dirnamePath, joinPath } from '../path-util.js';
+import { joinPath } from '../path-util.js';
 /** One line describing why `openPackArchive` rejected an archive, for a host's install-diagnostics wording. Passes `kind: 'zip'`'s and `kind: 'missing-entry'`'s message through verbatim (already specific); summarizes a manifest failure plainly. */
 export function describeArchiveError(error) {
     if (error.kind === 'zip')
@@ -29,7 +28,7 @@ export function describeArchiveError(error) {
  * copy), `webview.js`, `webview.css` and `terminal.js` when the archive has them, and
  * `scripts/*` when it ships any. Does NOT clear `destinationDir` first;
  * a caller that needs a clean re-extract (a reinstall replacing an
- * existing pack) calls `fs.removeDirectory` itself before this.
+ * existing pack) removes the folder itself before this.
  *
  * PATH JAIL: `@markii/pack`'s `openPackArchive` has already rejected any
  * entry whose name escapes the archive (`../`, an absolute path) or
@@ -39,24 +38,22 @@ export function describeArchiveError(error) {
  * `webview.css`, or a `scripts/`-relative Lua module name), never from
  * anything read back out of the zip's raw entry names.
  */
-export async function writeArchiveContents(archive, destinationDir, fs) {
-    await fs.makeDirectory(destinationDir);
+export async function writeArchiveContents(archive, destinationDir, writeFile) {
     const encoder = new TextEncoder();
-    await fs.writeFile(joinPath(destinationDir, 'pack.json'), encoder.encode(JSON.stringify(archive.manifest, null, 2) + '\n'));
-    await fs.writeFile(joinPath(destinationDir, 'webview.js'), archive.scriptBytes);
+    await writeFile(joinPath(destinationDir, 'pack.json'), encoder.encode(JSON.stringify(archive.manifest, null, 2) + '\n'));
+    await writeFile(joinPath(destinationDir, 'webview.js'), archive.scriptBytes);
     if (archive.stylesheetBytes !== undefined) {
-        await fs.writeFile(joinPath(destinationDir, 'webview.css'), archive.stylesheetBytes);
+        await writeFile(joinPath(destinationDir, 'webview.css'), archive.stylesheetBytes);
     }
     if (archive.terminalScriptBytes !== undefined) {
-        await fs.writeFile(joinPath(destinationDir, 'terminal.js'), archive.terminalScriptBytes);
+        await writeFile(joinPath(destinationDir, 'terminal.js'), archive.terminalScriptBytes);
     }
     const moduleNames = Object.keys(archive.scriptModules);
     if (moduleNames.length > 0) {
         const scriptsDir = joinPath(destinationDir, 'scripts');
         for (const name of moduleNames) {
             const target = joinPath(scriptsDir, name);
-            await fs.makeDirectory(dirnamePath(target));
-            await fs.writeFile(target, archive.scriptModules[name]);
+            await writeFile(target, archive.scriptModules[name]);
         }
     }
 }

package/dist/host/pack-install.d.ts

@@ -1,5 +1,5 @@
-import type { ArchiveExtractFs } from './pack-archive.js';
 import type { HostAdapter, HostLabels } from './adapter.js';
+import type { InstallPackOutcome as HostInstallPackOutcome } from './create-host.js';
 /** Whether a directory already exists under the install root, injected so this module needs no real disk to test. */
 export type PackDirectoryExists = (absolutePath: string) => Promise<boolean>;
 export interface InstallPackFromArchiveOptions {
@@ -9,7 +9,8 @@ export interface InstallPackFromArchiveOptions {
     /** This host's own pack-install directory (`HostPackSource.installRoot()`). Each installed pack gets a subdirectory named by its namespace, since two packs can never share one (docs/packs.md's collision rule), which makes "is this namespace already installed" a plain directory check. */
     readonly installRoot: string;
     readonly exists: PackDirectoryExists;
-    readonly extractFs: ArchiveExtractFs;
+    /** Removes the installed folder before a replacing install (`HostPackSource.removeFolder`). Called only when the namespace is already installed. */
+    readonly removeFolder: (absolutePath: string) => Promise<void>;
     /**
      * Namespaces this install may never claim (`HostPackSource.reservedNamespaces()`).
      * Empty for a host with no reserved set (VS Code). Checked before the
@@ -17,22 +18,10 @@ export interface InstallPackFromArchiveOptions {
      */
     readonly reservedNamespaces: ReadonlySet<string>;
 }
-export type InstallPackOutcome = {
-    readonly kind: 'installed';
-    readonly packName: string;
-    readonly installedDir: string;
-    readonly replaced: boolean;
-} | {
-    readonly kind: 'declined';
-    readonly step: 'consent' | 'replace';
-    readonly packName: string;
-} | {
-    readonly kind: 'reserved';
-    readonly packName: string;
-} | {
-    readonly kind: 'rejected';
-    readonly reason: string;
-};
+/** What one install attempt produced, in the shape `createMarkiiHost(...).installPack` returns (minus `unsupported`, which only the host behavior can say). */
+export type InstallAttemptOutcome = Exclude<HostInstallPackOutcome, {
+    readonly kind: 'unsupported';
+}>;
 /**
  * Never throws: a validation failure, a declined prompt, or a write
  * failure all come back as a structured outcome. Order: validate the
@@ -47,7 +36,7 @@ export type InstallPackOutcome = {
  * a host that can only show a non-blocking surface must deny rather than
  * assume yes.
  */
-export declare function installPackFromArchive(adapter: HostAdapter, options: InstallPackFromArchiveOptions): Promise<InstallPackOutcome>;
+export declare function installPackFromArchive(adapter: HostAdapter, options: InstallPackFromArchiveOptions): Promise<InstallAttemptOutcome>;
 /**
  * The consent prompt's wording (AGENTS.md's product principles: "clean is
  * not silent," and a consent step must say plainly what it authorizes).
@@ -82,6 +71,6 @@ export declare function installReplaceConfirmMessage(packName: string): string;
  * `markii.packs` before anything loads it), so it doesn't. Defaults to
  * `false`.
  */
-export declare function installPackMessage(outcome: InstallPackOutcome, archivePath: string, labels: HostLabels, reloadsAutomatically?: boolean): string;
+export declare function installPackMessage(outcome: HostInstallPackOutcome, archivePath: string, labels: HostLabels, reloadsAutomatically?: boolean): string;
 /** The full diagnostics-surface detail for one install attempt (AGENTS.md's "clean is not silent": the other of a failure's two homes). */
-export declare function installPackDiagnosticLines(outcome: InstallPackOutcome, archivePath: string): string[];
+export declare function installPackDiagnosticLines(outcome: InstallAttemptOutcome, archivePath: string): string[];