@intentius/chant 0.124.52 → 0.124.54

package/dist/lifecycle/index-join.js

@@ -0,0 +1,248 @@
+/**
+ * `chant search --index <ref>` (#4525): an index version as the observed side
+ * of a search, joined to the declared rows.
+ *
+ * Two halves, both pure apart from {@link readIndexRef}'s store read:
+ *
+ * - a ref names one index version in the store (#4519, ./index-document.ts):
+ *   `<scope key>`, `<scope key>@latest`, `<scope key>@<version>` or
+ *   `<scope key>/<version>.json`, where the scope key is `stamp.scopeKey`
+ *   (`cloud/aws/<account>/<scope digest>`) and a version is a name the store
+ *   lists (`20261026T091403Z-<digest12>`, with or without `.json`);
+ * - {@link joinDeclaredToIndex} gives every declared node a join verdict
+ *   and lays the bound indexed nodes over the declared canvas, the way
+ *   `--live` lays a live read over it (`sourceOverlayGraphs`).
+ *
+ * The join goes through each lexicon's own index match, its plugin's
+ * `indexIdentity` (#4523, ./identity-match.ts). aws has one; a lexicon with
+ * none gets `not-observed`, reason `unsupported-kind`, on every row, never a
+ * guessed match. The verdicts:
+ *
+ * - `bound`: one indexed node carries the identity the declaration spells;
+ * - `absent`: none does, and the index's coverage says it listed that type
+ *   and location;
+ * - `not-observed`: the index did not look (coverage `filtered`,
+ *   `not-reached`, a read failure), the lexicon has no index match, or the
+ *   index is of another substrate. Always with the reason and a detail;
+ * - `no-binding`: the declaration does not spell an identity (a
+ *   server-assigned id, a Ref), or the entity names no region and nothing
+ *   matched;
+ * - `ambiguous`: two or more indexed nodes carry the identity. None is bound.
+ *
+ * Indexed nodes no declared row binds stay out of a project's answer, as an
+ * undeclared resource stays out of a `--live` one; with no project the index
+ * is the whole graph ({@link indexOnlyGraph}).
+ */
+import { sourceOverlayGraphs } from "../graph-ir.js";
+import { matchDeclaredToIndex } from "./identity-match.js";
+import { indexVersionName, isIndexVersionName, validateIndexDocument } from "./index-document.js";
+const SOURCE_PREFIXES = ["cloud/", "engine/", "chant/"];
+const VERSION_ID = /^\d{8}T\d{6}Z-[0-9a-f]{12}(\.json)?$/;
+const REF_HINT = "name an index version as <scope key>[@latest|@<version>], where the scope key is the index's stamp.scopeKey (cloud/aws/<account>/<scope digest>) and a version is a name the store lists, such as 20261026T091403Z-0123456789ab";
+/** Parse `--index <ref>`, or say why it is not one. */
+export function parseIndexRef(ref) {
+    const text = ref.trim();
+    if (text === "")
+        return { error: "--index needs an index ref", hint: REF_HINT };
+    let scopeKey = text;
+    let version = "latest";
+    const at = text.lastIndexOf("@");
+    if (at >= 0) {
+        scopeKey = text.slice(0, at);
+        version = text.slice(at + 1);
+        if (version !== "latest" && !VERSION_ID.test(version)) {
+            return { error: `--index ${text}: "${version}" is not an index version`, hint: REF_HINT };
+        }
+    }
+    else {
+        const slash = text.lastIndexOf("/");
+        const last = text.slice(slash + 1);
+        if (slash > 0 && last.endsWith(".json") && VERSION_ID.test(last)) {
+            scopeKey = text.slice(0, slash);
+            version = last;
+        }
+    }
+    if (version !== "latest" && !version.endsWith(".json"))
+        version = `${version}.json`;
+    if (!SOURCE_PREFIXES.some((p) => scopeKey.startsWith(p)) || scopeKey.split("/").some((s) => s === "" || s === "." || s === "..")) {
+        return { error: `--index ${text}: "${scopeKey}" is not an index scope key`, hint: REF_HINT };
+    }
+    return { scopeKey, version };
+}
+/** The ref as one string, version resolved: `<scope key>@<version name without .json>`. */
+export function formatIndexRef(scopeKey, versionName) {
+    return `${scopeKey}@${versionName.replace(/\.json$/, "")}`;
+}
+/**
+ * Read the version a ref names. A stamp that disagrees with itself or with
+ * the key it was read under is refused: the answer would be about another
+ * scope than the one asked for.
+ */
+export async function readIndexRef(store, ref) {
+    let doc;
+    try {
+        doc = ref.version === "latest" ? await store.readIndexLatest(ref.scopeKey) : await store.readIndexAt(ref.scopeKey, ref.version);
+    }
+    catch (err) {
+        return { error: `could not read the index ${ref.scopeKey} from ${store.where}: ${err instanceof Error ? err.message : String(err)}` };
+    }
+    if (!doc) {
+        return {
+            error: ref.version === "latest"
+                ? `no index version is recorded under ${ref.scopeKey} in ${store.where}`
+                : `no index version ${ref.version.replace(/\.json$/, "")} is recorded under ${ref.scopeKey} in ${store.where}`,
+            hint: "a scope key ends in its 12-hex scope digest, as the index's stamp.scopeKey spells it; the store is the project's `snapshots` store, or CHANT_SNAPSHOT_STORE and its companions",
+        };
+    }
+    try {
+        validateIndexDocument(doc);
+    }
+    catch (err) {
+        return { error: `the index at ${ref.scopeKey} is not one chant can read: ${err instanceof Error ? err.message : String(err)}` };
+    }
+    if (doc.stamp.scopeKey !== ref.scopeKey) {
+        return { error: `the index read under ${ref.scopeKey} is stamped ${doc.stamp.scopeKey}, so it is not the scope asked for` };
+    }
+    const version = indexVersionName(doc.stamp.observedAt, doc.stamp.digest);
+    if (ref.version !== "latest" && isIndexVersionName(ref.version) && ref.version !== version) {
+        return { error: `the index version ${ref.version} under ${ref.scopeKey} is stamped as ${version}, so it is not the version asked for` };
+    }
+    return { doc, ref, version };
+}
+/** Every verdict, in the order a summary lists them. */
+export const INDEX_JOIN_VERDICTS = ["bound", "absent", "not-observed", "no-binding", "ambiguous"];
+function fromMatch(m) {
+    const base = {
+        ...("listedType" in m && m.listedType !== undefined ? { listedType: m.listedType } : {}),
+        ...("identifier" in m && m.identifier !== undefined ? { identifier: m.identifier } : {}),
+        ...("location" in m && m.location !== undefined && m.location !== "" ? { location: m.location } : {}),
+    };
+    switch (m.verdict) {
+        case "bound":
+            return { ...base, verdict: "bound", node: m.node, nativeId: m.nativeId };
+        case "absent":
+            return { ...base, verdict: "absent" };
+        case "refused":
+            return { ...base, verdict: "ambiguous", candidates: m.candidates, detail: m.detail };
+        case "not-observed":
+            return m.reason === "no-binding"
+                ? { ...base, verdict: "no-binding", detail: m.detail }
+                : { ...base, verdict: "not-observed", reason: m.reason, detail: m.detail };
+    }
+}
+/**
+ * Join every declared node to an index version. Pure: the lexicons come in
+ * as data. The canvas keeps every declared node and edge; a bound node takes
+ * the indexed node's physical id, attributes and facts, as `--live` gives a
+ * node its read's.
+ */
+export function joinDeclaredToIndex(declared, doc, lexicons, options = {}) {
+    const joins = {};
+    const scope = doc.stamp.scope;
+    const byLexicon = new Map();
+    for (const n of declared.nodes)
+        (byLexicon.get(n.lexicon) ?? byLexicon.set(n.lexicon, []).get(n.lexicon)).push(n);
+    for (const [lexicon, nodes] of byLexicon) {
+        const identity = lexicons.find((l) => l.name === lexicon)?.indexIdentity;
+        if (!identity) {
+            for (const n of nodes) {
+                joins[n.id] = {
+                    verdict: "not-observed",
+                    reason: "unsupported-kind",
+                    detail: `the ${lexicon} lexicon has no index match, so a declared ${n.kind} is not joined to an indexed resource`,
+                };
+            }
+            continue;
+        }
+        if (scope.kind !== "cloud") {
+            for (const n of nodes) {
+                joins[n.id] = {
+                    verdict: "not-observed",
+                    reason: "filtered",
+                    detail: `the index ${doc.stamp.scopeKey} is a ${scope.kind} source (${doc.stamp.source.name}); declared rows join only to a cloud read`,
+                };
+            }
+            continue;
+        }
+        if (scope.substrate !== identity.substrate) {
+            for (const n of nodes) {
+                joins[n.id] = {
+                    verdict: "not-observed",
+                    reason: "filtered",
+                    detail: `the index ${doc.stamp.scopeKey} reads ${scope.substrate}, and a ${lexicon} entity lives in ${identity.substrate}`,
+                };
+            }
+            continue;
+        }
+        const entities = nodes.map((n) => {
+            const region = options.regionOf?.(n.id);
+            return { name: n.id, entityType: n.kind, props: (n.attrs ?? {}), ...(region ? { region } : {}) };
+        });
+        const { matches } = matchDeclaredToIndex(entities, [doc], identity);
+        for (const [id, m] of Object.entries(matches))
+            joins[id] = fromMatch(m);
+    }
+    // The bound indexed nodes, renamed to the declared node they bind, are the
+    // observed side of the overlay. Nothing else of the index is.
+    const indexed = new Map(doc.graph.nodes.map((n) => [n.id, n]));
+    const live = [];
+    const unobserved = {};
+    for (const n of declared.nodes) {
+        const j = joins[n.id];
+        if (!j)
+            continue;
+        if (j.verdict === "bound") {
+            const hit = indexed.get(j.node);
+            if (hit)
+                live.push({ ...hit, id: n.id, physicalId: hit.physicalId ?? j.nativeId });
+        }
+        else if (j.verdict === "not-observed" || j.verdict === "no-binding") {
+            unobserved[n.id] = { type: n.kind, reason: j.verdict === "no-binding" ? "no-binding" : j.reason, detail: j.detail };
+        }
+    }
+    live.sort((a, b) => (a.id < b.id ? -1 : a.id > b.id ? 1 : 0));
+    let ir = sourceOverlayGraphs(declared, { ...declared, nodes: live, edges: [], exports: [] }, { unobserved });
+    // An ambiguous row is neither pending nor unread: the index holds candidates
+    // and chant will not pick one. Paint it as unknown, with no `_unobserved`.
+    ir = {
+        ...ir,
+        nodes: ir.nodes.map((n) => (joins[n.id]?.verdict === "ambiguous" ? { ...n, attrs: { ...n.attrs, _status: "neutral" } } : n)),
+    };
+    return { ir, joins };
+}
+/**
+ * The index alone, for a search with no project: every indexed node, each
+ * with its native id as its physical id.
+ */
+export function indexOnlyGraph(doc) {
+    return {
+        ...doc.graph,
+        nodes: doc.graph.nodes.map((n) => (n.physicalId === undefined && n.nativeId !== undefined ? { ...n, physicalId: n.nativeId } : n)),
+        edges: doc.graph.edges ?? [],
+    };
+}
+/** How many rows carry each verdict, for the provenance line. */
+export function countJoins(joins, ids) {
+    const out = Object.fromEntries(INDEX_JOIN_VERDICTS.map((v) => [v, 0]));
+    for (const id of ids) {
+        const j = joins[id];
+        if (j)
+            out[j.verdict] += 1;
+    }
+    return out;
+}
+/** A row's verdict where a physical id would go: `(absent)`, `(not observed: filtered)`, `(ambiguous: 2 candidates)`. */
+export function joinCell(j) {
+    switch (j.verdict) {
+        case "bound":
+            return undefined;
+        case "absent":
+            return "(absent)";
+        case "not-observed":
+            return `(not observed: ${j.reason})`;
+        case "no-binding":
+            return "(no-binding)";
+        case "ambiguous":
+            return `(ambiguous: ${j.candidates.length} candidates)`;
+    }
+}

