@homeflare/alchemy 0.33.0 → 0.34.0

package/src/grafana/contact-point-provenance.test.ts

@@ -0,0 +1,113 @@
+/**
+ * `Grafana.ContactPoint`'s provenance refusal — both the explicit-foreign case (`provenance:
+ * 'file'`) and the missing-field-fails-closed case an adversarial review of this PR found. Split
+ * out of `contact-point.test.ts` to keep each file under the house's 250-line cap.
+ */
+import { describe, expect, test } from 'bun:test';
+import * as Effect from 'effect/Effect';
+import { GrafanaProvisionedObjectError } from './alerting-provenance.ts';
+import { ITEM_PATH, LIST_PATH, liveJson, props } from './contact-point-fixtures.ts';
+import { fakeFailure, fakeGrafana, fakeGrafanaLayer } from './fake-grafana.ts';
+import { grafanaOperations } from './resource.ts';
+import { spec } from './contact-point.ts';
+
+describe('update and destroy — foreign provenance refuses', () => {
+  test('a file-provisioned contact point refuses update and sends no PUT', async () => {
+    const fileProvisioned = { ...liveJson, provenance: 'file' };
+    const fake = fakeGrafana((method, url) =>
+      method === 'GET' && url.pathname === LIST_PATH
+        ? Response.json([fileProvisioned])
+        : fakeFailure(500, 'no write should be attempted'),
+    );
+    const failure = await Effect.runPromise(
+      Effect.flip(
+        grafanaOperations(spec)
+          .reconcile({ ...props, name: 'Renamed' })
+          .pipe(Effect.provide(fakeGrafanaLayer(fake.fetch))),
+      ),
+    );
+    expect(failure).toBeInstanceOf(GrafanaProvisionedObjectError);
+    expect(failure.message).toContain('file');
+    expect(fake.seen.every((s) => s.method === 'GET')).toBe(true);
+  });
+
+  test('a file-provisioned contact point refuses destroy and sends no DELETE', async () => {
+    const fileProvisioned = { ...liveJson, provenance: 'file' };
+    const fake = fakeGrafana((method, url) =>
+      method === 'GET' && url.pathname === LIST_PATH
+        ? Response.json([fileProvisioned])
+        : fakeFailure(500, 'no DELETE should be attempted'),
+    );
+    const failure = await Effect.runPromise(
+      Effect.flip(
+        grafanaOperations(spec)
+          .destroy(props)
+          .pipe(Effect.provide(fakeGrafanaLayer(fake.fetch))),
+      ),
+    );
+    expect(failure).toBeInstanceOf(GrafanaProvisionedObjectError);
+    expect(fake.seen).toEqual([{ method: 'GET', path: LIST_PATH }]);
+  });
+});
+
+describe('missing provenance fails closed', () => {
+  // ⛔ THE REGRESSION AN ADVERSARIAL REVIEW OF THIS PR FOUND. An earlier version mapped
+  //   `live.provenance ?? ''`, so a response that simply omitted the field looked identical to an
+  //   explicit `ProvenanceNone` and was treated as writable — the guard failed OPEN. These three
+  //   tests pin the fix: missing refuses (both writes), an EXPLICIT `""` is the only thing that
+  //   allows one.
+  const noProvenanceField: Record<string, unknown> = { ...liveJson };
+  delete noProvenanceField.provenance;
+
+  test('a response with no provenance field at all refuses update', async () => {
+    const fake = fakeGrafana((method, url) =>
+      method === 'GET' && url.pathname === LIST_PATH
+        ? Response.json([noProvenanceField])
+        : fakeFailure(500, 'no write should be attempted'),
+    );
+    const failure = await Effect.runPromise(
+      Effect.flip(
+        grafanaOperations(spec)
+          .reconcile({ ...props, name: 'Renamed' })
+          .pipe(Effect.provide(fakeGrafanaLayer(fake.fetch))),
+      ),
+    );
+    expect(failure).toBeInstanceOf(GrafanaProvisionedObjectError);
+    expect(failure.message).toContain('did not report a provenance');
+    expect(fake.seen.every((s) => s.method === 'GET')).toBe(true);
+  });
+
+  test('a response with no provenance field at all refuses destroy', async () => {
+    const fake = fakeGrafana((method, url) =>
+      method === 'GET' && url.pathname === LIST_PATH
+        ? Response.json([noProvenanceField])
+        : fakeFailure(500, 'no DELETE should be attempted'),
+    );
+    const failure = await Effect.runPromise(
+      Effect.flip(
+        grafanaOperations(spec)
+          .destroy(props)
+          .pipe(Effect.provide(fakeGrafanaLayer(fake.fetch))),
+      ),
+    );
+    expect(failure).toBeInstanceOf(GrafanaProvisionedObjectError);
+    expect(fake.seen).toEqual([{ method: 'GET', path: LIST_PATH }]);
+  });
+
+  test('an EXPLICIT empty-string provenance (ProvenanceNone) is writable', async () => {
+    const explicitlyNone = { ...liveJson, provenance: '' };
+    const fake = fakeGrafana((method, url) => {
+      if (method === 'GET' && url.pathname === LIST_PATH) return Response.json([explicitlyNone]);
+      if (method === 'PUT' && url.pathname === ITEM_PATH) {
+        return Response.json({ ...explicitlyNone, name: 'Renamed' });
+      }
+      return fakeFailure(500, 'unexpected request');
+    });
+    await Effect.runPromise(
+      grafanaOperations(spec)
+        .reconcile({ ...props, name: 'Renamed' })
+        .pipe(Effect.provide(fakeGrafanaLayer(fake.fetch))),
+    );
+    expect(fake.seen.some((s) => s.method === 'PUT' && s.path === ITEM_PATH)).toBe(true);
+  });
+});

