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

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

@@ -11,7 +11,6 @@ import { CONDUCTOR_ADDON_SLOTS, validateConfigSources, } from './config-validati
 import { migrateAddonNames } from './migrate-addon-names.js';
 const CURRENT = {
     machine: 3,
-    'legacy-machine': 3,
     // v1 is the first versioned conductor shape: the conductor owns only
     // remote/executor/workspace and declares no agent addons. Zero was the
     // implicit pre-versioned state (no @bakers-schema-version marker present).
@@ -68,7 +67,6 @@ export function planConfig(options = {}) {
     const files = report.files;
     const machine = files.find((f) => f.kind === 'machine');
     const connection = files.find((f) => f.kind === 'connection');
-    const homeLocal = files.find((f) => f.kind === 'home-local');
     const local = files.find((f) => f.kind === 'local');
     if (options.operation === 'check') {
         const validated = validateConfigSources(inventoryOptions, new Map(original), files);
@@ -194,23 +192,6 @@ export function planConfig(options = {}) {
                 : {}),
             authType,
         })));
-    const legacy = files.find((f) => f.kind === 'legacy-machine');
-    if (legacy?.selected && !protectedFile(legacy) && editors.has(legacy.path)) {
-        const old = editor(legacy);
-        const current = editors.get(machine.path);
-        if (!current)
-            editors.set(machine.path, new ConfigSourceEditor(old.text));
-        else
-            for (const [key, p] of old.source.properties)
-                if (!key.includes('.') && !key.includes('[')) {
-                    const other = current.property(key);
-                    if (other && !sameValue(p, other))
-                        problem(legacy, 'conflicting_values', key, 'Legacy and canonical machine values agree.', [{ path: machine.path, key }]);
-                    else if (!other)
-                        current.set(key, old.expression(key));
-                }
-        editors.delete(legacy.path);
-    }
     const machineEditor = editor(machine);
     const literalSubtreeIssue = (source, key) => {
         const expression = source.expression(key);
@@ -494,8 +475,7 @@ export function planConfig(options = {}) {
         migrateStateDefaults(machine, machineEditor);
         deriveMachineDefault();
     }
-    for (const file of files.filter((candidate) => candidate.selected &&
-        ['conductor', 'local', 'home-local'].includes(candidate.kind))) {
+    for (const file of files.filter((candidate) => candidate.selected && ['conductor', 'local'].includes(candidate.kind))) {
         const source = editors.get(file.path);
         if (!source || protectedFile(file))
             continue;
@@ -517,7 +497,7 @@ export function planConfig(options = {}) {
         connection.selected &&
         !protectedFile(connection) &&
         !protectedFile(machine))
-        replaceGeneratedMachineWiring(editor(connection), editor(machine), connection, homeLocal ? editors.get(homeLocal.path) : undefined, homeLocal, machine.selected, options.inputs, problem);
+        replaceGeneratedMachineWiring(editor(connection), editor(machine), connection, options.inputs, problem);
     // Machine connection values must move atomically with their connection destinations.
     for (const key of CONNECTION_KEYS) {
         const target = key === 'base_url'
@@ -553,7 +533,7 @@ export function planConfig(options = {}) {
             move(machine, key, connection, target);
     }
     for (const file of files) {
-        if (protectedFile(file) || !file.selected || file.kind === 'legacy-machine')
+        if (protectedFile(file) || !file.selected)
             continue;
         let e = editors.get(file.path);
         if (e && e.source.shape !== 'object') {
@@ -623,9 +603,7 @@ export function planConfig(options = {}) {
                 if (e)
                     e.stamp(3);
             }
-            if (file.kind === 'conductor' ||
-                file.kind === 'local' ||
-                file.kind === 'home-local') {
+            if (file.kind === 'conductor' || file.kind === 'local') {
                 if ((!e || e.text.trim() === 'export default {};') &&
                     file.required &&
                     options.project) {
@@ -938,7 +916,7 @@ export function planConfig(options = {}) {
             before_version: file.version.effective,
             after_version: after === null
                 ? null
-                : ['machine', 'legacy-machine'].includes(file.kind)
+                : file.kind === 'machine'
                     ? 3
                     : ['connection', 'project-connection'].includes(file.kind)
                         ? 4
@@ -1059,7 +1037,7 @@ function oauthPrefix(e) {
         p.value === '@dropsh/plugin-oauth2')?.[0]
         .replace(/\.plugin$/, '');
 }
-function replaceGeneratedMachineWiring(e, machine, file, local, localFile, machineSelected, inputs, problem) {
+function replaceGeneratedMachineWiring(e, machine, file, inputs, problem) {
     if (!e.text.includes('async function loadMachine()'))
         return;
     const mappings = {
@@ -1077,29 +1055,15 @@ function replaceGeneratedMachineWiring(e, machine, file, local, localFile, machi
         if (literal?.staticallyDetermined && literal.value !== undefined)
             resolved.set(name, JSON.stringify(literal.value));
         else if (new RegExp(`^(?:local\\.[^;]+\\?\\? )?machine\\.${key}(?: \\?\\? 'bakers-agent')?$`).test(declaration[1] ?? '')) {
-            const localKey = key.startsWith('client_') ? `oauth.${key}` : key;
-            const override = local?.property(localKey);
-            const parent = localKey.startsWith('oauth.')
-                ? local?.property('oauth')
-                : undefined;
-            if (local?.source.unknownKeys ||
-                (parent && !parent.staticallyDetermined) ||
-                (override && !override.staticallyDetermined)) {
-                problem(localFile ?? file, 'unknown_value', localKey, 'The generated home-local override is a known literal.');
-                continue;
-            }
-            const p = override?.value != null ? override : machine.property(key);
+            // The retired home-local sibling is absent (inventory refuses otherwise),
+            // so a generated `local.x ??` prefix evaluates to the machine value.
+            const p = machine.property(key);
             const input = key === 'workspace_id' ? inputs?.workspaceId : undefined;
             const value = p?.staticallyDetermined && p.value != null
                 ? p.value
                 : (input ?? (key === 'client_id' ? 'bakers-agent' : undefined));
-            if (value !== undefined) {
+            if (value !== undefined)
                 resolved.set(name, JSON.stringify(value));
-                // This generated expression proves the override won before migration.
-                // Removing the shadowed machine value requires its selected write scope.
-                if (override?.value != null && machine.property(key) && machineSelected)
-                    machine.remove(key);
-            }
         }
     }
     for (const key of [...e.source.properties.keys()]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bakers-build/conductor",
-  "version": "0.5.1-next.746",
+  "version": "0.5.1-next.758",
   "description": "bakers.build conductor engine + CLI: registers, claims tickets via JSON:API, dispatches agents.",
   "type": "module",
   "license": "MIT",
@@ -32,8 +32,8 @@
   "dependencies": {
     "@dropsh/plugin-jsonapi-schema": "^0.8.2",
     "@dropsh/plugin-oauth2": "^0.8.2",
-    "@bakers-build/core": "^0.5.1-next.746",
-    "@bakers-build/message": "^0.5.1-next.746",
+    "@bakers-build/core": "^0.5.1-next.758",
+    "@bakers-build/message": "^0.5.1-next.758",
     "commander": "^12.1.0",
     "dropsh": "^0.8.2"
   }