@gaia-ai/gaia 0.2.0 → 0.3.0

package/dist/src/cli/gaia.js

@@ -1,3 +1,4 @@
+import { existsSync } from 'node:fs';
 import { dirname } from 'node:path';
 import { createInterface } from 'node:readline';
 import { Command } from 'commander';
@@ -416,8 +417,8 @@ Examples:
     conductor
         .command('init')
         .description('scaffold the committed .gaia/conductor.config.js for this repo plus the user-global conductor.config.machine.js context (identity + connection incl. secret)')
-        .requiredOption('--base-url <url>', 'control-plane base URL (site.base_url)')
-        .requiredOption('--project <name>', 'GAIA project name')
+        .option('--base-url <url>', 'control-plane base URL (site.base_url) — required only when onboarding this machine')
+        .option('--project <name>', 'GAIA project name — required only to scaffold the committed repo config; omit for machine-only onboarding')
         .option('--secret-env <VAR>', 'env var name to read the oauth client secret from (else TTY prompt)')
         .option('--client-id <id>', 'oauth consumer id', 'gaia-agent')
         .option('--machine-id <id>', 'machine host token for the context (defaults to hostname())')
@@ -425,40 +426,64 @@ Examples:
         .option('--machine-path <path>', 'user-global machine context path (defaults to ~/.config/conductor/conductor.config.machine.js)')
         .option('--config <path>', 'target committed config path', './.gaia/conductor.config.js')
         .option('--force', 'overwrite an existing committed config', false)
