@astrale-os/cli 0.5.0-alpha.0 → 0.6.0-alpha.0

package/studio/server/introspect/overlay-tsmorph.ts

@@ -28,7 +28,7 @@ function newProject(): Project {
 function tryAddFile(project: Project, file: string): SourceFile | undefined {
   try {
     if (!existsSync(file)) return undefined
-    return project.addSourceFileAtPath(file)
+    return project.getSourceFile(file) ?? project.addSourceFileAtPath(file)
   } catch {
     return undefined
   }
@@ -163,28 +163,129 @@ interface ConfigResolution {
   unlinkedReason?: 'no-config'
 }
 
-function resolveConfigObject(configNode: Node): ConfigResolution {
-  // Case A: a call expression, e.g. `todo('Owner.name')`. Follow the helper to
-  // its returned object literal (the local `todo` factory in evaluation).
-  if (Node.isCallExpression(configNode)) {
-    const obj = followFactoryToObject(configNode)
+function resolveConfigObject(configNode: Node, seen = new Set<string>()): ConfigResolution {
+  const node = unwrapExpression(configNode)
+  const key = `${node.getSourceFile().getFilePath()}:${node.getStart()}`
+  if (seen.has(key)) return { implemented: false, unlinkedReason: 'no-config' }
+  seen.add(key)
+
+  if (Node.isCallExpression(node)) {
+    // Curried SDK helpers carry the handler config in their final argument:
+    // `remoteMethod()(schema, 'Issue', 'delete', { authorize, execute })`.
+    const lastArg = node.getArguments().at(-1)
+    if (lastArg) {
+      const candidate = unwrapExpression(lastArg)
+      if (Node.isObjectLiteralExpression(candidate) || Node.isIdentifier(candidate)) {
+        return resolveConfigObject(candidate, seen)
+      }
+    }
+
+    // Local factories such as `todo('Owner.name')` return the config object themselves.
+    const obj = followFactoryToObject(node)
     if (obj) return classifyObjectLiteral(obj)
     return { implemented: false, unlinkedReason: 'no-config' }
   }
-  if (Node.isObjectLiteralExpression(configNode)) {
-    return classifyObjectLiteral(configNode)
+  if (Node.isObjectLiteralExpression(node)) {
+    return classifyObjectLiteral(node)
   }
-  // An identifier referencing a config defined elsewhere — try to resolve it.
-  if (Node.isIdentifier(configNode)) {
-    const decl = firstValueDeclaration(configNode)
-    if (decl && Node.isVariableDeclaration(decl)) {
-      const init = decl.getInitializer()
-      if (init) return resolveConfigObject(init)
-    }
+  // Handler maps normally reference a local or imported `remoteMethod` value.
+  if (Node.isIdentifier(node)) {
+    const value = valueOfIdentifier(node)
+    if (value) return resolveConfigObject(value, seen)
   }
   return { implemented: false, unlinkedReason: 'no-config' }
 }
 
+/** Remove syntax-only wrappers around a runtime value. */
+function unwrapExpression(node: Node): Node {
+  let current = node
+  while (
+    Node.isParenthesizedExpression(current) ||
+    Node.isAsExpression(current) ||
+    Node.isSatisfiesExpression(current) ||
+    Node.isTypeAssertion(current)
+  ) {
+    current = current.getExpression()
+  }
+  return current
+}
+
+/** Resolve a local or relatively imported identifier to its runtime value. */
+function valueOfIdentifier(id: Node): Node | undefined {
+  if (!Node.isIdentifier(id)) return undefined
+  const decl = firstValueDeclaration(id)
+  if (decl && Node.isVariableDeclaration(decl)) return decl.getInitializer()
+  return resolveImportedValue(id)
+}
+
+/** Follow a named relative import to the exported value that defines it. */
+function resolveImportedValue(id: Node): Node | undefined {
+  if (!Node.isIdentifier(id)) return undefined
+  const localName = id.getText()
+  const sourceFile = id.getSourceFile()
+
+  for (const imp of sourceFile.getImportDeclarations()) {
+    for (const named of imp.getNamedImports()) {
+      const local = named.getAliasNode()?.getText() ?? named.getName()
+      if (local !== localName) continue
+      const target = resolveModuleFile(sourceFile, imp.getModuleSpecifierValue())
+      if (!target) return undefined
+      return findExportedValue(id.getProject(), target, named.getName(), new Set<string>())
+    }
+  }
+  return undefined
+}
+
+/** Find an exported variable/function value, following local and barrel exports. */
+function findExportedValue(
+  project: Project,
+  file: string,
+  exportName: string,
+  seen: Set<string>,
+): Node | undefined {
+  const key = `${file}:${exportName}`
+  if (seen.has(key)) return undefined
+  seen.add(key)
+  const sf = tryAddFile(project, file)
+  if (!sf) return undefined
+
+  const localValue = (name: string, exportedOnly: boolean): Node | undefined => {
+    const variable = sf
+      .getVariableDeclarations()
+      .find(
+        (candidate) => candidate.getName() === name && (!exportedOnly || candidate.isExported()),
+      )
+    if (variable) return variable.getInitializer()
+    return sf
+      .getFunctions()
+      .find(
+        (candidate) => candidate.getName() === name && (!exportedOnly || candidate.isExported()),
+      )
+  }
+
+  const direct = localValue(exportName, true)
+  if (direct) return direct
+
+  for (const ex of sf.getExportDeclarations()) {
+    const modSpec = ex.getModuleSpecifierValue()
+    const target = modSpec ? resolveModuleFile(sf, modSpec) : undefined
+    const named = ex.getNamedExports()
+    if (named.length > 0) {
+      for (const specifier of named) {
+        const exposed = specifier.getAliasNode()?.getText() ?? specifier.getName()
+        if (exposed !== exportName) continue
+        const original = specifier.getName()
+        if (target) return findExportedValue(project, target, original, seen)
+        return localValue(original, false)
+      }
+    } else if (target) {
+      const found = findExportedValue(project, target, exportName, seen)
+      if (found) return found
+    }
+  }
+  return undefined
+}
+
 /** Given `todo('x')`, find the factory's `return { … }` object literal. */
 function followFactoryToObject(call: CallExpression): Node | undefined {
   const expr = call.getExpression()
@@ -287,11 +388,8 @@ function functionBodyOf(node: Node): Node | null | undefined {
   if (Node.isArrowFunction(node) || Node.isFunctionExpression(node)) fn = node
   else if (Node.isMethodDeclaration(node)) fn = node
   else if (Node.isIdentifier(node)) {
-    const decl = firstValueDeclaration(node)
-    if (decl && Node.isVariableDeclaration(decl)) {
-      const init = decl.getInitializer()
-      if (init) return functionBodyOf(init)
-    }
+    const value = valueOfIdentifier(node)
+    if (value) return functionBodyOf(value)
     return undefined
   }
   if (!fn) return undefined
@@ -434,9 +532,11 @@ function resolveModuleFile(from: SourceFile, spec: string): string | undefined {
   if (!spec.startsWith('.')) return undefined
   const baseDir = dirname(from.getFilePath())
   const base = resolvePath(baseDir, spec)
+  const sourceBase = base.replace(/\.(?:[cm]?js|jsx)$/, '')
   const candidates = [
-    base.endsWith('.ts') ? base : `${base}.ts`,
-    base.endsWith('.tsx') ? base : `${base}.tsx`,
+    base,
+    sourceBase.endsWith('.ts') ? sourceBase : `${sourceBase}.ts`,
+    sourceBase.endsWith('.tsx') ? sourceBase : `${sourceBase}.tsx`,
     `${base}/index.ts`,
     `${base}/index.tsx`,
   ]

package/studio/server/state/views.test.ts

@@ -0,0 +1,90 @@
+import { describe, expect, test } from 'bun:test'
+
+import type { RememberedViewTarget, ViewTargetCandidate } from '../../shared/types'
+
+import {
+  conciseCliFailure,
+  localViewUrl,
+  reconcileRememberedTarget,
+  targetFromRow,
+  targetQuery,
+} from './views'
+
+describe('managed local view URLs', () => {
+  test('mounts each view beneath the Studio-assigned server origin', () => {
+    expect(localViewUrl('http://127.0.0.1:5173', '/ui/issues')).toBe(
+      'http://127.0.0.1:5173/ui/issues',
+    )
+    expect(localViewUrl('http://127.0.0.1:61001/ignored', 'ui/issue')).toBe(
+      'http://127.0.0.1:61001/ui/issue',
+    )
+  })
+})
+
+test('reduces CLI stack output to the actionable kernel failure', () => {
+  expect(
+    conciseCliFailure(
+      `275 |   if (code === KERNEL_ERROR_CODES.INVALID_REQUEST)\n276 |\nPermissionDeniedError: Permission denied: READ on /:issues.astrale.ai:view.issue\n details: {\n  method: \"View:resolve\"\n}\n at mapServerError (errors.ts:280:61)\nBun v1.3.14`,
+    ),
+  ).toBe('PermissionDeniedError: Permission denied: READ on /:issues.astrale.ai:view.issue')
+})
+
+describe('target candidates', () => {
+  const remembered: RememberedViewTarget = {
+    id: 'gone-id',
+    className: 'Issue',
+    classOrigin: 'issues.astrale.ai',
+    label: 'Deleted issue',
+  }
+  const candidate: ViewTargetCandidate = {
+    id: 'live-id',
+    ref: '@live-id',
+    className: 'Issue',
+    classOrigin: 'issues.astrale.ai',
+    label: 'Live issue',
+  }
+
+  test('turns a missing remembered node into an explicit stale selection', () => {
+    expect(reconcileRememberedTarget(remembered, [candidate])).toEqual({
+      selected: null,
+      stale: remembered,
+    })
+    expect(reconcileRememberedTarget({ ...remembered, id: 'live-id' }, [candidate])).toEqual({
+      selected: candidate,
+      stale: null,
+    })
+  })
+
+  test('builds friendly candidates from generic qualified node properties', () => {
+    expect(
+      targetFromRow(
+        {
+          id: 'iss-1',
+          props: {
+            'kernel.astrale.ai:interface.Named.property.name': 'Broken authorization badge',
+            'kernel.astrale.ai:interface.Descriptable.property.description': 'Studio regression',
+            'kernel.astrale.ai:interface.Statused.property.status': 'open',
+          },
+        },
+        'Issue',
+        'issues.astrale.ai',
+      ),
+    ).toEqual({
+      id: 'iss-1',
+      ref: '@iss-1',
+      className: 'Issue',
+      classOrigin: 'issues.astrale.ai',
+      label: 'Broken authorization badge',
+      description: 'Studio regression',
+      status: 'open',
+    })
+  })
+
+  test('queries exact class instances through instance_of', () => {
+    const query = targetQuery('Issue', 'issues.astrale.ai')
+    expect(query).toContain('(n:Node)-[:instance_of]->(c:Class)-[:of_domain]->(d:Domain)')
+    expect(query).toContain('"Issue"')
+    expect(query).toContain('"issues.astrale.ai"')
+    expect(query).toContain('LIMIT 201')
+  })
+})