package/src/grafana/contact-point-secrets.test.ts

@@ -0,0 +1,117 @@
+/**
+ * `Grafana.ContactPoint`'s `secureSettingsRefs` seam (S25) — split out of `contact-point.test.ts`
+ * to keep each file under the house's 250-line cap. A secret value must reach the wire on write and
+ * never appear anywhere this resource returns or would persist.
+ */
+import { describe, expect, test } from 'bun:test';
+import * as Effect from 'effect/Effect';
+import { LIST_PATH, liveJson, props } from './contact-point-fixtures.ts';
+import { fakeFailure, fakeGrafana, fakeGrafanaLayer } from './fake-grafana.ts';
+import { grafanaOperations } from './resource.ts';
+import { GrafanaSecretRefUnsetError, spec } from './contact-point.ts';
+
+const ENV_VAR = 'GRAFANA_FAMILY_TEST_CP_TOKEN';
+
+describe('secure settings references (S25)', () => {
+  test('create resolves the env var fresh and merges it into settings, never as a prop', async () => {
+    process.env[ENV_VAR] = 'xoxb-s3cret';
+    try {
+      const fake = fakeGrafana((method, url) =>
+        method === 'POST' && url.pathname === LIST_PATH
+          ? Response.json(liveJson)
+          : fakeFailure(404, 'x'),
+      );
+      await Effect.runPromise(
+        spec
+          .create({ ...props, secureSettingsRefs: { url: ENV_VAR } })
+          .pipe(Effect.provide(fakeGrafanaLayer(fake.fetch))),
+      );
+      expect(fake.bodies[0]).toMatchObject({
+        settings: { recipient: '#oncall', url: 'xoxb-s3cret' },
+      });
+    } finally {
+      delete process.env[ENV_VAR];
+    }
+  });
+
+  test('the secret reaches the wire on create but never the RETURNED attributes — proven end to end', async () => {
+    // ⛔ THE POINT OF THIS FAMILY'S TESTS, TIGHTENED AFTER AN ADVERSARIAL REVIEW OF THIS PR: the
+    //   earlier version only asserted `JSON.stringify(props)` never contained the secret — trivially
+    //   true, since `props` never held it to begin with (it lives in `secureSettingsRefs`, an env
+    //   var NAME). This drives a REAL `reconcile` (create, then the read-back `resource.ts` always
+    //   does) through the fake and stringifies what it actually RETURNS — the shape that would be
+    //   persisted to state — proving the secret never survives there, not just that it was never in
+    //   an input we already knew was secret-free.
+    process.env[ENV_VAR] = 'xoxb-s3cret';
+    try {
+      let created = false;
+      const fake = fakeGrafana((method, url) => {
+        if (method === 'GET' && url.pathname === LIST_PATH) {
+          return created
+            ? Response.json([
+                { ...liveJson, settings: { recipient: '#oncall', url: 'RedactedValue' } },
+              ])
+            : Response.json([]);
+        }
+        if (method === 'POST' && url.pathname === LIST_PATH) {
+          created = true;
+          return Response.json(liveJson);
+        }
+        return fakeFailure(500, 'unexpected request');
+      });
+      const declared = { ...props, secureSettingsRefs: { url: ENV_VAR } };
+      const attrs = await Effect.runPromise(
+        grafanaOperations(spec)
+          .reconcile(declared)
+          .pipe(Effect.provide(fakeGrafanaLayer(fake.fetch))),
+      );
+      const createBody = fake.bodies[fake.seen.findIndex((s) => s.method === 'POST')];
+      // The wire genuinely carried it — the write would be useless otherwise.
+      expect(createBody).toMatchObject({ settings: { recipient: '#oncall', url: 'xoxb-s3cret' } });
+      // Nothing this resource returns or would persist does — the declaration, and the attributes
+      // `reconcile` hands back after reading the object right back through Grafana's own redaction.
+      expect(JSON.stringify(declared)).not.toContain('xoxb-s3cret');
+      expect(JSON.stringify(attrs)).not.toContain('xoxb-s3cret');
+      expect(attrs.settings).toEqual({ recipient: '#oncall', url: 'RedactedValue' });
+    } finally {
+      delete process.env[ENV_VAR];
+    }
+  });
+
+  test('create refuses with a typed error when the ref is unset — and sends nothing', async () => {
+    const fake = fakeGrafana(() => fakeFailure(500, 'should not be reached'));
+    const failure = await Effect.runPromise(
+      Effect.flip(
+        spec
+          .create({ ...props, secureSettingsRefs: { url: 'DEFINITELY_UNSET_VAR_XYZ' } })
+          .pipe(Effect.provide(fakeGrafanaLayer(fake.fetch))),
+      ),
+    );
+    expect(failure).toBeInstanceOf(GrafanaSecretRefUnsetError);
+    expect(fake.seen).toEqual([]);
+  });
+
+  test('a redacted secure field on read never fails matches, even if props still names a stale value', async () => {
+    // ⛔ THE POINT: `settings.url` is declared here (a stale placeholder — the real value comes
+    //   from `secureSettingsRefs` instead) specifically so a plain subset-match tolerance (live
+    //   simply carrying an UNDECLARED extra key) is not what makes this pass — `nonSecretSettings`
+    //   must actively exclude a key `secureSettingsRefs` names, even when `settings` also mentions
+    //   it, or a redacted live value would show a permanent false `update`.
+    const declared = {
+      ...props,
+      secureSettingsRefs: { url: 'IRRELEVANT' },
+      settings: { recipient: '#oncall', url: 'https://placeholder.invalid' },
+    };
+    const redactedLive = { ...liveJson, settings: { recipient: '#oncall', url: 'RedactedValue' } };
+    const fake = fakeGrafana((method, url) =>
+      method === 'GET' && url.pathname === LIST_PATH
+        ? Response.json([redactedLive])
+        : fakeFailure(500, 'x'),
+    );
+    const live = await Effect.runPromise(
+      spec.fetchLive(declared).pipe(Effect.provide(fakeGrafanaLayer(fake.fetch))),
+    );
+    const attrs = live !== undefined ? spec.attributes(live, props) : undefined;
+    expect(attrs !== undefined && spec.matches(attrs, declared)).toBe(true);
+  });
+});

