@gaia-ai/gaia 0.6.0 → 0.6.2

package/README.md

@@ -26,6 +26,23 @@ spawn plugins (Claude, Codex, herdr, and a deterministic fake for tests). Point
 it at a control plane with a `conductor.config.js` (scaffold one with
 `gaia init`).
 
+## `gaia ui` deep links
+
+`gaia ui` is the interactive terminal cockpit, and it takes an optional target so you open
+the thing you are working on directly:
+
+```bash
+gaia ui GAIA-221                  # a ticket by identifier (case-insensitive)
+gaia ui project:gaia              # a project; also ticket:<uuid> · run:<uuid>
+gaia ui --here                    # this branch's ticket, else this repo's project
+gaia ui GAIA-221 --view teaser    # a compact block instead of the tabbed detail
+```
+
+At most **one** target source (the positional, `--ticket`, `--project`, `--run`, `--here`);
+two exit non-zero naming both. `--here` reads the current branch for a ticket identifier and
+otherwise resolves this repo's git remote against the projects that claim it — several
+claimants open a picker. `gaia ui --help` lists every form.
+
 ## Plugins
 
 The four spawn plugins ship **inside** this package — nothing extra to install.

package/dist/src/host.js

@@ -1,29 +1,37 @@
 import { readFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
+import { commands as deploymentCommands } from '@gaia-ai/addon-deployment/preset';
+import { commands as dropshCommands } from '@gaia-ai/addon-dropsh/preset';
 import { commands as conductorCommands } from '@gaia-ai/conductor/preset';
 import { resolveModuleEslintStyle, } from '@gaia-ai/core';
-import { commands as dropshCommands } from '@gaia-ai/plugin-dropsh/preset';
 import { commands as uiCommands } from '@gaia-ai/ui/preset';
 import { Command } from 'commander';
 import { registerUpgrade } from './upgrade.js';
 // GAIA-201: the `gaia` plugin HOST. The meta package `@gaia-ai/gaia` owns the
-// CLI entrypoint (AC-1); ui / conductor / dropsh are declared, ESLint-style
-// resolved, LAZILY mounted command plugins (AC-2). The host discovers + mounts;
-// it hard-wires nothing. Only the invoked subcommand's module is imported —
-// `gaia --help` lists all three via describe-only stubs and imports none;
-// `gaia conductor …` imports only the conductor module.
+// CLI entrypoint (AC-1); ui / conductor / dropsh / deployment are declared,
+// ESLint-style resolved, LAZILY mounted command plugins (AC-2). The host
+// discovers + mounts; it hard-wires nothing. Only the invoked subcommand's module
+// is imported — `gaia --help` lists all four via describe-only stubs and imports
+// none; `gaia conductor …` imports only the conductor module.
 //
-// GAIA-215: the registry is DERIVED from the command surface — the three command
+// GAIA-215: the registry is DERIVED from the command surface — the command
 // addons' preset `commands` accumulators — rather than a hand-written list.
 // Those presets are LIGHT (they import no runtime, only return descriptors), so
 // composing them at boot keeps `gaia --help` import-light. `$GAIA_COMMANDS`
-// still overrides the whole registry.
+// still overrides the whole registry. GAIA-224 (Finding 7) added the fourth
+// command surface, `@gaia-ai/addon-deployment` (`gaia deployment …`), which the
+// `conductor` command plugin used to register as a side effect.
 /** Compose the built-in command registry from the command addons' presets. The
  *  accumulators are synchronous descriptor builders (light presets), threaded in
- *  the conductor → ui → dropsh order. */
+ *  the conductor → ui → dropsh → deployment order. */
 function composeCommandSurface() {
-    const accumulators = [conductorCommands, uiCommands, dropshCommands];
+    const accumulators = [
+        conductorCommands,
+        uiCommands,
+        dropshCommands,
+        deploymentCommands,
+    ];
     let acc = [];
     for (const fn of accumulators) {
         if (typeof fn === 'function')
@@ -141,6 +149,8 @@ function pluginDescribe(entry) {
             return 'interactive terminal UI: project dashboard, ticket list, ticket detail';
         case 'dropsh':
             return 'JSON:API shell (dropsh) bound to the GAIA connection config';
+        case 'deployment':
+            return 'release / deployment helpers';
         default:
             return `${entry.name} command`;
     }

package/dist/src/plugins-barrel.d.ts

@@ -1 +1,4 @@
-export * from '@gaia-ai/core/plugins';
+export { basicAuthProvider } from '@gaia-ai/addon-auth-basic';
+export { DrupalGaiaRemote, drupalRemote } from '@gaia-ai/addon-remote-drupal';
+export { GitWorkspace, gitWorkspace, loadInstructions, } from '@gaia-ai/addon-workspace-git';
+export { type AgentCandidate, type ResolvedAgent, selectAgent, selectAgents, selectExecutor, selectRemote, selectWorkspace, } from '@gaia-ai/conductor/contract';

package/dist/src/plugins-barrel.js

@@ -1 +1,16 @@
-export * from '@gaia-ai/core/plugins';
+// GAIA-224 (Finding 6, decision 11): the `@gaia-ai/gaia/plugins` BACK-COMPAT
+// barrel. It used to be a single `export * from '@gaia-ai/core/plugins'`; that
+// core barrel is deleted, because core no longer ships plugin implementations.
+// The barrel itself stays (published configs may still name
+// `{ plugin: '@gaia-ai/gaia/plugins', export: 'drupalRemote' }`), but it now
+// aggregates the CONTRIBUTIONS from where they actually live: the impl addons +
+// the conductor-surface selectors. "plugins" is the right word for a
+// contribution barrel (decision 16) — only the *package* prefix became `addon-`.
+//
+// The fakes (`fakeRemote`/`fakeWorkspace`) are deliberately NOT re-exported:
+// they moved into `@gaia-ai/addon-fake`, a workspace-only test fixture that is
+// never published, so the published meta package must not depend on it.
+export { basicAuthProvider } from '@gaia-ai/addon-auth-basic';
+export { DrupalGaiaRemote, drupalRemote } from '@gaia-ai/addon-remote-drupal';
+export { GitWorkspace, gitWorkspace, loadInstructions, } from '@gaia-ai/addon-workspace-git';
+export { selectAgent, selectAgents, selectExecutor, selectRemote, selectWorkspace, } from '@gaia-ai/conductor/contract';

package/dist/src/upgrade.d.ts

@@ -1,3 +1,48 @@
+import { type ProjectConnectionChoice } from '@gaia-ai/conductor';
 import type { Command } from 'commander';
-/** Register `gaia upgrade` on the host program. */
-export declare function registerUpgrade(program: Command): void;
+/** Where the running `gaia` resolved from and what it calls itself. */
+export interface GaiaInstallInfo {
+    /** The meta package version (`0.0.0` when the manifest is unreadable). */
+    version: string;
+    /** Absolute path of the package root this module was loaded from. */
+    root: string;
+    /** `global install` when that root sits inside `node_modules`, else `dev clone`. */
+    kind: 'dev clone' | 'global install';
+}
+/**
+ * Identify the running install from THIS module's own URL — walking up to the
+ * nearest `package.json` — rather than from `$PATH` or `process.argv`, so a shim
+ * that execs a checkout's build reports the checkout, not the shim.
+ */
+export declare function resolveInstallInfo(): GaiaInstallInfo;
+/**
+ * GAIA-218 (AC-3, AC-4): resolve what to do with the PROJECT connection override.
+ * Default no in every branch — only an explicit yes opts in. Non-interactive
+ * (no TTY) ⇒ always `skip`. The prompt is injected so the host test can stub it.
+ *
+ * - existing project `gaia.config.js` → "remove this override? [y/N]" → `remove`|`skip`
+ * - none                              → "create an override? [y/N]"   → `create`|`skip`
+ */
+export declare function resolveProjectConnectionChoice(opts: {
+    existing: string | undefined;
+    isTTY: boolean;
+    prompt: (question: string) => Promise<boolean>;
+}): Promise<ProjectConnectionChoice>;
+/**
+ * GAIA-230 (AC-9): the intro lines printed BEFORE the first migration step, on
+ * `--dry-run` too. `home` is where the schema `from` is read (the home connection
+ * config `~/.gaia/gaia.config.js`, the one every repo inherits); `to` is the
+ * version this gaia ships. Pure — returns the lines rather than printing them.
+ */
+export declare function renderUpgradeIntro(opts: {
+    cwd: string;
+    home: string;
+    install?: GaiaInstallInfo;
+}): string[];
+/** Register `gaia upgrade` on the host program. `deps` is injectable for tests. */
+export declare function registerUpgrade(program: Command, deps?: {
+    prompt?: (question: string) => Promise<boolean>;
+    isTTY?: boolean;
+    cwd?: string;
+    home?: string;
+}): void;

package/dist/src/upgrade.js

@@ -1,17 +1,114 @@
-import { runUpgrade } from '@gaia-ai/conductor';
-// GAIA-216: the `gaia upgrade` migration/seed routine was hoisted DOWN into the
-// engine (`@gaia-ai/conductor`) so `conductor init` can call it intra-package
-// without a host→engine→host cycle. The host keeps only the thin CLI
-// registration below; the behaviour/output contract is unchanged. See
-// `conductor/engine/src/cli/upgrade.ts` for `runUpgrade` + `UpgradeReport`.
-/** Register `gaia upgrade` on the host program. */
-export function registerUpgrade(program) {
+import { readFileSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { dirname, join, sep } from 'node:path';
+import { createInterface } from 'node:readline';
+import { fileURLToPath } from 'node:url';
+import { GAIA_CONFIG_SCHEMA_VERSION, hasProjectConnection, readConfigSchemaVersion, runUpgrade, } from '@gaia-ai/conductor';
+/**
+ * Identify the running install from THIS module's own URL — walking up to the
+ * nearest `package.json` — rather than from `$PATH` or `process.argv`, so a shim
+ * that execs a checkout's build reports the checkout, not the shim.
+ */
+export function resolveInstallInfo() {
+    let root = dirname(fileURLToPath(import.meta.url));
+    let version = '0.0.0';
+    for (;;) {
+        try {
+            const pkg = JSON.parse(readFileSync(join(root, 'package.json'), 'utf8'));
+            version = pkg.version ?? '0.0.0';
+            break;
+        }
+        catch {
+            const parent = dirname(root);
+            if (parent === root)
+                break;
+            root = parent;
+        }
+    }
+    return {
+        version,
+        root,
+        kind: root.includes(`${sep}node_modules${sep}`)
+            ? 'global install'
+            : 'dev clone',
+    };
+}
+/** Ask a yes/no question on the terminal; anything but an explicit yes is no. */
+async function promptYesNo(question) {
+    const rl = createInterface({ input: process.stdin, output: process.stdout });
+    try {
+        const answer = await new Promise((resolve) => rl.question(question, resolve));
+        const a = answer.trim().toLowerCase();
+        return a === 'y' || a === 'yes';
+    }
+    finally {
+        rl.close();
+    }
+}
+/**
+ * GAIA-218 (AC-3, AC-4): resolve what to do with the PROJECT connection override.
+ * Default no in every branch — only an explicit yes opts in. Non-interactive
+ * (no TTY) ⇒ always `skip`. The prompt is injected so the host test can stub it.
+ *
+ * - existing project `gaia.config.js` → "remove this override? [y/N]" → `remove`|`skip`
+ * - none                              → "create an override? [y/N]"   → `create`|`skip`
+ */
+export async function resolveProjectConnectionChoice(opts) {
+    if (!opts.isTTY)
+        return 'skip';
+    if (opts.existing !== undefined) {
+        const yes = await opts.prompt(`remove this project connection override (${opts.existing})? [y/N] `);
+        return yes ? 'remove' : 'skip';
+    }
+    const yes = await opts.prompt('create a project connection override for this repo? [y/N] ');
+    return yes ? 'create' : 'skip';
+}
+/**
+ * GAIA-230 (AC-9): the intro lines printed BEFORE the first migration step, on
+ * `--dry-run` too. `home` is where the schema `from` is read (the home connection
+ * config `~/.gaia/gaia.config.js`, the one every repo inherits); `to` is the
+ * version this gaia ships. Pure — returns the lines rather than printing them.
+ */
+export function renderUpgradeIntro(opts) {
+    const info = opts.install ?? resolveInstallInfo();
+    const homeConnection = join(opts.home, '.gaia', 'gaia.config.js');
+    const from = readConfigSchemaVersion(homeConnection);
+    return [
+        `gaia upgrade — gaia v${info.version} (${info.kind})`,
+        `  resolved from: ${info.root}`,
+        `  config schema: v${from} → v${GAIA_CONFIG_SCHEMA_VERSION} (${homeConnection})`,
+        `  the .gaia/ configs of ${opts.cwd} and of ${join(opts.home, '.gaia')} get migrated`,
+    ];
+}
+/** Register `gaia upgrade` on the host program. `deps` is injectable for tests. */
+export function registerUpgrade(program, deps = {}) {
     program
         .command('upgrade')
-        .description('migrate this install to the split config model (gaia.config.js connection + conductor.config.js engine; ~/.gaia/machine.config.js)')
+        .description('migrate this install: the split config model (gaia.config.js connection + conductor.config.js engine; ~/.gaia/machine.config.js) and the GAIA-224 addon package names (@gaia-ai/plugin-*, @gaia-ai/core/builtins and the @gaia-ai/core/plugins + @gaia-ai/gaia/plugins host barrels → @gaia-ai/addon-*). Prompts before creating/removing a project connection override.')
         .option('--dry-run', 'print the migration plan without writing anything', false)
-        .action((opts) => {
-        const report = runUpgrade({ dryRun: opts.dryRun });
+        .action(async (opts) => {
+        const cwd = deps.cwd ?? process.cwd();
+        const home = deps.home ?? homedir();
+        const isTTY = deps.isTTY ?? Boolean(process.stdin.isTTY);
+        const prompt = deps.prompt ?? promptYesNo;
+        // GAIA-230 (AC-9): the intro comes first — before the connection prompt and
+        // before the first migration step, so it is on the record either way.
+        for (const line of renderUpgradeIntro({ cwd, home }))
+            console.log(line);
+        const projectConnection = await resolveProjectConnectionChoice({
+            existing: hasProjectConnection(cwd),
+            isTTY,
+            prompt,
+        });
+        // `cwd`/`home` are forwarded so an injected pair really scopes the run —
+        // without them `runUpgrade` reached for `process.cwd()`/`homedir()` and
+        // rewrote the developer's own `.gaia/` from a test.
+        const report = runUpgrade({
+            cwd,
+            home,
+            dryRun: opts.dryRun,
+            projectConnection,
+        });
         for (const line of report.actions)
             console.log(line);
         if (report.alreadyCurrent)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gaia-ai/gaia",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "GAIA meta package: the `gaia` plugin-host CLI + all runtime plugins. Global install target.",
   "type": "module",
   "license": "MIT",
@@ -27,7 +27,7 @@
   "repository": {
     "type": "git",
     "url": "git+https://git.key-tec.de/keytec/gaia.git",
-    "directory": "conductor/host"
+    "directory": "gaia-cli/host"
   },
   "keywords": [
     "gaia",
@@ -38,17 +38,22 @@
     "jsonapi"
   ],
   "dependencies": {
-    "@gaia-ai/conductor": "^0.6.0",
-    "@gaia-ai/core": "^0.6.0",
-    "@gaia-ai/plugin-claude": "^0.6.0",
-    "@gaia-ai/plugin-codex": "^0.6.0",
-    "@gaia-ai/plugin-dropsh": "^0.6.0",
-    "@gaia-ai/plugin-essentials": "^0.6.0",
-    "@gaia-ai/plugin-gaia-ui": "^0.6.0",
-    "@gaia-ai/plugin-herdr": "^0.6.0",
-    "@gaia-ai/plugin-kimi": "^0.6.0",
-    "@gaia-ai/plugin-opencode": "^0.6.0",
-    "@gaia-ai/ui": "^0.6.0",
+    "@gaia-ai/addon-auth-basic": "^0.6.2",
+    "@gaia-ai/addon-claude": "^0.6.2",
+    "@gaia-ai/addon-codex": "^0.6.2",
+    "@gaia-ai/addon-deployment": "^0.6.2",
+    "@gaia-ai/addon-dropsh": "^0.6.2",
+    "@gaia-ai/addon-essentials": "^0.6.2",
+    "@gaia-ai/addon-gaia-ui": "^0.6.2",
+    "@gaia-ai/addon-herdr": "^0.6.2",
+    "@gaia-ai/addon-kimi": "^0.6.2",
+    "@gaia-ai/addon-opencode": "^0.6.2",
+    "@gaia-ai/addon-pi": "^0.6.2",
+    "@gaia-ai/addon-remote-drupal": "^0.6.2",
+    "@gaia-ai/addon-workspace-git": "^0.6.2",
+    "@gaia-ai/conductor": "^0.6.2",
+    "@gaia-ai/core": "^0.6.2",
+    "@gaia-ai/ui": "^0.6.2",
     "commander": "^12.1.0"
   }
 }