@astrale-os/cli 1.0.0-beta.2 → 1.0.0-beta.20

package/src/admin/instance/client.ts

@@ -1,13 +1,9 @@
-import type { ClientSession } from '@astrale-os/kernel-client/session'
-import type { Node } from '@astrale-os/sdk/graph/node'
+import type { ClientSession } from '@astrale-os/sdk/client/session'
 
 import { Path } from '@astrale-os/sdk/graph/path'
-import { Query } from '@astrale-os/sdk/query'
 
-import { bindAdmin, type AdminBinding } from '../binding'
-import { readAllNodes, type AdminGraphApi } from '../graph'
+import { AdminContract, callAdminMethod } from '../contract'
 import {
-  AdminHostNotFoundError,
   AdminInstanceNotFoundError,
   findOwnedInstance,
   type DomainInstallReceipt,
@@ -16,62 +12,38 @@ import {
   type OwnedInstanceInfo,
 } from './model'
 
-const ADMIN_ORIGIN = 'admin.astrale.ai'
-const PAGE_SIZE = 256
-const MAXIMUM_INSTANCES = 10_000
-const MAXIMUM_PAGES = Math.ceil(MAXIMUM_INSTANCES / PAGE_SIZE) + 1
-
-const HostRef = Object.freeze({ origin: ADMIN_ORIGIN, kind: 'class' as const, name: 'Host' })
-const fleetReservesAdminHost = Object.freeze({
-  origin: ADMIN_ORIGIN,
-  kind: 'class' as const,
-  name: 'fleet_reserves_admin_host',
-})
-
 export interface AdminInstanceContext {
   readonly session: ClientSession
-  readonly graph: AdminGraphApi
 }
 
 export interface AdminInstanceApi {
   list(): Promise<OwnedInstanceInfo[]>
-  create(slug: string, hostId?: string): Promise<InstanceInfo>
+  create(slug: string): Promise<InstanceInfo>
   status(identifier: string): Promise<InstanceInfo>
   delete(identifier: string): Promise<InstanceInfo>
   installDomain(identifier: string, domain: string): Promise<DomainInstallReceipt>
 }
 
 export interface AdminInstanceDependencies {
-  readonly bind?: (session: ClientSession) => Promise<AdminBinding>
   readonly operationId?: (kind: 'create' | 'status' | 'delete' | 'install-domain') => string
 }
 
 /**
- * Bind one discovered Admin root revision and expose only the public Instance
- * product journey. No Host lifecycle method is present on this capability.
+ * Connect the public Instance journey through stable Admin call paths. Routine
+ * operations perform no schema discovery. No Host lifecycle method is present.
  */
 export async function connectAdminInstances(
   context: AdminInstanceContext,
   dependencies: AdminInstanceDependencies = {},
 ): Promise<AdminInstanceApi> {
-  const binding = await (dependencies.bind ?? bindAdmin)(context.session)
-  if (binding.$.publication?.origin !== ADMIN_ORIGIN || binding.$.origin !== ADMIN_ORIGIN) {
-    throw new TypeError('Configured Admin target does not serve the Admin Domain.')
-  }
-
-  const Instance = binding.$.class('Instance')
-  const Host = binding.$.class('Host')
-  const Fleet = binding.$.class('Fleet')
-  const fleet = binding.$.core.nodes.fleet?.path
-  if (fleet === undefined) throw new TypeError('Admin Domain has no singleton Fleet receiver.')
-
   const operationId = dependencies.operationId ?? defaultOperationId
 
   const list = async (): Promise<OwnedInstanceInfo[]> => {
-    const result: unknown = await binding.$.invoke(
-      Fleet.$.method('listInstances') as never,
-      fleet,
-      {} as never,
+    const result: unknown = await callAdminMethod(
+      context.session,
+      AdminContract.fleet,
+      'listInstances',
+      {},
     )
     if (!Array.isArray(result)) throw new TypeError('Admin Instance inventory is invalid.')
     return result.map((value) => instanceFromSummary(value) as OwnedInstanceInfo)
@@ -88,121 +60,55 @@ export async function connectAdminInstances(
     identifier: string,
   ): Promise<InstanceInfo> => {
     const instance = await requireInstance(identifier)
-    const output = await binding.$.invoke(
-      Instance.$.method(method) as never,
-      Path.parse(instance.id),
-      { operationId: operationId(method) } as never,
-    )
+    const output = await callAdminMethod(context.session, Path.parse(instance.id), method, {
+      operationId: operationId(method),
+    })
     return instanceFromSummary(output)
   }
 
   return Object.freeze({
     list,
-    async create(slug: string, hostId?: string) {
+    async create(slug: string) {
       const input = Object.freeze({
         operationId: operationId('create'),
         slug,
       })
-      if (hostId !== undefined) {
-        const selected = await hostInventory(context.graph, binding, Host, fleet)
-        const host = selected.hosts.find(
-          (item) => item.id === hostId && item.state === 'ready' && item.path !== selected.reserved,
-        )
-        if (host === undefined) throw new AdminHostNotFoundError(hostId)
-        return instanceFromSummary(
-          await binding.$.invoke(
-            Host.$.method('createInstance') as never,
-            Path.parse(host.path),
-            input as never,
-          ),
-        )
-      }
-
-      // Default placement belongs to Admin. Avoid a redundant Host graph read:
-      // it requires broader graph authority than this Fleet operation and can
-      // deny an otherwise authorized caller before the server selects a Host.
       return instanceFromSummary(
-        await binding.$.invoke(Fleet.$.method('createInstance') as never, fleet, input as never),
+        await callAdminMethod(context.session, AdminContract.fleet, 'createInstance', input),
       )
     },
     status: (identifier: string) => invokeInstance('status', identifier),
     delete: (identifier: string) => invokeInstance('delete', identifier),
     async installDomain(identifier: string, domain: string): Promise<DomainInstallReceipt> {
       const instance = await requireInstance(identifier)
-      const output = await binding.$.invoke(
-        Instance.$.method('installDomain') as never,
+      const output = await callAdminMethod(
+        context.session,
         Path.parse(instance.id),
+        'installDomain',
         {
           operationId: operationId('install-domain'),
           domain: Path.parse(domain).raw,
-        } as never,
+        },
       )
       return domainInstallReceipt(output)
     },
   })
 }
 
-interface HostInventoryItem {
-  readonly id: string
-  readonly nodeId: string
-  readonly path: string
-  readonly state: string
-}
-
-async function hostInventory(
-  graph: AdminGraphApi,
-  binding: AdminBinding,
-  Host: ReturnType<AdminBinding['$']['class']>,
-  fleet: Path,
-): Promise<{ readonly hosts: readonly HostInventoryItem[]; readonly reserved?: string }> {
-  const [nodes, reservedPage] = await Promise.all([
-    readAllNodes(
-      graph,
-      Query.from({ kind: 'node', definitions: [HostRef] }).select({
-        kind: 'nodes',
-        projection: { kind: 'value' },
-      }),
-      {
-        label: 'Admin Host inventory',
-        maximum: MAXIMUM_INSTANCES,
-        maximumPages: MAXIMUM_PAGES,
-      },
-    ),
-    graph.neighbors(fleet, fleetReservesAdminHost, {
-      direction: 'outgoing',
-      page: { size: 1 },
-    }),
-  ])
-  const reserved = reservedPage.first === null ? undefined : Path.id(reservedPage.first.id).raw
-  return Object.freeze({
-    hosts: Object.freeze(
-      nodes.map((node) =>
-        Object.freeze({
-          id: requiredStringProperty(Host, node, 'id'),
-          nodeId: String(node.id),
-          path: Path.id(node.id).raw,
-          state: requiredStringProperty(Host, node, 'state'),
-        }),
-      ),
-    ),
-    ...(reserved === undefined ? {} : { reserved }),
-  })
-}
-
-type DynamicDefinition = ReturnType<AdminBinding['$']['class']>
-
 function instanceFromSummary(input: unknown): InstanceInfo {
   const value = record(input, 'Admin Instance summary')
   const failure = value.failure === undefined ? undefined : record(value.failure, 'Admin failure')
   return Object.freeze({
-    id: requiredString(value.id, 'Admin Instance id'),
+    id: requiredNodePath(value.id, 'Admin Instance id'),
     slug: requiredString(value.slug, 'Admin Instance slug'),
     url: optionalStringValue(value.url) ?? '',
-    state: instanceState(value.state),
     ...(value.hostId === undefined
       ? {}
-      : { hostId: requiredString(value.hostId, 'Admin Host id') }),
-    ...(value.region === undefined ? {} : { region: requiredString(value.region, 'Admin region') }),
+      : { hostId: requiredNodePath(value.hostId, 'Admin Host id') }),
+    ...(value.region === undefined
+      ? {}
+      : { region: requiredString(value.region, 'Admin Host region') }),
+    state: instanceState(value.state),
     ...(value.phase === undefined
       ? {}
       : { phase: requiredString(value.phase, 'Admin Instance phase') }),
@@ -212,6 +118,9 @@ function instanceFromSummary(input: unknown): InstanceInfo {
     ...(value.createdAt === undefined
       ? {}
       : { createdAt: requiredString(value.createdAt, 'Admin Instance creation time') }),
+    ...(value.updatedAt === undefined
+      ? {}
+      : { updatedAt: requiredString(value.updatedAt, 'Admin Instance update time') }),
     ...(value.organizationId === undefined
       ? {}
       : { organizationId: requiredString(value.organizationId, 'Admin organization id') }),
@@ -223,8 +132,8 @@ function domainInstallReceipt(input: unknown): DomainInstallReceipt {
   const failure = value.failure === undefined ? undefined : record(value.failure, 'Admin failure')
   if (typeof value.ok !== 'boolean') throw new TypeError('Admin Domain install outcome is invalid.')
   return Object.freeze({
-    domain: requiredString(value.domain, 'Admin Domain reference'),
-    instance: requiredString(value.instance, 'Admin Instance reference'),
+    domain: requiredNodePath(value.domain, 'Admin Domain reference'),
+    instance: requiredNodePath(value.instance, 'Admin Instance reference'),
     origin: requiredString(value.origin, 'Installed Domain origin'),
     ok: value.ok,
     ...(value.installedRevision === undefined
@@ -238,13 +147,6 @@ function domainInstallReceipt(input: unknown): DomainInstallReceipt {
   })
 }
 
-function requiredStringProperty(definition: DynamicDefinition, node: Node, name: string): string {
-  return requiredString(
-    node.props[definition.$.property(name).key],
-    `Admin ${definition.name}.${name}`,
-  )
-}
-
 function instanceState(input: unknown): InstanceState {
   if (
     input === 'provisioning' ||
@@ -263,6 +165,15 @@ function requiredString(input: unknown, label: string): string {
   return input
 }
 
+function requiredNodePath(input: unknown, label: string): string {
+  const value = requiredString(input, label)
+  try {
+    return Path.parse(value).raw
+  } catch {
+    throw new TypeError(`${label} is invalid.`)
+  }
+}
+
 function optionalStringValue(input: unknown): string | undefined {
   if (input === undefined) return undefined
   return requiredString(input, 'Admin string value')

package/src/admin/instance/index.ts

@@ -5,10 +5,9 @@ export {
   type AdminInstanceDependencies,
 } from './client'
 export {
-  AdminHostNotFoundError,
   AdminInstanceNotFoundError,
   findOwnedInstance,
-  formatInstanceLocation,
+  formatInstanceState,
   type DomainInstallReceipt,
   type InstanceInfo,
   type InstanceState,

package/src/admin/instance/model.ts

@@ -7,10 +7,11 @@ export interface InstanceInfo {
   readonly url: string
   readonly hostId?: string
   readonly region?: string
-  readonly state?: InstanceState
+  readonly state: InstanceState
   readonly phase?: string
   readonly error?: string | null
   readonly createdAt?: string
+  readonly updatedAt?: string
   readonly organizationId?: string
 }
 
@@ -28,19 +29,13 @@ export interface DomainInstallReceipt {
   readonly error?: string
 }
 
-export class AdminInstanceNotFoundError extends Error {
-  readonly name = 'NotFoundError'
-
-  constructor(readonly identifier: string) {
-    super(`No owned Admin Instance matches ${JSON.stringify(identifier)}.`)
-  }
-}
-
-export class AdminHostNotFoundError extends Error {
-  readonly name = 'NotFoundError'
-
+export class AdminInstanceNotFoundError extends AstraleError {
   constructor(readonly identifier: string) {
-    super(`No caller-usable Admin Host matches ${JSON.stringify(identifier)}.`)
+    super(
+      'INSTANCE_NOT_FOUND',
+      `No owned Admin Instance matches ${JSON.stringify(identifier)}.`,
+      'Run `astrale instance list` to see your instances.',
+    )
   }
 }
 
@@ -57,9 +52,8 @@ export function findOwnedInstance(
   )
 }
 
-/** Human-readable location of an Instance (state, region, and Host Path). */
-export function formatInstanceLocation(info: InstanceInfo): string {
-  return [info.state && info.state !== 'ready' ? info.state : undefined, info.region, info.hostId]
-    .filter(Boolean)
-    .join(' · ')
+/** Human-readable non-ready lifecycle state for one Instance. */
+export function formatInstanceState(info: InstanceInfo): string {
+  return info.state === 'ready' ? '' : `${info.state}${info.phase ? ` (${info.phase})` : ''}`
 }
+import { AstraleError } from '../../errors'

package/src/commands/__tests__/admin-instance.test.ts

@@ -4,7 +4,10 @@ import type { IdentityStore } from '../../identity/index'
 
 import { AuthError } from '../../errors'
 import { findOwnedInstance, type OwnedInstanceInfo } from '../../lib/admin-instance'
-import { assertAlphaCreateIdentity } from '../instance/create'
+import {
+  assertInstanceCreateIdentity,
+  selectInstanceCreateIdentity,
+} from '../../lib/provision-instance'
 
 describe('admin-backed instance commands', () => {
   test('findOwnedInstance matches owner inventory by slug or stable node id', () => {
@@ -14,8 +17,6 @@ describe('admin-backed instance commands', () => {
       url: 'https://demo.eu.astrale.ai',
       state: 'failed',
       organizationId: 'org_123',
-      hostId: 'host-1',
-      region: 'eu',
       phase: 'installing:default-domains',
       error: 'postInstall failed',
       createdAt: '2026-07-16T00:00:00.000Z',
@@ -39,8 +40,8 @@ describe('admin-backed instance commands', () => {
       },
     }
 
-    expect(() => assertAlphaCreateIdentity(store)).toThrow(AuthError)
-    expect(() => assertAlphaCreateIdentity(store)).toThrow('WorkOS login required')
+    expect(() => assertInstanceCreateIdentity(store)).toThrow(AuthError)
+    expect(() => assertInstanceCreateIdentity(store)).toThrow('WorkOS login required')
   })
 
   test('instance create preflight accepts IdP-backed identities', () => {
@@ -58,7 +59,8 @@ describe('admin-backed instance commands', () => {
       },
     }
 
-    expect(() => assertAlphaCreateIdentity(store)).not.toThrow()
+    expect(() => assertInstanceCreateIdentity(store)).not.toThrow()
+    expect(selectInstanceCreateIdentity(store)).toBe('bryan')
   })
 
   test('--as selection must also be IdP-backed', () => {
@@ -82,7 +84,8 @@ describe('admin-backed instance commands', () => {
       },
     }
 
-    expect(() => assertAlphaCreateIdentity(store, { as: 'local' })).toThrow(AuthError)
-    expect(() => assertAlphaCreateIdentity(store, { as: 'workos' })).not.toThrow()
+    expect(() => assertInstanceCreateIdentity(store, { as: 'local' })).toThrow(AuthError)
+    expect(() => assertInstanceCreateIdentity(store, { as: 'workos' })).not.toThrow()
+    expect(selectInstanceCreateIdentity(store, { as: 'workos' })).toBe('workos')
   })
 })

package/src/commands/__tests__/call-describe.test.ts

@@ -1,34 +1,47 @@
 import { Path } from '@astrale-os/sdk/graph/path'
+import { bundle, defineSchema, func, method, nodeClass } from '@astrale-os/sdk/schema'
 import { describe, expect, test } from 'bun:test'
 
-import { describeCallableFromSchema } from '../call-describe'
+import { describeCallableFromBundle } from '../call-describe'
 
-const schema = {
-  classes: {
-    Manager: {
-      methods: {
-        createInstance: {
-          auth: 'authorized',
-          description: 'Create one child Instance.',
-          input: { type: 'object', required: ['operationId', 'slug'] },
-          output: { mode: 'value' },
-        },
-      },
-    },
+const createInstance = method({
+  auth: 'authenticated',
+  description: 'Create one child Instance.',
+  input: {
+    type: 'object',
+    properties: { operationId: { type: 'string' }, slug: { type: 'string' } },
+    required: ['operationId', 'slug'],
+    additionalProperties: false,
   },
-  functions: {
-    journal: {
-      description: 'Read the authorized Kernel journal.',
-      input: { type: 'object' },
-    },
+  output: { type: 'object', additionalProperties: true },
+  static: true,
+})
+const inspectInstance = method({
+  auth: 'authenticated',
+  description: 'Inspect one child Instance.',
+  input: { type: 'object', properties: {}, additionalProperties: false },
+  output: { type: 'object', additionalProperties: true },
+})
+const journal = func({
+  auth: 'authenticated',
+  description: 'Read the authorized Kernel journal.',
+  input: { type: 'object', properties: {}, additionalProperties: false },
+  output: { type: 'object', additionalProperties: true },
+})
+const source = defineSchema('host.astrale.ai', {
+  classes: {
+    Manager: nodeClass({ methods: { createInstance } }),
+    Instance: nodeClass({ methods: { inspectInstance } }),
   },
-}
+  functions: { journal },
+})
+const installed = bundle.create(source)
 
-describe('describeCallableFromSchema', () => {
-  test('reads a static Class method from the Domain schema', () => {
-    const described = describeCallableFromSchema(
+describe('describeCallableFromBundle', () => {
+  test('reads a static Class method from the resolved Domain', () => {
+    const described = describeCallableFromBundle(
       Path.parse('/:host.astrale.ai:class.Manager:createInstance'),
-      schema,
+      installed,
     )
     expect(described).toMatchObject({
       origin: 'host.astrale.ai',
@@ -36,30 +49,30 @@ describe('describeCallableFromSchema', () => {
       method: 'createInstance',
       dispatch: 'static',
       description: 'Create one child Instance.',
-      auth: 'authorized',
+      auth: 'authenticated',
     })
     expect(described?.input).toMatchObject({ required: ['operationId', 'slug'] })
   })
 
-  test('finds an instance method when the receiver Path is not a Class projection', () => {
+  test('finds one instance method when the receiver Path is not a Class projection', () => {
     expect(
-      describeCallableFromSchema(
-        Path.parse('/:host.astrale.ai:core.manager::createInstance'),
-        schema,
+      describeCallableFromBundle(
+        Path.parse('/:host.astrale.ai:core.manager::inspectInstance'),
+        installed,
       ),
     ).toMatchObject({
       origin: 'host.astrale.ai',
-      class: 'Manager',
-      method: 'createInstance',
+      class: 'Instance',
+      method: 'inspectInstance',
       dispatch: 'instance',
     })
   })
 
-  test('reads a standalone Function from the Domain schema', () => {
+  test('reads a standalone Function from the resolved Domain', () => {
     expect(
-      describeCallableFromSchema(Path.parse('/:kernel.astrale.ai:function.journal'), schema),
+      describeCallableFromBundle(Path.parse('/:host.astrale.ai:function.journal'), installed),
     ).toMatchObject({
-      origin: 'kernel.astrale.ai',
+      origin: 'host.astrale.ai',
       function: 'journal',
       description: 'Read the authorized Kernel journal.',
     })

package/src/commands/__tests__/call.test.ts

@@ -26,4 +26,38 @@ describe('call command result lifetime', () => {
     if (materialized.kind !== 'stream') throw new Error('expected a materialized stream')
     expect(Object.isFrozen(materialized.values)).toBe(true)
   })
+
+  test('drains streaming binary bytes before the command session closes', async () => {
+    let sessionOpen = true
+    async function* body() {
+      for (const chunk of [new Uint8Array([1, 2]), new Uint8Array([3])]) {
+        if (!sessionOpen) throw new Error('session closed before binary consumption')
+        yield chunk
+      }
+    }
+
+    const materialized = await materializeCallResult({
+      kind: 'binary',
+      invocation: { source: 'https://kernel.test' as never, id: 'test-binary' },
+      value: {
+        body: body(),
+        mediaType: 'application/octet-stream',
+        status: 206,
+        headers: { 'content-range': 'bytes 0-2/3' },
+      },
+    })
+    sessionOpen = false
+
+    expect(materialized).toMatchObject({
+      kind: 'binary',
+      value: {
+        mediaType: 'application/octet-stream',
+        status: 206,
+        headers: { 'content-range': 'bytes 0-2/3' },
+      },
+    })
+    if (materialized.kind !== 'binary') throw new Error('expected materialized binary')
+    expect([...materialized.value.body]).toEqual([1, 2, 3])
+    expect(Object.isFrozen(materialized.value)).toBe(true)
+  })
 })

package/src/commands/__tests__/domain-install-operation.test.ts

@@ -1,9 +1,7 @@
-import { defineDomain } from '@astrale-os/sdk'
-import { issuer } from '@astrale-os/sdk/auth'
-import { createDeployment } from '@astrale-os/sdk/deployment'
-import { defineSchema } from '@astrale-os/sdk/schema/v1'
+import { defineSchema } from '@astrale-os/sdk/schema'
 import { afterEach, describe, expect, mock, test } from 'bun:test'
 
+import { releaseFor } from '../../__tests__/fixtures/publication'
 import { installDirect } from '../domain/install'
 
 const GENERATED = '4a4c9a18-50f6-4d84-a7b7-2d83e3e45dc8'
@@ -12,16 +10,7 @@ const RETRY = '139137b5-af47-47ce-92b2-b64a2b0c63d7'
 const originalFetch = globalThis.fetch
 
 const schema = defineSchema('crm.test', {})
-const definition = defineDomain({
-  schema,
-  handlers: { functions: {}, classes: {}, interfaces: {} },
-})
-const deployed = createDeployment({
-  definition,
-  issuer: issuer.accept('https://crm.test'),
-  bundleHref: 'https://crm.test/domain.bundle.json',
-  bindings: { callables: [] },
-}).publication
+const deployed = releaseFor(schema, 'https://crm.test').publication
 
 function publicationResponse(): Response {
   return Response.json(deployed)
@@ -49,9 +38,7 @@ describe('direct domain install operation identity', () => {
           recovery = input.recovery
           requests.push(
             await input.fn({
-              session: {
-                call: async (call: { input: unknown }) => call.input,
-              },
+              session: { schema: { install: async (input: unknown) => input } },
             } as never),
           )
         },
@@ -62,7 +49,7 @@ describe('direct domain install operation identity', () => {
     expect(requests).toEqual([
       {
         operation: GENERATED,
-        domains: [{ source: { kind: 'remote', url: 'https://crm.test' } }],
+        domains: [{ publication: { url: 'https://crm.test' } }],
       },
     ])
     expect(recovery).toEqual({
@@ -89,9 +76,7 @@ describe('direct domain install operation identity', () => {
         runKernelCommand: async (input) => {
           requests.push(
             await input.fn({
-              session: {
-                call: async (call: { input: unknown }) => call.input,
-              },
+              session: { schema: { install: async (input: unknown) => input } },
             } as never),
           )
         },
@@ -103,7 +88,7 @@ describe('direct domain install operation identity', () => {
     expect(requests).toEqual([
       {
         operation: RETRY,
-        domains: [{ source: { kind: 'remote', url: 'https://crm.test' } }],
+        domains: [{ publication: { url: 'https://crm.test' } }],
       },
     ])
   })

package/src/commands/__tests__/domain-install-owned.test.ts

@@ -1,4 +1,4 @@
-import { ResponseError } from '@astrale-os/kernel-client'
+import { ResponseError } from '@astrale-os/sdk/client'
 import { afterEach, beforeEach, describe, expect, mock, test } from 'bun:test'
 
 import type { OwnedInstanceInfo } from '../../lib/admin-instance'

package/src/commands/__tests__/domain-list.test.ts

@@ -1,11 +1,9 @@
-import { defineDomain } from '@astrale-os/sdk'
-import { issuer } from '@astrale-os/sdk/auth'
-import { createDeployment } from '@astrale-os/sdk/deployment'
-import { defineSchema } from '@astrale-os/sdk/schema/v1'
+import { defineSchema, schema as schemaApi } from '@astrale-os/sdk/schema'
 import { afterAll, describe, expect, test } from 'bun:test'
 
 import type { DomainInfo } from '../../lib/admin-domain'
 
+import { releaseFor } from '../../__tests__/fixtures/publication'
 import { byDefaultThenName, domainProjection, probe, type DomainRow } from '../domain/list'
 
 const strip = (s: string): string => s.replace(/\[[0-9;]*m/g, '')
@@ -85,16 +83,7 @@ describe('domain list — canonical Publication check', () => {
 
   test('reports the admitted schema revision in machine data', async () => {
     const schema = defineSchema('catalog-check.example.dev', {})
-    const definition = defineDomain({
-      schema,
-      handlers: { functions: {}, classes: {}, interfaces: {} },
-    })
-    const deployed = createDeployment({
-      definition,
-      issuer: issuer.accept('https://catalog-check.example.dev'),
-      bundleHref: 'https://catalog-check.example.dev/domain.bundle.json',
-      bindings: { callables: [] },
-    }).publication
+    const deployed = releaseFor(schema, 'https://catalog-check.example.dev').publication
     const server = Bun.serve({
       port: 0,
       fetch(request) {
@@ -114,23 +103,14 @@ describe('domain list — canonical Publication check', () => {
       ),
     ).resolves.toMatchObject({
       reachable: true,
-      schemaRevision: definition.domain.$.revision,
+      schemaRevision: schemaApi.revision(schema),
       checkError: null,
     })
   })
 
   test('rejects a Publication whose origin differs from the catalog entry', async () => {
     const schema = defineSchema('deployed.example.dev', {})
-    const definition = defineDomain({
-      schema,
-      handlers: { functions: {}, classes: {}, interfaces: {} },
-    })
-    const deployed = createDeployment({
-      definition,
-      issuer: issuer.accept('https://deployed.example.dev'),
-      bundleHref: 'https://deployed.example.dev/domain.bundle.json',
-      bindings: { callables: [] },
-    }).publication
+    const deployed = releaseFor(schema, 'https://deployed.example.dev').publication
     const server = Bun.serve({
       port: 0,
       fetch: () => Response.json(deployed),