package/dist/lifecycle/index.d.ts

@@ -2,6 +2,10 @@ export * from "./types.js";
 export * from "./git.js";
 export * from "./digest.js";
 export * from "./snapshot.js";
+export * from "./snapshot-store.js";
+export * from "./snapshot-store-s3.js";
+export * from "./index-document.js";
+export * from "./index-diff.js";
 export * from "./live-diff.js";
 export * from "./deep-diff.js";
 export * from "./deep-observe.js";

package/dist/lifecycle/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lifecycle/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,OAAO,CAAC;AACtB,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,wBAAwB,CAAC;AACvC,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,KAAK,MAAM,EAAE,KAAK,MAAM,EAAE,KAAK,UAAU,EAAE,KAAK,YAAY,EAAE,KAAK,MAAM,EAAE,KAAK,QAAQ,EAAE,KAAK,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9K,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lifecycle/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,OAAO,CAAC;AACtB,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,wBAAwB,CAAC;AACvC,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,KAAK,MAAM,EAAE,KAAK,MAAM,EAAE,KAAK,UAAU,EAAE,KAAK,YAAY,EAAE,KAAK,MAAM,EAAE,KAAK,QAAQ,EAAE,KAAK,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9K,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC"}

package/dist/lifecycle/index.js

@@ -2,6 +2,10 @@ export * from "./types.js";
 export * from "./git.js";
 export * from "./digest.js";
 export * from "./snapshot.js";