package/src/grafana/contact-point.test.ts

@@ -0,0 +1,123 @@
+/**
+ * `Grafana.ContactPoint` against a fake Grafana — the list-then-filter-by-uid read (no by-uid GET
+ * exists), the observe-before-write "adopt" posture, and subset-match tolerance. Mirrors
+ * `datasource.test.ts`. Secure-settings-ref tests: `contact-point-secrets.test.ts`. Provenance
+ * refusal tests (foreign and missing): `contact-point-provenance.test.ts` — split out to keep each
+ * file under the house's 250-line cap.
+ */
+import { describe, expect, test } from 'bun:test';
+import * as Effect from 'effect/Effect';
+import { ITEM_PATH, LIST_PATH, liveJson, props } from './contact-point-fixtures.ts';
+import { fakeFailure, fakeGrafana, fakeGrafanaLayer } from './fake-grafana.ts';
+import { grafanaOperations } from './resource.ts';
+import { spec } from './contact-point.ts';
+
+describe('spec.fetchLive', () => {
+  test('lists and filters by uid client-side — no by-uid GET route exists', async () => {
+    const other = { ...liveJson, name: 'Other', uid: 'other' };
+    const fake = fakeGrafana((method, url) =>
+      method === 'GET' && url.pathname === LIST_PATH
+        ? Response.json([other, liveJson])
+        : fakeFailure(404, 'unexpected request'),
+    );
+    const live = await Effect.runPromise(
+      spec.fetchLive(props).pipe(Effect.provide(fakeGrafanaLayer(fake.fetch))),
+    );
+    expect(live !== undefined && spec.attributes(live, props)).toEqual({
+      disableResolveMessage: false,
+      name: 'On-call Slack',
+      provenance: 'api',
+      settings: { recipient: '#oncall' },
+      type: 'slack',
+      uid: 'slack-oncall',
+    });
+    // ⛔ THE POINT: a GET never carries a body.
+    expect(fake.bodies[0]).toBeUndefined();
+  });
+
+  test('a uid absent from the list decodes to undefined, not an error', async () => {
+    const fake = fakeGrafana(() => Response.json([]));
+    const result = await Effect.runPromise(
+      spec.fetchLive(props).pipe(Effect.provide(fakeGrafanaLayer(fake.fetch))),
+    );
+    expect(result).toBeUndefined();
+  });
+
+  test('a 403 propagates — never folded to absent', async () => {
+    const fake = fakeGrafana(() => fakeFailure(403, 'forbidden'));
+    const failure = await Effect.runPromise(
+      Effect.flip(spec.fetchLive(props).pipe(Effect.provide(fakeGrafanaLayer(fake.fetch)))),
+    );
+    expect(failure._tag).toBe('Forbidden');
+  });
+});
+
+describe('subset match — tolerates a default Grafana injects into settings', () => {
+  test('an unchanged declaration is a noop despite an extra live settings field it never declared', async () => {
+    const decorated = { ...liveJson, settings: { ...liveJson.settings, severity: 'critical' } };
+    const fake = fakeGrafana((method, url) =>
+      method === 'GET' && url.pathname === LIST_PATH
+        ? Response.json([decorated])
+        : fakeFailure(500, 'reconcile should not write when content is unchanged'),
+    );
+    const after = await Effect.runPromise(
+      grafanaOperations(spec)
+        .reconcile(props)
+        .pipe(Effect.provide(fakeGrafanaLayer(fake.fetch))),
+    );
+    expect(after.uid).toBe('slack-oncall');
+    expect(fake.seen.every((s) => s.method === 'GET')).toBe(true);
+  });
+});
+
+describe('reconcile — adopt semantics', () => {
+  test('declaring exactly what is live is a noop: no write is ever sent', async () => {
+    const fake = fakeGrafana((method, url) =>
+      method === 'GET' && url.pathname === LIST_PATH
+        ? Response.json([liveJson])
+        : fakeFailure(500, 'reconcile should not write when nothing changed'),
+    );
+    const after = await Effect.runPromise(
+      grafanaOperations(spec)
+        .reconcile(props)
+        .pipe(Effect.provide(fakeGrafanaLayer(fake.fetch))),
+    );
+    expect(after.uid).toBe('slack-oncall');
+    expect(fake.seen.every((s) => s.method === 'GET')).toBe(true);
+  });
+});
+
+describe('update and destroy — normal, api-provenance writes', () => {
+  test("an api-provenance contact point (this family's own writes) updates normally", async () => {
+    const fake = fakeGrafana((method, url) => {
+      if (method === 'GET' && url.pathname === LIST_PATH) return Response.json([liveJson]);
+      if (method === 'PUT' && url.pathname === ITEM_PATH) {
+        return Response.json({ ...liveJson, name: 'Renamed' });
+      }
+      return fakeFailure(500, 'unexpected request');
+    });
+    await Effect.runPromise(
+      grafanaOperations(spec)
+        .reconcile({ ...props, name: 'Renamed' })
+        .pipe(Effect.provide(fakeGrafanaLayer(fake.fetch))),
+    );
+    expect(fake.seen.some((s) => s.method === 'PUT' && s.path === ITEM_PATH)).toBe(true);
+  });
+
+  test('deletes a live, api-provenance contact point by uid', async () => {
+    const fake = fakeGrafana((method, url) => {
+      if (method === 'GET' && url.pathname === LIST_PATH) return Response.json([liveJson]);
+      if (method === 'DELETE' && url.pathname === ITEM_PATH) return Response.json({});
+      return fakeFailure(500, 'unexpected request');
+    });
+    await Effect.runPromise(
+      grafanaOperations(spec)
+        .destroy(props)
+        .pipe(Effect.provide(fakeGrafanaLayer(fake.fetch))),
+    );
+    expect(fake.seen).toEqual([
+      { method: 'GET', path: LIST_PATH },
+      { method: 'DELETE', path: ITEM_PATH },
+    ]);
+  });
+});