+        .option('--reonboard', 'force machine-context onboarding even if a context file exists', false)
         .action(async (opts) => {
-        let userId = opts.userId;
-        if (userId === undefined || userId.trim() === '') {
-            if (process.stdin.isTTY) {
-                userId = await promptUserId();
-            }
-            if (userId === undefined || userId.trim() === '') {
-                throw new Error('--user-id is required (or run in a TTY to be prompted)');
-            }
-        }
-        // The secret lives in the machine context; resolve it only when that
-        // context does not already carry one (existing values are never
-        // overwritten). Source: --secret-env value, else a TTY prompt.
+        // Two independent axes decide what init writes:
+        //  - machine axis: an existing context means project-only; --reonboard
+        //    (or an absent context) forces machine-context (re)scaffolding.
+        //  - repo axis: --project scaffolds the committed repo config; omitting
+        //    it means machine-only (no repo). The 4 quadrants:
+        //      context absent  + project → both files
+        //      context absent  + no proj → machine-only onboarding
+        //      context present + project → project-only
+        //      context present + no proj → no-op (machine already onboarded)
         const machinePath = opts.machinePath ?? machineContextPath();
         const existing = await readMachineContext(machinePath);
+        const contextPresent = existsSync(machinePath);
+        const onboarding = !contextPresent || opts.reonboard;
+        const project = opts.project ?? '';
+        const hasProject = project.trim() !== '';
+        // Context present and nothing repo-scoped to do → no-op with guidance.
+        if (!onboarding && !hasProject) {
+            console.log(`machine already onboarded (${machinePath}) — pass --project to set up a repo`);
+            return;
+        }
+        let userId = opts.userId ?? '';
         let secret = '';
-        if (typeof existing.client_secret !== 'string' ||
-            existing.client_secret.trim() === '') {
-            secret =
-                opts.secretEnv !== undefined
-                    ? (process.env[opts.secretEnv] ?? '')
-                    : '';
-            if (secret.trim() === '') {
-                if (process.stdin.isTTY) {
-                    secret = await promptSecret();
+        const baseUrl = opts.baseUrl ?? '';
+        if (onboarding) {
+            // Full onboarding: base-url + user-id + secret are required here.
+            if (baseUrl.trim() === '') {
+                throw new Error('--base-url is required when onboarding this machine (no machine context yet, or --reonboard)');
+            }
+            if (userId.trim() === '') {
+                if (process.stdin.isTTY)
+                    userId = await promptUserId();
+                if (userId.trim() === '') {
+                    throw new Error('--user-id is required (or run in a TTY to be prompted)');
                 }
+            }
+            // The secret lives in the machine context; resolve it only when that
+            // context does not already carry one (existing values are never
+            // overwritten). Source: --secret-env value, else a TTY prompt.
+            if (typeof existing.client_secret !== 'string' ||
+                existing.client_secret.trim() === '') {
+                secret =
+                    opts.secretEnv !== undefined
+                        ? (process.env[opts.secretEnv] ?? '')
+                        : '';
                 if (secret.trim() === '') {
-                    throw new Error('OAuth client secret required: pass --secret-env <VAR> (exported) or run in a TTY to be prompted');
+                    if (process.stdin.isTTY)
+                        secret = await promptSecret();
+                    if (secret.trim() === '') {
+                        throw new Error('OAuth client secret required: pass --secret-env <VAR> (exported) or run in a TTY to be prompted');
+                    }
                 }
             }
         }
         const inputs = {
-            baseUrl: opts.baseUrl,
-            project: opts.project,
+            baseUrl,
+            project,
             clientId: opts.clientId,
             secret,
             userId,
@@ -470,16 +495,39 @@ Examples:
             configPath: opts.config,
             force: opts.force,
             machinePath,
+            skipMachine: !onboarding,
+            skipCommitted: !hasProject,
         });
-        console.log(res.wroteCommitted
-            ? `wrote ${res.committedPath}`
-            : `kept ${res.committedPath} (exists — pass --force to replace)`);
+        // Mode banner.
+        if (!onboarding) {
+            console.log(`machine context found (${machinePath}) → setting up project only`);
+            if (typeof existing.base_url !== 'string' ||
+                existing.base_url.trim() === '') {
+                console.log(`warning: ${machinePath} exists but looks incomplete (no base_url) — ` +
+                    `run with --reonboard to fill the machine context`);
+            }
+        }
+        else if (!hasProject) {
+            console.log(`onboarding this machine (no project) → run again with --project inside a repo to set it up`);
+        }
+        else {
+            console.log(opts.reonboard
+                ? `re-onboarding this machine (--reonboard)`
+                : `no machine context → onboarding this machine`);
+        }
+        if (hasProject) {
+            console.log(res.wroteCommitted
+                ? `wrote ${res.committedPath}`
+                : `kept ${res.committedPath} (exists — pass --force to replace)`);
+        }
         const m = res.machine;
-        console.log(m.created
-            ? `wrote ${m.path} (user-global machine context)`
-            : m.filledKeys.length > 0
-                ? `updated ${m.path} (filled: ${m.filledKeys.join(', ')})`
-                : `kept ${m.path} (already complete)`);
+        if (onboarding) {
+            console.log(m.created
+                ? `wrote ${m.path} (user-global machine context)`
+                : m.filledKeys.length > 0
+                    ? `updated ${m.path} (filled: ${m.filledKeys.join(', ')})`
+                    : `kept ${m.path} (already complete)`);
+        }
         console.log(`\nNext steps:\n` +
             `  gaia dropsh auth login --provider session\n` +
             `  gaia dropsh auth login --provider pm\n` +

package/dist/src/cli/init.d.ts

@@ -11,6 +11,10 @@ export interface ScaffoldOptions {
     configPath: string;
     force: boolean;
     machinePath?: string;
+    /** When true, scaffold the committed config only — never read/write the machine context. */
+    skipMachine?: boolean;
+    /** When true, scaffold the machine context only — never write the committed config. */
+    skipCommitted?: boolean;
 }
 export interface ScaffoldResult {
     committedPath: string;
@@ -70,5 +74,9 @@ export declare function scaffoldMachineContext(opts: MachineContextOptions): Pro
  * (created only if missing — never overwritten unless `force`) and the
  * user-global machine context (create-if-missing / fill-only-missing). The
  * optional per-project conductor.config.local.js is NOT generated.
+ *
+ * `skipMachine` writes the committed config only (project-only setup); its
+ * mirror `skipCommitted` writes the machine context only (machine-only
+ * onboarding, no repo). Setting both is a no-op.
  */
 export declare function scaffold(inputs: InitInputs, opts: ScaffoldOptions): Promise<ScaffoldResult>;

package/dist/src/cli/init.js

@@ -199,22 +199,33 @@ export async function scaffoldMachineContext(opts) {
  * (created only if missing — never overwritten unless `force`) and the
  * user-global machine context (create-if-missing / fill-only-missing). The
  * optional per-project conductor.config.local.js is NOT generated.
+ *
+ * `skipMachine` writes the committed config only (project-only setup); its
+ * mirror `skipCommitted` writes the machine context only (machine-only
+ * onboarding, no repo). Setting both is a no-op.
  */
 export async function scaffold(inputs, opts) {
     const committedPath = opts.configPath;
-    mkdirSync(dirname(committedPath), { recursive: true });
     let wroteCommitted = false;
-    if (!existsSync(committedPath) || opts.force) {
-        writeFileSync(committedPath, renderCommittedConfig(inputs), 'utf8');
-        wroteCommitted = true;
+    if (!opts.skipCommitted) {
+        mkdirSync(dirname(committedPath), { recursive: true });
+        if (!existsSync(committedPath) || opts.force) {
+            writeFileSync(committedPath, renderCommittedConfig(inputs), 'utf8');
+            wroteCommitted = true;
+        }
     }
-    const machine = await scaffoldMachineContext({
-        path: opts.machinePath ?? machineContextPath(),
-        userId: inputs.userId ?? '',
-        baseUrl: inputs.baseUrl,
-        clientId: inputs.clientId,
-        secret: inputs.secret,
-        ...(inputs.machineId !== undefined ? { machineId: inputs.machineId } : {}),
-    });
+    const machinePath = opts.machinePath ?? machineContextPath();
+    const machine = opts.skipMachine
+        ? { path: machinePath, created: false, filledKeys: [] }
+        : await scaffoldMachineContext({
+            path: machinePath,
+            userId: inputs.userId ?? '',
+            baseUrl: inputs.baseUrl,
+            clientId: inputs.clientId,
+            secret: inputs.secret,
+            ...(inputs.machineId !== undefined
+                ? { machineId: inputs.machineId }
+                : {}),
+        });
     return { committedPath, wroteCommitted, machine };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gaia-ai/gaia",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "GAIA Network conductor node: registers, claims tickets via JSON:API, runs agents through spawn plugins.",
   "type": "module",
   "license": "MIT",
@@ -41,10 +41,10 @@
   "dependencies": {
     "@dropsh/plugin-oauth2": "^0.4.1",
     "@dropsh/plugin-schemata": "^0.4.1",
-    "@gaia-ai/plugin-claude": "^0.2.0",
-    "@gaia-ai/plugin-codex": "^0.2.0",
-    "@gaia-ai/plugin-herdr": "^0.2.0",
-    "@gaia-ai/plugin-herdr-workspace": "^0.2.0",
+    "@gaia-ai/plugin-claude": "^0.3.0",
+    "@gaia-ai/plugin-codex": "^0.3.0",
+    "@gaia-ai/plugin-herdr": "^0.3.0",
+    "@gaia-ai/plugin-herdr-workspace": "^0.3.0",
     "commander": "^12.1.0",
     "dropsh": "^0.4.1",
     "pino": "^9.6.0",