@design-intelligence/ghost 0.24.0 → 0.25.1

package/README.md

@@ -8,7 +8,7 @@ email, empty state, or sentence.
 Reviewers repeat the same feedback on every surface: "that's not our voice."
 Write the decision in `.ghost/` so the next agent has it before starting work.
 
-[Documentation](https://block.github.io/ghost/) ·
+[Project site](https://block.github.io/ghost/) ·
 [Repo](https://github.com/block/ghost)
 
 ## Install
@@ -55,37 +55,54 @@ pulls every node whose stated situation applies. Bare `ghost gather` inspects
 the catalog without grounding a task.
 
 Run `ghost --help` for the core workflow and `ghost <command> --help` for
-flags. The [CLI reference](https://block.github.io/ghost/docs/cli) covers
-every command; [Getting Started](https://block.github.io/ghost/docs/getting-started)
-covers the full model. Stuck? See
-[Troubleshooting](https://block.github.io/ghost/docs/troubleshooting).
+current flags and command behavior.
 
 ## Library
 
 ```ts
 import {
-  initghostPackage,
-  lintghostPackage,
-  loadghostPackage,
+  initGhostPackage,
+  lintGhostPackage,
+  loadGhostPackage,
 } from "@design-intelligence/ghost/package";
 import { buildCatalogMenu } from "@design-intelligence/ghost/core";
+import {
+  gatherGhostPackage,
+  inspectGhostMaterial,
+  loadGhostSnapshot,
+  pullGhostNodes,
+} from "@design-intelligence/ghost/embed";
 import { buildCli } from "@design-intelligence/ghost/cli";
 ```
 
+Embedded hosts can use `@design-intelligence/ghost/embed` for the same semantic
+contract as CLI `gather` and `pull` without CLI-only presentation fields or event
+side effects. `loadGhostSnapshot` reads the package, resolved/absent/dangling
+cover state, glossary kinds, and checks. `gatherGhostPackage` returns the
+complete unfiltered menu with the resolved cover separated from selectable
+nodes; checks stay separate. `pullGhostNodes` validates and de-duplicates ids,
+returns misses with suggestions, stable cover/concrete/prose ordering, stripped
+node bodies, extracted Skeletons, and material transport packets. Use
+`inspectGhostMaterial` only for materials declared by a pulled node; it is local
+and bundled-only by default, with explicit host policy required for referenced
+files. HTTPS inspection is always rejected. Returned text is source data, not
+render-safe markup. Embedded operations do not write `.ghost/.events`; hosts may
+persist exported observability events in their own telemetry.
+
 Available subpath exports: `@design-intelligence/ghost`,
 `@design-intelligence/ghost/package`,
-`@design-intelligence/ghost/core`, and
+`@design-intelligence/ghost/core`,
+`@design-intelligence/ghost/embed`, and
 `@design-intelligence/ghost/cli`. The former package API remains available as
 an explicitly deprecated compatibility alias.
 
-## Project Status: Beta
+## Project Status: Development Preview
 
-ghost is pre-1.0 and under active development. The CLI, package schema,
-on-disk `.ghost/` package shape, and public JavaScript exports may change in
-breaking ways before a stable 1.0 release. Breaking changes may ship in minor
-versions; patch versions are reserved for fixes that should not require
-migration. Pin the version you depend on and review release notes before
-upgrading.
+ghost is being built in public, but it is not ready for adoption and the
+project is not seeking external testers yet. The CLI, package schema, on-disk
+`.ghost/` package shape, and public JavaScript exports may change without
+migration support. Breaking changes may ship in minor versions; patch versions
+are reserved for fixes that should not require migration.
 
 Every `ghost` command is also available as `ghost-fingerprint` for when
 another tool owns the `ghost` bin.

package/dist/commands/gather-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gather-command.d.ts","sourceRoot":"","sources":["../../src/commands/gather-command.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAsB/B,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAgGpD"}
+{"version":3,"file":"gather-command.d.ts","sourceRoot":"","sources":["../../src/commands/gather-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAQ/B,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAoDpD"}

package/dist/commands/gather-command.js

@@ -1,9 +1,6 @@
-import { readFile } from "node:fs/promises";
-import { buildCatalogMenu, parseGlossary, } from "#ghost-core";
-import { isMissingPathError } from "../internal/fs.js";
+import { gatherGhostPackage, loadGhostSnapshot } from "../embed/index.js";
 import { appendGhostEvent, resolveRunId } from "../observability-events.js";
 import { resolveGhostPackage } from "../package.js";
-import { loadGhostPackage } from "../scan/fingerprint-package.js";
 import { failFromError } from "./errors.js";
 export function registerGatherCommand(cli) {
     cli
@@ -20,60 +17,25 @@ export function registerGatherCommand(cli) {
                 process.exit(2);
                 return;
             }
-            const ask = normalizeAsk(askParts);
+            const ask = normalizeAskParts(askParts);
             const paths = resolveGhostPackage(opts.package, process.cwd());
-            const loaded = await loadGhostPackage(paths);
-            const coverId = loaded.manifest.cover;
-            const coverNode = coverId
-                ? loaded.catalog.nodes.get(coverId)
-                : undefined;
-            const menu = buildCatalogMenu(loaded.catalog).filter((entry) => entry.id !== coverNode?.id);
-            const kinds = await readMenuKinds(paths.glossary);
+            const snapshot = await loadGhostSnapshot(paths);
+            const menu = gatherGhostPackage(snapshot, { ask });
             const runId = resolveRunId(opts.run);
             await appendGhostEvent(paths.packageDir, {
                 event: "gather",
                 ...(runId ? { run: runId } : {}),
-                ...(ask ? { ask } : {}),
-                menu: menu.map((entry) => entry.id),
+                ...(menu.ask ? { ask: menu.ask } : {}),
+                menu: menu.nodes.map((entry) => entry.id),
             });
             // ghost does no selection. It emits the complete catalog; the agent
             // reads the ask against it and pulls the nodes whose described
             // conditions apply.
             if (opts.format === "json") {
-                process.stdout.write(`${JSON.stringify({
-                    kind: "menu",
-                    ...(ask ? { ask } : {}),
-                    source: {
-                        artifact: "ghost package",
-                        list: "Available guidance",
-                    },
-                    contract: gatherContract(ask),
-                    ...(coverNode
-                        ? {
-                            cover: {
-                                id: coverNode.id,
-                                body: coverNode.body,
-                                inContext: true,
-                                selectable: false,
-                            },
-                        }
-                        : {}),
-                    next: { command: "ghost pull <id> [<id>…]" },
-                    silence: {
-                        ifNoneApply: "Name the package's silence, follow the cover silence posture when present, and do not invent ghost-backed guidance.",
-                    },
-                    coverage: menuCoverage(menu),
-                    ...(kinds.length > 0 ? { kinds } : {}),
-                    nodes: menu,
-                }, null, 2)}\n`);
+                process.stdout.write(`${JSON.stringify(formatGatherJson(menu), null, 2)}\n`);
             }
             else {
-                process.stdout.write(formatMenuMarkdown(menu, kinds, {
-                    ask,
-                    cover: coverNode
-                        ? { id: coverNode.id, body: coverNode.body }
-                        : undefined,
-                }));
+                process.stdout.write(formatMenuMarkdown(menu));
             }
             process.exit(0);
         }
@@ -82,75 +44,35 @@ export function registerGatherCommand(cli) {
         }
     });
 }
-function normalizeAsk(askParts) {
+function normalizeAskParts(askParts) {
     const ask = (askParts ?? []).join(" ").trim();
     return ask.length > 0 ? ask : undefined;
 }
-/**
- * Read the glossary's declared kinds and their prose purposes for the menu
- * header. Missing or malformed glossaries degrade to no legend — the menu
- * itself never depends on the glossary being present.
- */
-async function readMenuKinds(glossaryPath) {
-    let raw;
-    try {
-        raw = await readFile(glossaryPath, "utf-8");
-    }
-    catch (err) {
-        if (isMissingPathError(err))
-            return [];
-        throw err;
-    }
-    const result = parseGlossary(raw);
-    if (result.glossary === null)
-        return [];
-    return result.glossary.kinds
-        .filter((kind) => kind.purpose.length > 0)
-        .map((kind) => ({
-        name: kind.name,
-        // Legend entries are one line each: keep the section's first paragraph
-        // and collapse internal wrapping.
-        purpose: (kind.purpose.split(/\n\s*\n/, 1)[0] ?? "")
-            .replace(/\s+/g, " ")
-            .trim(),
-    }));
-}
-function gatherContract(ask) {
+function formatGatherJson(menu) {
     return {
-        completeness: {
-            complete: true,
-            filtered: false,
-            ranked: false,
-            selectedByGhost: false,
-        },
-        selection: {
-            basis: "applicability",
-            instruction: ask
-                ? "Pull every node whose description indicates its stated situation applies and whose guidance, material, structure, or refusal governs the work; skip inapplicable nodes."
-                : "Bare gather is catalog inspection. Do not treat the menu as task grounding until an ask is supplied; when grounding a task, pull every applicable node and skip inapplicable nodes.",
-            topicOverlapAloneIsApplicability: false,
-            addForCompleteness: false,
-            omitApplicableForCount: false,
-        },
-        noAsk: "Bare gather is catalog inspection and does not imply task grounding.",
-    };
-}
-function menuCoverage(menu) {
-    return {
-        nodes: menu.length,
-        concrete: menu.filter((entry) => entry.concrete).length,
-        payloads: {
-            materials: menu.filter((entry) => entry.materials !== undefined).length,
-            fencedExamples: menu.filter((entry) => entry.hasFencedExample).length,
-            skeletons: menu.filter((entry) => entry.hasSkeleton).length,
-        },
-        // A node without a description is a bare id the agent cannot select
-        // against; surface the count where selection happens.
-        undescribed: menu.filter((entry) => !entry.description || entry.description.trim().length === 0).length,
+        kind: menu.kind,
+        ...(menu.ask ? { ask: menu.ask } : {}),
+        source: menu.source,
+        contract: menu.contract,
+        ...(menu.cover.state === "resolved"
+            ? {
+                cover: {
+                    id: menu.cover.id,
+                    body: menu.cover.node.body,
+                    inContext: true,
+                    selectable: false,
+                },
+            }
+            : {}),
+        next: { command: "ghost pull <id> [<id>…]" },
+        silence: menu.silence,
+        coverage: menu.coverage,
+        ...(menu.kinds !== undefined ? { kinds: menu.kinds } : {}),
+        nodes: menu.nodes,
     };
 }
 function menuCoverageLine(menu) {
-    const coverage = menuCoverage(menu);
+    const coverage = menu.coverage;
     const payloadParts = [
         `${coverage.payloads.materials} with materials`,
         `${coverage.payloads.fencedExamples} with substantial fenced examples`,
@@ -165,28 +87,28 @@ function menuCoverageLine(menu) {
     }
     return parts.join(" · ");
 }
-function formatMenuMarkdown(menu, kinds, options = {}) {
+function formatMenuMarkdown(menu) {
     const lines = ["# ghost package", ""];
-    if (options.ask)
-        lines.push(`Ask: ${options.ask}`, "");
-    if (options.cover) {
-        lines.push(`## Cover in context: \`${options.cover.id}\``, "", options.cover.body, "", "Cover status: already in context; outside selection; do not pull again.", "", "---", "");
+    if (menu.ask)
+        lines.push(`Ask: ${menu.ask}`, "");
+    if (menu.cover.state === "resolved") {
+        lines.push(`## Cover in context: \`${menu.cover.id}\``, "", menu.cover.node.body, "", "Cover status: already in context; outside selection; do not pull again.", "", "---", "");
     }
     lines.push("## Available guidance", "", menuCoverageLine(menu), "");
-    if (options.ask) {
+    if (menu.ask) {
         lines.push("Complete, unfiltered, unranked list from the ghost package. ghost has not selected nodes for this ask.", "Pull every node whose description indicates its stated situation applies and whose guidance, material, structure, or refusal governs the work. Skip inapplicable nodes. Topic overlap alone is not applicability. Do not add nodes for completeness or omit applicable nodes to meet a count.", "Next: `ghost pull <id> [<id>…]`.", "If nothing applies, name the package's silence, follow the cover silence posture, and do not invent ghost-backed guidance.", "");
     }
     else {
         lines.push("Complete, unfiltered, unranked list from the ghost package. Bare gather is catalog inspection; ghost has not grounded a task or selected nodes.", "When grounding an ask, pull every applicable node with `ghost pull <id> [<id>…]`. Skip inapplicable nodes and do not invent ghost-backed guidance when the ghost package is silent.", "");
     }
-    if (kinds.length > 0) {
+    if (menu.kinds !== undefined && menu.kinds.length > 0) {
         lines.push("Kinds:", "");
-        for (const kind of kinds) {
+        for (const kind of menu.kinds) {
             lines.push(`- **${kind.name}** — ${kind.purpose}`);
         }
         lines.push("");
     }
-    for (const entry of menu) {
+    for (const entry of menu.nodes) {
         const kind = entry.kind ? ` _(${entry.kind})_` : "";
         lines.push(`- \`${entry.id}\`${kind}`);
         if (entry.description)

package/dist/commands/gather-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"gather-command.js","sourceRoot":"","sources":["../../src/commands/gather-command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"gather-command.js","sourceRoot":"","sources":["../../src/commands/gather-command.ts"],"names":[],"mappings":"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"}

package/dist/commands/pull-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pull-command.d.ts","sourceRoot":"","sources":["../../src/commands/pull-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAqC/B,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CA+HlD"}
+{"version":3,"file":"pull-command.d.ts","sourceRoot":"","sources":["../../src/commands/pull-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAU/B,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAwFlD"}

package/dist/commands/pull-command.js

@@ -1,8 +1,7 @@
-import { classifyMaterialLocator, closestIds, extractSkeletonFences, resolveLocalMaterialLocator, stripSkeletonSections, transportMaterials, } from "#ghost-core";
-import { appendGhostEvent, resolveRunId, } from "../observability-events.js";
+import { loadGhostSnapshot, pullGhostNodes } from "../embed/index.js";
+import { appendGhostEvent, resolveRunId } from "../observability-events.js";
 import { resolveGhostPackage } from "../package.js";
-import { GHOST_EVENTS_FILENAME, GHOST_MATERIALS_DIR, } from "../scan/constants.js";
-import { loadGhostPackage } from "../scan/fingerprint-package.js";
+import { GHOST_EVENTS_FILENAME } from "../scan/constants.js";
 import { resolveGitRoot } from "../scan/package-paths.js";
 import { failFromError } from "./errors.js";
 export function registerPullCommand(cli) {
@@ -31,68 +30,43 @@ export function registerPullCommand(cli) {
                 return;
             }
             const paths = resolveGhostPackage(opts.package, process.cwd());
-            const loaded = await loadGhostPackage(paths);
-            const catalog = loaded.catalog;
-            const requested = [...new Set(ids)];
-            const allIds = [...catalog.nodes.keys()];
-            const known = requested.filter((id) => catalog.nodes.has(id));
-            const missed = requested
-                .filter((id) => !catalog.nodes.has(id))
-                .map((id) => ({ requested: id, suggested: closestIds(id, allIds) }));
-            for (const miss of missed) {
+            const snapshot = await loadGhostSnapshot(paths);
+            const repoRoot = await resolveGitRoot(process.cwd());
+            const result = await pullGhostNodes(snapshot, {
+                ids,
+                repoRoot,
+                inlineMaterials: opts.materials !== false,
+                order: opts.order,
+            });
+            for (const miss of result.missed) {
                 const hint = miss.suggested.length > 0
                     ? ` (did you mean ${miss.suggested.map((s) => `\`${s}\``).join(", ")}?)`
                     : "";
                 console.error(`Warning: unknown node \`${miss.requested}\`${hint}`);
             }
-            if (missed.length > 0) {
+            if (result.missed.length > 0) {
                 console.error("Run `ghost gather` to list every node.");
             }
-            const givenNodes = known.map((id) => catalog.nodes.get(id));
-            const nodes = opts.order === "given"
-                ? givenNodes
-                : orderPulledNodes(givenNodes, loaded.manifest.cover);
-            const pulledNodes = await resolvePulledNodes(nodes, paths.packageDir, opts.materials !== false);
-            const counts = sumMaterialCounts(pulledNodes);
             if (opts.events !== false) {
                 const runId = resolveRunId(opts.run);
                 await appendGhostEvent(paths.packageDir, {
                     event: "pull",
                     ...(runId ? { run: runId } : {}),
-                    ids: known,
-                    inlinedMaterials: counts.inlined,
-                    omittedMaterials: counts.omitted,
-                    ...(missed.length > 0 ? { missed } : {}),
+                    ids: [...result.ids],
+                    inlinedMaterials: result.materialCounts.inlined,
+                    omittedMaterials: result.materialCounts.omitted,
+                    ...(result.missed.length > 0 ? { missed: [...result.missed] } : {}),
                 });
             }
-            if (known.length === 0) {
+            if (result.ids.length === 0) {
                 process.exit(2);
                 return;
             }
             if (opts.format === "json") {
-                process.stdout.write(`${JSON.stringify({
-                    kind: "pull",
-                    ...(missed.length > 0 ? { missed } : {}),
-                    nodes: pulledNodes.map(({ node, materials }) => ({
-                        id: node.id,
-                        ...(node.kind !== undefined ? { kind: node.kind } : {}),
-                        ...(node.description
-                            ? { description: node.description }
-                            : {}),
-                        ...(node.materials !== undefined
-                            ? {
-                                materials: opts.materials === false
-                                    ? node.materials
-                                    : materials.materials.map(formatJsonMaterial),
-                            }
-                            : {}),
-                        body: stripSkeletonSections(node.body),
-                    })),
-                    skeletons: pulledSkeletons(pulledNodes),
-                }, null, 2)}\n`);
+                process.stdout.write(`${JSON.stringify(formatPullJson(result, opts.materials !== false), null, 2)}\n`);
             }
             else {
-                process.stdout.write(formatPullMarkdown(pulledNodes));
+                process.stdout.write(formatPullMarkdown(result));
             }
             process.exit(0);
         }
@@ -101,114 +75,49 @@ export function registerPullCommand(cli) {
         }
     });
 }
-async function resolvePulledNodes(nodes, packageDir, inlineMaterials) {
-    const repoRoot = await resolveGitRoot(process.cwd());
-    return Promise.all(nodes.map(async (node) => ({
-        node,
-        materials: inlineMaterials
-            ? await transportMaterials(node.materials, {
-                repoRoot,
-                packageDir,
-                materialsDir: GHOST_MATERIALS_DIR,
-            })
-            : locatorOnlyMaterials(node.materials, repoRoot, packageDir),
-    })));
-}
-function orderPulledNodes(nodes, coverId) {
-    return nodes
-        .map((node, index) => ({
-        node,
-        index,
-        bucket: steeringBucket(node, coverId),
-    }))
-        .sort((a, b) => a.bucket - b.bucket || a.index - b.index)
-        .map((entry) => entry.node);
-}
-function steeringBucket(node, coverId) {
-    if (coverId !== undefined && node.id === coverId)
-        return 0;
-    if (node.concrete)
-        return 1;
-    return 2;
-}
-function locatorOnlyMaterials(locators, repoRoot, packageDir) {
+function formatPullJson(result, inlineMaterials) {
     return {
-        materials: (locators ?? []).map((locator) => ({
-            locator,
-            tier: classifyMaterialLocator(locator).kind === "url"
-                ? "url"
-                : resolveLocalMaterialLocator(locator, {
-                    repoRoot,
-                    packageDir,
-                    materialsDir: GHOST_MATERIALS_DIR,
-                }).tier,
+        kind: "pull",
+        ...(result.missed.length > 0 ? { missed: result.missed } : {}),
+        nodes: result.nodes.map((node) => ({
+            id: node.id,
+            ...(node.kind !== undefined ? { kind: node.kind } : {}),
+            ...(node.description ? { description: node.description } : {}),
+            ...(node.declaredMaterials !== undefined
+                ? {
+                    materials: inlineMaterials
+                        ? (node.materials ?? []).map(formatJsonMaterial)
+                        : node.declaredMaterials,
+                }
+                : {}),
+            body: node.body,
         })),
-        inlined: 0,
-        omitted: 0,
-    };
-}
-function sumMaterialCounts(nodes) {
-    return nodes.reduce((sum, { materials }) => ({
-        inlined: sum.inlined + materials.inlined,
-        omitted: sum.omitted + materials.omitted,
-    }), { inlined: 0, omitted: 0 });
-}
-function pulledSkeletons(nodes) {
-    return nodes.flatMap(({ node }) => extractSkeletonFences(node.body).map((fence) => ({
-        nodeId: node.id,
-        ...(fence.info ? { info: fence.info } : {}),
-        content: fence.content,
-    })));
-}
-function formatJsonMaterial(material) {
-    return {
-        locator: material.locator,
-        tier: material.tier,
-        ...(material.inlined !== undefined ? { inlined: material.inlined } : {}),
-        ...(material.omitted
-            ? { omitted: true, reason: material.reason ?? "not inlined" }
-            : {}),
-        ...(material.reason === "binary inspect-pointer"
-            ? { inspect: material.path ?? material.locator }
-            : {}),
+        skeletons: result.skeletons,
     };
 }
-function formatPullMarkdown(nodes) {
+function formatPullMarkdown(result) {
     const sections = [];
-    for (const { node, materials } of nodes) {
+    for (const node of result.nodes) {
         const kind = node.kind ? ` _(${node.kind})_` : "";
         const lines = [`# \`${node.id}\`${kind}`];
         if (node.description)
             lines.push("", `> ${node.description}`);
-        lines.push("", stripSkeletonSections(node.body).trim());
-        if (materials.materials.length > 0) {
+        lines.push("", node.body.trim());
+        if (node.materials !== undefined && node.materials.length > 0) {
             lines.push("", "Materials:");
-            for (const material of materials.materials) {
-                if (material.inlined !== undefined) {
-                    const info = material.path ?? material.locator;
-                    lines.push("", fencedMarkdown(material.inlined.trimEnd(), info));
-                }
-                else if (material.reason === "binary inspect-pointer") {
-                    lines.push(`- inspect: ${material.path ?? material.locator} — view this image before generating`);
-                }
-                else {
-                    const reason = material.omitted
-                        ? ` — ${material.reason ?? "not inlined"}`
-                        : "";
-                    lines.push(`- ${material.locator}${reason}`);
-                }
+            for (const material of node.materials) {
+                appendMaterialMarkdown(lines, material);
             }
         }
         sections.push(lines.join("\n"));
     }
-    const skeletons = pulledSkeletons(nodes);
-    if (skeletons.length > 0) {
+    if (result.skeletons.length > 0) {
         const lines = [
             "# Skeletons — begin the artifact from this structure",
             "",
             "Begin the artifact from the matching structure below verbatim, then fill it.",
         ];
-        for (const skeleton of skeletons) {
+        for (const skeleton of result.skeletons) {
             lines.push("", `## From \`${skeleton.nodeId}\``, "");
             lines.push(fencedMarkdown(skeleton.content.trimEnd(), skeleton.info));
         }
@@ -216,6 +125,34 @@ function formatPullMarkdown(nodes) {
     }
     return `${sections.join("\n\n---\n\n")}\n`;
 }
+function appendMaterialMarkdown(lines, material) {
+    if (material.inlined !== undefined) {
+        const info = material.path ?? material.locator;
+        lines.push("", fencedMarkdown(material.inlined.trimEnd(), info));
+    }
+    else if (material.reason === "binary inspect-pointer") {
+        lines.push(`- inspect: ${material.path ?? material.locator} — view this image before generating`);
+    }
+    else {
+        const reason = material.omitted
+            ? ` — ${material.reason ?? "not inlined"}`
+            : "";
+        lines.push(`- ${material.locator}${reason}`);
+    }
+}
+function formatJsonMaterial(material) {
+    return {
+        locator: material.locator,
+        tier: material.tier,
+        ...(material.inlined !== undefined ? { inlined: material.inlined } : {}),
+        ...(material.omitted
+            ? { omitted: true, reason: material.reason ?? "not inlined" }
+            : {}),
+        ...(material.reason === "binary inspect-pointer"
+            ? { inspect: material.path ?? material.locator }
+            : {}),
+    };
+}
 function fencedMarkdown(content, info) {
     const fence = "`".repeat(Math.max(3, longestBacktickRun(content) + 1));
     return `${fence}${info ?? ""}\n${content}\n${fence}`;