package/src/grafana/contact-point.ts

@@ -0,0 +1,179 @@
+/**
+ * `Grafana.ContactPoint` — one Grafana alerting contact point, keyed by `uid`.
+ *
+ * ⚠️ NO GET-BY-UID ROUTE EXISTS — MEASURED against the SDK's generated operations (grep across
+ *   `services/grafana.ts` for `routeGet.*[Cc]ontactpoint`: only `routeGetContactpoints` (list,
+ *   with an optional `name` filter) and `routeGetContactpointsExport`). Unlike
+ *   `Grafana.Datasource`/`Grafana.Folder`/`Grafana.Dashboard`, `fetchLive` cannot key its read
+ *   directly on `uid`. Filtering server-side by `name` is NOT a substitute: `name` is a grouping
+ *   label a declaration can rename (`uid` is the only field this resource keys on, and Grafana's
+ *   own doc calls `name` "used as grouping key in the UI" — several contact points can share one),
+ *   so narrowing the GET to the DECLARED name would miss a live object still filed under an OLDER
+ *   name mid-rename, reporting it absent and attempting a duplicate `create`. `fetchLive` instead
+ *   lists every contact point (`routeGetContactpoints({})`, no filter) and matches `uid`
+ *   client-side — the same ambiguity `resource.ts`'s header and netbox's `soleMatch` name, resolved
+ *   the same way: requiring the one field the API is actually keyed on.
+ *
+ * ⛔ SECRET SETTINGS NEVER APPEAR AS A LITERAL PROP (S25) — same shape as `Grafana.Datasource`'s
+ *   `secureJsonDataRefs` (`secret-refs.ts`, shared). Grafana does not use a separate top-level
+ *   "secure settings" field for contact points the way it does for datasources; a secure key (a
+ *   webhook URL with an embedded token, an API key, …) lives INSIDE `settings` on write, and comes
+ *   back inside `settings` REDACTED on read — Grafana's own docs for the contact-points EXPORT
+ *   route say as much explicitly ("Redacted settings will contain RedactedValue instead"; the
+ *   plain, non-export GET this resource calls has no `decrypt` option at all, so it is redacted
+ *   unconditionally). `secureSettingsRefs` therefore names which keys of `settings` are secret —
+ *   value resolved from an env var NAME fresh inside `create`/`update`'s own effect (S24), merged
+ *   into `settings` only at that point, never stored and never diffed (see `matches` below).
+ *
+ * ⛔ A FOREIGN-PROVENANCE CONTACT POINT REFUSES EVERY UPDATE AND DESTROY — `alerting-provenance.ts`,
+ *   shared with `Grafana.MessageTemplate`/`Grafana.AlertRuleGroup`/`Grafana.NotificationPolicy`.
+ *   See that file's header for the full reasoning and citations. `create` is never at risk: it only
+ *   runs when `fetchLive` already found nothing with this `uid`.
+ *
+ * ⚠️ `X-Disable-Provenance` IS NEVER SET, BY DESIGN. Every create/update through this resource
+ *   therefore leaves the contact point with `provenance: "api"` (Grafana's own default for an
+ *   object this API just wrote) — which the docs describe as blocking that same object from being
+ *   edited in the Grafana UI afterward. That is the intended outcome, not an oversight: an object
+ *   this family declares is meant to be owned by the declaration, the same "one owner per resource"
+ *   posture `provisioned.ts` establishes for folders/dashboards — handing it back to UI-editability
+ *   by default would silently create the two-owner situation this whole file exists to prevent.
+ */
+import { Resource } from 'alchemy';
+import * as Provider from 'alchemy/Provider';
+import * as grafana from '@distilled.cloud/grafana';
+import * as Effect from 'effect/Effect';
+import {
+  type GrafanaProvisionedObjectError,
+  isForeignProvenance,
+  refuseIfForeignProvenance,
+} from './alerting-provenance.ts';
+import { type GrafanaSpec, grafanaHandlers } from './resource.ts';
+import { GrafanaSecretRefUnsetError, resolveSecretRefs } from './secret-refs.ts';
+import { declaredContentMatches } from './subset-match.ts';
+
+export { GrafanaSecretRefUnsetError };
+
+export interface ContactPointProps {
+  uid: string;
+  name: string;
+  /** Grafana integration id — `slack`, `webhook`, `email`, `pagerduty`, `opsgenie`, … */
+  type: string;
+  /** Non-secret settings — shape depends on `type`. Never put a secret VALUE here — declare it
+   *  in `secureSettingsRefs` instead; see the file header. */
+  settings: Record<string, unknown>;
+  /** Secure field name (e.g. `url`, `token`, `password`) -> env var NAME holding its value. */
+  secureSettingsRefs?: Record<string, string>;
+  disableResolveMessage?: boolean;
+}
+
+export interface ContactPointAttributes {
+  uid: string;
+  name: string;
+  type: string;
+  /** As Grafana returns it — any secure key is a redaction placeholder, never the real value. */
+  settings: Record<string, unknown>;
+  disableResolveMessage: boolean;
+  /** `""`/`"api"` (this family may write); anything else, INCLUDING `undefined` (Grafana didn't
+   *  report the field), refuses — see alerting-provenance.ts's "fails open" note. */
+  provenance: string | undefined;
+}
+
+export interface GrafanaContactPoint extends Resource<
+  'Grafana.ContactPoint',
+  ContactPointProps,
+  ContactPointAttributes,
+  never
+> {}
+
+export const GrafanaContactPoint = Resource<GrafanaContactPoint>('Grafana.ContactPoint');
+
+/** `settings` minus every key `secureSettingsRefs` names — the only part `matches` ever compares
+ *  (a secure key's live value is always a redaction placeholder, never comparable). */
+const nonSecretSettings = (props: ContactPointProps): Record<string, unknown> => {
+  const refs = props.secureSettingsRefs;
+  if (refs === undefined) return props.settings;
+  const out: Record<string, unknown> = {};
+  for (const [key, value] of Object.entries(props.settings)) {
+    if (!(key in refs)) out[key] = value;
+  }
+  return out;
+};
+
+const resolveSettings = (props: ContactPointProps) =>
+  Effect.map(
+    resolveSecretRefs(props.secureSettingsRefs, (field) => `settings.${field}`),
+    (secrets) => (secrets === undefined ? props.settings : { ...props.settings, ...secrets }),
+  );
+
+export const spec: GrafanaSpec<
+  ContactPointProps,
+  grafana.EmbeddedContactPoint,
+  ContactPointAttributes,
+  | grafana.RouteGetContactpointsError
+  | grafana.RoutePostContactpointsError
+  | grafana.RoutePutContactpointError
+  | grafana.RouteDeleteContactpointsError
+  | GrafanaProvisionedObjectError
+  | GrafanaSecretRefUnsetError
+> = {
+  attributes: (live) => ({
+    disableResolveMessage: live.disableResolveMessage ?? false,
+    name: live.name ?? '',
+    // ⛔ NEVER `?? ''` — an absent field must stay distinguishable from an explicit `""`
+    //   (ProvenanceNone); see alerting-provenance.ts's "fails open" note.
+    provenance: live.provenance,
+    settings: (live.settings ?? {}) as Record<string, unknown>,
+    type: live.type,
+    uid: live.uid ?? '',
+  }),
+  create: (props) =>
+    Effect.flatMap(resolveSettings(props), (settings) =>
+      grafana.routePostContactpoints({
+        name: props.name,
+        settings,
+        type: props.type,
+        uid: props.uid,
+        ...(props.disableResolveMessage === undefined
+          ? {}
+          : { disableResolveMessage: props.disableResolveMessage }),
+      }),
+    ),
+  destroy: (props, live) =>
+    Effect.gen(function* () {
+      if (isForeignProvenance(live.provenance)) {
+        return yield* refuseIfForeignProvenance('Grafana.ContactPoint', props.uid, live.provenance);
+      }
+      yield* grafana.routeDeleteContactpoints({ UID: props.uid });
+    }),
+  fetchLive: (props) =>
+    grafana
+      .routeGetContactpoints({})
+      .pipe(Effect.map((points) => points.find((point) => point.uid === props.uid))),
+  matches: (attributes, props) =>
+    attributes.name === props.name &&
+    attributes.type === props.type &&
+    attributes.disableResolveMessage === (props.disableResolveMessage ?? false) &&
+    declaredContentMatches(nonSecretSettings(props), attributes.settings),
+  update: (props, live) =>
+    Effect.gen(function* () {
+      if (isForeignProvenance(live.provenance)) {
+        return yield* refuseIfForeignProvenance('Grafana.ContactPoint', props.uid, live.provenance);
+      }
+      const settings = yield* resolveSettings(props);
+      yield* grafana.routePutContactpoint({
+        UID: props.uid,
+        name: props.name,
+        settings,
+        type: props.type,
+        uid: props.uid,
+        ...(props.disableResolveMessage === undefined
+          ? {}
+          : { disableResolveMessage: props.disableResolveMessage }),
+      });
+    }),
+};
+
+export const handlers = grafanaHandlers(spec);
+
+export const GrafanaContactPointProvider = () =>
+  Provider.effect(GrafanaContactPoint, Effect.succeed(GrafanaContactPoint.Provider.of(handlers)));

