@gaia-ai/conductor 0.6.1 → 0.6.2

package/dist/src/cli/migrate-addon-names.d.ts

@@ -9,7 +9,9 @@ export declare const ADDON_RENAME_BAK_SUFFIX = ".pre-addon-rename.bak";
  */
 export declare const RENAMED_ADDONS: readonly ["auth-basic", "claude", "codex", "deployment", "dropsh", "essentials", "fake", "gaia-ui", "herdr", "kimi", "opencode", "pi", "remote-drupal", "workspace-git"];
 /**
- * Where each export of the DELETED `@gaia-ai/core/plugins` host barrel lives now.
+ * Where each export of the host barrels lives now — the DELETED
+ * `@gaia-ai/core/plugins` and (GAIA-230) the meta package's
+ * `@gaia-ai/gaia/plugins`, which is unresolvable from a dev-clone install.
  *
  * The key set is the barrel's own export list — `core/src/plugins/registry-exports.ts`
  * as of the commit that deleted it — re-pointed at the addon that owns each
@@ -28,12 +30,20 @@ export declare const CORE_PLUGINS_BARREL_EXPORTS: Readonly<Record<string, {
     target: string;
     defaultExport: boolean;
 }>>;
+/**
+ * The host-barrel specifiers a descriptor may name. Both map through
+ * `CORE_PLUGINS_BARREL_EXPORTS`: `@gaia-ai/core/plugins` is DELETED, and
+ * `@gaia-ai/gaia/plugins` (GAIA-230) is unresolvable from a dev-clone install
+ * because the meta package that exports it is the workspace's leaf sink.
+ */
+export declare const HOST_BARREL_PATHS: readonly ["@gaia-ai/core/plugins", "@gaia-ai/gaia/plugins"];
 /** Which surface a config file speaks — decides the ambiguous builtins mapping. */
 export type ConfigSurface = 'connection' | 'engine';
 /**
- * Rewrite the legacy specifiers in one config's SOURCE TEXT — all three: the
+ * Rewrite the legacy specifiers in one config's SOURCE TEXT — all of them: the
  * renamed `@gaia-ai/plugin-*` packages, the deleted `@gaia-ai/core/builtins`
- * preset, and the deleted `@gaia-ai/core/plugins` barrel descriptors. Pure; line
+ * preset, and the host-barrel descriptors naming either `@gaia-ai/core/plugins`
+ * (deleted) or `@gaia-ai/gaia/plugins` (GAIA-230). Pure; line
  * count is preserved (every replacement is line-local), which is what lets the
  * reported diff be a plain index-aligned line diff.
  */

package/dist/src/cli/migrate-addon-names.js

@@ -9,13 +9,31 @@ import { listConductorConfigFiles } from '../config.js';
 // `.gaia/` configs still name the old packages — so `gaia upgrade` rewrites them
 // in the user's PROJECT `./.gaia/` and HOME `~/.gaia/` configs.
 //
-// All THREE deleted/renamed specifiers are covered. The `@gaia-ai/gaia/plugins`
-// barrel is deliberately NOT covered: it still exists as a back-compat
-// aggregator. `@gaia-ai/core/plugins` has no such reprieve — it is gone, and the
-// pre-GAIA-224 project docs explicitly told configs to name `@gaia-ai/core/plugins`
-// and NOT `@gaia-ai/gaia/plugins` (core resolved from both the dev monorepo and a
-// global install; the meta package did not), so real installs DO name the deleted
-// one. See `CORE_PLUGINS_BARREL_EXPORTS`.
+// All THREE deleted/renamed specifiers are covered, and — GAIA-230 — so is the
+// FOURTH: the `@gaia-ai/gaia/plugins` host barrel.
+//
+// GAIA-224 excluded that barrel on the premise that it "still exists as a
+// back-compat aggregator", so a config naming it keeps resolving. That premise is
+// INSTALL-DEPENDENT and false for a dev-clone install: `@gaia-ai/gaia` is the
+// workspace's leaf SINK, so nothing depends on it and it is absent from
+// `gaia-cli/node_modules/@gaia-ai/`; it is also the only package exporting
+// `./plugins` (`@gaia-ai/core`'s export map has no such subpath). The `gaia` shim
+// prefers a checkout's own build over the global install by design, so exactly
+// there the barrel is unresolvable and that one config line dies while its
+// sibling `addon-*` slots resolve fine.
+//
+// The barrel itself keeps existing — this is not repairing a dead reference, it is
+// making configs stop NAMING a barrel the project docs already tell them not to
+// name. Both barrels are therefore migrated the same closed-set way, over the same
+// `CORE_PLUGINS_BARREL_EXPORTS` table. Two deliberate consequences:
+//   - the table is a SUPERSET of what `@gaia-ai/gaia/plugins` actually re-exports
+//     (`host/src/plugins-barrel.ts` omits the fakes on purpose — they are
+//     workspace-only and must not be a published package's dependency). Mapping
+//     them anyway is right: such a descriptor is broken today, and retargeting it
+//     at `@gaia-ai/addon-fake` fixes it.
+//   - `loadInstructions` IS a barrel export but is not a plugin factory and is
+//     absent from the table, so it stays untouched — as does any other unmapped
+//     `export:`.
 //
 // Covered per config dir:
 //   - the connection config `gaia.config.js` (its `plugins[]` / `addons[]`);
