diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b53780..234c6b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ ### Changed - Require readable capability layers and contextual refactoring with a twenty-line method gate (#148). +- Align Admin with exact SDK, Identity and UI capacity contract candidates (#150). + +### Changed + - Organize permanent tests by tier and enforce the shared development/testing strategy (#146). - Rebuild Admin from exact SDK .16, Identity .7 and reusable UI .16 owner archives (#137). diff --git a/README.md b/README.md index d5ff595..dc1751e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,21 @@ # Cordis Admin +## Task 3D owner compatibility + +Issue #150 aligns existing Admin behavior with the exact public owner candidates below. +Keycloak identity, session authority and reusable mobile-first UI remain owned by their existing +packages. This compatibility slice adds no browser application or Agent execution authority. + +| Owner | Version | Source | Archive SHA-256 | +| --- | --- | --- | --- | +| SDK | `0.0.0-cordis.19` | `90cf4f3cc62e166685280450c727499defd2af5b` | `93dd549c98aba180306e9b19cc1cbc37494544b2764ed341c531c9af618c6f81` | +| Identity | `0.0.0-cordis.8` | `cb86258e93337559aa4a248177a20bd2a07fd467` | `a308c71b0da1822e7786121092a05f2496d26614942aaeb459a78531e689cb76` | +| UI | `0.0.0-cordis.18` | `e2b9c5e10611c196834fd57ba5358a74304e373c` | `d09e6ed33f7f1bc2f7210208a94f33bbd2a6453d8fe886f75a1f950887223e48` | + +Peer pins, installed packages and accepted archives must agree. Historical artifacts stay +immutable. Full Task 3D runtime acceptance and productive Work/model execution are separate; +the latter remains Task 10. All issues remain open until authorized release. + ## Task 3B: Installed administration contribution diff --git a/bun.lock b/bun.lock index 8918328..aa8b2d5 100644 --- a/bun.lock +++ b/bun.lock @@ -22,9 +22,9 @@ "typescript": "5.9.3", }, "peerDependencies": { - "@treeseed-cordis/identity": "0.0.0-cordis.7", - "@treeseed-cordis/sdk": "0.0.0-cordis.16", - "@treeseed-cordis/ui": "0.0.0-cordis.16", + "@treeseed-cordis/identity": "0.0.0-cordis.8", + "@treeseed-cordis/sdk": "0.0.0-cordis.19", + "@treeseed-cordis/ui": "0.0.0-cordis.18", "react": "19.3.1", "react-dom": "19.3.1", }, @@ -33,11 +33,11 @@ "packages": { "@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], - "@treeseed-cordis/identity": ["@treeseed-cordis/identity@vendor/identity.tgz", { "dependencies": { "cordis": "4.0.0-rc.12", "openid-client": "6.8.8", "postgres": "3.4.9" }, "peerDependencies": { "@treeseed-cordis/sdk": "0.0.0-cordis.16" } }, "sha512-6HRxydsGkxlStDLD2VUORS94ats/OL/Cgue26y1Jr9ciuK60Q38xqMO9TxwcPCV0y++LQ08f38cgfKVrAJoDsQ=="], + "@treeseed-cordis/identity": ["@treeseed-cordis/identity@vendor/identity.tgz", { "dependencies": { "cordis": "4.0.0-rc.12", "openid-client": "6.8.8", "postgres": "3.4.9" }, "peerDependencies": { "@treeseed-cordis/sdk": "0.0.0-cordis.19" } }, "sha512-lv0ZBSpAa8X9XZOPLCuGwZdCvi8DW1NCS+rYqnM3jHiCXTZaBDKSSk1v+O7WPSG/dzxI3410n5sxu6eISY/uYg=="], - "@treeseed-cordis/sdk": ["@treeseed-cordis/sdk@vendor/sdk.tgz", { "dependencies": { "cordis": "4.0.0-rc.12", "jsonc-parser": "3.3.1", "semver": "7.8.5", "zod": "4.6.7" } }, "sha512-rAg7xVOU05Z1+TcMxn2DWpAqZBrZuUvIhmYa4aEP6PetQrJdTBAtAxnM/Jo17Qa26wBq7j1hmwt6alu00sM4BQ=="], + "@treeseed-cordis/sdk": ["@treeseed-cordis/sdk@vendor/sdk.tgz", { "dependencies": { "cordis": "4.0.0-rc.12", "jsonc-parser": "3.3.1", "semver": "7.8.5", "zod": "4.6.7" } }, "sha512-Z3l9ZnIYwvICaafrklKPGKnIuuXYjopxpP9j9qxN/AdyP5NcjD4L47D+oYgJRVcsfNaQmka5IhuYmQ58ROS8dA=="], - "@treeseed-cordis/ui": ["@treeseed-cordis/ui@vendor/ui.tgz", { "dependencies": { "cordis": "4.0.0-rc.12", "zod": "4.6.7" }, "peerDependencies": { "@treeseed-cordis/sdk": "0.0.0-cordis.16", "react": "19.3.1", "react-dom": "19.3.1", "typescript": "5.9.3" }, "optionalPeers": ["typescript"] }, "sha512-0ZM+ysL8u97gcyKJrSwDZW9hawyeAAAJ9Ax5SUk/OMlJHG3MNqwijC/ewbcdhsSE77soqwW+VUP+ysAAOoLIxw=="], + "@treeseed-cordis/ui": ["@treeseed-cordis/ui@vendor/ui.tgz", { "dependencies": { "cordis": "4.0.0-rc.12", "zod": "4.6.7" }, "peerDependencies": { "@treeseed-cordis/sdk": "0.0.0-cordis.19", "react": "19.3.1", "react-dom": "19.3.1", "typescript": "5.9.3" }, "optionalPeers": ["typescript"] }, "sha512-cykVCpJC02KxtG+zaqR+2lh383GPjGZNzxi0u9u6iJUUhL59HWUL5nlLRTpo9c7ShdEJdNDNBX+8Y/Nc+FVWWQ=="], "@types/bun": ["@types/bun@1.4.4", "", { "dependencies": { "bun-types": "1.4.4" } }, "sha512-9wkRDXUXK124pEnAutE6n/l18j+i9GC5IAHK8TmX/2nlySETmky0OU6yL5U8pW1AoKh++AN9auDCr647BfurjQ=="], diff --git a/package.json b/package.json index 429316a..b63ec90 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@treeseed-cordis/admin", - "version": "0.0.0-cordis.10", + "version": "0.0.0-cordis.11", "private": true, "type": "module", "license": "Apache-2.0", @@ -36,9 +36,9 @@ "check:readability": "bun .agents/skills/release-workflow/scripts/source-readability.ts" }, "peerDependencies": { - "@treeseed-cordis/sdk": "0.0.0-cordis.16", - "@treeseed-cordis/identity": "0.0.0-cordis.7", - "@treeseed-cordis/ui": "0.0.0-cordis.16", + "@treeseed-cordis/sdk": "0.0.0-cordis.19", + "@treeseed-cordis/identity": "0.0.0-cordis.8", + "@treeseed-cordis/ui": "0.0.0-cordis.18", "react": "19.3.1", "react-dom": "19.3.1" }, @@ -62,18 +62,18 @@ "cordisCandidate": { "sdk": { "repository": "https://github.com/treeseed-ai/sdk.git", - "commit": "4c0ecd2a0fc28545dbf677cc988ce69f0cf2f15d", - "sha256": "4084aa8dbe9767984fac9fef7f5cea30a0bec93ed416138d32c804e6389fdba5" + "commit": "90cf4f3cc62e166685280450c727499defd2af5b", + "sha256": "93dd549c98aba180306e9b19cc1cbc37494544b2764ed341c531c9af618c6f81" }, "identity": { "repository": "https://github.com/treeseed-ai/identity.git", - "commit": "f29824578d0aa8fc7725a195b72c698b476da429", - "sha256": "90ac95f3e1d953f0aeddb5d0da01e9e596b226bbbc806bff3566d274a34f22d6" + "commit": "cb86258e93337559aa4a248177a20bd2a07fd467", + "sha256": "a308c71b0da1822e7786121092a05f2496d26614942aaeb459a78531e689cb76" }, "ui": { "repository": "https://github.com/treeseed-ai/ui.git", - "commit": "32f16876aa6f0eb1f99a4ab339296609c830df23", - "sha256": "0251c6ff1f5c4b6a628d85113d1e10b9ab019f26d1dda38c7aad3c12f84ef571" + "commit": "e2b9c5e10611c196834fd57ba5358a74304e373c", + "sha256": "d09e6ed33f7f1bc2f7210208a94f33bbd2a6453d8fe886f75a1f950887223e48" } }, "cordis": { @@ -94,7 +94,7 @@ }, "cordisAsset": { "path": "dist/src/browser.bundle.js", - "sha256": "0ab38675fba96c380d0c590fb353b443c6642e0114b7327ab636cd6591691c78" + "sha256": "c7f7e2a214b86a75cb6b8454325bced2530c0518183f34582c72d4ba603e30fe" }, "cordisPackage": { "formatVersion": 4, @@ -102,7 +102,7 @@ "pluginId": "admin", "package": { "name": "@treeseed-cordis/admin", - "version": "0.0.0-cordis.10" + "version": "0.0.0-cordis.11" }, "providers": [ { @@ -395,8 +395,8 @@ "assets": [ { "path": "dist/src/browser.bundle.js", - "sha256": "0ab38675fba96c380d0c590fb353b443c6642e0114b7327ab636cd6591691c78", - "size": 990317 + "sha256": "c7f7e2a214b86a75cb6b8454325bced2530c0518183f34582c72d4ba603e30fe", + "size": 1007807 } ], "images": [] diff --git a/src/views.ts b/src/views.ts index 7813741..977086c 100644 --- a/src/views.ts +++ b/src/views.ts @@ -1,6 +1,9 @@ import {PlatformOperations} from '@treeseed-cordis/sdk'; import {UiSchemas,type UiViewModel} from '@treeseed-cordis/ui/contracts'; -export class AdminPackageIdentity{static readonly version='0.0.0-cordis.10';static readonly artifact='@treeseed-cordis/admin@'+this.version;} +export class AdminPackageIdentity { + static readonly version = '0.0.0-cordis.11'; + static readonly artifact = '@treeseed-cordis/admin@' + this.version; +} export class AdminViews { static initial(installationId:string,csrf:string):UiViewModel{return UiSchemas.view.parse({id:'admin.page',componentId:'stack',model:{title:'Cordis installed status',children:[{id:'admin.installation',componentId:'text',model:{text:'Installation '+installationId}},{id:'admin.status',componentId:'status',model:{title:'Installed status',state:'Loading'}},{id:'admin.refresh',componentId:'form',model:{title:'Status',actionId:'admin.refresh',submitLabel:'Refresh status',fields:[]}},{id:'admin.logout',componentId:'form',model:{title:'Session',actionId:'admin.logout',submitLabel:'Sign out',actionData:{csrf},fields:[]}}]}});} static refreshed(view:UiViewModel,value:unknown):UiViewModel{const stack=UiSchemas.stackModel.parse(view.model),result=PlatformOperations.status.parseOutput(value),children:UiViewModel[]=[];for(const child of stack.children)if(child.id!=='admin.status'&&child.id!=='admin.services')children.push(child);children.splice(1,0,{id:'admin.status',componentId:'status',model:{title:'Installed status',state:result.ready?'Ready':'Not ready',detail:result.activeComposition??'No active composition'}});const rows:string[][]=[];if('services' in result)for(const service of result.services)rows.push([service.serviceId,service.ready?'Ready':'Not ready']);children.splice(2,0,{id:'admin.services',componentId:'table',model:{title:'Services',columns:['Service','State'],rows}});return UiSchemas.view.parse({...view,model:{...stack,children}});} diff --git a/tests/regression/adoption.test.ts b/tests/regression/adoption.test.ts index c0c43cc..90b6860 100644 --- a/tests/regression/adoption.test.ts +++ b/tests/regression/adoption.test.ts @@ -1,10 +1,14 @@ import { test, expect } from 'bun:test'; import { spawnSync } from 'node:child_process'; class AdoptionTests { - program(): void { - const code = "import {readFileSync,existsSync,realpathSync} from 'node:fs';import {createRequire} from 'node:module';import {dirname,join} from 'node:path';import {createHash} from 'node:crypto';import {IdentityBuild} from '@treeseed-cordis/identity';class Program{static run(){const own=JSON.parse(readFileSync('package.json','utf8')),require=createRequire(import.meta.url);for(const [owner,expected] of [['sdk','0.0.0-cordis.16'],['identity','0.0.0-cordis.7'],['ui','0.0.0-cordis.16']]){if(own.peerDependencies['@treeseed-cordis/'+owner]!==expected)throw new Error('Required owner candidate mismatch');let directory=dirname(realpathSync(require.resolve('@treeseed-cordis/'+owner)));while(!existsSync(join(directory,'package.json'))){const parent=dirname(directory);if(parent===directory)throw new Error('Missing installed package');directory=parent;}const installed=JSON.parse(readFileSync(join(directory,'package.json'),'utf8'));if(installed.version!==own.peerDependencies['@treeseed-cordis/'+owner]||createHash('sha256').update(readFileSync('vendor/'+owner+'.tgz')).digest('hex')!==own.cordisCandidate[owner].sha256)throw new Error('Installed owner adoption mismatch');}if(IdentityBuild.package().package.version!==own.peerDependencies['@treeseed-cordis/identity'])throw new Error('Native owner projection mismatch');process.stdout.write('owner-adoption-ok\\n');}}Program.run();"; - const result = spawnSync('node', ['--input-type=module', '-e', code], { encoding: 'utf8' }); expect(result.status).toBe(0); expect(result.stderr).toBe(''); expect(result.stdout).toBe('owner-adoption-ok\n'); - } + program(): void { + const result = spawnSync('node', ['dist/tests/support/capacity-contract-program.js'], { + encoding: 'utf8', + }); + expect(result.status).toBe(0); + expect(result.stderr).toBe(''); + expect(result.stdout).toBe('owner-adoption-ok\n'); + } } const adoption = new AdoptionTests(); -test("regression: installed native owner identities match exact peer selections and vendored archive pins", adoption.program.bind(adoption)); +test('regression: installed native owner identities match exact peer selections and vendored archive pins', adoption.program.bind(adoption)); diff --git a/tests/support/capacity-contract-program.ts b/tests/support/capacity-contract-program.ts new file mode 100644 index 0000000..090cdff --- /dev/null +++ b/tests/support/capacity-contract-program.ts @@ -0,0 +1,58 @@ +import assert from 'node:assert/strict'; +import { readFileSync, existsSync, realpathSync } from 'node:fs'; +import { createHash } from 'node:crypto'; +import { createRequire } from 'node:module'; +import { dirname, join } from 'node:path'; +import * as sdk from '@treeseed-cordis/sdk'; +import { IdentityBuild } from '@treeseed-cordis/identity'; +import { AdminBuild } from '../../src/admin.js'; + +interface Selection { version: string; commit: string; sha256: string; } +class OwnerCompatibilityProgram { + private static readonly entries: Record = { + sdk: createRequire(import.meta.url).resolve('@treeseed-cordis/sdk'), + identity: createRequire(import.meta.url).resolve('@treeseed-cordis/identity'), + ui: createRequire(import.meta.url).resolve('@treeseed-cordis/ui'), + }; + private static readonly selections: Record = { + sdk: { version: '0.0.0-cordis.19', commit: '90cf4f3cc62e166685280450c727499defd2af5b', + sha256: '93dd549c98aba180306e9b19cc1cbc37494544b2764ed341c531c9af618c6f81' }, + identity: { version: '0.0.0-cordis.8', commit: 'cb86258e93337559aa4a248177a20bd2a07fd467', + sha256: 'a308c71b0da1822e7786121092a05f2496d26614942aaeb459a78531e689cb76' }, + ui: { version: '0.0.0-cordis.18', commit: 'e2b9c5e10611c196834fd57ba5358a74304e373c', + sha256: 'd09e6ed33f7f1bc2f7210208a94f33bbd2a6453d8fe886f75a1f950887223e48' }, + }; + run(): void { + for (const [owner, selection] of Object.entries(OwnerCompatibilityProgram.selections)) + this.selection(owner, selection); + assert.equal(typeof Reflect.get(sdk, 'CapacitySchemas'), 'function'); + assert.equal(sdk.PlatformOperations.all.length, 7); + assert.equal(AdminBuild.metadata().capability, 'admin.routes'); + assert.equal(IdentityBuild.package().package.version, '0.0.0-cordis.8'); + process.stdout.write('owner-adoption-ok\n'); + } + private selection(owner: string, selection: Selection): void { + const metadata = JSON.parse(readFileSync('package.json', 'utf8')); + const digest = createHash('sha256').update(readFileSync('vendor/' + owner + '.tgz')).digest('hex'); + assert.equal(metadata.peerDependencies['@treeseed-cordis/' + owner], selection.version); + assert.equal(metadata.cordisCandidate[owner].commit, selection.commit); + assert.equal(metadata.cordisCandidate[owner].sha256, selection.sha256); + assert.equal(digest, selection.sha256); + assert.equal(this.installed(owner), selection.version); + } + private installed(owner: string): string { + const name = '@treeseed-cordis/' + owner; + let directory = dirname(realpathSync(OwnerCompatibilityProgram.entries[owner]!)); + while (true) { + const file = join(directory, 'package.json'); + if (existsSync(file)) { + const metadata = JSON.parse(readFileSync(file, 'utf8')); + if (metadata.name === name) return metadata.version; + } + const parent = dirname(directory); + assert.notEqual(parent, directory, 'Missing installed package'); + directory = parent; + } + } +} +if (import.meta.main) new OwnerCompatibilityProgram().run(); diff --git a/vendor/identity.tgz b/vendor/identity.tgz index f66b9d2..3e14097 100644 Binary files a/vendor/identity.tgz and b/vendor/identity.tgz differ diff --git a/vendor/sdk.tgz b/vendor/sdk.tgz index d3a34a6..f874fc1 100644 Binary files a/vendor/sdk.tgz and b/vendor/sdk.tgz differ diff --git a/vendor/ui.tgz b/vendor/ui.tgz index da5e139..656d2de 100644 Binary files a/vendor/ui.tgz and b/vendor/ui.tgz differ