package/src/grafana/dashboard-model.ts

@@ -50,62 +50,13 @@ export const normalizeModel = (model: DashboardModel, uid: string): DashboardMod
 export const modelTitle = (model: DashboardModel): string =>
   typeof model.title === 'string' ? model.title : '';
 
-const isPlainObject = (value: unknown): value is Record<string, unknown> =>
-  typeof value === 'object' && value !== null && !Array.isArray(value);
-
 /**
- * ★ `declared` NEED ONLY BE A SUBSET OF `live` — an adversarial review of this PR (2026-09-24)
- *   found that plain structural equality made an ordinary, never-edited dashboard show `update`
- *   FOREVER: Grafana's own dashboard-save schema migration rewrites any panel or target whose
- *   `datasource` is absent into an explicit `{type, uid}` reference to the resolved default
- *   datasource — documented Grafana schema-migration behavior (not re-measured against a live
- *   instance in this PR — no live calls). A declared panel that never sets `datasource` (the
- *   common case: hand-authored JSON, or anything relying on the dashboard-level default) would,
- *   after the FIRST create, read back with that field populated; plain `deepEqual` (this file used
- *   `alchemy/Diff`'s before this fix) then disagreed with the declaration on every subsequent plan,
- *   `update` sent the undecorated model back, and Grafana redecorated it again on the next read —
- *   non-convergent.
- *
- * This function instead asks only "does every field the DECLARATION mentions, at any depth, still
- * match what is live" — `live` may carry additional fields, at any depth, that `declared` never
- * mentioned (the datasource auto-decoration above, or any future Grafana-injected default,
- * `fieldConfig` defaults and `pluginVersion` included) without being compared at all. A field
- * `declared` DOES mention that is missing, or different, in `live` still fails the match — real
- * content drift is still caught exactly as before; only fields the declaration is silent about are
- * now tolerated rather than compared.
- *
- * ⚠️ THE TRADE-OFF THIS ACCEPTS, DELIBERATELY: removing a field from the declaration (rather than
- *   changing its value) can no longer force Grafana to drop it. If a panel once declared an
- *   explicit `datasource` and a later declaration deletes that key entirely (rather than setting a
- *   different one), `live` keeps whatever the last write set — the declaration is silent about that
- *   key now, so nothing compares it, so no `update` ever fires to change it. This is the same
- *   "undeclared means don't care, never means force-to-default" convention already used everywhere
- *   else in this kit for a plain optional prop (e.g. `datasource.ts`'s `matches` never treats an
- *   undeclared `access` as "must be unset"); it now also applies inside the JSON model, not just at
- *   the props level. Declare an explicit replacement value to change a field; omission never clears
- *   one that was set by a previous declaration or by Grafana itself.
- *
- * ⚠️ ARRAYS COMPARE BY LENGTH, THEN ELEMENT-WISE SUBSET — never by a looser "declared has fewer
- *   items" rule. `panels`/`targets` are position-significant (see `normalizeModel`'s header); an
- *   array Grafana pads or reorders on its own would still need normalizing here explicitly, the
- *   same as any other newly-discovered auto-decoration — this function does not paper over that.
- * ⚠️ `null` ON EITHER SIDE OF A LEAF NEVER MISMATCHES (mirrors `alchemy/Diff`'s `deepEqual` with
- *   `stripNullish: true`, which this function replaces for the dashboard model specifically).
+ * `declared` need only be a subset of `live` — dashboard.ts's `matches` runs `normalizeModel`'s
+ * output through this. Moved to `subset-match.ts` once `Grafana.ContactPoint`'s `settings` needed
+ * the identical "declaration silent about a field means don't compare it" rule; re-exported here
+ * under its original name so this file's own callers and dashboard-model.test.ts are unchanged.
+ * See subset-match.ts for the full reasoning, including the regression this exists to fix
+ * (Grafana's dashboard-save schema migration auto-decorating a panel's `datasource`) and the
+ * trade-off it accepts (an omitted field can no longer force-clear a previously-set one).
  */
