@aopslabs/aops 0.3.1 → 0.3.3

package/dist/commands/community-server.js

@@ -13,7 +13,7 @@ import { resolveCommunityOfflineRelease, resolveCommunityPublishedRelease, } fro
 import { inspectCommunityDoctor } from './community-doctor.js';
 import { buildCommunityInstanceContract, } from '../lib/community-instance-contract.js';
 import { asCommunityDiagnosticError } from '../lib/community-diagnostic.js';
-import { assertCommunityNativePathLayout, attestCommunityNativeExternalSnapshot, inspectCommunityNativeInstall, inspectCommunityNativeRuntime, loadExternalPostgresUrl, loadExternalServerAuthConfig, planCommunityNativeInstalledMigration, readCommunityNativeLogs, rollbackCommunityNativeApplication, resolveCommunityNativeLaunchMode, resolveCommunityNativePaths, setupCommunityNativeInstall, startCommunityNativeInstall, stopCommunityNativeInstall, } from '../lib/community-native-lifecycle.js';
+import { assertCommunityNativePathLayout, attestCommunityNativeExternalSnapshot, inspectCommunityNativeInstall, inspectCommunityNativeRuntime, loadExternalPostgresUrl, loadExternalServerAuthConfig, planCommunityNativeInstalledMigration, readCommunityNativeLogs, rollbackCommunityNativeApplication, resolveCommunityNativeInstalledNpmSourceRoot, resolveCommunityNativeLaunchMode, resolveCommunityNativePaths, setupCommunityNativeInstall, startCommunityNativeInstall, stopCommunityNativeInstall, } from '../lib/community-native-lifecycle.js';
 import { inspectCommunityNativeApplicationRecoveryStatus } from '../lib/community-native-application-recovery.js';
 import { inspectCommunityNativeDatabaseRecoveryStatus, restoreCommunityNativeDatabaseForUpdate, } from '../lib/community-native-database-recovery.js';
 import { inspectCommunityNativePostgres, removeCommunityNativePostgresContainerForReset, removeCommunityNativeManagedPostgres, } from '../lib/community-native-postgres.js';