@@ -34,10 +52,10 @@ import { listConductorConfigFiles } from '../config.js';
 //     The `@gaia-ai/core/plugins` rewrite is likewise closed-set: it is driven by
 //     the barrel's OWN export list, and an export name outside that list is left
 //     untouched rather than retargeted at a guess.
-//   - `*Plugin` interface identifiers (`RemotePlugin`, `herdrExecutorPlugin`, …),
-//     the `plugins:`/`addons:` config KEYS and the `@gaia-ai/gaia/plugins`
-//     subpath barrel are excluded BY CONSTRUCTION: they carry neither the
-//     `@gaia-ai/plugin-` scope prefix nor the `@gaia-ai/core/` path.
+//   - `*Plugin` interface identifiers (`RemotePlugin`, `herdrExecutorPlugin`, …)
+//     and the `plugins:`/`addons:` config KEYS are excluded BY CONSTRUCTION: a
+//     replacement only ever fires on a full quoted specifier, and none of those
+//     is one.
 //   - Idempotent: a config already on `addon-*` produces zero matches and is
 //     left BYTE-unchanged (no rewrite, no backup, no report line).
 //   - `--dry-run` prints the line diff and writes nothing.
@@ -85,7 +103,9 @@ const QUOTED_LEGACY_ADDON = new RegExp(`(['"\`])@gaia-ai/plugin-(${[...RENAMED_A
 /** `'@gaia-ai/core/builtins'` inside a matched quote pair (the deleted preset). */
 const QUOTED_LEGACY_BUILTINS = /(['"`])@gaia-ai\/core\/builtins\1/g;
 /**
- * Where each export of the DELETED `@gaia-ai/core/plugins` host barrel lives now.
+ * Where each export of the host barrels lives now — the DELETED
+ * `@gaia-ai/core/plugins` and (GAIA-230) the meta package's
+ * `@gaia-ai/gaia/plugins`, which is unresolvable from a dev-clone install.
  *
  * The key set is the barrel's own export list — `core/src/plugins/registry-exports.ts`
  * as of the commit that deleted it — re-pointed at the addon that owns each
@@ -113,13 +133,25 @@ export const CORE_PLUGINS_BARREL_EXPORTS = {
     fakeWorkspace: { target: FAKE, defaultExport: false },
     gitWorkspace: { target: WORKSPACE_GIT, defaultExport: true },
 };
-const BARREL_PATH = '@gaia-ai/core/plugins';
+/**
+ * The host-barrel specifiers a descriptor may name. Both map through
+ * `CORE_PLUGINS_BARREL_EXPORTS`: `@gaia-ai/core/plugins` is DELETED, and
+ * `@gaia-ai/gaia/plugins` (GAIA-230) is unresolvable from a dev-clone install
+ * because the meta package that exports it is the workspace's leaf sink.
+ */
+export const HOST_BARREL_PATHS = [
+    '@gaia-ai/core/plugins',
+    '@gaia-ai/gaia/plugins',
+];
+/** The two barrel specifiers as one non-capturing regex alternation, so the
+ *  backreference numbers in the descriptor patterns below are unaffected. */
+const BARREL_PATH = `(?:${HOST_BARREL_PATHS.join('|')})`;
 /** `plugin:` / `use:` — the two descriptor keys that name a package. */
 const PKG_KEY = '(?:plugin|use)';
 /** A JS identifier, i.e. an `export:` value the barrel could have carried. */
 const IDENT = String.raw `[A-Za-z_$][\w$]*`;
 /**
- * `plugin: '@gaia-ai/core/plugins', export: 'drupalRemote'` — the barrel
+ * `plugin: '<barrel>', export: 'drupalRemote'` — the barrel
  * descriptor in its written order, single/double/back quoted, one line or many
  * (`\s` spans newlines). Requiring the `export:` to be ADJACENT is what keeps
  * this from ever pairing a barrel mention with an unrelated slot's `export:`.
@@ -128,7 +160,7 @@ const BARREL_THEN_EXPORT = new RegExp(`(${PKG_KEY}\\s*:\\s*)(['"\`])${BARREL_PAT
 /** The same descriptor with the keys written the other way round. */
 const EXPORT_THEN_BARREL = new RegExp(`export\\s*:\\s*(['"\`])(${IDENT})\\1(\\s*,\\s*)(${PKG_KEY}\\s*:\\s*)(['"\`])${BARREL_PATH}\\5`, 'g');
 /**
- * Rewrite the `@gaia-ai/core/plugins` descriptors in one config's source text.
+ * Rewrite the host-barrel descriptors (both specifiers) in one config's source text.
  *
  * A mapped descriptor becomes `<key>: '<addon>'` — with the `export:` DROPPED
  * when the addon default-exports that factory *and* the whole descriptor sits on
@@ -227,9 +259,10 @@ function builtinsTargetFor(text, at, surface) {
     return surface === 'connection' ? AUTH_BASIC : REMOTE_DRUPAL;
 }
 /**
- * Rewrite the legacy specifiers in one config's SOURCE TEXT — all three: the
+ * Rewrite the legacy specifiers in one config's SOURCE TEXT — all of them: the
  * renamed `@gaia-ai/plugin-*` packages, the deleted `@gaia-ai/core/builtins`
- * preset, and the deleted `@gaia-ai/core/plugins` barrel descriptors. Pure; line
+ * preset, and the host-barrel descriptors naming either `@gaia-ai/core/plugins`
+ * (deleted) or `@gaia-ai/gaia/plugins` (GAIA-230). Pure; line
  * count is preserved (every replacement is line-local), which is what lets the
  * reported diff be a plain index-aligned line diff.
  */