-export const declaredContentMatches = (declared: unknown, live: unknown): boolean => {
-  if (declared == null) return true;
-  if (Array.isArray(declared)) {
-    return (
-      Array.isArray(live) &&
-      declared.length === live.length &&
-      declared.every((item, index) => declaredContentMatches(item, live[index]))
-    );
-  }
-  if (isPlainObject(declared)) {
-    return (
-      isPlainObject(live) &&
-      Object.entries(declared).every(([key, value]) => declaredContentMatches(value, live[key]))
-    );
-  }
-  return declared === live;
-};
+export { declaredContentMatches } from './subset-match.ts';

package/src/grafana/datasource.ts

@@ -20,9 +20,11 @@
 import { Resource } from 'alchemy';
 import * as Provider from 'alchemy/Provider';
 import * as grafana from '@distilled.cloud/grafana';
-import * as Data from 'effect/Data';
 import * as Effect from 'effect/Effect';
 import { type GrafanaSpec, grafanaHandlers } from './resource.ts';
+import { GrafanaSecretRefUnsetError, resolveSecretRefs } from './secret-refs.ts';
+
+export { GrafanaSecretRefUnsetError };
 
 export interface DatasourceProps {
   uid: string;
@@ -64,33 +66,9 @@ export interface GrafanaDatasource extends Resource<
 
 export const GrafanaDatasource = Resource<GrafanaDatasource>('Grafana.Datasource');
 
-/** A named secure-field env var is unset — a domain refusal, not a distilled error. */
-export class GrafanaSecretRefUnsetError extends Data.TaggedError('GrafanaSecretRefUnsetError')<{
-  readonly message: string;
-}> {}
-
 /** Reads every named env var fresh, inside the caller's effect (S24) — never at plan time. */
-const resolveSecureJsonData = (
-  refs: Record<string, string> | undefined,
-): Effect.Effect<Record<string, string> | undefined, GrafanaSecretRefUnsetError> =>
-  Effect.gen(function* () {
-    if (refs === undefined) return undefined;
-    const out: Record<string, string> = {};
-    for (const [field, envVar] of Object.entries(refs)) {
-      const raw = process.env[envVar];
-      if (raw === undefined || raw.trim() === '') {
-        return yield* Effect.fail(
-          new GrafanaSecretRefUnsetError({
-            message:
-              `${envVar} is unset. Export the value of secureJsonData.${field} there — ` +
-              'never as an Alchemy prop.',
-          }),
-        );
-      }
-      out[field] = raw.trim();
-    }
-    return out;
-  });
+const resolveSecureJsonData = (refs: Record<string, string> | undefined) =>
+  resolveSecretRefs(refs, (field) => `secureJsonData.${field}`);
 
 /** `exactOptionalPropertyTypes` means an undeclared field must be OMITTED, never sent as `undefined`. */
 const fields = (props: DatasourceProps) => ({