@bakers-build/core 0.5.1-next.746 → 0.5.1-next.758

package/dist/src/cli/config-inventory.js

@@ -1,6 +1,5 @@
 import { createHash } from 'node:crypto';
-import { readdirSync, readFileSync } from 'node:fs';
-import { homedir } from 'node:os';
+import { existsSync, readdirSync, readFileSync } from 'node:fs';
 import { dirname, join, resolve } from 'node:path';
 import { shellQuote } from '../core/shell.js';
 import { findConfigProjectBbDir, homeBbDir, stemForConfigFile, } from './bakers-dir.js';
@@ -25,11 +24,8 @@ function observed(property, key) {
 /** Collect selected files and prerequisite sources without importing any module. */
 export function inventoryConfig(options = {}) {
     const operation = options.operation ?? 'check';
-    const home = resolve(options.home ?? homedir());
     // The `.bakers` root is core's decision (BB_HOME), not this function's; an
-    // explicit options.home still pins it, which is what fixtures rely on. `home`
-    // above stays the operating-system home because the legacy machine input
-    // below lives at ~/.config/conductor, outside `.bakers` entirely.
+    // explicit options.home still pins it, which is what fixtures rely on.
     const bakersRoot = homeBbDir(options.home);
     const cwd = resolve(options.cwd ?? process.cwd());
     const machinePath = resolve(options.machinePath ?? join(bakersRoot, 'machine.config.js'));
@@ -283,7 +279,7 @@ export function inventoryConfig(options = {}) {
             requireValue('schema_version', 'A positive integer schema version.', (property) => typeof property.value === 'number' &&
                 Number.isInteger(property.value) &&
                 property.value > 0);
-        if (kind === 'machine' || kind === 'legacy-machine') {
+        if (kind === 'machine') {
             for (const key of ['machine_id', 'user_id'])
                 requireValue(key, 'A nonempty identifier using letters, numbers, dots, underscores or hyphens.', (property) => typeof property.value === 'string' &&
                     IDENTIFIER.test(property.value));
@@ -389,7 +385,7 @@ export function inventoryConfig(options = {}) {
                     add('dead_key', key, `${key} is no longer read from conductor.config.local.js.`, `Remove ${key} from ${shellQuote(path)} after confirming the selected global connection contains the intended value.`, 'ownership', 'warning', property);
             }
         }
-        if (kind !== 'machine' && kind !== 'legacy-machine') {
+        if (kind !== 'machine') {
             for (const key of ['max_parallel', 'conductor.max_parallel', 'tunnel']) {
                 const property = source.properties.get(key);
                 if (property)
@@ -406,21 +402,25 @@ export function inventoryConfig(options = {}) {
     };
     inspectFile(machinePath, 'machine', 'machine', true);
     inspectFile(connectionPath, 'connection', 'connection', true);
-    inspectFile(join(dirname(connectionPath), 'conductor.config.local.js'), 'home-local', 'connection', false, 'supplementary');
-    const legacy = join(home, '.config/conductor/conductor.config.machine.js');
-    // An explicit machine target does not authorize migration of another home's legacy input.
-    if (!options.machinePath ||
-        machinePath === join(bakersRoot, 'machine.config.js')) {
-        // Keep an absent legacy file out of the report; it is never required.
-        try {
-            readFileSync(legacy);
-            inspectFile(legacy, 'legacy-machine', 'machine', false, 'supplementary');
-        }
-        catch (error) {
-            if (error.code !== 'ENOENT')
-                inspectFile(legacy, 'legacy-machine', 'machine', false, 'supplementary');
-        }
-    }
+    // Conductor configs live in the project only. Historical global connections
+    // imported this retired sibling, so migrating one past it unseen would
+    // silently switch server or account: refuse until it is gone.
+    const retiredLocal = join(dirname(connectionPath), 'conductor.config.local.js');
+    if (existsSync(retiredLocal))
+        report.findings.push({
+            code: 'superseded_file',
+            severity: 'error',
+            stage: 'inventory',
+            path: retiredLocal,
+            key: null,
+            expected: 'No conductor config beside the global connection; conductor overrides live in the project .bakers/conductor.config.local.js.',
+            observed: null,
+            owner: 'connection',
+            related: [],
+            statically_determined: true,
+            remediation: `Move any values from ${shellQuote(retiredLocal)} into the machine, connection or project local config, then delete it.`,
+            recheck,
+        });
     if (projectRoot) {
         const bakersDir = join(projectRoot, '.bakers');
         let names = [];

package/dist/src/cli/config-report.d.ts

@@ -1,7 +1,7 @@
 export type ConfigScope = 'machine' | 'connection' | 'project' | 'all';
 export type ConfigLayer = Exclude<ConfigScope, 'all'>;
 export type ConfigOperation = 'init' | 'upgrade' | 'check';
-export type ConfigFileKind = 'machine' | 'home-local' | 'legacy-machine' | 'connection' | 'project-connection' | 'conductor' | 'local';
+export type ConfigFileKind = 'machine' | 'connection' | 'project-connection' | 'conductor' | 'local';
 export type ConfigFindingCode = 'scope_required' | 'invalid_scope' | 'project_required' | 'missing_required_file' | 'missing_required_key' | 'unreadable_file' | 'syntax_error' | 'unsupported_source_shape' | 'unknown_value' | 'invalid_value' | 'version_marker_disagreement' | 'future_schema_version' | 'misplaced_key' | 'conflicting_values' | 'out_of_scope_write_required' | 'changed_since_planning' | 'authentication_failure' | 'no_workspace' | 'cancelled_selection' | 'superseded_file' | 'dead_key' | 'retired_key' | 'addon_scope_not_allowed' | 'addon_scope_skipped' | 'addon_with_invalid' | 'write_failure';
 export interface ConfigLocation {
     path: string;

package/dist/src/cli/machine-context.d.ts

@@ -40,8 +40,6 @@ export interface MachineContext {
 }
 /** Canonical machine-context path: `<BB_HOME or ~/.bakers>/machine.config.js`. */
 export declare function machineContextPath(): string;
-/** Legacy machine-context path (pre-BB-201), historical migration input only. */
-export declare function legacyMachineContextPath(): string;
 /** Resolve explicit or canonical current host context. */
 export declare function resolveMachineContextPath(path?: string): string;
 /** Import an existing context module's default export, or `{}` if absent/broken. */

package/dist/src/cli/machine-context.js

@@ -1,5 +1,4 @@
 import { existsSync } from 'node:fs';
-import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { pathToFileURL } from 'node:url';
 import { homeBbDir } from './bakers-dir.js';
@@ -7,10 +6,6 @@ import { homeBbDir } from './bakers-dir.js';
 export function machineContextPath() {
     return join(homeBbDir(), 'machine.config.js');
 }
-/** Legacy machine-context path (pre-BB-201), historical migration input only. */
-export function legacyMachineContextPath() {
-    return join(homedir(), '.config', 'conductor', 'conductor.config.machine.js');
-}
 /** Resolve explicit or canonical current host context. */
 export function resolveMachineContextPath(path) {
     if (path !== undefined && path !== '')

package/dist/src/index.d.ts

@@ -9,7 +9,7 @@ export { type ConfigSourceInspection, type ConfigSourceProperty, declaresTopLeve
 export { HOME_IMPORT_EXPRESSION_PATTERN, importConfig, } from './cli/import-config.js';
 export { type LayeredUiEntryLayer, machineUiConfigPath, projectConductorConfigPath, readUiEntryLayers, } from './cli/layered-ui-entries.js';
 export { type BbConnectionConfig, BbConnectionConfigError, type BbConnectionGlobals, type BbConnectionLoadOptions, type BbConnectionSelection, type EffectiveConnectionField, loadBbConfig, loadBbConnectionBootstrap, reportLoadedBbConfigFields, resolveBbConnectionSelection, } from './cli/load-bakers-config.js';
-export { type AgentRoutes, legacyMachineContextPath, type MachineContext, machineContextPath, readMachineContext, resolveMachineContextPath, } from './cli/machine-context.js';
+export { type AgentRoutes, type MachineContext, machineContextPath, readMachineContext, resolveMachineContextPath, } from './cli/machine-context.js';
 export { corePackageRoot } from './cli/paths.js';
 export { resolveModuleEslintStyle } from './cli/resolve-module.js';
 export { BB_PACKAGE, checkForUpdate, declineUpdate, defaultUpdateCachePath, fetchLatestVersion, fetchUpdateNotice, printVersionLine, REGISTRY_LATEST_URL, resolveCliVersion, UNKNOWN_VERSION, UPDATE_CHECK_TTL_MS, type UpdateCheckOptions, type UpdateCheckResult, updateNotice, } from './cli/version-check.js';

package/dist/src/index.js

@@ -11,7 +11,7 @@ export { declaresTopLevelKey, findDefaultExportObject, inspectConfigSource, matc
 export { HOME_IMPORT_EXPRESSION_PATTERN, importConfig, } from './cli/import-config.js';
 export { machineUiConfigPath, projectConductorConfigPath, readUiEntryLayers, } from './cli/layered-ui-entries.js';
 export { BbConnectionConfigError, loadBbConfig, loadBbConnectionBootstrap, reportLoadedBbConfigFields, resolveBbConnectionSelection, } from './cli/load-bakers-config.js';
-export { legacyMachineContextPath, machineContextPath, readMachineContext, resolveMachineContextPath, } from './cli/machine-context.js';
+export { machineContextPath, readMachineContext, resolveMachineContextPath, } from './cli/machine-context.js';
 export { corePackageRoot } from './cli/paths.js';
 export { resolveModuleEslintStyle } from './cli/resolve-module.js';
 export { BB_PACKAGE, checkForUpdate, declineUpdate, defaultUpdateCachePath, fetchLatestVersion, fetchUpdateNotice, printVersionLine, REGISTRY_LATEST_URL, resolveCliVersion, UNKNOWN_VERSION, UPDATE_CHECK_TTL_MS, updateNotice, } from './cli/version-check.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bakers-build/core",
-  "version": "0.5.1-next.746",
+  "version": "0.5.1-next.758",
   "description": "bakers.build surface-agnostic kernel: host contract, split-config helpers, addon preset/discovery machinery, shared primitives.",
   "type": "module",
   "license": "MIT",