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

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-Di4OXGNH.js → elk-api-ByzoDZWH.js}

@@ -1 +1 @@
-import{m as L}from"./index-BLm6J11H.js";function S(y,b){for(var u=0;u<b.length;u++){const a=b[u];if(typeof a!="string"&&!Array.isArray(a)){for(const i in a)if(i!=="default"&&!(i in y)){const n=Object.getOwnPropertyDescriptor(a,i);n&&Object.defineProperty(y,i,n.get?n:{enumerable:!0,get:()=>a[i]})}}}return Object.freeze(Object.defineProperty(y,Symbol.toStringTag,{value:"Module"}))}function w(y){throw new Error('Could not dynamically require "'+y+'". Please configure the dynamicRequireTargets or/and ignoreDynamicRequires option of @rollup/plugin-commonjs appropriately for this require call to work.')}var O={exports:{}},j;function C(){return j||(j=1,(function(y,b){(function(u){y.exports=u()})(function(){return(function(){function u(a,i,n){function d(f,_){if(!i[f]){if(!a[f]){var h=typeof w=="function"&&w;if(!_&&h)return h(f,!0);if(g)return g(f,!0);var o=new Error("Cannot find module '"+f+"'");throw o.code="MODULE_NOT_FOUND",o}var e=i[f]={exports:{}};a[f][0].call(e.exports,function(r){var t=a[f][1][r];return d(t||r)},e,e.exports,u,a,i,n)}return i[f].exports}for(var g=typeof w=="function"&&w,m=0;m<n.length;m++)d(n[m]);return d}return u})()({1:[function(u,a,i){Object.defineProperty(i,"__esModule",{value:!0}),i.default=void 0;function n(o){"@babel/helpers - typeof";return n=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},n(o)}function d(o,e){if(!(o instanceof e))throw new TypeError("Cannot call a class as a function")}function g(o,e){for(var r=0;r<e.length;r++){var t=e[r];t.enumerable=t.enumerable||!1,t.configurable=!0,"value"in t&&(t.writable=!0),Object.defineProperty(o,f(t.key),t)}}function m(o,e,r){return e&&g(o.prototype,e),Object.defineProperty(o,"prototype",{writable:!1}),o}function f(o){var e=_(o,"string");return n(e)=="symbol"?e:e+""}function _(o,e){if(n(o)!="object"||!o)return o;var r=o[Symbol.toPrimitive];if(r!==void 0){var t=r.call(o,e);if(n(t)!="object")return t;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(o)}i.default=(function(){function o(){var e=this,r=arguments.length>0&&arguments[0]!==void 0?arguments[0]:{},t=r.defaultLayoutOptions,s=t===void 0?{}:t,l=r.algorithms,v=l===void 0?["layered","stress","mrtree","radial","force","disco","sporeOverlap","sporeCompaction","rectpacking"]:l,c=r.workerFactory,p=r.workerUrl;if(d(this,o),this.defaultLayoutOptions=s,this.initialized=!1,typeof p>"u"&&typeof c>"u")throw new Error("Cannot construct an ELK without both 'workerUrl' and 'workerFactory'.");var k=c;typeof p<"u"&&typeof c>"u"&&(k=function(M){return new Worker(M)});var E=k(p);if(typeof E.postMessage!="function")throw new TypeError("Created worker does not provide the required 'postMessage' function.");this.worker=new h(E),this.worker.postMessage({cmd:"register",algorithms:v}).then(function(P){return e.initialized=!0}).catch(console.err)}return m(o,[{key:"layout",value:function(r){var t=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{},s=t.layoutOptions,l=s===void 0?this.defaultLayoutOptions:s,v=t.logging,c=v===void 0?!1:v,p=t.measureExecutionTime,k=p===void 0?!1:p;return r?this.worker.postMessage({cmd:"layout",graph:r,layoutOptions:l,options:{logging:c,measureExecutionTime:k}}):Promise.reject(new 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 h=(function(){function o(e){var r=this;if(d(this,o),e===void 0)throw new Error("Missing mandatory parameter 'worker'.");this.resolvers={},this.worker=e,this.worker.onmessage=function(t){setTimeout(function(){r.receive(r,t)},0)}}return m(o,[{key:"postMessage",value:function(r){var t=this.id||0;this.id=t+1,r.id=t;var s=this;return new Promise(function(l,v){s.resolvers[t]=function(c,p){c?(s.convertGwtStyleError(c),v(c)):l(p)},s.worker.postMessage(r)})}},{key:"receive",value:function(r,t){var s=t.data,l=r.resolvers[s.id];l&&(delete r.resolvers[s.id],s.error?l(s.error):l(null,s.data))}},{key:"terminate",value:function(){this.worker&&this.worker.terminate()}},{key:"convertGwtStyleError",value:function(r){if(r){var t=r.__java$exception;t&&(t.cause&&t.cause.backingJsObject&&(r.cause=t.cause.backingJsObject,this.convertGwtStyleError(r.cause)),delete r.__java$exception)}}}])})()},{}],2:[function(u,a,i){var n=u("./elk-api.js").default;Object.defineProperty(a.exports,"__esModule",{value:!0}),a.exports=n,n.default=n},{"./elk-api.js":1}]},{},[2])(2)})})(O)),O.exports}var x=C();const A=L(x),q=S({__proto__:null,default:A},[x]);export{q as e};
+import{m as L}from"./index-N8J8EKlB.js";function S(y,b){for(var u=0;u<b.length;u++){const a=b[u];if(typeof a!="string"&&!Array.isArray(a)){for(const i in a)if(i!=="default"&&!(i in y)){const n=Object.getOwnPropertyDescriptor(a,i);n&&Object.defineProperty(y,i,n.get?n:{enumerable:!0,get:()=>a[i]})}}}return Object.freeze(Object.defineProperty(y,Symbol.toStringTag,{value:"Module"}))}function w(y){throw new Error('Could not dynamically require "'+y+'". Please configure the dynamicRequireTargets or/and ignoreDynamicRequires option of @rollup/plugin-commonjs appropriately for this require call to work.')}var O={exports:{}},j;function C(){return j||(j=1,(function(y,b){(function(u){y.exports=u()})(function(){return(function(){function u(a,i,n){function d(f,_){if(!i[f]){if(!a[f]){var h=typeof w=="function"&&w;if(!_&&h)return h(f,!0);if(g)return g(f,!0);var o=new Error("Cannot find module '"+f+"'");throw o.code="MODULE_NOT_FOUND",o}var e=i[f]={exports:{}};a[f][0].call(e.exports,function(r){var t=a[f][1][r];return d(t||r)},e,e.exports,u,a,i,n)}return i[f].exports}for(var g=typeof w=="function"&&w,m=0;m<n.length;m++)d(n[m]);return d}return u})()({1:[function(u,a,i){Object.defineProperty(i,"__esModule",{value:!0}),i.default=void 0;function n(o){"@babel/helpers - typeof";return n=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},n(o)}function d(o,e){if(!(o instanceof e))throw new TypeError("Cannot call a class as a function")}function g(o,e){for(var r=0;r<e.length;r++){var t=e[r];t.enumerable=t.enumerable||!1,t.configurable=!0,"value"in t&&(t.writable=!0),Object.defineProperty(o,f(t.key),t)}}function m(o,e,r){return e&&g(o.prototype,e),Object.defineProperty(o,"prototype",{writable:!1}),o}function f(o){var e=_(o,"string");return n(e)=="symbol"?e:e+""}function _(o,e){if(n(o)!="object"||!o)return o;var r=o[Symbol.toPrimitive];if(r!==void 0){var t=r.call(o,e);if(n(t)!="object")return t;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(o)}i.default=(function(){function o(){var e=this,r=arguments.length>0&&arguments[0]!==void 0?arguments[0]:{},t=r.defaultLayoutOptions,s=t===void 0?{}:t,l=r.algorithms,v=l===void 0?["layered","stress","mrtree","radial","force","disco","sporeOverlap","sporeCompaction","rectpacking"]:l,c=r.workerFactory,p=r.workerUrl;if(d(this,o),this.defaultLayoutOptions=s,this.initialized=!1,typeof p>"u"&&typeof c>"u")throw new Error("Cannot construct an ELK without both 'workerUrl' and 'workerFactory'.");var k=c;typeof p<"u"&&typeof c>"u"&&(k=function(M){return new Worker(M)});var E=k(p);if(typeof E.postMessage!="function")throw new TypeError("Created worker does not provide the required 'postMessage' function.");this.worker=new h(E),this.worker.postMessage({cmd:"register",algorithms:v}).then(function(P){return e.initialized=!0}).catch(console.err)}return m(o,[{key:"layout",value:function(r){var t=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{},s=t.layoutOptions,l=s===void 0?this.defaultLayoutOptions:s,v=t.logging,c=v===void 0?!1:v,p=t.measureExecutionTime,k=p===void 0?!1:p;return r?this.worker.postMessage({cmd:"layout",graph:r,layoutOptions:l,options:{logging:c,measureExecutionTime:k}}):Promise.reject(new 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 h=(function(){function o(e){var r=this;if(d(this,o),e===void 0)throw new Error("Missing mandatory parameter 'worker'.");this.resolvers={},this.worker=e,this.worker.onmessage=function(t){setTimeout(function(){r.receive(r,t)},0)}}return m(o,[{key:"postMessage",value:function(r){var t=this.id||0;this.id=t+1,r.id=t;var s=this;return new Promise(function(l,v){s.resolvers[t]=function(c,p){c?(s.convertGwtStyleError(c),v(c)):l(p)},s.worker.postMessage(r)})}},{key:"receive",value:function(r,t){var s=t.data,l=r.resolvers[s.id];l&&(delete r.resolvers[s.id],s.error?l(s.error):l(null,s.data))}},{key:"terminate",value:function(){this.worker&&this.worker.terminate()}},{key:"convertGwtStyleError",value:function(r){if(r){var t=r.__java$exception;t&&(t.cause&&t.cause.backingJsObject&&(r.cause=t.cause.backingJsObject,this.convertGwtStyleError(r.cause)),delete r.__java$exception)}}}])})()},{}],2:[function(u,a,i){var n=u("./elk-api.js").default;Object.defineProperty(a.exports,"__esModule",{value:!0}),a.exports=n,n.default=n},{"./elk-api.js":1}]},{},[2])(2)})})(O)),O.exports}var x=C();const A=L(x),q=S({__proto__:null,default:A},[x]);export{q as e};