@gaia-ai/gaia 0.15.0 → 0.15.2

package/dist/src/config.js

@@ -1,8 +1,8 @@
-import { homedir, hostname } from 'node:os';
+import { hostname } from 'node:os';
 import { join } from 'node:path';
 import { createInterface } from 'node:readline';
 import { pathToFileURL } from 'node:url';
-import { reportLoadedGaiaConfigFields, resolveGaiaConnectionSelection, } from '@gaia-ai/core';
+import { homeGaiaDir, reportLoadedGaiaConfigFields, resolveGaiaConnectionSelection, } from '@gaia-ai/core';
 import { Option } from 'commander';
 /** Terminal-only input. Secret characters are never echoed. */
 async function promptInput(label, secret = false) {
@@ -42,6 +42,10 @@ export function renderConfigReport(report, dryRun = false) {
     ];
     for (const file of report.files.filter((file) => file.selected))
         lines.push(`${file.layer}: ${file.path} (${file.state}; schema ${file.version.effective ?? 'unversioned'} → ${file.version.current ?? 'unversioned'}; ${file.fingerprint ?? 'absent'})`);
+    if (report.machine_policy) {
+        const { tunnel, source } = report.machine_policy;
+        lines.push(`Machine tunnel: ${tunnel === null ? 'unresolved' : tunnel} (from ${source})`);
+    }
     if (report.connection_resolution) {
         const selected = report.connection_resolution;
         lines.push(`Connection: ${selected.id} (${selected.selected_by}) — ${selected.path}`);
@@ -102,6 +106,8 @@ function buildConfigCommand(parent, operation, deps, hiddenScope, description) {
                 .option('--workspace-id <uuid>', 'explicit workspace UUID')
                 .option('--workspace <name>', 'committed project workspace name')
                 .option('--secret-env <name>', 'environment variable containing the OAuth secret')
+                .option('--after-create <command>', "committed conductor config's after_create hook; empty means none, gaia-cli names no provisioning tool")
+                .option('--after-done <command>', "committed conductor config's after_done hook; empty means none, gaia-cli names no provisioning tool")
                 .addOption(new Option('--auth-type <type>', 'sign in with device code (default, no secret) or a client secret (internal/CI)').choices(['client_credentials', 'device']));
         command.action(async (options) => {
             if (hiddenScope !== undefined && options.scope === undefined)
@@ -149,10 +155,17 @@ function buildConfigCommand(parent, operation, deps, hiddenScope, description) {
                     options.authType === 'client_credentials'
                         ? 'oauth2_client_credentials'
                         : 'oauth2_device_code';
+            if (options.afterCreate !== undefined || options.afterDone !== undefined)
+                inputs.hooks = {
+                    ...(options.afterCreate ? { after_create: options.afterCreate } : {}),
+                    ...(options.afterDone ? { after_done: options.afterDone } : {}),
+                };
             const planning = {
                 operation,
                 cwd,
-                home: deps.home ?? homedir(),
+                // Only forward an explicitly injected home; absent, core resolves the
+                // `.gaia` root itself and honours GAIA_HOME.
+                ...(deps.home !== undefined ? { home: deps.home } : {}),
                 inputs,
                 // `gaia init` (hiddenScope !== undefined) never pulls the project
                 // layer in, even inside a project checkout (GAIA-496 finding 1).
@@ -168,7 +181,7 @@ function buildConfigCommand(parent, operation, deps, hiddenScope, description) {
             else if (options.connection !== undefined) {
                 if (!/^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(options.connection))
                     throw new Error('--connection must be an identifier containing letters, numbers, dot, underscore or hyphen.');
-                planning.connectionPath = join(deps.home ?? homedir(), '.gaia', 'connections', `${options.connection}.js`);
+                planning.connectionPath = join(homeGaiaDir(deps.home), 'connections', `${options.connection}.js`);
             }
             let selectedConnection;
             const initializesNamedConnection = operation === 'init' &&
@@ -177,7 +190,12 @@ function buildConfigCommand(parent, operation, deps, hiddenScope, description) {
             if (!initializesNamedConnection && options.scope !== 'machine') {
                 selectedConnection = await resolveGaiaConnectionSelection({
                     cwd,
-                    home: deps.home ?? homedir(),
+                    // Only forward an explicitly injected home; absent, core resolves
+                    // the `.gaia` root itself and honours GAIA_HOME (same rule as the
+                    // `planning` object above — a stray `?? homedir()` here would
+                    // resolve this command's connection selection under `~/.gaia` while
+                    // the rest of it honours the override).
+                    ...(deps.home !== undefined ? { home: deps.home } : {}),
                     env,
                     ...(options.config ? { explicit: options.config } : {}),
                     ...(options.connection ? { connection: options.connection } : {}),
@@ -291,8 +309,46 @@ function buildConfigCommand(parent, operation, deps, hiddenScope, description) {
                     report.verification = current.verification;
                 }
             }
+            // A device-code connection authenticates from a session that sign-in
+            // creates, and nothing has signed in yet when `init` has only just
+            // written the file. Verifying here therefore reports
+            // `authentication_failure` on a perfectly correct machine — a symptom
+            // named in place of its cause, and the reason `gaia init` used to end
+            // `failed` on every fresh setup. Writing the connection and signing in
+            // are two steps, so `init` reports the second as outstanding instead.
+            // An explicit `--online` still verifies, so the deferral is gated on
+            // the whole predicate rather than on the file read alone — otherwise
+            // `--auth-type device` defers the very check the operator asked for.
+            // Read the grant off the connection that is about to be verified, not
+            // off `--auth-type`: a repeat `gaia init` supplies no flag and writes
+            // nothing, and keying on the input would leave exactly that run — the
+            // one an operator uses as a diagnostic — reporting a failure again. A
+            // read that fails falls through to verifying, so a broken file is
+            // reported rather than quietly skipped.
+            let connectionGrant;
+            if (operation === 'init' && planning.connectionPath)
+                try {
+                    const fields = await reportLoadedGaiaConfigFields(planning.connectionPath);
+                    // Locate the OAuth plugin by identity. Its grant is the only one
+                    // that says anything about signing in, and any plugin may carry a
+                    // `with.type` of its own, so matching on field shape alone reads
+                    // whichever happens to come first.
+                    const prefix = fields
+                        .find((field) => /^plugins\[\d+\]\.plugin$/.test(field.key) &&
+                        field.value === '@dropsh/plugin-oauth2')
+                        ?.key.replace(/\.plugin$/, '');
+                    if (prefix !== undefined)
+                        connectionGrant = fields.find((field) => field.key === `${prefix}.with.type`)?.value;
+                }
+                catch {
+                    // Inventory findings already describe an unreadable or malformed file.
+                }
+            const awaitsSignIn = !options.online &&
+                (inputs.authType === 'oauth2_device_code' ||
+                    connectionGrant === 'oauth2_device_code');
             if (!cancelled &&
                 !options.dryRun &&
+                !awaitsSignIn &&
                 (operation === 'init' || options.online) &&
                 !report.findings.some((f) => f.severity === 'error')) {
                 const { verifyConfigConnections } = await import('@gaia-ai/core');
@@ -314,7 +370,23 @@ function buildConfigCommand(parent, operation, deps, hiddenScope, description) {
             else if (!options.dryRun &&
                 (operation === 'init' || options.online) &&
                 report.verification.online.status !== 'not_applicable') {
-                const reason = 'Online validation skipped because offline errors require repair or input was cancelled.';
+                // `gaia init` is also the diagnostic an operator re-runs on a finished
+                // setup. Naming sign-in as the next step there is the one instruction
+                // that is certainly wrong, so say which of the two situations this is.
+                const { hasStoredGaiaSession } = await import('@gaia-ai/core');
+                const reason = awaitsSignIn
+                    ? (await hasStoredGaiaSession(deps.host ?? {
+                        resolveBases: [import.meta.url, pathToFileURL(`${cwd}/`).href],
+                    }, {
+                        cwd,
+                        ...(planning.connectionPath
+                            ? { explicit: planning.connectionPath }
+                            : {}),
+                        ...(deps.stateDir ? { stateDir: deps.stateDir } : {}),
+                    }))
+                        ? 'A session for this connection already exists; verify it with gaia config check --scope connection --online.'
+                        : 'Sign-in is the next step: run gaia dropsh auth login, then gaia config check --scope connection --online.'
+                    : 'Online validation skipped because offline errors require repair or input was cancelled.';
                 report.verification.online.reason = reason;
                 report.verification.skipped.push({
                     path: report.roots.connection,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gaia-ai/gaia",
-  "version": "0.15.0",
+  "version": "0.15.2",
   "description": "GAIA meta package: the `gaia` plugin-host CLI + all runtime plugins. Global install target.",
   "type": "module",
   "license": "MIT",
@@ -38,29 +38,29 @@
     "jsonapi"
   ],
   "dependencies": {
-    "@gaia-ai/addon-agents": "^0.15.0",
-    "@gaia-ai/addon-auth-basic": "^0.15.0",
-    "@gaia-ai/addon-claude": "^0.15.0",
-    "@gaia-ai/addon-codex": "^0.15.0",
-    "@gaia-ai/addon-deployment": "^0.15.0",
-    "@gaia-ai/addon-dropsh": "^0.15.0",
-    "@gaia-ai/addon-essentials": "^0.15.0",
-    "@gaia-ai/addon-gaia-ui": "^0.15.0",
-    "@gaia-ai/addon-gaia-ui-artifacts": "^0.15.0",
-    "@gaia-ai/addon-grok": "^0.15.0",
-    "@gaia-ai/addon-herdr": "^0.15.0",
-    "@gaia-ai/addon-info": "^0.15.0",
-    "@gaia-ai/addon-kimi": "^0.15.0",
-    "@gaia-ai/addon-opencode": "^0.15.0",
-    "@gaia-ai/addon-pi": "^0.15.0",
-    "@gaia-ai/addon-ports": "^0.15.0",
-    "@gaia-ai/addon-ports-ui": "^0.15.0",
-    "@gaia-ai/addon-remote-drupal": "^0.15.0",
-    "@gaia-ai/addon-workspace": "^0.15.0",
-    "@gaia-ai/addon-workspace-git": "^0.15.0",
-    "@gaia-ai/conductor": "^0.15.0",
-    "@gaia-ai/core": "^0.15.0",
-    "@gaia-ai/ui": "^0.15.0",
+    "@gaia-ai/addon-agents": "^0.15.2",
+    "@gaia-ai/addon-auth-basic": "^0.15.2",
+    "@gaia-ai/addon-claude": "^0.15.2",
+    "@gaia-ai/addon-codex": "^0.15.2",
+    "@gaia-ai/addon-deployment": "^0.15.2",
+    "@gaia-ai/addon-dropsh": "^0.15.2",
+    "@gaia-ai/addon-essentials": "^0.15.2",
+    "@gaia-ai/addon-gaia-ui": "^0.15.2",
+    "@gaia-ai/addon-gaia-ui-artifacts": "^0.15.2",
+    "@gaia-ai/addon-grok": "^0.15.2",
+    "@gaia-ai/addon-herdr": "^0.15.2",
+    "@gaia-ai/addon-info": "^0.15.2",
+    "@gaia-ai/addon-kimi": "^0.15.2",
+    "@gaia-ai/addon-opencode": "^0.15.2",
+    "@gaia-ai/addon-pi": "^0.15.2",
+    "@gaia-ai/addon-ports": "^0.15.2",
+    "@gaia-ai/addon-ports-ui": "^0.15.2",
+    "@gaia-ai/addon-remote-drupal": "^0.15.2",
+    "@gaia-ai/addon-workspace": "^0.15.2",
+    "@gaia-ai/addon-workspace-git": "^0.15.2",
+    "@gaia-ai/conductor": "^0.15.2",
+    "@gaia-ai/core": "^0.15.2",
+    "@gaia-ai/ui": "^0.15.2",
     "commander": "^12.1.0"
   }
 }