@astrale-os/cli 1.0.0-beta.0 → 1.0.0-beta.10

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

@@ -3,7 +3,17 @@ import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 
-import { hashAnatomyFiles } from './baseline'
+import type { SchemaIR } from '../../shared/types'
+
+import { STUDIO_SCHEMA_PROJECTION_VERSION } from '../../shared/types'
+import {
+  BASELINE_FORMAT_VERSION,
+  captureBaseline,
+  computeChanges,
+  hashAnatomyFiles,
+  loadBaseline,
+} from './baseline'
+import { writeJson, writeState } from './store'
 
 const roots: string[] = []
 
@@ -11,13 +21,13 @@ afterEach(() => {
   while (roots.length) rmSync(roots.pop()!, { recursive: true, force: true })
 })
 
-test('hashes current implementation and semantic layer files alongside legacy anatomy', () => {
+test('hashes current Application and vertical authoring files', () => {
   const root = mkdtempSync(join(tmpdir(), 'studio-current-baseline-'))
   roots.push(root)
   for (const dir of [
     'schema',
     'actions/risk',
-    'handlers/risk',
+    'providers/mail',
     'queries/risk',
     'ui/risk',
     'views/risk',
@@ -26,9 +36,10 @@ test('hashes current implementation and semantic layer files alongside legacy an
   }
   for (const file of [
     'schema/index.ts',
-    'implementation.ts',
+    'application.ts',
+    'runtime.ts',
     'actions/risk/index.ts',
-    'handlers/risk/index.ts',
+    'providers/mail/index.ts',
     'queries/risk/index.ts',
     'ui/risk/screen.tsx',
     'views/risk/index.ts',
@@ -40,12 +51,217 @@ test('hashes current implementation and semantic layer files alongside legacy an
 
   expect(Object.keys(hashAnatomyFiles(root, 'schema')).sort()).toEqual([
     'actions/risk/index.ts',
-    'handlers/risk/index.ts',
-    'implementation.ts',
+    'application.ts',
     'package.json',
+    'providers/mail/index.ts',
     'queries/risk/index.ts',
+    'runtime.ts',
     'schema/index.ts',
     'ui/risk/screen.tsx',
     'views/risk/index.ts',
   ])
 })
+
+const schema = (domain: string): SchemaIR => ({
+  format: 'astrale.dsl',
+  version: 'v1',
+  domain,
+  classes: {},
+  importsByKey: {},
+  importedClassesByKey: {},
+  functions: {},
+  views: {},
+  policies: {},
+  dependencies: [],
+  core: {},
+})
+
+const canonicalRoot = {
+  format: 'astrale.dsl',
+  version: 'v1',
+  origin: 'notes.example.dev',
+} as const
+
+test('persists a versioned canonical baseline with revision and raw root', () => {
+  const root = mkdtempSync(join(tmpdir(), 'studio-versioned-baseline-'))
+  roots.push(root)
+  const revision = `sha256:${'b'.repeat(64)}` as const
+
+  captureBaseline(
+    root,
+    { ir: schema('notes.example.dev'), root: canonicalRoot, revision },
+    { source: 'hash' },
+  )
+
+  expect(loadBaseline(root)).toMatchObject({
+    formatVersion: BASELINE_FORMAT_VERSION,
+    revision,
+    root: canonicalRoot,
+    files: { source: 'hash' },
+  })
+})
+
+test('invalidates an unversioned baseline instead of diffing it through a new projection', () => {
+  const root = mkdtempSync(join(tmpdir(), 'studio-legacy-baseline-'))
+  roots.push(root)
+  writeJson(root, '.cache/baseline/meta.json', { capturedAt: '2026-01-01T00:00:00.000Z' })
+  writeJson(root, '.cache/baseline/ir.json', schema('notes.example.dev'))
+  writeJson(root, '.cache/baseline/files.json', {})
+
+  expect(loadBaseline(root)).toBeNull()
+})
+
+const corruptBaselineCases = [
+  {
+    name: 'missing meta',
+    mutate: (root: string) => rmSync(join(root, '.domain-studio/.cache/baseline/meta.json')),
+  },
+  {
+    name: 'syntactically invalid meta',
+    mutate: (root: string) => writeState(root, '.cache/baseline/meta.json', '{'),
+  },
+  {
+    name: 'structurally invalid meta',
+    mutate: (root: string) =>
+      writeJson(root, '.cache/baseline/meta.json', {
+        formatVersion: BASELINE_FORMAT_VERSION,
+        projectionVersion: STUDIO_SCHEMA_PROJECTION_VERSION,
+      }),
+  },
+  {
+    name: 'future baseline format',
+    mutate: (root: string) =>
+      writeJson(root, '.cache/baseline/meta.json', {
+        formatVersion: BASELINE_FORMAT_VERSION + 1,
+        projectionVersion: STUDIO_SCHEMA_PROJECTION_VERSION,
+        revision: `sha256:${'d'.repeat(64)}`,
+      }),
+  },
+  {
+    name: 'future projection format',
+    mutate: (root: string) =>
+      writeJson(root, '.cache/baseline/meta.json', {
+        formatVersion: BASELINE_FORMAT_VERSION,
+        projectionVersion: STUDIO_SCHEMA_PROJECTION_VERSION + 1,
+        revision: `sha256:${'d'.repeat(64)}`,
+      }),
+  },
+  {
+    name: 'missing IR',
+    mutate: (root: string) => rmSync(join(root, '.domain-studio/.cache/baseline/ir.json')),
+  },
+  {
+    name: 'syntactically invalid IR',
+    mutate: (root: string) => writeState(root, '.cache/baseline/ir.json', '{'),
+  },
+  {
+    name: 'structurally invalid IR',
+    mutate: (root: string) =>
+      writeJson(root, '.cache/baseline/ir.json', {
+        ...schema('notes.example.dev'),
+        classes: { Broken: null },
+      }),
+  },
+  {
+    name: 'missing canonical root',
+    mutate: (root: string) => rmSync(join(root, '.domain-studio/.cache/baseline/schema-root.json')),
+  },
+  {
+    name: 'syntactically invalid canonical root',
+    mutate: (root: string) => writeState(root, '.cache/baseline/schema-root.json', '{'),
+  },
+  {
+    name: 'structurally invalid canonical root',
+    mutate: (root: string) =>
+      writeJson(root, '.cache/baseline/schema-root.json', { canonical: true }),
+  },
+  {
+    name: 'missing file hashes',
+    mutate: (root: string) => rmSync(join(root, '.domain-studio/.cache/baseline/files.json')),
+  },
+  {
+    name: 'syntactically invalid file hashes',
+    mutate: (root: string) => writeState(root, '.cache/baseline/files.json', '{'),
+  },
+  {
+    name: 'structurally invalid file hashes',
+    mutate: (root: string) => writeJson(root, '.cache/baseline/files.json', { source: 42 }),
+  },
+] as const
+
+for (const scenario of corruptBaselineCases) {
+  test(`invalidates a baseline with ${scenario.name}`, () => {
+    const root = mkdtempSync(join(tmpdir(), 'studio-corrupt-baseline-'))
+    roots.push(root)
+    const revision = `sha256:${'d'.repeat(64)}` as const
+    captureBaseline(root, { ir: schema('notes.example.dev'), root: canonicalRoot, revision }, {})
+
+    scenario.mutate(root)
+
+    expect(loadBaseline(root)).toBeNull()
+  })
+}
+
+test('keeps a valid current-format legacy baseline without a canonical root or revision', () => {
+  const root = mkdtempSync(join(tmpdir(), 'studio-legacy-v2-baseline-'))
+  roots.push(root)
+  const legacyIr = { ...schema('notes.example.dev'), version: 'legacy' }
+
+  captureBaseline(root, { ir: legacyIr, root: null, revision: null }, { source: 'hash' })
+
+  expect(loadBaseline(root)).toMatchObject({
+    formatVersion: BASELINE_FORMAT_VERSION,
+    ir: legacyIr,
+    root: null,
+    revision: null,
+    files: { source: 'hash' },
+  })
+})
+
+test('uses equal admitted revisions to suppress projection-only schema churn', () => {
+  const root = mkdtempSync(join(tmpdir(), 'studio-revision-baseline-'))
+  roots.push(root)
+  const revision = `sha256:${'c'.repeat(64)}` as const
+  captureBaseline(
+    root,
+    {
+      ir: schema('old-projection.example.dev'),
+      root: { ...canonicalRoot, origin: 'old-projection.example.dev' },
+      revision,
+    },
+    {},
+  )
+
+  const changes = computeChanges(
+    root,
+    schema('new-projection.example.dev'),
+    {},
+    {
+      currentRevision: revision,
+      git: { hasGit: false },
+    },
+  )
+  expect(changes.schemaChanges).toEqual([])
+  expect(changes.structuralStatus).toBe('none')
+  expect(changes.baselineRevision).toBe(revision)
+  expect(changes.currentRevision).toBe(revision)
+})
+
+test('uses caller-provided Git enrichment without importing workspace effects', () => {
+  const root = mkdtempSync(join(tmpdir(), 'studio-enriched-baseline-'))
+  roots.push(root)
+  captureBaseline(root, { ir: schema('notes.example.dev'), root: null, revision: null }, {})
+
+  const changes = computeChanges(
+    root,
+    schema('notes.example.dev'),
+    {},
+    {
+      git: { hasGit: true, diffText: 'diff --git a/schema/index.ts b/schema/index.ts' },
+    },
+  )
+
+  expect(changes.source).toBe('git')
+  expect(changes.hasGit).toBe(true)
+  expect(changes.schemaDiffText).toBe('diff --git a/schema/index.ts b/schema/index.ts')
+})

package/studio/server/state/baseline.ts

@@ -1,26 +1,38 @@
 /**
  * baseline.ts — the PRIMARY change tracker. On first launch we capture a
- * snapshot (the schema IR + a content hash of the "anatomy + schema fileset")
+ * versioned snapshot (canonical revision/root, render IR, and a content hash of
+ * the "anatomy + schema fileset")
  * under `.domain-studio/.cache/baseline/`. Subsequent runs diff the live state
  * against that baseline to compute a ChangeSet. Git (git.ts) only enriches when
  * a real repo is present; the fixtures are not repos, so baseline stands alone.
  *
  * Layout under `.cache/baseline/`:
- *   ir.json     — the captured SchemaIR (or null)
- *   files.json  — { [relpathFromRoot]: sha256 }
- *   meta.json   — { capturedAt }
+ *   ir.json           — the captured render SchemaIR (or null)
+ *   schema-root.json  — the admitted portable V1 root (or null)
+ *   files.json        — { [relpathFromRoot]: sha256 }
+ *   meta.json         — format/projection versions, revision, capturedAt
  */
 import { createHash } from 'node:crypto'
 import { existsSync, readFileSync, readdirSync, statSync } from 'node:fs'
 import { join, relative, resolve } from 'node:path'
 
-import type { ChangeSet, FileChange, SchemaChange, SchemaIR } from '../../shared/types'
+import type {
+  ChangeSet,
+  FileChange,
+  SchemaChange,
+  SchemaIR,
+  SchemaRevision,
+} from '../../shared/types'
 
-import { classify, diffSchemas } from '../introspect/diff'
-import { detectGit, gitDiff } from './git'
-import { readJson, writeJson } from './store'
+import { isSchemaRevision, STUDIO_SCHEMA_PROJECTION_VERSION } from '../../shared/types'
+import { isCanonicalDomainSchemaV1 } from '../introspect/canonical-schema'
+import { diffSchemas, structuralStatusOf } from '../introspect/diff'
+import { decodeSchemaIR } from '../introspect/schema-ir-json'
+import { asFiniteNumber, asJsonRecord, asStringRecord, parseJson } from '../json'
+import { readState, writeJson } from './store'
 
 const BASE = '.cache/baseline'
+export const BASELINE_FORMAT_VERSION = 2
 
 /** Directories to never descend into when hashing the fileset. */
 const SKIP_DIRS = new Set(['node_modules', '.dist', 'dist', '.domain-studio', '.git'])
@@ -33,12 +45,10 @@ const SKIP_DIRS = new Set(['node_modules', '.dist', 'dist', '.domain-studio', '.
 export const ANATOMY_GLOBS = {
   dirs: [
     'actions',
-    'capabilities',
     'core',
+    'providers',
     'runtime',
     'views',
-    'functions',
-    'handlers',
     'integrations',
     'migrations',
     'mutations',
@@ -52,8 +62,8 @@ export const ANATOMY_GLOBS = {
     'client/src',
   ],
   files: [
-    'implementation.ts',
-    'domain.ts',
+    'application.ts',
+    'runtime.ts',
     'index.ts',
     'core.ts',
     'deps.ts',
@@ -140,30 +150,128 @@ export function hashAnatomyFiles(root: string, schemaDirName: string): Record<st
 }
 
 export interface Baseline {
+  formatVersion: typeof BASELINE_FORMAT_VERSION
+  projectionVersion: number
   ir: SchemaIR | null
+  /** Admitted canonical root only; null for legacy/preview snapshots. */
+  root: unknown | null
+  revision: SchemaRevision | null
   files: Record<string, string>
   capturedAt?: string
 }
 
+export interface BaselineSchemaSnapshot {
+  ir: SchemaIR | null
+  /** Admitted canonical root only; preview roots must be passed as null. */
+  root: unknown | null
+  revision: SchemaRevision | null
+}
+
+interface BaselineMeta {
+  formatVersion: number
+  projectionVersion: number
+  revision: SchemaRevision | null
+  capturedAt?: string
+}
+
+function decodeBaselineMeta(value: unknown): BaselineMeta | undefined {
+  const record = asJsonRecord(value)
+  if (!record) return undefined
+  const formatVersion = asFiniteNumber(record.formatVersion)
+  const projectionVersion = asFiniteNumber(record.projectionVersion)
+  const revision =
+    record.revision === null
+      ? null
+      : isSchemaRevision(record.revision)
+        ? record.revision
+        : undefined
+  const capturedAt = record.capturedAt
+  if (
+    formatVersion === undefined ||
+    projectionVersion === undefined ||
+    revision === undefined ||
+    (capturedAt !== undefined && typeof capturedAt !== 'string')
+  ) {
+    return undefined
+  }
+  return {
+    formatVersion,
+    projectionVersion,
+    revision,
+    ...(capturedAt === undefined ? {} : { capturedAt }),
+  }
+}
+
+function decodeNullableSchemaIR(value: unknown): SchemaIR | null | undefined {
+  return value === null ? null : decodeSchemaIR(value)
+}
+
+function decodeNullableSchemaRoot(value: unknown): unknown | null | undefined {
+  return value === null ? null : isCanonicalDomainSchemaV1(value) ? value : undefined
+}
+
+function readBaselineJson<T>(
+  root: string,
+  subpath: string,
+  decode: (value: unknown) => T | undefined,
+): T | undefined {
+  const raw = readState(root, subpath)
+  if (raw === null) return undefined
+  const parsed = parseJson(raw)
+  return parsed === undefined ? undefined : decode(parsed)
+}
+
 /** Persist a baseline snapshot under `.cache/baseline/`. All writes go through the store. */
 export function captureBaseline(
   root: string,
-  ir: SchemaIR | null,
+  snapshot: BaselineSchemaSnapshot,
   fileHashes: Record<string, string>,
 ): void {
-  writeJson(root, `${BASE}/ir.json`, ir)
+  writeJson(root, `${BASE}/ir.json`, snapshot.ir)
+  writeJson(root, `${BASE}/schema-root.json`, snapshot.root)
   writeJson(root, `${BASE}/files.json`, fileHashes)
-  writeJson(root, `${BASE}/meta.json`, { capturedAt: new Date().toISOString() })
+  writeJson(root, `${BASE}/meta.json`, {
+    formatVersion: BASELINE_FORMAT_VERSION,
+    projectionVersion: STUDIO_SCHEMA_PROJECTION_VERSION,
+    revision: snapshot.revision,
+    capturedAt: new Date().toISOString(),
+  } satisfies BaselineMeta)
 }
 
-/** Load a previously-captured baseline, or null if none exists. Never throws. */
+/**
+ * Load a current baseline. Older/unrecognised formats and render-projection
+ * versions are explicitly invalidated so adapter changes cannot masquerade as
+ * authored schema changes. The lifecycle will seed a replacement snapshot.
+ */
 export function loadBaseline(root: string): Baseline | null {
-  const irPath = join(resolve(root), '.domain-studio', BASE, 'meta.json')
-  if (!existsSync(irPath)) return null
-  const ir = readJson<SchemaIR | null>(root, `${BASE}/ir.json`, null)
-  const files = readJson<Record<string, string>>(root, `${BASE}/files.json`, {})
-  const meta = readJson<{ capturedAt?: string }>(root, `${BASE}/meta.json`, {})
-  return { ir, files, capturedAt: meta.capturedAt }
+  const meta = readBaselineJson(root, `${BASE}/meta.json`, decodeBaselineMeta)
+  if (
+    !meta ||
+    meta.formatVersion !== BASELINE_FORMAT_VERSION ||
+    meta.projectionVersion !== STUDIO_SCHEMA_PROJECTION_VERSION ||
+    !isSchemaRevisionOrNull(meta.revision)
+  ) {
+    return null
+  }
+  const ir = readBaselineJson(root, `${BASE}/ir.json`, decodeNullableSchemaIR)
+  const schemaRoot = readBaselineJson(root, `${BASE}/schema-root.json`, decodeNullableSchemaRoot)
+  const files = readBaselineJson(root, `${BASE}/files.json`, asStringRecord)
+  if (ir === undefined || schemaRoot === undefined || files === undefined) return null
+  if (meta.revision !== null && (schemaRoot === null || ir === null)) return null
+  if (meta.revision === null && schemaRoot !== null) return null
+  return {
+    formatVersion: BASELINE_FORMAT_VERSION,
+    projectionVersion: STUDIO_SCHEMA_PROJECTION_VERSION,
+    ir,
+    root: schemaRoot,
+    revision: meta.revision ?? null,
+    files,
+    capturedAt: meta.capturedAt,
+  }
+}
+
+function isSchemaRevisionOrNull(value: unknown): value is SchemaRevision | null {
+  return value === null || isSchemaRevision(value)
 }
 
 /** Compare two file-hash maps into added/modified/removed FileChange[]. */
@@ -185,9 +293,8 @@ function summarizeSchemaChanges(changes: SchemaChange[]): string {
   if (changes.length === 0) return 'No schema changes.'
   return changes
     .map((c) => {
-      const flag = c.breaking ? 'breaking' : 'additive'
       const detail = c.detail ? `: ${c.detail}` : ''
-      return `${c.kind} ${c.target}${detail} (${flag})`
+      return `${c.kind} ${c.target}${detail}`
     })
     .join('\n')
 }
@@ -202,9 +309,12 @@ export function computeChanges(
   root: string,
   currentIr: SchemaIR | null,
   currentFiles: Record<string, string>,
-  opts: { schemaDirName: string },
+  opts: {
+    currentRevision?: SchemaRevision | null
+    git: { hasGit: boolean; diffText?: string }
+  },
 ): ChangeSet {
-  const { hasGit } = detectGit(root)
+  const { hasGit } = opts.git
   const source: ChangeSet['source'] = hasGit ? 'git' : 'baseline'
   const baseline = loadBaseline(root)
 
@@ -215,17 +325,19 @@ export function computeChanges(
       hasBaseline: false,
       schemaChanges: [],
       fileChanges: [],
-      classification: 'none',
+      structuralStatus: 'none',
+      ...(opts.currentRevision ? { currentRevision: opts.currentRevision } : {}),
     }
   }
 
-  const schemaChanges = diffSchemas(baseline.ir ?? null, currentIr)
-  const classification = classify(schemaChanges)
+  const schemaChanges =
+    baseline.revision && opts.currentRevision === baseline.revision
+      ? []
+      : diffSchemas(baseline.ir ?? null, currentIr)
+  const structuralStatus = structuralStatusOf(schemaChanges)
   const fileChanges = diffFiles(baseline.files ?? {}, currentFiles)
 
-  const schemaDiffText = hasGit
-    ? (gitDiff(root, opts.schemaDirName) ?? undefined)
-    : summarizeSchemaChanges(schemaChanges)
+  const schemaDiffText = hasGit ? opts.git.diffText : summarizeSchemaChanges(schemaChanges)
 
   return {
     source,
@@ -234,7 +346,9 @@ export function computeChanges(
     schemaChanges,
     fileChanges,
     schemaDiffText,
-    classification,
+    structuralStatus,
+    ...(baseline.revision ? { baselineRevision: baseline.revision } : {}),
+    ...(opts.currentRevision ? { currentRevision: opts.currentRevision } : {}),
     baselineCapturedAt: baseline.capturedAt,
   }
 }

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

@@ -3,7 +3,8 @@ import { mkdtempSync, rmSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 
-import { readComments, upsertComment } from './comments'
+import { mergeReply, readComments, upsertComment } from './comments'
+import { writeJson } from './store'
 
 const roots: string[] = []
 
@@ -27,3 +28,67 @@ test('missing comment stores do not share entries across domains', () => {
   ])
   expect(readComments(rootB).comments).toEqual([])
 })
+
+test('normalizes malformed nested comment data and ignores future fields', () => {
+  const root = mkdtempSync(join(tmpdir(), 'studio-comments-corrupt-'))
+  roots.push(root)
+  writeJson(root, 'comments.json', {
+    schemaVersion: 'render-fingerprint',
+    futureStoreField: { version: 2 },
+    comments: [
+      {
+        id: 'kept',
+        anchors: ['Thing'],
+        anchorRefs: [
+          { ref: 'class.Thing', kind: 'schema', futureAnchorField: true },
+          { ref: 42, kind: 'schema' },
+        ],
+        status: 'open',
+        thread: [
+          {
+            id: 'entry',
+            role: 'author',
+            type: 'text',
+            text: 'A valid question',
+            futureEntryField: true,
+          },
+          { id: 'broken', role: 'nobody', type: 'text', text: 'ignored' },
+        ],
+        createdAt: '2026-08-20T00:00:00.000Z',
+        futureCommentField: true,
+      },
+      { id: 42, thread: [] },
+    ],
+  })
+
+  expect(readComments(root)).toEqual({
+    schemaVersion: 'render-fingerprint',
+    comments: [
+      {
+        id: 'kept',
+        anchors: ['Thing'],
+        anchorRefs: [{ ref: 'class.Thing', kind: 'schema' }],
+        status: 'open',
+        thread: [
+          {
+            id: 'entry',
+            role: 'author',
+            type: 'text',
+            text: 'A valid question',
+          },
+        ],
+        createdAt: '2026-08-20T00:00:00.000Z',
+        kind: 'question',
+      },
+    ],
+  })
+})
+
+test('rejects a syntactically valid machine-state block with the wrong root shape', () => {
+  const root = mkdtempSync(join(tmpdir(), 'studio-comments-paste-'))
+  roots.push(root)
+
+  expect(() => mergeReply(root, 'render-fingerprint', '```json\n[]\n```')).toThrow(
+    'invalid machine-state json block',
+  )
+})