@moorline/core 0.0.1 → 0.0.3

package/dist/app/bootstrap/apiAdapterPackageLoader.d.ts

@@ -1,15 +1,5 @@
 import type { MoorlineConfig } from '../../types/config.js';
 import { type RuntimeApiAdapterPackage, type RuntimeApiAdapterContext } from '@moorline/contracts';
-export declare function loadApiAdapterPackageById(input: {
-    runtimeRoot: string;
-    packageId: string;
-    context: RuntimeApiAdapterContext;
-    onDiscoveryWarning?: (input: {
-        packageId: string;
-        packageDir: string;
-        detail: string;
-    }) => void;
-}): Promise<RuntimeApiAdapterPackage>;
 export declare function loadConfiguredApiAdapterPackage(input: {
     config: MoorlineConfig;
     context: RuntimeApiAdapterContext;

package/dist/app/bootstrap/apiAdapterPackageLoader.js

@@ -101,7 +101,7 @@ async function importApiAdapterPackage(record, context) {
         manifest: record.manifest
     };
 }
-export async function loadApiAdapterPackageById(input) {
+async function loadApiAdapterPackageById(input) {
     const rootDir = join(input.runtimeRoot, 'packages', 'api-adapters');
     const records = listApiAdapterPackageRecords(rootDir);
     const validRecords = records.filter((entry) => entry.kind === 'valid');

package/dist/app/bootstrap/apiAdapterPackageLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"apiAdapterPackageLoader.js","sourceRoot":"","sources":["../../../../../../src/app/bootstrap/apiAdapterPackageLoader.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"apiAdapterPackageLoader.js","sourceRoot":"","sources":["../../../../../../src/app/bootstrap/apiAdapterPackageLoader.ts"],"names":[],"mappings":"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"}

package/dist/app/bootstrap/operatorPackageService.d.ts

@@ -2,7 +2,7 @@ import { type MoorlineConfig } from '../../types/config.js';
 import type { MoorlineShareBundle } from '../../types/config.js';
 import type { PackageApplyPlan, PackageKind, PackageSourceDescriptor, PackageSurface } from '../../types/package.js';
 import type { PackageRegistryEntry, PackageSearchInput } from '../../core/extension/packages/packageRegistryTypes.js';
-type PackageConfigValues = Record<string, string>;
+type PackageConfigValues = Record<string, unknown>;
 type PackageConfigReplacement = {
     key: string;
     value: string;
@@ -21,15 +21,16 @@ export declare class OperatorPackageService {
     private operationJournalPath;
     private writeOperationJournal;
     private clearOperationJournal;
+    private markSetupIncomplete;
     private withOperationJournal;
     private withAsyncOperationJournal;
     private repairInventoryAgainstDisk;
     private backupCorruptOperationJournal;
     private recoverInterruptedPackageOperation;
     private checkpoint;
-    listCatalog(): PackageRegistryEntry[];
-    searchCatalog(input: PackageSearchInput): Promise<PackageRegistryEntry[]>;
-    getCatalogPackage(input: {
+    listPackageCache(): PackageRegistryEntry[];
+    searchPackages(input: PackageSearchInput): Promise<PackageRegistryEntry[]>;
+    getPackageInfo(input: {
         kind?: PackageKind;
         packageId: string;
     }): Promise<PackageRegistryEntry>;
@@ -38,6 +39,7 @@ export declare class OperatorPackageService {
     getInventory(): import("../../core/extension/packages/packageInventoryStore.js").PackageInventoryState;
     getApplyPlan(): PackageApplyPlan;
     private expectedPackageForEntry;
+    private packageMetadataForEntry;
     private embeddedBundleMemberEntries;
     installPackage(input: {
         surface?: PackageKind;
@@ -46,7 +48,12 @@ export declare class OperatorPackageService {
         packageId?: string;
     }): Promise<import("../../types/package.js").PackageInstallRecord>;
     private addBundleOwner;
+    private addBundleActivationOwner;
     private removeBundleOwner;
+    private removeBundleActivationOwner;
+    private packageIsDesiredActive;
+    private activationIsBundleOwned;
+    private removeBundleOwnedActivation;
     private bundleMemberDependents;
     private assertReplacementSatisfiesExistingBundleOwners;
     private installBundle;

package/dist/app/bootstrap/operatorPackageService.js

@@ -1,18 +1,17 @@
 import { copyFileSync, existsSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
-import { defaultHttpApiAdapterConfig, homeRootForRuntime } from '../../types/config.js';
+import { homeRootForRuntime } from '../../types/config.js';
 import { createPackageApplyPlan } from '../../core/extension/packages/packageApplyPlanner.js';
 import { findDependentRecords, findDependents } from '../../core/extension/packages/packageDependencyResolver.js';
 import { resolvePackageConfigSchema } from '../../core/extension/packages/packageConfigSchema.js';
 import { PackageInventoryStore } from '../../core/extension/packages/packageInventoryStore.js';
 import { PackageInstaller } from '../../core/extension/packages/packageInstaller.js';
 import { coerceSurfaceConfigInput, evaluateRuntimeStartability } from '../../core/extension/packages/runtimeStartability.js';
-import { appliedPackageRefs, desiredPackageRefsFromConfig, isBuiltInActivatedPackage, packageActivationUniqueKey } from '../../core/extension/packages/packageActivation.js';
+import { appliedPackageRefs, desiredPackageRefsFromConfig, packageActivationUniqueKey } from '../../core/extension/packages/packageActivation.js';
 import { buildRequiredAppliedSurfaceConfigs, buildShareableMoorlineConfig, runtimePaths, saveMoorlineConfig } from '../../core/system/config/configStore.js';
 import { recordHistoryCheckpoint } from '../../core/system/vcs/gitCheckpointService.js';
 import { GitHistoryService } from '../../core/system/vcs/gitHistoryService.js';
 import { loadTransportPackageById } from './transportPackageLoader.js';
-import { assertOfficialCatalogChecksums, getOfficialCatalog } from './officialCatalog.js';
 import { packageVersionSatisfiesRange, resolveBundleMembers } from '../../core/extension/packages/packageVersionResolver.js';
 import { PackageRegistryService } from '../../core/extension/packages/packageRegistryService.js';
 import { loadInstallablePackageManifest } from '../../core/extension/packages/packageManifest.js';
@@ -70,6 +69,24 @@ function packageConfigRootIfPresent(config, surface, packageId) {
     }
     return config.surfaces.skills.configByPackageId[packageId] ?? {};
 }
+function scalarPackageConfigInputText(value, label) {
+    if (value === undefined || value === null) {
+        return '';
+    }
+    if (typeof value === 'string') {
+        return value;
+    }
+    if (typeof value === 'number') {
+        if (!Number.isFinite(value)) {
+            throw new Error(`${label} must be a finite number.`);
+        }
+        return String(value);
+    }
+    if (typeof value === 'boolean') {
+        return String(value);
+    }
+    throw new Error(`${label} must be a string, number, or boolean.`);
+}
 function coercePackageConfigValue(input) {
     if (input.surface === 'transport' || input.surface === 'provider') {
         return coerceSurfaceConfigInput({
@@ -80,19 +97,20 @@ function coercePackageConfigValue(input) {
             rawValue: input.rawValue
         });
     }
+    const rawText = scalarPackageConfigInputText(input.rawValue, `${input.surface} config key ${input.key}`);
     if (!input.schema?.properties) {
-        return input.rawValue;
+        return rawText;
     }
     const property = input.schema.properties[input.key];
     if (!property) {
         throw new Error(`Unknown ${input.surface} config key ${input.key} for ${input.packageId}.`);
     }
     const required = new Set(input.schema.required ?? []);
-    const trimmed = input.rawValue.trim();
+    const trimmed = rawText.trim();
     if (required.has(input.key) && trimmed.length === 0) {
         throw new Error(`${input.surface} config key ${input.key} is required.`);
     }
-    let value = input.rawValue;
+    let value = rawText;
     if (property.type === 'boolean') {
         if (trimmed === 'true') {
             value = true;
@@ -117,7 +135,9 @@ function coercePackageConfigValue(input) {
     return value;
 }
 function isBuiltInPackage(surface, packageId) {
-    return surface === 'api-adapter' && packageId === 'official/http';
+    void surface;
+    void packageId;
+    return false;
 }
 export class OperatorPackageService {
     config;
@@ -125,7 +145,7 @@ export class OperatorPackageService {
     now;
     inventory;
     installer;
-    packageRegistry = new PackageRegistryService();
+    packageRegistry;
     history = new GitHistoryService();
     homeRoot;
     constructor(config, configPath, now = () => new Date().toISOString(), homeRoot = homeRootForRuntime(config.runtimeRoot)) {
@@ -134,6 +154,7 @@ export class OperatorPackageService {
         this.now = now;
         this.inventory = new PackageInventoryStore(config.runtimeRoot);
         this.installer = new PackageInstaller(config.runtimeRoot, now);
+        this.packageRegistry = new PackageRegistryService({ runtimeRoot: config.runtimeRoot });
         this.homeRoot = homeRoot;
     }
     ensureInitialized() {
@@ -164,6 +185,16 @@ export class OperatorPackageService {
     clearOperationJournal() {
         rmSync(this.operationJournalPath(), { force: true });
     }
+    markSetupIncomplete() {
+        const nextSetup = {
+            completed: false
+        };
+        if (JSON.stringify(this.config.setup) === JSON.stringify(nextSetup)) {
+            return;
+        }
+        this.config.setup = nextSetup;
+        saveMoorlineConfig(this.config, this.configPath);
+    }
     withOperationJournal(operation, work) {
         this.writeOperationJournal(operation);
         try {
@@ -173,6 +204,9 @@ export class OperatorPackageService {
         }
         catch (error) {
             this.recoverInterruptedPackageOperation();
+            if (operation === 'apply') {
+                this.markSetupIncomplete();
+            }
             this.clearOperationJournal();
             throw error;
         }
@@ -186,6 +220,9 @@ export class OperatorPackageService {
         }
         catch (error) {
             this.recoverInterruptedPackageOperation();
+            if (operation === 'apply') {
+                this.markSetupIncomplete();
+            }
             this.clearOperationJournal();
             throw error;
         }
@@ -246,16 +283,16 @@ export class OperatorPackageService {
             ...(input.includeConfig ? { configPath: this.configPath } : {})
         });
     }
-    listCatalog() {
-        return this.packageRegistry.listCachedCatalog();
+    listPackageCache() {
+        return this.packageRegistry.listCachedEntries();
     }
-    async searchCatalog(input) {
+    async searchPackages(input) {
         return await this.packageRegistry.search(input);
     }
-    async getCatalogPackage(input) {
+    async getPackageInfo(input) {
         return await this.packageRegistry.getPackage(input);
     }
-    exportShareBundle(productVersion = process.env.npm_package_version ?? '0.0.1') {
+    exportShareBundle(productVersion = process.env.npm_package_version ?? '0.0.2') {
         const inventory = this.inventory.load();
         const notes = [
             'Secrets are excluded from this bundle.',
@@ -312,6 +349,21 @@ export class OperatorPackageService {
             version: entry.version
         };
     }
+    packageMetadataForEntry(entry) {
+        return {
+            kind: entry.kind,
+            surface: entry.surface,
+            packageId: entry.packageId,
+            name: entry.name,
+            description: entry.description,
+            ...(entry.version ? { version: entry.version } : {}),
+            tags: [...entry.tags],
+            source: entry.source,
+            requires: [...entry.requires],
+            ...(entry.members ? { members: [...entry.members] } : {}),
+            ...('suggestedAfterInstall' in entry && entry.suggestedAfterInstall ? { suggestedAfterInstall: [...entry.suggestedAfterInstall] } : {})
+        };
+    }
     embeddedBundleMemberEntries(input) {
         const entries = [];
         for (const member of input.members) {
@@ -327,7 +379,6 @@ export class OperatorPackageService {
                 name: loaded.manifest.name,
                 description: loaded.manifest.description ?? loaded.manifest.id,
                 version: loaded.manifest.version,
-                recommendedForSetup: false,
                 tags: ['embedded'],
                 source: {
                     kind: 'local_dir',
@@ -343,18 +394,12 @@ export class OperatorPackageService {
         if (!kind) {
             throw new Error('Package install requires a kind.');
         }
-        if (input.packageId) {
-            assertOfficialCatalogChecksums({
-                kind,
-                packageId: input.packageId
-            });
-        }
         const registryEntry = input.source || !input.packageId
             ? null
             : await this.packageRegistry.resolveInstallEntry({ kind, packageId: input.packageId });
         const source = input.source ?? registryEntry?.source ?? null;
         if (!source) {
-            throw new Error('Package install requires a source descriptor or a catalog package id');
+            throw new Error('Package install requires a source descriptor or package id');
         }
         if (kind === 'bundle') {
             return await this.installBundle({ packageId: input.packageId, source, registryEntry: registryEntry ?? undefined });
@@ -382,6 +427,15 @@ export class OperatorPackageService {
         record.installedByPackageIds = [...new Set([...record.installedByPackageIds, input.bundlePackageId])].sort();
         this.inventory.save(state);
     }
+    addBundleActivationOwner(input) {
+        const state = this.inventory.load();
+        const record = state.installed.find((entry) => entry.kind === input.kind && entry.packageId === input.packageId);
+        if (!record) {
+            return;
+        }
+        record.activatedByPackageIds = [...new Set([...(record.activatedByPackageIds ?? []), input.bundlePackageId])].sort();
+        this.inventory.save(state);
+    }
     removeBundleOwner(input) {
         const state = this.inventory.load();
         const record = state.installed.find((entry) => entry.kind === input.kind && entry.packageId === input.packageId);
@@ -397,6 +451,60 @@ export class OperatorPackageService {
         }
         this.inventory.save(state);
     }
+    removeBundleActivationOwner(input) {
+        const state = this.inventory.load();
+        const record = state.installed.find((entry) => entry.kind === input.kind && entry.packageId === input.packageId);
+        if (!record?.activatedByPackageIds?.includes(input.bundlePackageId)) {
+            return null;
+        }
+        const nextOwners = record.activatedByPackageIds.filter((owner) => owner !== input.bundlePackageId);
+        if (nextOwners.length > 0) {
+            record.activatedByPackageIds = nextOwners;
+        }
+        else {
+            delete record.activatedByPackageIds;
+        }
+        this.inventory.save(state);
+        return nextOwners;
+    }
+    packageIsDesiredActive(input) {
+        if (input.kind === 'api-adapter') {
+            return this.config.surfaces.apiAdapter.activePackageId === input.packageId;
+        }
+        if (input.kind === 'transport') {
+            return this.config.surfaces.transport.activePackageId === input.packageId;
+        }
+        if (input.kind === 'provider') {
+            return this.config.surfaces.provider.activePackageId === input.packageId;
+        }
+        if (input.kind === 'plugin') {
+            return this.config.surfaces.plugins.enabledPackageIds.includes(input.packageId);
+        }
+        if (input.kind === 'skill') {
+            return this.config.surfaces.skills.enabledPackageIds.includes(input.packageId);
+        }
+        return false;
+    }
+    activationIsBundleOwned(input) {
+        const record = this.inventory.get(input.kind, input.packageId);
+        return (record?.activatedByPackageIds?.length ?? 0) > 0;
+    }
+    removeBundleOwnedActivation(input) {
+        const remainingOwners = this.removeBundleActivationOwner(input);
+        if (remainingOwners === null) {
+            return;
+        }
+        if (remainingOwners.length > 0 || !this.packageIsDesiredActive(input)) {
+            return;
+        }
+        if (input.kind === 'api-adapter' || input.kind === 'transport' || input.kind === 'provider') {
+            this.setSelectedPackage(input.kind, null);
+            return;
+        }
+        if (input.kind === 'plugin' || input.kind === 'skill') {
+            this.disablePackage(input.kind, input.packageId);
+        }
+    }
     bundleMemberDependents(input) {
         return findDependentRecords(this.inventory.load().installed, input.kind, input.packageId)
             .map((entry) => `${entry.surface}:${entry.packageId}`)
@@ -443,7 +551,7 @@ export class OperatorPackageService {
         });
         const bundle = input.registryEntry
             ? {
-                ...input.registryEntry,
+                ...this.packageMetadataForEntry(input.registryEntry),
                 members: input.registryEntry.members && input.registryEntry.members.length > 0 ? input.registryEntry.members : record.members ?? []
             }
             : {
@@ -453,7 +561,6 @@ export class OperatorPackageService {
                 name: record.name,
                 description: record.description ?? record.packageId,
                 version: record.version,
-                recommendedForSetup: false,
                 tags: [],
                 source: input.source,
                 requires: [],
@@ -468,14 +575,28 @@ export class OperatorPackageService {
             });
             const embeddedKeys = new Set(embeddedMemberEntries.map((entry) => `${entry.kind}:${entry.packageId}`));
             const externalMembers = requestedMembers.filter((member) => !embeddedKeys.has(`${member.kind}:${member.packageId}`));
-            const memberEntries = externalMembers.length > 0
-                ? await this.packageRegistry.resolveBundleMemberEntries({ members: externalMembers })
+            const sourceMemberEntries = externalMembers
+                .filter((member) => Boolean(member.source))
+                .map((member) => ({
+                kind: member.kind,
+                surface: member.kind,
+                packageId: member.packageId,
+                name: member.packageId,
+                description: member.reason ?? member.packageId,
+                version: member.version === '*' || member.version === 'latest' || member.version === 'stable' ? undefined : member.version,
+                tags: ['member-source'],
+                source: member.source,
+                requires: []
+            }));
+            const npmMembers = externalMembers.filter((member) => !member.source);
+            const memberEntries = npmMembers.length > 0
+                ? await this.packageRegistry.resolveBundleMemberEntries({ members: npmMembers })
                 : [];
             members = resolveBundleMembers({
-                catalog: [
+                entries: [
                     ...embeddedMemberEntries,
-                    ...getOfficialCatalog(),
-                    ...memberEntries
+                    ...sourceMemberEntries,
+                    ...memberEntries.map((entry) => this.packageMetadataForEntry(entry))
                 ],
                 bundle
             });
@@ -488,56 +609,84 @@ export class OperatorPackageService {
                 // Best effort rollback; the resolution error below is the actionable failure.
             }
             const detail = error instanceof Error ? error.message : String(error);
-            throw new Error(`Bundle ${record.packageId} can only reference packages that are present in catalog metadata in this version. ${detail}`);
+            throw new Error(`Bundle ${record.packageId} can only reference packages that can be resolved from embedded packages, member sources, or registry metadata. ${detail}`);
         }
         try {
             for (const resolved of members) {
-                const existing = this.inventory.get(resolved.catalogEntry.kind, resolved.catalogEntry.packageId);
+                const existing = this.inventory.get(resolved.packageEntry.kind, resolved.packageEntry.packageId);
                 if (!existing) {
                     await this.installer.install({
-                        surface: resolved.catalogEntry.kind,
-                        source: resolved.catalogEntry.source,
+                        surface: resolved.packageEntry.kind,
+                        source: resolved.packageEntry.source,
                         installedByPackageId: record.packageId,
-                        expectedPackage: this.expectedPackageForEntry(resolved.catalogEntry)
+                        expectedPackage: this.expectedPackageForEntry(resolved.packageEntry)
                     });
                 }
                 else {
                     const satisfiesBundleRange = packageVersionSatisfiesRange({
-                        packageId: resolved.catalogEntry.packageId,
+                        packageId: resolved.packageEntry.packageId,
                         version: existing.version,
                         range: resolved.member.version
                     });
                     if (!satisfiesBundleRange) {
                         if (!existing.installedByPackageIds || existing.installedByPackageIds.length === 0) {
-                            throw new Error(`Installed ${resolved.catalogEntry.kind} package ${existing.packageId}@${existing.version} does not satisfy bundle ` +
+                            throw new Error(`Installed ${resolved.packageEntry.kind} package ${existing.packageId}@${existing.version} does not satisfy bundle ` +
                                 `${record.packageId} requirement ${resolved.member.version}. Remove or update it before installing the bundle.`);
                         }
                         this.assertReplacementSatisfiesExistingBundleOwners({
-                            kind: resolved.catalogEntry.kind,
-                            packageId: resolved.catalogEntry.packageId,
-                            replacementVersion: resolved.catalogEntry.version,
+                            kind: resolved.packageEntry.kind,
+                            packageId: resolved.packageEntry.packageId,
+                            replacementVersion: resolved.packageEntry.version,
                             ownerPackageIds: existing.installedByPackageIds
                         });
                         await this.installer.install({
-                            surface: resolved.catalogEntry.kind,
-                            source: resolved.catalogEntry.source,
+                            surface: resolved.packageEntry.kind,
+                            source: resolved.packageEntry.source,
                             installedByPackageId: record.packageId,
-                            expectedPackage: this.expectedPackageForEntry(resolved.catalogEntry)
+                            expectedPackage: this.expectedPackageForEntry(resolved.packageEntry)
                         });
                     }
                     else if (existing.installedByPackageIds && existing.installedByPackageIds.length > 0) {
                         this.addBundleOwner({
-                            kind: resolved.catalogEntry.kind,
-                            packageId: resolved.catalogEntry.packageId,
+                            kind: resolved.packageEntry.kind,
+                            packageId: resolved.packageEntry.packageId,
                             bundlePackageId: record.packageId
                         });
                     }
                 }
                 if (resolved.member.activation === 'select') {
-                    this.setSelectedPackage(resolved.member.kind, resolved.catalogEntry.packageId);
+                    const shouldTrackActivation = !this.packageIsDesiredActive({
+                        kind: resolved.member.kind,
+                        packageId: resolved.packageEntry.packageId
+                    }) || this.activationIsBundleOwned({
+                        kind: resolved.member.kind,
+                        packageId: resolved.packageEntry.packageId
+                    });
+                    this.setSelectedPackage(resolved.member.kind, resolved.packageEntry.packageId);
+                    if (shouldTrackActivation) {
+                        this.addBundleActivationOwner({
+                            kind: resolved.member.kind,
+                            packageId: resolved.packageEntry.packageId,
+                            bundlePackageId: record.packageId
+                        });
+                    }
                 }
                 else if (resolved.member.activation === 'enable') {
-                    this.enablePackage(resolved.member.kind, resolved.catalogEntry.packageId);
+                    const shouldTrackActivation = !this.packageIsDesiredActive({
+                        kind: resolved.member.kind,
+                        packageId: resolved.packageEntry.packageId
+                    }) || this.activationIsBundleOwned({
+                        kind: resolved.member.kind,
+                        packageId: resolved.packageEntry.packageId
+                    });
+                    this.enablePackage(resolved.member.kind, resolved.packageEntry.packageId);
+                    if (shouldTrackActivation) {
+                        this.addBundleActivationOwner({
+                            kind: resolved.member.kind,
+                            packageId: resolved.packageEntry.packageId,
+                            bundlePackageId: record.packageId
+                        });
+                    }
                 }
             }
         }
@@ -596,6 +745,9 @@ export class OperatorPackageService {
                 if (!installed) {
                     continue;
                 }
+                if (member.activation === 'select' || member.activation === 'enable') {
+                    this.removeBundleOwnedActivation({ kind: member.kind, packageId: member.packageId, bundlePackageId: input.packageId });
+                }
                 const owners = installed.installedByPackageIds ?? [];
                 if (!owners.includes(input.packageId)) {
                     keptMembers.push(`${member.kind}:${member.packageId} is manually installed`);
@@ -686,7 +838,6 @@ export class OperatorPackageService {
         let inventoryChanged = false;
         if (pruneDesiredSelections) {
             if (this.config.surfaces.apiAdapter.activePackageId &&
-                this.config.surfaces.apiAdapter.activePackageId !== 'official/http' &&
                 !installed['api-adapter'].has(this.config.surfaces.apiAdapter.activePackageId)) {
                 this.config.surfaces.apiAdapter.activePackageId = null;
                 this.config.surfaces.apiAdapter.config = {};
@@ -703,8 +854,22 @@ export class OperatorPackageService {
                 configChanged = true;
             }
         }
+        if (this.config.transport &&
+            (!this.config.surfaces.transport.activePackageId ||
+                this.config.transport.packageId !== this.config.surfaces.transport.activePackageId ||
+                !installed.transport.has(this.config.transport.packageId))) {
+            delete this.config.transport;
+            configChanged = true;
+        }
+        if (this.config.provider &&
+            (!this.config.surfaces.provider.activePackageId ||
+                this.config.provider.packageId !== this.config.surfaces.provider.activePackageId ||
+                !installed.provider.has(this.config.provider.packageId))) {
+            delete this.config.provider;
+            configChanged = true;
+        }
         for (const packageId of Object.keys(this.config.surfaces.apiAdapter.configByPackageId ?? {})) {
-            if (packageId !== 'official/http' && !installed['api-adapter'].has(packageId)) {
+            if (!installed['api-adapter'].has(packageId)) {
                 delete this.config.surfaces.apiAdapter.configByPackageId?.[packageId];
                 configChanged = true;
             }
@@ -743,7 +908,7 @@ export class OperatorPackageService {
                 configChanged = true;
             }
         }
-        const normalizedApplied = appliedPackageRefs(state.applied).filter((entry) => isBuiltInActivatedPackage(entry) || installed[entry.surface].has(entry.packageId));
+        const normalizedApplied = appliedPackageRefs(state.applied).filter((entry) => installed[entry.surface].has(entry.packageId));
         if (JSON.stringify(normalizedApplied) !== JSON.stringify(state.applied.activated)) {
             state.applied.activated = normalizedApplied;
             inventoryChanged = true;
@@ -785,9 +950,8 @@ export class OperatorPackageService {
             }
             else {
                 const savedConfig = this.config.surfaces.apiAdapter.configByPackageId?.[packageId];
-                const legacyDefaultConfig = packageId === 'official/http' ? defaultHttpApiAdapterConfig() : {};
                 this.config.surfaces.apiAdapter.config = {
-                    ...(savedConfig ?? legacyDefaultConfig)
+                    ...(savedConfig ?? {})
                 };
             }
         }
@@ -988,16 +1152,24 @@ export class OperatorPackageService {
     }
     async apply() {
         return await this.withAsyncOperationJournal('apply', async () => {
-            this.reconcileDesiredAndAppliedState();
-            await this.completeSelectedTransportConfig();
-            const state = this.inventory.load();
-            const startability = evaluateRuntimeStartability(this.config, state);
-            if (!startability.startable) {
-                throw new Error(startability.issues.join('\n'));
+            let state = this.inventory.load();
+            let plan;
+            try {
+                this.reconcileDesiredAndAppliedState();
+                await this.completeSelectedTransportConfig();
+                state = this.inventory.load();
+                const startability = evaluateRuntimeStartability(this.config, state);
+                if (!startability.startable) {
+                    throw new Error(startability.issues.join('\n'));
+                }
+                plan = createPackageApplyPlan(this.config, state);
+                if (plan.errors.length > 0) {
+                    throw new Error(plan.errors.map((entry) => entry.detail).join('\n'));
+                }
             }
-            const plan = createPackageApplyPlan(this.config, state);
-            if (plan.errors.length > 0) {
-                throw new Error(plan.errors.map((entry) => entry.detail).join('\n'));
+            catch (error) {
+                this.markSetupIncomplete();
+                throw error;
             }
             const applied = buildRequiredAppliedSurfaceConfigs(this.config);
             this.config.transport = applied.transport;