@astrale-os/cli 1.0.0-beta.8 → 1.0.0-beta.9

package/src/admin/instance/client.ts

@@ -1,9 +1,6 @@
 import type { ClientSession } from '@astrale-os/sdk/client/session'
-import type { Node } from '@astrale-os/sdk/graph/node'
-import type { ResolvedClass } from '@astrale-os/sdk/schema'
 
 import { Path } from '@astrale-os/sdk/graph/path'
-import { Query } from '@astrale-os/sdk/query'
 
 import {
   bindAdmin,
@@ -11,12 +8,9 @@ import {
   requireAdminBinding,
   requireAdminClass,
   requireAdminCore,
-  requireAdminProperty,
   type AdminBinding,
 } from '../binding'
-import { readAllNodes, type AdminGraphApi } from '../graph'
 import {
-  AdminHostNotFoundError,
   AdminInstanceNotFoundError,
   findOwnedInstance,
   type DomainInstallReceipt,
@@ -25,18 +19,13 @@ import {
   type OwnedInstanceInfo,
 } from './model'
 
-const PAGE_SIZE = 256
-const MAXIMUM_INSTANCES = 10_000
-const MAXIMUM_PAGES = Math.ceil(MAXIMUM_INSTANCES / PAGE_SIZE) + 1
-
 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>
@@ -58,9 +47,7 @@ export async function connectAdminInstances(
   const binding = requireAdminBinding(await (dependencies.bind ?? bindAdmin)(context.session))
 
   const Instance = requireAdminClass(binding, 'Instance', 'node')
-  const Host = requireAdminClass(binding, 'Host', 'node')
   const Fleet = requireAdminClass(binding, 'Fleet', 'node')
-  const fleetReservesAdminHost = requireAdminClass(binding, 'fleet_reserves_admin_host', 'edge')
   const fleet = requireAdminCore(binding, 'fleet')
 
   const operationId = dependencies.operationId ?? defaultOperationId
@@ -102,32 +89,11 @@ export async function connectAdminInstances(
 
   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, Host, fleetReservesAdminHost, 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 invokeAdminMethod(
-            context.session,
-            binding,
-            Host,
-            'createInstance',
-            Path.parse(host.path),
-            input,
-          ),
-        )
-      }
-
-      // 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 invokeAdminMethod(context.session, binding, Fleet, 'createInstance', fleet, input),
       )
@@ -152,55 +118,6 @@ export async function connectAdminInstances(
   })
 }
 