package/dist/src/config.js

@@ -1,7 +1,7 @@
 import { readdirSync } from 'node:fs';
 import { resolve } from 'node:path';
 import { pathToFileURL } from 'node:url';
-import { discoverAddons, emptyContributions, resolveConductorSlots, resolveModuleEslintStyle, } from '@gaia-ai/core';
+import { discoverAddons, emptyContributions, findDefaultExportObject, matchDelimiter, resolveConductorSlots, resolveModuleEslintStyle, scanTopLevelProperties, } from '@gaia-ai/core';
 import { narrowConductorContributions } from './plugins/preset.js';
 // GAIA-201: the `.gaia/` walk-up + connection resolution moved to `@gaia-ai/core`
 // (`resolveConfigPath` / `resolveGaiaConfigPath` / `findGaiaDir`). Re-export the
@@ -330,171 +330,9 @@ export function stripStatesFromConfigSource(source) {
 // (`baseUrl`/`clientId`/`clientSecret`) and a connection-only `loadMachine`
 // (with its `const machine = await loadMachine()`) when they become unreferenced.
 // ---------------------------------------------------------------------------
-const CLOSER = { '{': '}', '[': ']', '(': ')' };
-/** Skip a `//`-line comment; return the index of the terminating newline (or EOF). */
-function skipLineComment(src, i) {
-    const nl = src.indexOf('\n', i);
-    return nl === -1 ? src.length : nl;
-}
-/** Skip a `/* *\/` block comment; return the index just past it. */
-function skipBlockComment(src, i) {
-    const end = src.indexOf('*/', i + 2);
-    return end === -1 ? src.length : end + 2;
-}
-/** Skip a string/template literal (honouring `\` escapes and `${ … }`
- *  interpolations in backtick strings); return the index just past the close. */
-function skipString(src, i) {
-    const quote = src[i];
-    i++;
-    while (i < src.length) {
-        const c = src[i];
-        if (c === '\\') {
-            i += 2;
-            continue;
-        }
-        if (quote === '`' && c === '$' && src[i + 1] === '{') {
-            i = matchDelimiter(src, i + 1) + 1;
-            continue;
-        }
-        if (c === quote)
-            return i + 1;
-        i++;
-    }
-    return i;
-}
-/** Given the index of an opening `{`/`[`/`(`, return the index of its matching
- *  close, skipping nested delimiters, strings and comments. -1 if unbalanced. */
-function matchDelimiter(src, openIdx) {
-    const stack = [CLOSER[src[openIdx]]];
-    let i = openIdx + 1;
-    while (i < src.length && stack.length > 0) {
-        const c = src[i];
-        if (c === '/' && src[i + 1] === '/') {
-            i = skipLineComment(src, i);
-            continue;
-        }
-        if (c === '/' && src[i + 1] === '*') {
-            i = skipBlockComment(src, i);
-            continue;
-        }
-        if (c === "'" || c === '"' || c === '`') {
-            i = skipString(src, i);
-            continue;
-        }
-        if (c === '{' || c === '[' || c === '(') {
-            stack.push(CLOSER[c]);
-            i++;
-            continue;
-        }
-        if (c === '}' || c === ']' || c === ')') {
-            if (c === stack[stack.length - 1])
-                stack.pop();
-            i++;
-            continue;
-        }
-        i++;
-    }
-    return stack.length === 0 ? i - 1 : -1;
-}
-/** Skip whitespace + comments starting at `i` (bounded by `limit`). */
-function skipTrivia(src, i, limit) {
-    while (i < limit) {
-        const c = src[i];
-        if (c === ' ' || c === '\t' || c === '\n' || c === '\r') {
-            i++;
-            continue;
-        }
-        if (c === '/' && src[i + 1] === '/') {
-            i = skipLineComment(src, i);
-            continue;
-        }
-        if (c === '/' && src[i + 1] === '*') {
-            i = skipBlockComment(src, i);
-            continue;
-        }
-        break;
-    }
-    return i;
-}
-/** Read a property key (bare identifier or quoted string) at `i`. */
-function readKey(src, i) {
-    const c = src[i];
-    if (c === "'" || c === '"') {
-        const end = skipString(src, i);
-        return { name: src.slice(i + 1, end - 1), end };
-    }
-    const m = /^[A-Za-z0-9_$]+/.exec(src.slice(i));
-    if (m)
-        return { name: m[0], end: i + m[0].length };
-    return { end: i };
-}
-/** From `from`, scan to just past the next top-level `,` (or to `limit` when the
- *  value runs to the object close), skipping nested delimiters/strings/comments. */
-function scanToTopLevelComma(src, from, limit) {
-    let i = from;
-    while (i < limit) {
-        const c = src[i];
-        if (c === '/' && src[i + 1] === '/') {
-            i = skipLineComment(src, i);
-            continue;
-        }
-        if (c === '/' && src[i + 1] === '*') {
-            i = skipBlockComment(src, i);
-            continue;
-        }
-        if (c === "'" || c === '"' || c === '`') {
-            i = skipString(src, i);
-            continue;
-        }
-        if (c === '{' || c === '[' || c === '(') {
-            i = matchDelimiter(src, i) + 1;
-            continue;
-        }
-        if (c === ',')
-            return i + 1;
-        i++;
-    }
-    return limit;
-}
-/** Locate the `export default { … }` object; return the body span (exclusive of
- *  the braces) or undefined when the default export is not an object literal. */
-function findDefaultExportObject(src) {
-    const m = /export\s+default\s*/.exec(src);
-    if (!m)
-        return undefined;
-    const braceIdx = m.index + m[0].length;
-    if (src[braceIdx] !== '{')
-        return undefined;
-    const end = matchDelimiter(src, braceIdx);
-    if (end === -1)
-        return undefined;
-    return { bodyStart: braceIdx + 1, bodyEnd: end };
-}
-/** Enumerate the top-level properties of the object body [bodyStart, bodyEnd). */
-function scanTopLevelProperties(src, bodyStart, bodyEnd) {
-    const entries = [];
-    let i = bodyStart;
-    while (i < bodyEnd) {
-        const entryStart = i;
-        const keyPos = skipTrivia(src, i, bodyEnd);
-        if (keyPos >= bodyEnd)
-            break;
-        const key = readKey(src, keyPos);
-        let j = skipTrivia(src, key.end, bodyEnd);
-        if (src[j] !== ':') {
-            // Not a `key: value` property (spread/computed/shorthand) — keep it.
-            const term = scanToTopLevelComma(src, keyPos, bodyEnd);
-            entries.push({ key: undefined, start: entryStart, end: term });
-            i = term;
-            continue;
-        }
-        j++;
-        const term = scanToTopLevelComma(src, j, bodyEnd);
-        entries.push({ key: key.name, start: entryStart, end: term });
-        i = term;
-    }
-    return entries;
-}
+// GAIA-230: the scanner primitives themselves now live in `@gaia-ai/core`
+// (`core/src/cli/config-source.ts`) — the kernel needs them for the content-gated
+// legacy connection read, and layer 0 cannot import this package. Imported above.
 /** Count word-boundary occurrences of an identifier in the source. */
 function countIdent(src, name) {
     const re = new RegExp(`(?<![A-Za-z0-9_$])${name}(?![A-Za-z0-9_$])`, 'g');

package/dist/src/index.d.ts

@@ -1,8 +1,9 @@
 export type * from '@gaia-ai/core';
 export type { ConductorRegistryEntry } from '@gaia-ai/core';
 export { conductorId } from '@gaia-ai/core';
+export { GAIA_CONFIG_SCHEMA_VERSION, readConfigSchemaVersion, } from './cli/config-schema.js';
 export { renderGaiaConfig } from './cli/init.js';
-export { type AddonRenameResult, type ConfigSurface, migrateAddonNames, migrateAddonNamesInFile, RENAMED_ADDONS, runAddonRenameMigration, } from './cli/migrate-addon-names.js';
+export { type AddonRenameResult, type ConfigSurface, HOST_BARREL_PATHS, migrateAddonNames, migrateAddonNamesInFile, RENAMED_ADDONS, runAddonRenameMigration, } from './cli/migrate-addon-names.js';
 export { hasProjectConnection, type ProjectConnectionChoice, runConnectionUpgrade, runUpgrade, type UpgradeReport, } from './cli/upgrade.js';
 export { default as conductorCommandPlugin, type GaiaCliDeps, runConductorCli, } from './commands/conductor.js';
 export { composeConductorConfig, DEFAULT_AGENT_PROMPT, loadConductorConfig, stripLegacyConnectionFromConfigSource, } from './config.js';

package/dist/src/index.js

@@ -1,11 +1,14 @@
 export { conductorId } from '@gaia-ai/core';
+// GAIA-216: the connection-config schema version + its regex reader. GAIA-230:
+// the host's `gaia upgrade` intro prints the `from → to` pair from these.
+export { GAIA_CONFIG_SCHEMA_VERSION, readConfigSchemaVersion, } from './cli/config-schema.js';
 // GAIA-201: the connection-config template, reused by `gaia upgrade` to seed a
 // `gaia.config.js`.
 export { renderGaiaConfig } from './cli/init.js';
 // GAIA-224 (Finding 8b): the addon package-name rename pass `gaia upgrade` runs
 // as its last step (`@gaia-ai/plugin-*` + the deleted `@gaia-ai/core/builtins`
 // and `@gaia-ai/core/plugins` → `@gaia-ai/addon-*`).
-export { migrateAddonNames, migrateAddonNamesInFile, RENAMED_ADDONS, runAddonRenameMigration, } from './cli/migrate-addon-names.js';
+export { HOST_BARREL_PATHS, migrateAddonNames, migrateAddonNamesInFile, RENAMED_ADDONS, runAddonRenameMigration, } from './cli/migrate-addon-names.js';
 // GAIA-216: the seed/migration routine, hoisted from the host so `conductor init`
 // (intra-package) and `gaia upgrade` (host→engine) share one implementation.
 export { hasProjectConnection, runConnectionUpgrade, runUpgrade, } from './cli/upgrade.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gaia-ai/conductor",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "GAIA conductor engine + CLI: registers, claims tickets via JSON:API, dispatches agents.",
   "type": "module",
   "license": "MIT",
@@ -28,7 +28,7 @@
     "directory": "gaia-cli/conductor"
   },
   "dependencies": {
-    "@gaia-ai/core": "^0.6.1",
+    "@gaia-ai/core": "^0.6.2",
     "@dropsh/plugin-oauth2": "^0.5.7",
     "@dropsh/plugin-jsonapi-schema": "^0.5.8",
     "commander": "^12.1.0",