@@ -214,6 +214,8 @@ function resolveDependencies(dependencies = {}) {
         planNativeMigration: dependencies.planNativeMigration ?? planCommunityNativeInstalledMigration,
         attestNativeExternalSnapshot: dependencies.attestNativeExternalSnapshot ?? attestCommunityNativeExternalSnapshot,
         setupNativeInstall: dependencies.setupNativeInstall ?? setupCommunityNativeInstall,
+        startNativeInstall: dependencies.startNativeInstall ?? startCommunityNativeInstall,
+        resolveNativeInstalledNpmSourceRoot: dependencies.resolveNativeInstalledNpmSourceRoot ?? resolveCommunityNativeInstalledNpmSourceRoot,
         rollbackNativeApplication: dependencies.rollbackNativeApplication ?? rollbackCommunityNativeApplication,
         restoreNativeDatabase: dependencies.restoreNativeDatabase ?? restoreCommunityNativeDatabaseForUpdate,
         stopNativeCockpit: dependencies.stopNativeCockpit ?? stopCommunityNativeCockpit,
@@ -764,8 +766,9 @@ export async function runCommunityServerStart(options, dependencies = {}) {
     await withMutatingCommandScope(dependencies, async (runtime, signal) => {
         const native = inspectNativeFrom(options);
         if (native.status === 'installed') {
-            const launch = await withNativeOperation(options, 'start', runtime, signal, () => startCommunityNativeInstall({
+            const launch = await withNativeOperation(options, 'start', runtime, signal, () => runtime.startNativeInstall({
                 ...installSelection(options),
+                adoptSourceRoot: runtime.resolveNativeInstalledNpmSourceRoot(),
                 mode: resolveCommunityNativeLaunchMode(options),
                 signal,
             }));

package/dist/lib/community-diagnostic.js

@@ -66,7 +66,7 @@ function guidance(code) {
         return {
             summary: 'The installed npm server package no longer matches the source or build fingerprint AOPS previously verified.',
             nextActions: Object.freeze([
-                'Reinstall the matching public `@aopslabs/aops` and `@aopslabs/aops-server` packages separately.',
+                'Reinstall the public `@aopslabs/aops` package so npm restores its exact Server dependency.',
                 'Re-run `aops setup init` for the selected path after the verified package bytes have been restored.',
             ]),
         };

package/dist/lib/community-native-lifecycle.js

@@ -7,7 +7,8 @@ import { fileURLToPath } from 'node:url';
 import { parseEnv } from 'node:util';
 import { COMMUNITY_NATIVE_CHILD_PROTOCOL, COMMUNITY_NATIVE_CONTROL_PROTOCOL, } from './community-native-child.js';
 import { resolveCommunityInstallPaths } from './community-lifecycle.js';
-import { COMMUNITY_NATIVE_POSTGRES_CONTRACT_PATH, assertCommunityNativePostgresInstanceState, assertCommunityNativePostgresState, buildCommunityNativePostgresUrl, setupCommunityNativePostgres, startCommunityNativePostgres, stopCommunityNativePostgres, } from './community-native-postgres.js';
+import { buildCommunityInstanceContract, } from './community-instance-contract.js';
+import { COMMUNITY_NATIVE_POSTGRES_CONTRACT_PATH, assertCommunityNativePostgresInstanceState, assertCommunityNativePostgresState, buildCommunityNativePostgresUrl, setupCommunityNativePostgres, startCommunityNativePostgres, } from './community-native-postgres.js';
 import { COMMUNITY_NATIVE_MIGRATION_POLICY_PATH, assertCommunityNativeMigrationReceiptV1, planCommunityNativeMigration, runCommunityNativeMigration, } from './community-native-migration.js';
 import { createCommunityExternalSnapshotAttestationV1, writeCommunityExternalSnapshotAttestationV1, } from './community-migration-snapshot.js';
 import { createCommunityNativeApplicationReferenceV1, readCommunityNativeApplicationUpdate, sameCommunityNativeApplicationContent, writeCommunityNativeApplicationRollbackOutcome, writeCommunityNativeApplicationRollbackPrepared, writeCommunityNativeApplicationUpdateOutcome, writeCommunityNativeApplicationUpdatePrepared, } from './community-native-application-recovery.js';
@@ -660,20 +661,29 @@ function sourceLayout(root, manifest = sourcePackage(root)) {
 function isPackagedCommunityServerSource(source) {
     return sourceLayout(source.root).kind === 'npm-package';
 }
+function isPersistedPackagedCommunityServerState(state) {
+    return samePhysicalPath(state.build.hostEntry, path.join(state.source.root, PACKAGE_BUILD_PATHS.hostEntry)) &&
+        samePhysicalPath(state.build.handlerEntry, path.join(state.source.root, PACKAGE_BUILD_PATHS.handlerEntry)) &&
+        samePhysicalPath(state.build.cockpitIndex, path.join(state.source.root, PACKAGE_BUILD_PATHS.cockpitIndex));
+}
 export function isCommunityNativeNpmPackageSource(sourceRoot) {
     const resolved = path.resolve(sourceRoot);
     return sourceLayout(realpathSync(resolved)).kind === 'npm-package';
 }
 export function resolveCommunityNativeDefaultSourceRoot(fallbackRoot = process.cwd(), moduleUrl = import.meta.url) {
+    return resolveCommunityNativeInstalledNpmSourceRoot(moduleUrl) ?? path.resolve(fallbackRoot);
+}
+export function resolveCommunityNativeInstalledNpmSourceRoot(moduleUrl = import.meta.url) {
     try {
         const require = createRequire(moduleUrl);
         const packageJsonPath = require.resolve(`${PUBLIC_SERVER_PACKAGE_NAME}/package.json`);
         const packageRoot = path.dirname(packageJsonPath);
-        sourceLayout(packageRoot);
+        if (sourceLayout(packageRoot).kind !== 'npm-package')
+            return null;
         return packageRoot;
     }
     catch {
-        return path.resolve(fallbackRoot);
+        return null;
     }
 }
 export function inspectCommunityNativeSource(sourceRoot = process.cwd()) {
@@ -827,6 +837,12 @@ export function reconcileCommunityNativePriorApplication(params) {
         throw new Error('community_native_container_postgres_contract_required');
     }
     if (!samePhysicalPath(state.source.root, selectedSource.root)) {
+        if (sourceLayout(selectedSource.root).kind === 'npm-package') {
+            const comparison = compareCommunityReleaseVersions(selectedSource.releaseVersion, state.source.releaseVersion);
+            if (comparison < 0) {
+                throw new Error(`community_native_application_downgrade_refused:${state.source.releaseVersion}:to:${selectedSource.releaseVersion}`);
+            }
+        }
         return 'application-source-adopted';
     }
     try {
@@ -1620,15 +1636,6 @@ export async function stopCommunityNativeInstall(params = {}) {
         now,
     });
     if (observed.runtimeState === 'stopped' || observed.runtimeState === 'crashed') {
-        if (inspection.state.postgres.mode === 'container') {
-            await stopCommunityNativePostgres({
-                state: inspection.state.postgres,
-                instanceName: inspection.state.instanceName,
-                instanceRoot: inspection.paths.instanceRoot,
-                runtime: params.postgresRuntime,
-                signal: params.signal,
-            });
-        }
         return { status: 'already-stopped', state: inspection.state, process: observed.process };
     }
     if (!observed.process || !observed.identity || !observed.supervisorAlive ||
@@ -1654,15 +1661,6 @@ export async function stopCommunityNativeInstall(params = {}) {
             };
             delete stopped.failure;
             writeProcess(inspection.paths, stopped);
-            if (inspection.state.postgres.mode === 'container') {
-                await stopCommunityNativePostgres({
-                    state: inspection.state.postgres,
-                    instanceName: inspection.state.instanceName,
-                    instanceRoot: inspection.paths.instanceRoot,
-                    runtime: params.postgresRuntime,
-                    signal: params.signal,
-                });
-            }
             return { status: 'stopped', state: inspection.state, process: stopped };
         }
         await runtime.sleep(READY_POLL_MS, params.signal);
@@ -2443,15 +2441,62 @@ export async function startCommunityNativeInstall(params) {
     if (inspection.status !== 'installed' || !inspection.state) {
         throw new Error(`community_native_not_installed:${inspection.status}:${inspection.error ?? 'run_server_setup'}`);
     }
+    const runtime = params.runtime ?? communityNativeRuntime;
+    const now = params.now ?? (() => new Date());
+    const createId = params.createId ?? randomUUID;
+    const mode = params.mode ?? 'detached';
+    const readyTimeoutMs = params.readyTimeoutMs ?? DEFAULT_READY_TIMEOUT_MS;
+    if (params.adoptSourceRoot
+        && isPersistedPackagedCommunityServerState(inspection.state)
+        && inspection.state.server.host === '127.0.0.1'
+        && inspection.state.server.exposure === 'loopback'
+        && inspection.state.server.authProvider === 'trusted-local') {
+        const selectedSource = inspectCommunityNativeSource(params.adoptSourceRoot);
+        const state = inspection.state;
+        const contract = buildCommunityInstanceContract({
+            runtime: 'native',
+            postgres: state.postgres.mode,
+            postgresConfig: state.postgres.mode === 'external' ? state.postgres.configRef : undefined,
+            postgresTls: state.postgres.mode === 'external' ? state.postgres.tlsPolicy : undefined,
+            exposure: state.server.exposure,
+            auth: state.server.authProvider,
+            publicPort: state.server.publicPort,
+            instance: state.instanceName,
+            port: state.server.port,
+            processEnv: params.env,
+        });
+        const reconciliation = reconcileCommunityNativePriorApplication({
+            state,
+            selectedSource,
+            contract,
+            selectedExternalConfigRef: state.postgres.mode === 'external' ? state.postgres.configRef : undefined,
+        });
+        if (reconciliation === 'application-source-adopted') {
+            const refreshed = await setupCommunityNativeInstall({
+                contract,
+                sourceRoot: selectedSource.root,
+                dataRoot: params.dataRoot,
+                mode,
+                runtime,
+                postgresRuntime: params.postgresRuntime,
+                now,
+                createId,
+                readyTimeoutMs,
+                env: params.env,
+                signal: params.signal,
+            });
+            return refreshed.launch;
+        }
+    }
     return launchInstalledNative({
         paths: inspection.paths,
         state: inspection.state,
-        mode: params.mode ?? 'detached',
-        runtime: params.runtime ?? communityNativeRuntime,
+        mode,
+        runtime,
         postgresRuntime: params.postgresRuntime,
-        now: params.now ?? (() => new Date()),
-        createId: params.createId ?? randomUUID,
-        readyTimeoutMs: params.readyTimeoutMs ?? DEFAULT_READY_TIMEOUT_MS,
+        now,
+        createId,
+        readyTimeoutMs,
         env: params.env,
         signal: params.signal,
     });

package/dist/lib/community-native-postgres.js

@@ -302,8 +302,11 @@ async function verifyContainer(runtime, state, instanceName, signal, verifyPersi
         (hostPort !== null && (!Number.isSafeInteger(hostPort) || hostPort < 1 || hostPort > 65_535)) ||
         (verifyPersistedPort && hostPort !== null && hostPort !== state.port))
         throw new Error('community_native_postgres_container_port_binding_drift');
-    if (verifyPersistedPort && await mappedPort(runtime, state, signal) !== state.port) {
-        throw new Error('community_native_postgres_container_port_binding_drift');
+    if (verifyPersistedPort) {
+        const observed = await containerState(runtime, state.containerName, signal);
+        if (observed.status === 'running' && await mappedPort(runtime, state, signal) !== state.port) {
+            throw new Error('community_native_postgres_container_port_binding_drift');
+        }
     }
     const restartPolicy = await inspectContainerJson(runtime, state.containerName, '{{json .HostConfig.RestartPolicy}}', 'container_restart_policy_inspect', signal);
     if (!restartPolicy || typeof restartPolicy !== 'object' || Array.isArray(restartPolicy) ||
@@ -476,19 +479,6 @@ export async function startCommunityNativePostgres(params) {
     if (port !== state.port)
         throw new Error('community_native_postgres_port_mapping_drift:run_server_setup_--apply');
 }
-export async function stopCommunityNativePostgres(params) {
-    throwIfCommunityCommandAborted(params.signal);
-    const state = assertCommunityNativePostgresInstanceState(params);
-    const runtime = params.runtime ?? communityNativePostgresRuntime;
-    if (!await verifyContainer(runtime, state, params.instanceName, params.signal)) {
-        throw new Error('community_native_postgres_container_missing');
-    }
-    const observed = await containerState(runtime, state.containerName, params.signal);
-    if (observed.status === 'exited' || observed.status === 'created')
-        return 'already-stopped';
-    await runDocker(runtime, ['container', 'stop', '--time', '15', state.containerName], 'container_stop', params.signal);
-    return 'stopped';
-}
 export async function removeCommunityNativePostgresContainer(params) {
     throwIfCommunityCommandAborted(params.signal);
     const state = assertCommunityNativePostgresInstanceState(params);

package/dist/lib/setup-readiness.js

@@ -709,12 +709,12 @@ export async function inspectSetupReadiness(options = {}) {
                     : 'Native source runtime requirements are available.'
                 : needsDocker
                     ? 'The installed npm server runtime (or an explicit source checkout) and a running Docker daemon are required.'
-                    : 'Install the matching @aopslabs/aops-server package separately, or provide a valid development checkout with pnpm 11.',
+                    : 'Install or update @aopslabs/aops so its matching Server dependency is present, or provide a valid development checkout with pnpm 11.',
             next: runtimeReady
                 ? undefined
                 : needsDocker
                     ? 'Install and start Docker Desktop/Engine, then retry the npm-server setup.'
-                    : 'Install the matching npm server package or provide a valid Community source checkout.',
+                    : 'Install or update the @aopslabs/aops package, or provide a valid Community source checkout.',
             data: {
                 node: process.version,
                 sourceRoot: selectedSourceRoot,

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@aopslabs/aops",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "type": "module",
   "description": "AOPS CLI and terminal setup application.",
-  "aopsDockerServerVersion": "0.2.3",
+  "aopsDockerServerVersion": "0.2.5",
   "license": "SEE LICENSE IN LICENSE",
   "repository": {
     "type": "git",
@@ -46,7 +46,7 @@
     "test:target-transport": "node --test test/target-transport.test.mjs",
     "test:r6-cutover-baseline": "node scripts/verify-r6-cutover-baseline.mjs",
     "test:r6-auth-cutover": "node --test test/r6-auth-cutover.test.mjs",
-    "test:container-runtime": "node --test test/container-runtime.test.mjs",
+    "test:container-runtime": "node --test test/container-runtime.test.mjs test/community-native-postgres.test.mjs",
     "test:kernel-alignment": "node --test test/kernel-alignment.test.mjs",
     "test:home": "node --test test/home-menu.test.mjs",
     "test:launchers": "node --test test/terminal-launchers.test.mjs",
@@ -55,10 +55,11 @@
     "start": "node dist/main.js"
   },
   "dependencies": {
+    "@aopslabs/aops-server": "0.2.5",
     "@aopslabs/artifact-trust-contracts": "0.3.0",
     "@aopslabs/cli-kit": "0.1.0",
     "@aopslabs/aops-host-registration": "0.2.0",
-    "@aopslabs/aops-pg-bootstrap": "0.2.0",
+    "@aopslabs/aops-pg-bootstrap": "0.2.1",
     "@aopslabs/aops-runtime-config": "0.2.0",
     "@sigstore/bundle": "4.0.0",
     "@sigstore/protobuf-specs": "0.5.1",