@astrale-os/cli 1.0.0-beta.1 → 1.0.0-beta.11

package/src/program/__tests__/program.test.ts

@@ -187,7 +187,7 @@ describe('program composition', () => {
       'whoami',
     ])
     expect(createHash('sha256').update(JSON.stringify(surface)).digest('hex')).toBe(
-      'b21a8c98f0bb75432b460d4562c2d86f39ffb8e88349962e4611ccbf65fa9f73',
+      '56d2049ff4f7ddd24abdd9df39d4a827757f1b39a92dc7fb55933105d722f97f',
     )
   })
 
@@ -213,6 +213,19 @@ describe('help contract — no internal SPEC anchors leak to users', () => {
 
     expect(offenders).toEqual([])
   })
+
+  test('Kernel and Instance vocabulary does not expose retired Host or Interface concepts', async () => {
+    const program = await buildProgram()
+    const help = allCommands(program)
+      .map((command) => command.helpInformation())
+      .join('\n')
+
+    expect(help).not.toContain('host.astrale.ai')
+    expect(help).not.toContain(':interface.')
+    expect(help).not.toContain('Class or Interface')
+    expect(help).not.toContain('emulated host')
+    expect(help).not.toContain('Host shell')
+  })
 })
 
 describe('help contract — IdP/auth surface is registered', () => {
@@ -251,14 +264,17 @@ describe('help contract — admin target surface is registered', () => {
     expect(adminUse?.helpInformation()).not.toContain('--issuer <url>')
   })
 
-  test('instance create is the alphaCreate flow, not legacy Instance.init DX', async () => {
+  test('instance create delegates infrastructure placement to Admin', async () => {
     const program = await buildProgram()
     const instanceCreate = allCommands(program).find((command) => command.name() === 'create')
     const help = instanceCreate?.helpInformation() ?? ''
 
-    expect(help).toContain('Instance.alphaCreate')
+    expect(help).toContain('Provision an instance through the Admin control plane')
+    expect(help).not.toContain('Host')
+    expect(help).not.toContain('Fleet')
+    expect(help).not.toContain('--host-id')
     expect(help).not.toContain('--no-use')
-    expect(help).not.toContain('Instance.init requires --host-id')
+    expect(help).not.toContain('Instance.init')
   })
 })
 

package/src/program/build.ts

@@ -159,7 +159,7 @@ Command groups:
 
 Path syntax:
   /:origin                       Domain root
-  /:origin:class.Name            Class node     (or /:origin:interface.Name)
+  /:origin:class.Name            Class node
   /:origin:class.Name:method     Static callable
   <nodePath>::method             Instance method dispatch — double colon ::
   @nodeId                        Reference a node by its UID
@@ -174,7 +174,7 @@ Examples:
   $ astrale instance status staging
   $ astrale token --audience shell.astrale.ai --ttl 3600
   $ astrale query /:notes.example.dev:class.Note --limit 50
-  $ astrale introspect /:host.astrale.ai:class.Manager:createInstance
+  $ astrale introspect /:kernel.astrale.ai:class.Identity:whois
   $ astrale query --file query.v6.json --cursor "$CURSOR"
 `,
   )

package/src/setup/__tests__/instance-step.test.ts

@@ -27,11 +27,15 @@ function instance(slug: string, state: OwnedInstanceInfo['state'] = 'ready'): Ow
   }
 }
 
+function inventory(instances: OwnedInstanceInfo[], identity?: string) {
+  return { instances, ...(identity ? { identity } : {}) }
+}
+
 function dependencies(
   overrides: Partial<InstanceSetupDependencies> = {},
 ): InstanceSetupDependencies {
   return {
-    fetchOwned: mock(async () => []),
+    fetchOwned: mock(async () => inventory([])),
     adopt: mock(async () => {}),
     selectReady: mock(async (instances) => instances[0] ?? null),
     confirmCreate: mock(async () => true),
@@ -48,12 +52,14 @@ describe('setup owned-instance reconciliation', () => {
   test('silently adopts the sole owned ready instance', async () => {
     const ready = instance('only')
     const failed = instance('old-attempt', 'failed')
-    const deps = dependencies({ fetchOwned: mock(async () => [failed, ready]) })
+    const deps = dependencies({
+      fetchOwned: mock(async () => inventory([failed, ready], 'manager')),
+    })
 
     await expect(ensureOwnedInstance(ctx, deps)).resolves.toBe('fixed')
 
     expect(deps.adopt).toHaveBeenCalledTimes(1)
-    expect(deps.adopt).toHaveBeenCalledWith(ready)
+    expect(deps.adopt).toHaveBeenCalledWith(ready, 'manager')
     expect(deps.selectReady).not.toHaveBeenCalled()
     expect(deps.confirmCreate).not.toHaveBeenCalled()
     expect(deps.provision).not.toHaveBeenCalled()
@@ -64,14 +70,14 @@ describe('setup owned-instance reconciliation', () => {
     const second = instance('second')
     const pending = instance('pending', 'provisioning')
     const deps = dependencies({
-      fetchOwned: mock(async () => [first, pending, second]),
+      fetchOwned: mock(async () => inventory([first, pending, second], 'manager')),
       selectReady: mock(async (instances) => instances[1] ?? null),
     })
 
     await expect(ensureOwnedInstance(ctx, deps)).resolves.toBe('fixed')
 
     expect(deps.selectReady).toHaveBeenCalledWith([first, second])
-    expect(deps.adopt).toHaveBeenCalledWith(second)
+    expect(deps.adopt).toHaveBeenCalledWith(second, 'manager')
     expect(deps.confirmCreate).not.toHaveBeenCalled()
     expect(deps.provision).not.toHaveBeenCalled()
   })
@@ -80,7 +86,7 @@ describe('setup owned-instance reconciliation', () => {
     const first = instance('first')
     const second = instance('second')
     const deps = dependencies({
-      fetchOwned: mock(async () => [first, second]),
+      fetchOwned: mock(async () => inventory([first, second])),
       selectReady: mock(async () => null),
     })
 
@@ -165,7 +171,9 @@ describe('setup owned-instance reconciliation', () => {
       phase: 'installing:default-domains',
     }
     const failed = { ...instance('broken', 'failed'), error: 'postInstall failed' }
-    const deps = dependencies({ fetchOwned: mock(async () => [provisioning, failed]) })
+    const deps = dependencies({
+      fetchOwned: mock(async () => inventory([provisioning, failed])),
+    })
     const logged: string[] = []
     const original = console.log
     console.log = mock((...args: unknown[]) => {
@@ -218,10 +226,10 @@ describe('owned-instance adoption', () => {
     console.log = mock(() => {})
 
     try {
-      await adoptOwnedInstance(owned, {
+      await adoptOwnedInstance(owned, 'manager', {
         upsert: mock(async (...args) => {
           calls.push(['upsert', ...args])
-          return {}
+          return { entry: {} }
         }),
         activate: mock(async (...args) => {
           calls.push(['activate', ...args])
@@ -232,7 +240,16 @@ describe('owned-instance adoption', () => {
     }
 
     expect(calls).toEqual([
-      ['upsert', 'existing', 'existing', 'https://existing.eu.astrale.ai', 'org_existing'],
+      [
+        'upsert',
+        {
+          key: 'existing',
+          slug: 'existing',
+          url: 'https://existing.eu.astrale.ai',
+          organizationId: 'org_existing',
+          defaultIdentity: 'manager',
+        },
+      ],
       ['activate', 'existing'],
     ])
   })

package/src/setup/steps/instance.ts

@@ -4,7 +4,7 @@ import type { OwnedInstanceInfo } from '../../lib/admin-instance'
 import type { SetupContext, SetupStep } from '../types'
 
 import { AstraleError } from '../../errors'
-import { listOwnedInstances } from '../../lib/admin-instance'
+import { listOwnedInstancesWithIdentity } from '../../lib/admin-instance'
 import { normalizeInstanceKernelUrl, setActive, upsertManagedBookmark } from '../../lib/instance'
 import { readLocalStatus } from '../../lib/local-status'
 import { log, withSpinner } from '../../lib/log'
@@ -14,8 +14,11 @@ import { provisionInstance, type ProvisionResult } from '../../lib/provision-ins
 import { guiOrigin, slugError } from '../util'
 
 export type InstanceSetupDependencies = {
-  fetchOwned: (ctx: SetupContext) => Promise<OwnedInstanceInfo[]>
-  adopt: (info: OwnedInstanceInfo) => Promise<void>
+  fetchOwned: (ctx: SetupContext) => Promise<{
+    readonly instances: OwnedInstanceInfo[]
+    readonly identity?: string
+  }>
+  adopt: (info: OwnedInstanceInfo, identity?: string) => Promise<void>
   selectReady: (instances: OwnedInstanceInfo[]) => Promise<OwnedInstanceInfo | null>
   confirmCreate: () => Promise<boolean>
   promptSlug: () => Promise<string | undefined>
@@ -23,12 +26,7 @@ export type InstanceSetupDependencies = {
 }
 
 export type OwnedInstanceAdoptionDependencies = {
-  upsert: (
-    key: string,
-    slug: string,
-    url: string,
-    organizationId?: string,
-  ) => Promise<{ repointedFrom?: string }>
+  upsert: typeof upsertManagedBookmark
   activate: (slug: string) => Promise<unknown>
 }
 
@@ -41,12 +39,19 @@ function hero(slug: string, kernelUrl: string): void {
 
 export async function adoptOwnedInstance(
   info: OwnedInstanceInfo,
+  defaultIdentity?: string,
   deps: OwnedInstanceAdoptionDependencies = {
     upsert: upsertManagedBookmark,
     activate: setActive,
   },
 ): Promise<void> {
-  const { repointedFrom } = await deps.upsert(info.slug, info.slug, info.url, info.organizationId)
+  const { repointedFrom } = await deps.upsert({
+    key: info.slug,
+    slug: info.slug,
+    url: info.url,
+    ...(info.organizationId ? { organizationId: info.organizationId } : {}),
+    ...(defaultIdentity ? { defaultIdentity } : {}),
+  })
   await deps.activate(info.slug)
   if (repointedFrom) {
     log.warn(
@@ -61,7 +66,7 @@ function defaultDependencies(ctx: SetupContext): InstanceSetupDependencies {
   return {
     fetchOwned: (setupCtx) =>
       withSpinner('Checking for existing instances', !setupCtx.machine, () =>
-        listOwnedInstances(setupCtx.opts),
+        listOwnedInstancesWithIdentity(setupCtx.opts),
       ),
     adopt: adoptOwnedInstance,
     selectReady: (instances) =>
@@ -90,9 +95,9 @@ export async function ensureOwnedInstance(
   ctx: SetupContext,
   deps: InstanceSetupDependencies = defaultDependencies(ctx),
 ): Promise<'fixed' | 'skipped'> {
-  let owned: OwnedInstanceInfo[]
+  let inventory: Awaited<ReturnType<InstanceSetupDependencies['fetchOwned']>>
   try {
-    owned = await deps.fetchOwned(ctx)
+    inventory = await deps.fetchOwned(ctx)
   } catch (cause) {
     const detail = cause instanceof Error ? cause.message : String(cause)
     throw new AstraleError(
@@ -102,9 +107,11 @@ export async function ensureOwnedInstance(
     )
   }
 
+  const owned = inventory.instances
+
   const ready = owned.filter((info) => info.state === 'ready')
   if (ready.length === 1) {
-    await deps.adopt(ready[0]!)
+    await deps.adopt(ready[0]!, inventory.identity)
     return 'fixed'
   }
 
@@ -114,7 +121,7 @@ export async function ensureOwnedInstance(
       log.dim('  Skipped — no active instance set.')
       return 'skipped'
     }
-    await deps.adopt(choice)
+    await deps.adopt(choice, inventory.identity)
     return 'fixed'
   }
 

package/studio/client/dist/assets/elk-api-DjmKsHXc.js

@@ -0,0 +1 @@
+import{r as e,t}from"./rolldown-runtime-Dd_uD5pT.js";var n=t(((t,n)=>{(function(e){if(typeof t==`object`&&n!==void 0)n.exports=e();else if(typeof define==`function`&&define.amd)define([],e);else{var r=typeof window<`u`?window:typeof global<`u`?global:typeof self<`u`?self:this;r.ELK=e()}})(function(){return(function(){function t(n,r,i){function a(s,c){if(!r[s]){if(!n[s]){var l=typeof e==`function`&&e;if(!c&&l)return l(s,!0);if(o)return o(s,!0);var u=Error(`Cannot find module '`+s+`'`);throw u.code=`MODULE_NOT_FOUND`,u}var d=r[s]={exports:{}};n[s][0].call(d.exports,function(e){var t=n[s][1][e];return a(t||e)},d,d.exports,t,n,r,i)}return r[s].exports}for(var o=typeof e==`function`&&e,s=0;s<i.length;s++)a(i[s]);return a}return t})()({1:[function(e,t,n){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;function r(e){"@babel/helpers - typeof";return r=typeof Symbol==`function`&&typeof Symbol.iterator==`symbol`?function(e){return typeof e}:function(e){return e&&typeof Symbol==`function`&&e.constructor===Symbol&&e!==Symbol.prototype?`symbol`:typeof e},r(e)}function i(e,t){if(!(e instanceof t))throw TypeError(`Cannot call a class as a function`)}function a(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,`value`in r&&(r.writable=!0),Object.defineProperty(e,s(r.key),r)}}function o(e,t,n){return t&&a(e.prototype,t),n&&a(e,n),Object.defineProperty(e,"prototype",{writable:!1}),e}function s(e){var t=c(e,`string`);return r(t)==`symbol`?t:t+``}function c(e,t){if(r(e)!=`object`||!e)return e;var n=e[Symbol.toPrimitive];if(n!==void 0){var i=n.call(e,t||`default`);if(r(i)!=`object`)return i;throw TypeError(`@@toPrimitive must return a primitive value.`)}return(t===`string`?String:Number)(e)}n.default=function(){function e(){var t=this,n=arguments.length>0&&arguments[0]!==void 0?arguments[0]:{},r=n.defaultLayoutOptions,a=r===void 0?{}:r,o=n.algorithms,s=o===void 0?[`layered`,`stress`,`mrtree`,`radial`,`force`,`disco`,`sporeOverlap`,`sporeCompaction`,`rectpacking`]:o,c=n.workerFactory,u=n.workerUrl;if(i(this,e),this.defaultLayoutOptions=a,this.initialized=!1,u===void 0&&c===void 0)throw Error(`Cannot construct an ELK without both 'workerUrl' and 'workerFactory'.`);var d=c;u!==void 0&&c===void 0&&(d=function(e){return new Worker(e)});var f=d(u);if(typeof f.postMessage!=`function`)throw TypeError(`Created worker does not provide the required 'postMessage' function.`);this.worker=new l(f),this.worker.postMessage({cmd:`register`,algorithms:s}).then(function(e){return t.initialized=!0}).catch(console.err)}return o(e,[{key:`layout`,value:function(e){var t=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{},n=t.layoutOptions,r=n===void 0?this.defaultLayoutOptions:n,i=t.logging,a=i!==void 0&&i,o=t.measureExecutionTime,s=o!==void 0&&o;return e?this.worker.postMessage({cmd:`layout`,graph:e,layoutOptions:r,options:{logging:a,measureExecutionTime:s}}):Promise.reject(Error(`Missing mandatory parameter 'graph'.`))}},{key:`knownLayoutAlgorithms`,value:function(){return this.worker.postMessage({cmd:`algorithms`})}},{key:`knownLayoutOptions`,value:function(){return this.worker.postMessage({cmd:`options`})}},{key:`knownLayoutCategories`,value:function(){return this.worker.postMessage({cmd:`categories`})}},{key:`terminateWorker`,value:function(){this.worker&&this.worker.terminate()}}])}();var l=function(){function e(t){var n=this;if(i(this,e),t===void 0)throw Error(`Missing mandatory parameter 'worker'.`);this.resolvers={},this.worker=t,this.worker.onmessage=function(e){setTimeout(function(){n.receive(n,e)},0)}}return o(e,[{key:`postMessage`,value:function(e){var t=this.id||0;this.id=t+1,e.id=t;var n=this;return new Promise(function(r,i){n.resolvers[t]=function(e,t){e?(n.convertGwtStyleError(e),i(e)):r(t)},n.worker.postMessage(e)})}},{key:`receive`,value:function(e,t){var n=t.data,r=e.resolvers[n.id];r&&(delete e.resolvers[n.id],n.error?r(n.error):r(null,n.data))}},{key:`terminate`,value:function(){this.worker&&this.worker.terminate()}},{key:`convertGwtStyleError`,value:function(e){if(e){var t=e.__java$exception;t&&(t.cause&&t.cause.backingJsObject&&(e.cause=t.cause.backingJsObject,this.convertGwtStyleError(e.cause)),delete e.__java$exception)}}}])}()},{}],2:[function(e,t,n){var r=e("./elk-api.js").default;Object.defineProperty(t.exports,"__esModule",{value:!0}),t.exports=r,r.default=r},{"./elk-api.js":1}]},{},[2])(2)})}));export default n();