+export * from "./snapshot-store.js";
+export * from "./snapshot-store-s3.js";
+export * from "./index-document.js";
+export * from "./index-diff.js";
 export * from "./live-diff.js";
 export * from "./deep-diff.js";
 export * from "./deep-observe.js";

package/dist/lifecycle/observation-baseline.d.ts

@@ -23,19 +23,29 @@
  *
  * ## Where it lives
  *
- * `<environment>/observation-baseline.json` on the `chant/lifecycle` orphan
- * branch — the epic's named candidate home, and the same storage the snapshots
- * (`<env>/<lexicon>.json`), the release ledger (`<env>/releases.jsonl`) and the
- * build archive (`_builds/<digest>.json`) already use, through the same
- * `writeBlobToPath`/`readBlobFromPath` plumbing. One env-keyed namespace for
- * everything chant records *about* an environment rather than *for* it.
+ * A file in the repository, `.chant/observation-baseline/<env>.json` under
+ * the project (#4519). An acceptance is then a commit in an ordinary pull
+ * request, reviewed with the change that needed it. It is not derivable and
+ * not critical, and it is meant to be reviewed: that is the rule that puts a
+ * record here rather than in the index store.
  *
- * The parse/serialize/update half below is pure and storage-free, so the
- * decision is one function call deep if a repo-committed file (`.chant/`) turns
- * out to be the better review surface.
+ * Other homes, through `observationBaseline` in chant.config.ts or
+ * `CHANT_OBSERVATION_BASELINE_STORE`: `git-ref` (`refs/chant/observation-baseline`),
+ * `s3` (`<prefix>/observation-baseline/<env>.json`, with the s3 settings of
+ * `observationBaseline.s3`, else of `snapshots`), or `none`.
+ *
+ * A baseline written before #4519, `<environment>/observation-baseline.json`
+ * on the `chant/lifecycle` orphan branch, is still read when the configured
+ * home has none. It is never written there again.
+ *
+ * The parse/serialize/update half below is pure and storage-free.
  */
-/** The file name under `<environment>/` on the orphan branch. */
+/** The file name under `<environment>/` on the orphan branch, where a baseline written before #4519 is read from. */
 export declare const OBSERVATION_BASELINE_FILE = "observation-baseline.json";
+/** The directory, relative to the project, that holds one baseline file per environment (#4519). */
+export declare const OBSERVATION_BASELINE_DIR = ".chant/observation-baseline";
+/** The ref a `git-ref` baseline is written to. */
+export declare const OBSERVATION_BASELINE_REF = "refs/chant/observation-baseline";
 /** One deviation somebody accepted, bound to the value they accepted. */
 export interface AcceptedDeviation {
     /** Property path within the entity's normalized tree (`Tags[0].Value`, `Policy.Statement[1].Effect`). */
@@ -120,17 +130,47 @@ export interface AcceptDeviationsOptions {
 export declare function acceptDeviations(baseline: ObservationBaseline, lexicon: string, deviations: readonly DeviationToAccept[], opts?: AcceptDeviationsOptions): ObservationBaseline;
 /** Total accepted deviations across every lexicon — for the "N accepted" line. */
 export declare function countAccepted(baseline: ObservationBaseline | null | undefined): number;
+export type ObservationBaselineStoreKind = "file" | "git-ref" | "s3" | "none";
+/** `observationBaseline` in chant.config.ts. */
+export interface ObservationBaselineStoreConfig {
+    store: ObservationBaselineStoreKind;
+    /** `file`: the directory, relative to the project. Default {@link OBSERVATION_BASELINE_DIR}. */
+    dir?: string;
+    /** `git-ref`: the ref. Default {@link OBSERVATION_BASELINE_REF}. */
+    ref?: string;
+    /** `s3`: where. Default: the `snapshots` store's s3 settings. */
+    s3?: import("./snapshot-store-s3.js").S3StoreSettings;
+}
+/** Where to read and write a baseline: the project directory, and its config when the caller has it loaded. */
+export interface ObservationBaselineLocation {
+    cwd?: string;
+    /** The project's loaded chant.config. Loaded from `cwd` upward when absent. */
+    config?: {
+        observationBaseline?: unknown;
+        snapshots?: unknown;
+    };
+    /** Overrides the configured home. */
+    store?: ObservationBaselineStoreConfig;
+}
+/** The home in effect: `CHANT_OBSERVATION_BASELINE_STORE` over `observationBaseline` over `file`. */
+export declare function observationBaselineStoreConfig(configured?: unknown, env?: Record<string, string | undefined>): ObservationBaselineStoreConfig;
+/** Where a baseline for `environment` lives in the configured home, for messages. */
+export declare function observationBaselineWhere(environment: string, opts?: ObservationBaselineLocation): Promise<string>;
 /**
- * Read the accepted baseline for an environment. Returns `null` when the branch,
- * the environment, or the file does not exist — every one of which means
- * "nothing accepted yet", the normal state before anyone runs
- * `--update-baseline`.
+ * Read the accepted baseline for an environment. Returns `null` when there is
+ * none, the normal state before anyone runs `--update-baseline`. When the
+ * configured home has none, a baseline written before #4519 on the
+ * `chant/lifecycle` branch is read instead.
  */
-export declare function readObservationBaseline(environment: string, opts?: {
-    cwd?: string;
-}): Promise<ObservationBaseline | null>;
-/** Write the accepted baseline to the orphan branch. Returns the new commit SHA. */
-export declare function writeObservationBaseline(baseline: ObservationBaseline, opts?: {
-    cwd?: string;
-}): Promise<string>;
+export declare function readObservationBaseline(environment: string, opts?: ObservationBaselineLocation): Promise<ObservationBaseline | null>;
+/** What {@link saveObservationBaseline} did. `file` means written in the working tree, for the caller to commit. */
+export interface SavedObservationBaseline {
+    where: string;
+    published: "file" | "pushed" | "local" | "failed" | "none";
+    detail?: string;
+}
+/** Write the accepted baseline to its home, and push it when the home is a ref. */
+export declare function saveObservationBaseline(baseline: ObservationBaseline, opts?: ObservationBaselineLocation): Promise<SavedObservationBaseline>;
+/** Write the accepted baseline to its home. Returns where it went. */
+export declare function writeObservationBaseline(baseline: ObservationBaseline, opts?: ObservationBaselineLocation): Promise<string>;
 //# sourceMappingURL=observation-baseline.d.ts.map

package/dist/lifecycle/observation-baseline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"observation-baseline.d.ts","sourceRoot":"","sources":["../../src/lifecycle/observation-baseline.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"observation-baseline.d.ts","sourceRoot":"","sources":["../../src/lifecycle/observation-baseline.ts"],"names":[],"mappings":"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"}

package/dist/lifecycle/observation-baseline.js

@@ -23,22 +23,35 @@
  *
  * ## Where it lives
  *
- * `<environment>/observation-baseline.json` on the `chant/lifecycle` orphan
- * branch — the epic's named candidate home, and the same storage the snapshots
- * (`<env>/<lexicon>.json`), the release ledger (`<env>/releases.jsonl`) and the
- * build archive (`_builds/<digest>.json`) already use, through the same
- * `writeBlobToPath`/`readBlobFromPath` plumbing. One env-keyed namespace for
- * everything chant records *about* an environment rather than *for* it.
+ * A file in the repository, `.chant/observation-baseline/<env>.json` under
+ * the project (#4519). An acceptance is then a commit in an ordinary pull
+ * request, reviewed with the change that needed it. It is not derivable and
+ * not critical, and it is meant to be reviewed: that is the rule that puts a
+ * record here rather than in the index store.
  *
- * The parse/serialize/update half below is pure and storage-free, so the
- * decision is one function call deep if a repo-committed file (`.chant/`) turns
- * out to be the better review surface.
+ * Other homes, through `observationBaseline` in chant.config.ts or
+ * `CHANT_OBSERVATION_BASELINE_STORE`: `git-ref` (`refs/chant/observation-baseline`),
+ * `s3` (`<prefix>/observation-baseline/<env>.json`, with the s3 settings of
+ * `observationBaseline.s3`, else of `snapshots`), or `none`.
+ *
+ * A baseline written before #4519, `<environment>/observation-baseline.json`
+ * on the `chant/lifecycle` orphan branch, is still read when the configured
+ * home has none. It is never written there again.
+ *
+ * The parse/serialize/update half below is pure and storage-free.
  */
-import { readBlobFromPath, writeBlobToPath } from "./git.js";
+import { mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
+import { dirname, join, resolve } from "node:path";
+import { ledgerDir, readBlobFromPath } from "./git.js";
+import { encodeIndexSegment } from "./index-document.js";
 import { sortedJsonReplacer } from "../utils.js";
 import { EFFECT_RECEIPT_ENTITY_TYPE } from "../effect-receipt.js";
-/** The file name under `<environment>/` on the orphan branch. */
+/** The file name under `<environment>/` on the orphan branch, where a baseline written before #4519 is read from. */
 export const OBSERVATION_BASELINE_FILE = "observation-baseline.json";
+/** The directory, relative to the project, that holds one baseline file per environment (#4519). */
+export const OBSERVATION_BASELINE_DIR = ".chant/observation-baseline";
+/** The ref a `git-ref` baseline is written to. */
+export const OBSERVATION_BASELINE_REF = "refs/chant/observation-baseline";
 /** An environment with nothing accepted yet. */
 export function emptyBaseline(environment) {
     return { baseline: "v1", environment, lexicons: {} };
@@ -139,17 +152,129 @@ export function countAccepted(baseline) {
     }
     return n;
 }
-// ── Storage (chant/lifecycle orphan branch) ─────────────────────────────────
+const BASELINE_KINDS = ["file", "git-ref", "s3", "none"];
+/** The home in effect: `CHANT_OBSERVATION_BASELINE_STORE` over `observationBaseline` over `file`. */
+export function observationBaselineStoreConfig(configured, env = process.env) {
+    const base = (configured && typeof configured === "object" ? configured : {});
+    const kind = (env.CHANT_OBSERVATION_BASELINE_STORE?.trim() || base.store || "file");
+    if (!BASELINE_KINDS.includes(kind)) {
+        throw new Error(`observation baseline store "${kind}" is not one of ${BASELINE_KINDS.join(", ")}`);
+    }
+    return { ...(base.store === kind ? base : {}), store: kind };
+}
+async function resolveLocation(opts) {
+    const cwd = resolve(opts?.cwd ?? process.cwd());
+    const { findProjectConfigPastFragments, loadChantConfigUpward } = await import("../config.js");
+    let config = opts?.config;
+    if (!opts?.store && config === undefined) {
+        try {
+            config = (await loadChantConfigUpward(cwd)).config;
+        }
+        catch {
+            config = undefined;
+        }
+    }
+    // The `file` home is relative to the project, not to wherever the command
+    // ran: a run from a member's subdirectory writes under that member's own
+    // directory, as every other store writes under its member path (#2538).
+    const projectDir = findProjectConfigPastFragments(cwd).dir;
+    return { cwd, projectDir, store: opts?.store ?? observationBaselineStoreConfig(config?.observationBaseline), snapshots: config?.snapshots };
+}
+/** The `file` home's path for one environment, under the project directory. */
+function baselineFile(projectDir, store, env) {
+    return join(projectDir, store.dir ?? OBSERVATION_BASELINE_DIR, `${env}.json`);
+}
+async function s3For(store, snapshots) {
+    const { S3Medium } = await import("./snapshot-store-s3.js");
+    const { snapshotStoreConfig } = await import("./snapshot-store.js");
+    let settings = store.s3;
+    if (!settings) {
+        const snap = snapshotStoreConfig(snapshots);
+        if (snap.store !== "s3")
+            throw new Error("the s3 observation baseline store needs observationBaseline.s3, or a snapshots store that is s3");
+        const { store: _s, ...rest } = snap;
+        settings = rest;
+    }
+    return new S3Medium(settings);
+}
+/** Where a baseline for `environment` lives in the configured home, for messages. */
+export async function observationBaselineWhere(environment, opts) {
+    const { cwd, store, snapshots } = await resolveLocation(opts);
+    switch (store.store) {
+        case "file":
+            return join(store.dir ?? OBSERVATION_BASELINE_DIR, `${encodeIndexSegment(environment)}.json`);
+        case "git-ref":
+            return `${store.ref ?? OBSERVATION_BASELINE_REF}:${await ledgerDir(encodeIndexSegment(environment), { cwd })}.json`;
+        case "s3":
+            return `${(await s3For(store, snapshots)).where}/observation-baseline/${await ledgerDir(encodeIndexSegment(environment), { cwd })}.json`;
+        case "none":
+            return "nowhere (the observation baseline store is none)";
+    }
+}
 /**
- * Read the accepted baseline for an environment. Returns `null` when the branch,
- * the environment, or the file does not exist — every one of which means
- * "nothing accepted yet", the normal state before anyone runs
- * `--update-baseline`.
+ * Read the accepted baseline for an environment. Returns `null` when there is
+ * none, the normal state before anyone runs `--update-baseline`. When the
+ * configured home has none, a baseline written before #4519 on the
+ * `chant/lifecycle` branch is read instead.
  */
 export async function readObservationBaseline(environment, opts) {
-    return parseBaseline(await readBlobFromPath(environment, OBSERVATION_BASELINE_FILE, opts));
+    const { cwd, projectDir, store, snapshots } = await resolveLocation(opts);
+    let text = null;
+    switch (store.store) {
+        case "none":
+            return null;
+        case "file":
+            try {
+                text = readFileSync(baselineFile(projectDir, store, encodeIndexSegment(environment)), "utf8");
+            }
+            catch {
+                text = null;
+            }
+            break;
+        case "git-ref": {
+            const { getRuntime } = await import("../runtime-adapter.js");
+            const path = `${await ledgerDir(encodeIndexSegment(environment), { cwd })}.json`;
+            const r = await getRuntime().spawn(["git", "cat-file", "blob", `${store.ref ?? OBSERVATION_BASELINE_REF}:${path}`], { cwd });
+            text = r.exitCode === 0 ? r.stdout : null;
+            break;
+        }
+        case "s3":
+            text = await (await s3For(store, snapshots)).get(`observation-baseline/${await ledgerDir(encodeIndexSegment(environment), { cwd })}.json`);
+            break;
+    }
+    return parseBaseline(text ?? (await readBlobFromPath(environment, OBSERVATION_BASELINE_FILE, { cwd })));
+}
+/** Write the accepted baseline to its home, and push it when the home is a ref. */
+export async function saveObservationBaseline(baseline, opts) {
+    const { cwd, projectDir, store, snapshots } = await resolveLocation(opts);
+    const where = await observationBaselineWhere(baseline.environment, { cwd, store, ...(snapshots !== undefined ? { config: { snapshots } } : {}) });
+    const content = serializeBaseline(baseline);
+    const env = encodeIndexSegment(baseline.environment);
+    switch (store.store) {
+        case "none":
+            return { where, published: "none" };
+        case "file": {
+            const file = baselineFile(projectDir, store, env);
+            mkdirSync(dirname(file), { recursive: true });
+            const tmp = `${file}.${process.pid}.tmp`;
+            writeFileSync(tmp, content);
+            renameSync(tmp, file);
+            return { where, published: "file" };
+        }
+        case "git-ref": {
+            const { commitFilesToRef, publishRef } = await import("./snapshot-store.js");
+            const ref = store.ref ?? OBSERVATION_BASELINE_REF;
+            const path = `${await ledgerDir(env, { cwd })}.json`;
+            await commitFilesToRef(ref, [{ path, content }], "Accepted observation baseline", { cwd });
+            const pushed = await publishRef(ref, new Map([[path, content]]), "Accepted observation baseline", { cwd });
+            return { where, published: pushed.status === "pushed" ? "pushed" : pushed.status === "local" ? "local" : "failed", ...(pushed.detail ? { detail: pushed.detail } : {}) };
+        }
+        case "s3":
+            await (await s3For(store, snapshots)).put(`observation-baseline/${await ledgerDir(env, { cwd })}.json`, content);
+            return { where, published: "pushed" };
+    }
 }
-/** Write the accepted baseline to the orphan branch. Returns the new commit SHA. */
+/** Write the accepted baseline to its home. Returns where it went. */
 export async function writeObservationBaseline(baseline, opts) {
-    return writeBlobToPath(baseline.environment, OBSERVATION_BASELINE_FILE, serializeBaseline(baseline), "Accepted observation baseline", opts);
+    return (await saveObservationBaseline(baseline, opts)).where;
 }

package/dist/lifecycle/observe.d.ts.map

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

package/dist/lifecycle/observe.js

@@ -38,6 +38,8 @@ function qualifyObservation(obs, stackName) {
         notes: obs.notes,
         // Exports are already keyed by stack (#1279); nothing to qualify.
         ...(obs.stackExports ? { stackExports: obs.stackExports } : {}),
+        // Edge endpoints are resource ids, so they re-key with them (#4528).
+        ...(obs.edges ? { edges: obs.edges.map((e) => ({ ...e, from: `${stackName}::${e.from}`, to: `${stackName}::${e.to}` })) } : {}),
     };
 }
 /**
@@ -383,13 +385,16 @@ function pushObservation(observations, warnings, lexicon, observed, environment,
     // Dependencies ride alongside the managed resources so they become nodes, and
     // carry `referencedBy` so every consumer can still tell the two apart.
     const hasDependencies = Object.keys(dependencies.resources).length > 0;
+    // The read's own edges (#4528, an engine's graph) and the dependency
+    // closure's ride together; `buildLiveGraphIr` dedupes them.
+    const edges = [...(observed.edges ?? []), ...dependencies.edges];
     observations.push({
         lexicon,
         resources: hasDependencies
             ? { ...observed.resources, ...dependencies.resources }
             : observed.resources,
         ...(unobservedNames.length > 0 ? { unobserved: observed.unobserved } : {}),
-        ...(dependencies.edges.length > 0 ? { edges: dependencies.edges } : {}),
+        ...(edges.length > 0 ? { edges } : {}),
         ...(observed.stackExports && Object.keys(observed.stackExports).length > 0
             ? { stackExports: observed.stackExports }
             : {}),