-interface HostInventoryItem {
-  readonly id: string
-  readonly nodeId: string
-  readonly path: string
-  readonly state: string
-}
-
-async function hostInventory(
-  graph: AdminGraphApi,
-  Host: ResolvedClass<'node'>,
-  fleetReservesAdminHost: ResolvedClass<'edge'>,
-  fleet: Path,
-): Promise<{ readonly hosts: readonly HostInventoryItem[]; readonly reserved?: string }> {
-  const [nodes, reservedPage] = await Promise.all([
-    readAllNodes(
-      graph,
-      Query.from({ nodes: [Host] }).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 = ResolvedClass<'node'>
-
 function instanceFromSummary(input: unknown): InstanceInfo {
   const value = record(input, 'Admin Instance summary')
   const failure = value.failure === undefined ? undefined : record(value.failure, 'Admin failure')
@@ -209,10 +126,6 @@ function instanceFromSummary(input: unknown): InstanceInfo {
     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') }),
     ...(value.phase === undefined
       ? {}
       : { phase: requiredString(value.phase, 'Admin Instance phase') }),
@@ -248,13 +161,6 @@ function domainInstallReceipt(input: unknown): DomainInstallReceipt {
   })
 }
 
-function requiredStringProperty(definition: DynamicDefinition, node: Node, name: string): string {
-  return requiredString(
-    node.props[requireAdminProperty(definition, name).key],
-    `Admin ${definition.ref.name}.${name}`,
-  )
-}
-
 function instanceState(input: unknown): InstanceState {
   if (
     input === 'provisioning' ||

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

@@ -5,9 +5,7 @@ export interface InstanceInfo {
   readonly id: string
   readonly slug: string
   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
@@ -38,12 +36,6 @@ export class AdminInstanceNotFoundError extends AstraleError {
   }
 }
 
-export class AdminHostNotFoundError extends AstraleError {
-  constructor(readonly identifier: string) {
-    super('HOST_NOT_FOUND', `No caller-usable Admin Host matches ${JSON.stringify(identifier)}.`)
-  }
-}
-
 /** Match an owner-scoped Instance by slug, canonical Node Path, or bare Node id. */
 export function findOwnedInstance(
   instances: readonly OwnedInstanceInfo[],
@@ -57,10 +49,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__/instance-list-rows.test.ts

@@ -5,7 +5,7 @@ import type { InstanceInfo } from '../../lib/admin-instance'
 import { buildInstanceRows, type Bookmark } from '../instance/list'
 
 const managed: InstanceInfo[] = [
-  { id: 'demo', slug: 'demo', url: 'https://demo.eu.astrale.ai', region: 'eu' },
+  { id: 'demo', slug: 'demo', url: 'https://demo.eu.astrale.ai', state: 'ready' },
 ]
 
 function bookmark(overrides: Partial<Bookmark> = {}): Bookmark {

package/src/commands/call-describe.ts

@@ -83,7 +83,7 @@ export function missingCallableDescription(path: string): AstraleError {
   return new AstraleError(
     'CALL_DESCRIBE_UNAVAILABLE',
     `No callable schema is installed for ${path}.`,
-    'Use a Domain-rooted Path such as /:host.astrale.ai:class.Manager:createInstance. Method Paths are not Function nodes.',
+    'Use a Domain-rooted Path such as /:kernel.astrale.ai:class.Identity:whois. Method Paths are not Function nodes.',
   )
 }
 

package/src/commands/call.ts

@@ -181,7 +181,7 @@ Self-reference:
   Callable input/output lives on astrale introspect <path>.
 
 Examples:
-  $ astrale introspect /:host.astrale.ai:class.Manager:createInstance
+  $ astrale introspect /:kernel.astrale.ai:class.Identity:whois
   $ astrale call /:blog.acme.com:class.Author:list limit=10
   $ astrale call '@self::deactivate'
   $ astrale call /:kernel.astrale.ai:function.journal --data '{"limit":5}' --json
@@ -190,7 +190,7 @@ Examples:
     {
       name: 'path',
       description:
-        'Operation path (e.g., /:host.astrale.ai:class.Manager:createInstance or /node::method)',
+        'Operation path (e.g., /:kernel.astrale.ai:class.Identity:whois or /node::method)',
     },
     { name: 'params...', description: 'Params as key=value pairs', required: false },
   ],

package/src/commands/domain/list.ts

@@ -73,7 +73,7 @@ Behavior:
   or with --json/--raw (agent-friendly — full DomainInfo objects). -q prints
   one install URL per line (pipeable into \`domain install\`); --count prints
   only the number. --default-only keeps the install-by-default entries (what
-  every new instance gets via alphaCreate). --check probes each published URL's
+  every new instance receives during Admin-managed provisioning). --check probes each published URL's
   canonical Publication and adds a live/unreachable STATUS column
   (+ reachable/schemaRevision in machine output).
 

package/src/commands/domain/publish.ts

@@ -3,9 +3,11 @@ import chalk from 'chalk'
 import type { KernelCommandOpts } from '../../connection'
 import type { CommandDefinition } from '../../program/index'
 
+import { formatKernelError } from '../../connection/errors'
 import { publishAdminDomain } from '../../lib/admin-domain'
 import { ADMIN_TARGET_OPTIONS, type AdminTargetCommandOpts } from '../../lib/admin-target'
-import { fatal, withSpinner } from '../../lib/log'
+import { domainPublicationUrl } from '../../lib/domain-publication'
+import { withSpinner } from '../../lib/log'
 import { isMachine, output } from '../../lib/output'
 import { promptText } from '../../lib/prompt'
 import { isHttpUrl, validateName, validateUrl } from '../../lib/validation'
@@ -48,9 +50,9 @@ Behavior:
 
   Publishing only makes the domain INSTALLABLE. Mount it on an instance with
   \`astrale domain install <url>\` (or rely on the admin's install-by-default
-  policy). This is usually invoked for you by \`astrale-domain publish\` (which
-  registers the already-deployed URL — it does NOT deploy) or by
-  \`astrale-domain deploy --publish\` (deploy AND register in one step).
+  policy). Deployment and catalog publication are separate owners: run the
+  project's \`astrale-domain deploy <environment>\`, then publish its observed
+  public URL with this command.
 
   Run in a terminal with flags omitted and it PROMPTS for origin / name /
   public-url (origin defaults to the URL host, name to the origin's first
@@ -68,17 +70,16 @@ Examples:
     { flags: '--description <text>', description: 'Optional human description for the catalog' },
     {
       flags: '--install-by-default',
-      description: 'Mark the domain for install on every new instance (alphaCreate)',
+      description: 'Mark the domain for install on every new instance',
     },
   ],
   // No positional arguments → Commander passes (opts, command); `opts` is first.
   action: async (opts: PublishOpts) => {
     try {
       // Interactive fill (TTY only): a human running this by hand is prompted for
-      // any missing field. The primary caller — `astrale-domain publish` — always
-      // passes every flag, so it never prompts. No TTY / --ci / --no-prompt / CI
-      // env → no prompt: fall straight through to the required-flag error below,
-      // so a piped / agent / LLM run fails fast instead of hanging on a read.
+      // any missing field. Automation passes every flag. No TTY / --ci /
+      // --no-prompt / CI env means no prompt: fall straight through to the
+      // required-flag error below so a piped or agent run fails fast.
       const interactive = !!process.stdin.isTTY && !(opts.ci || opts.noPrompt || process.env.CI)
       let { origin, name, publicUrl } = opts
       if (interactive) {
@@ -102,6 +103,7 @@ Examples:
       validateName(origin, 'origin')
       validateName(name, 'domain')
       validateUrl(publicUrl)
+      const discoveryUrl = domainPublicationUrl(publicUrl).href
 
       const result = await withSpinner(
         `Publishing ${name} → ${publicUrl}`,
@@ -110,7 +112,7 @@ Examples:
           publishAdminDomain(opts, {
             origin,
             name,
-            url: publicUrl,
+            url: discoveryUrl,
             ...(opts.description ? { description: opts.description } : {}),
             ...(opts.installByDefault ? { installByDefault: true } : {}),
           }),
@@ -127,7 +129,8 @@ Examples:
         return
       }
     } catch (e) {
-      fatal(e)
+      await formatKernelError(e, isMachine(opts), undefined, opts.debug)
+      process.exit(1)
     }
   },
 } satisfies CommandDefinition

package/src/commands/get.ts

@@ -59,7 +59,7 @@ Examples:
   $ astrale get /:notes.example.dev:class.Note
   $ astrale get @abc123 --json
   $ astrale get @self
-  $ astrale get /:host.astrale.ai --schema
+  $ astrale get /:kernel.astrale.ai --schema
 `,
   arguments: [{ name: 'target', description: 'Canonical Node Path or @id' }],
   options: [{ flags: '--schema', description: 'Include schema-valued properties' }],

package/src/commands/instance/create.ts

@@ -1,15 +1,12 @@
 import type { CommandDefinition } from '../../program/index'
 
+import { formatKernelError } from '../../connection/errors'
 import { ADMIN_TARGET_OPTIONS } from '../../lib/admin-target'
-import { fatal } from '../../lib/log'
 import { isMachine, output } from '../../lib/output'
 import { promptText } from '../../lib/prompt'
 import { provisionInstance, type ProvisionOpts } from '../../lib/provision-instance'
 import { validateSlug } from '../../lib/validation'
 
-// Re-exported for tests + `astrale setup`, which share the provisioning saga.
-export { assertAlphaCreateIdentity, parseEligibleHostIds } from '../../lib/provision-instance'
-
 /** inquirer `validate` for a slug: true when valid, else the human message. */
 function slugError(value: string): true | string {
   try {
@@ -22,12 +19,12 @@ function slugError(value: string): true | string {
 
 export default {
   name: 'create',
-  description: 'Provision an alpha instance through the admin kernel (Instance.alphaCreate)',
+  description: 'Provision an instance through the Admin control plane',
   afterHelpText: `
 Behavior:
-  Calls Instance.alphaCreate on the configured admin kernel. The caller must be
-  logged in with WorkOS. When --host-id is omitted, the admin kernel chooses the
-  caller's single eligible host. The new instance becomes the active instance.
+  Requests a new Instance from the configured Admin Domain. The caller must be
+  logged in with WorkOS. Admin owns infrastructure placement. The new instance
+  becomes the active instance.
 
   Run with no slug in a terminal and it prompts for one (validated live). With
   no TTY — or --ci / --no-prompt — the slug argument is required up front, so
@@ -38,13 +35,7 @@ Examples:
   $ astrale instance create demo
 `,
   arguments: [{ name: 'id', description: 'Instance slug', required: false }],
-  options: [
-    ...ADMIN_TARGET_OPTIONS,
-    {
-      flags: '--host-id <id>',
-      description: 'Advanced: host node id to provision on when multiple hosts are available',
-    },
-  ],
+  options: [...ADMIN_TARGET_OPTIONS],
   action: async (id: string | undefined, opts: ProvisionOpts) => {
     try {
       // Interactive (TTY only): prompt for the slug when omitted, with live
@@ -63,7 +54,8 @@ Examples:
         return
       }
     } catch (e) {
-      fatal(e, opts)
+      await formatKernelError(e, isMachine(opts), undefined, opts.debug)
+      process.exit(1)
     }
   },
 } satisfies CommandDefinition

package/src/commands/instance/delete.ts

@@ -2,10 +2,11 @@ import type { KernelCommandOpts } from '../../connection'
 import type { CommandDefinition } from '../../program/index'
 
 import { AdminInstanceNotFoundError } from '../../admin/instance'
+import { formatKernelError } from '../../connection/errors'
 import { deleteOwnedInstance } from '../../lib/admin-instance'
 import { ADMIN_TARGET_OPTIONS, type AdminTargetCommandOpts } from '../../lib/admin-target'
 import { clearActive, readInstances, removeInstance, resolveInstanceKey } from '../../lib/instance'
-import { fatal, log, withSpinner } from '../../lib/log'
+import { log, withSpinner } from '../../lib/log'
 import { isMachine, output } from '../../lib/output'
 
 type DeleteOpts = KernelCommandOpts &
@@ -19,10 +20,9 @@ export default {
   afterHelpText: `
 Behavior:
   Calls Instance.delete on the configured admin kernel: best-effort decommission
-  of the instance's routing-registry entry + WorkOS org (frees the slug), then
-  removes the Instance record. The host kernel itself is NOT deregistered (the
-  deprovisioning saga is a follow-up). A same-name local bookmark is removed
-  after the delete succeeds unless --keep-bookmark is passed.
+  of the instance's route and tenant reservation, then removes the Instance
+  projection. A same-name local bookmark is removed after the delete succeeds
+  unless --keep-bookmark is passed.
 `,
   arguments: [{ name: 'id', description: 'Instance slug', required: true }],
   options: [
@@ -62,7 +62,8 @@ Behavior:
         log.dim(`  hint: it's a local bookmark — drop it with: astrale instance forget ${id}`)
         process.exit(1)
       }
-      fatal(e, opts)
+      await formatKernelError(e, isMachine(opts), undefined, opts.debug)
+      process.exit(1)
     }
   },
 } satisfies CommandDefinition

package/src/commands/instance/list.ts

@@ -7,7 +7,7 @@ import type { CommandDefinition } from '../../program/index'
 import { AstraleError } from '../../errors'
 import { listOwnedInstances } from '../../lib/admin-instance'
 import {
-  formatInstanceLocation,
+  formatInstanceState,
   type InstanceInfo,
   type OwnedInstanceInfo,
 } from '../../lib/admin-instance'
@@ -136,7 +136,7 @@ export function buildInstanceRows(
         name: twin?.active ? `${item.slug} ${chalk.green('*')}` : item.slug,
         kind: 'managed',
         url: item.url ?? '',
-        extra: [formatInstanceLocation(item), twin ? formatBookmarkConnection(twin) : '']
+        extra: [formatInstanceState(item), twin ? formatBookmarkConnection(twin) : '']
           .filter(Boolean)
           .join(' · '),
       })

package/src/commands/instance/status.ts

@@ -3,9 +3,10 @@ import chalk from 'chalk'
 import type { KernelCommandOpts } from '../../connection'
 import type { CommandDefinition } from '../../program/index'
 
+import { formatKernelError } from '../../connection/errors'
 import { statusOwnedInstance } from '../../lib/admin-instance'
 import { ADMIN_TARGET_OPTIONS, type AdminTargetCommandOpts } from '../../lib/admin-target'
-import { fatal, log, withSpinner } from '../../lib/log'
+import { log, withSpinner } from '../../lib/log'
 import { isMachine, output, type RawOutputOpts } from '../../lib/output'
 
 type StatusOpts = KernelCommandOpts & AdminTargetCommandOpts & RawOutputOpts
@@ -27,12 +28,11 @@ export default {
       console.log(`${chalk.bold(result.slug)} ${chalk.dim(result.url)}`)
       log.dim(`  state: ${result.state}${result.phase ? ` (${result.phase})` : ''}`)
       if (result.error) log.dim(`  error: ${result.error}`)
-      if (result.region) log.dim(`  region: ${result.region}`)
-      if (result.hostId) log.dim(`  host: ${result.hostId}`)
       if (result.organizationId) log.dim(`  organization: ${result.organizationId}`)
       if (result.createdAt) log.dim(`  created: ${result.createdAt}`)
     } catch (e) {
-      fatal(e, opts)
+      await formatKernelError(e, isMachine(opts), undefined, opts.debug)
+      process.exit(1)
     }
   },
 } satisfies CommandDefinition

package/src/commands/instance/use.ts

@@ -3,7 +3,7 @@ import type { CommandDefinition } from '../../program/index'
 
 import { AstraleError } from '../../errors'
 import { getDefault, setDefault } from '../../identity/index'
-import { listOwnedInstances } from '../../lib/admin-instance'
+import { listOwnedInstancesWithIdentity } from '../../lib/admin-instance'
 import { ADMIN_TARGET_OPTIONS } from '../../lib/admin-target'
 import { fetchWithCaFile } from '../../lib/ca-fetch'
 import {
@@ -143,7 +143,7 @@ const defaultBookmarkProbeDependencies: BookmarkProbeDependencies = Object.freez
 
 async function resolveUseTarget(name: string, opts: UseOpts): Promise<ResolvedInstance> {
   const [store, managed] = await Promise.all([readInstances(), fetchManagedInstances(name, opts)])
-  const candidates = collectInstanceCandidates(name, store, managed)
+  const candidates = collectInstanceCandidates(name, store, managed.instances)
 
   if (candidates.length === 0) {
     throw new AstraleError(
@@ -168,12 +168,13 @@ async function resolveUseTarget(name: string, opts: UseOpts): Promise<ResolvedIn
   }
 
   assertManagedReady(chosen.info)
-  const { repointedFrom } = await upsertManagedBookmark(
-    chosen.key,
-    chosen.info.slug,
-    chosen.url,
-    chosen.info.organizationId,
-  )
+  const { repointedFrom } = await upsertManagedBookmark({
+    key: chosen.key,
+    slug: chosen.info.slug,
+    url: chosen.url,
+    ...(chosen.info.organizationId ? { organizationId: chosen.info.organizationId } : {}),
+    ...(managed.identity ? { defaultIdentity: managed.identity } : {}),
+  })
   if (repointedFrom) {
     log.warn(`Bookmark "${chosen.key}" repointed: ${repointedFrom} → ${chosen.url}`)
   }
@@ -185,16 +186,19 @@ async function resolveUseTarget(name: string, opts: UseOpts): Promise<ResolvedIn
  * Best-effort: an unreachable or unauthenticated admin kernel degrades to
  * bookmark-only resolution.
  */
-async function fetchManagedInstances(name: string, opts: UseOpts): Promise<OwnedInstanceInfo[]> {
+async function fetchManagedInstances(
+  name: string,
+  opts: UseOpts,
+): Promise<{ readonly instances: OwnedInstanceInfo[]; readonly identity?: string }> {
   try {
     validateSlug(name)
   } catch {
-    return []
+    return { instances: [] }
   }
   try {
-    return await listOwnedInstances(opts)
+    return await listOwnedInstancesWithIdentity(opts)
   } catch {
-    return []
+    return { instances: [] }
   }
 }
 

package/src/commands/introspect.ts

@@ -59,7 +59,7 @@ export function parseIntrospectTarget(target: string): { origin: string; path: P
     throw new AstraleError(
       'NOT_A_DOMAIN',
       'introspect requires a Domain origin or Path, not an @id.',
-      'Example: astrale introspect host.astrale.ai  or  /:host.astrale.ai:class.Manager:createInstance',
+      'Example: astrale introspect kernel.astrale.ai  or  /:kernel.astrale.ai:class.Identity:whois',
     )
   }
   const raw = target.startsWith('/') ? target : `/:${target}`
@@ -91,15 +91,15 @@ export default {
   afterHelpText: `
 Behavior:
   Calls the public Kernel introspect syscall for one installed Domain.
-  A bare origin (host.astrale.ai or /:host.astrale.ai) prints installation
+  A bare origin (kernel.astrale.ai or /:kernel.astrale.ai) prints installation
   state, target, source, readiness, and capabilities. --bundle includes the
   schema bundle. A method or Function Path projects that callable's
   input/output from the installed bundle.
 
 Examples:
-  $ astrale introspect host.astrale.ai
-  $ astrale introspect /:host.astrale.ai --bundle
-  $ astrale introspect /:host.astrale.ai:class.Manager:createInstance
+  $ astrale introspect kernel.astrale.ai
+  $ astrale introspect /:kernel.astrale.ai --bundle
+  $ astrale introspect /:kernel.astrale.ai:class.Identity:whois
   $ astrale introspect /:kernel.astrale.ai:function.journal
 `,
   arguments: [{ name: 'target', description: 'Domain origin or canonical Path' }],