@onesi/genesis-cli 0.2.4 → 0.2.5

package/README.md

@@ -3,7 +3,7 @@
 `genesis`, the OneOS command line. It works against the Genesis API at `https://os.one.ml/api`.
 
 ```sh
-npx -y @onesi/genesis-cli@0.2.4 --help
+npx -y @onesi/genesis-cli@0.2.5 --help
 ```
 
 ## First run

package/dist/fleets.js

@@ -76,9 +76,11 @@ export function registerFleets(program, client, emit, keyInput = readFoundryKey)
     instances.command('start <instance_id>').description('Connect already admitted Henry compute').option('--idempotency-key <uuid>', 'canonical UUID4 to retain after an uncertain reply').action(async (id, options) => emit(await (await client()).fleets.instances.start(id, { idempotencyKey: options.idempotencyKey })));
     const connection = fleets.command('connection').description('Organization-owned Foundry connection');
     connection.command('get').action(async () => emit(await (await client()).fleets.connection.get()));
-    connection.command('set').description('Read a Foundry key from stdin and encrypt it with Genesis KMS').action(async () => {
+    connection.command('set').description('Read a Foundry key from stdin and encrypt it with Genesis KMS')
+        .option('--model <id>', 'Foundry model for this organization\'s tasks (must be listed by Foundry for the key); default gpt-4.1-mini')
+        .action(async (options) => {
         const apiKey = await keyInput();
-        emit(await (await client()).fleets.connection.set(apiKey));
+        emit(await (await client()).fleets.connection.set(apiKey, options.model !== undefined ? { model: options.model } : {}));
     });
     connection.command('delete').action(async () => emit(await (await client()).fleets.connection.delete()));
     const usage = fleets.command('usage').description('Usage observations derived from your tasks');

package/dist/hives-project.d.ts

@@ -0,0 +1,8 @@
+import type { Command } from 'commander';
+import { type Genesis } from '@onesi/genesis';
+/**
+ * Every `genesis hives` command with a <project_id>: the help says "Hives project id (prj_…)"; a Genesis pr_… id of
+ * the selected context resolves to its Hives binding, and where project_id is the last argument of a command that
+ * does not delete or end anything it may be omitted. The binding is read once per invocation, before the action.
+ */
+export declare function registerHivesProjectDefault(hives: Command, client: () => Promise<Genesis>): void;

package/dist/hives-project.js

@@ -0,0 +1,31 @@
+import { HIVES_PROJECT_ID_DEFAULT, HIVES_PROJECT_ID_DESCRIPTION, isGenesisProjectId } from '@onesi/genesis';
+/** Commands that delete or end something keep an explicit project id: an omitted one never defaults. */
+const EXPLICIT = /^(?:delete|remove|purge|uninstall|destroy|stop|cancel|rollback|detach)/;
+const projectArgument = (command) => command.registeredArguments.findIndex((a) => a.name() === 'project_id');
+/**
+ * Every `genesis hives` command with a <project_id>: the help says "Hives project id (prj_…)"; a Genesis pr_… id of
+ * the selected context resolves to its Hives binding, and where project_id is the last argument of a command that
+ * does not delete or end anything it may be omitted. The binding is read once per invocation, before the action.
+ */
+export function registerHivesProjectDefault(hives, client) {
+    const visit = (command) => {
+        const at = projectArgument(command);
+        if (at >= 0 && command.parent?.name() !== 'context') {
+            const argument = command.registeredArguments[at];
+            const optional = at === command.registeredArguments.length - 1 && !argument.variadic && !EXPLICIT.test(command.name());
+            argument.description = optional ? `${HIVES_PROJECT_ID_DESCRIPTION}; ${HIVES_PROJECT_ID_DEFAULT}` : HIVES_PROJECT_ID_DESCRIPTION;
+            if (optional)
+                argument.required = false;
+        }
+        command.commands.forEach(visit);
+    };
+    hives.commands.forEach(visit);
+    hives.hook('preAction', async (_hooked, action) => {
+        const at = projectArgument(action);
+        if (at < 0 || action.parent?.name() === 'context')
+            return;
+        const value = action.processedArgs[at];
+        if (value === undefined || isGenesisProjectId(value))
+            action.processedArgs[at] = await (await client()).hives.resolveProject(value);
+    });
+}

package/dist/index.js

@@ -20,6 +20,7 @@ import { registerRunner } from './runner.js';
 import { createHivesNodeTransport } from './hives-node-transport.js';
 import { registerHivesOperations } from './hives-operations.js';
 import { registerHivesCoverage } from './hives-coverage.js';
+import { registerHivesProjectDefault } from './hives-project.js';
 import { readFunctionFile, readFunctionJson, writeFunctionOutput } from './function-input.js';
 import { basename } from 'node:path';
 import { readWasmFile } from './wasm-input.js';
@@ -40,7 +41,7 @@ export function buildProgram(deps = {}) {
     const auth = { ...authConfig(env, f), sleep: deps.sleep };
     const program = new Command('genesis')
         .description('One CLI for every Genesis service.')
-        .version('0.2.4')
+        .version('0.2.5')
         .option('--json', 'machine-readable JSON output')
         .option('--api-key <key>', 'use this API key (default: GENESIS_API_KEY, then your `genesis login`)')
         .option('--base-url <url>', 'gateway URL (default: GENESIS_BASE_URL or https://os.one.ml/api)')
@@ -56,7 +57,7 @@ export function buildProgram(deps = {}) {
         const opts = {
             apiKey: o.apiKey ?? env.GENESIS_API_KEY, token: env.GENESIS_TOKEN,
             baseUrl: o.baseUrl ?? env.GENESIS_BASE_URL, routing: o.direct || env.GENESIS_ROUTING === 'direct' ? 'direct' : 'gateway',
-            fetch: f, userAgent: 'genesis-cli/0.2.4',
+            fetch: f, userAgent: 'genesis-cli/0.2.5',
             credentials: store ? savedLoginProvider(auth, store) : undefined,
         };
         return new Genesis(hivesTransport ? { ...opts, fetch: createHivesNodeTransport(opts, deps.signal) } : opts);
@@ -277,7 +278,7 @@ export function buildProgram(deps = {}) {
         if (!key)
             throw new Error('Give the enrollment key with --key-file, --key-stdin or GENESIS_ENROLLMENT_KEY; it is never accepted as an argument.');
         const body = await readFunctionJson(o.bodyFile, 16 * 1024);
-        const result = await new Genesis({ baseUrl: g().baseUrl ?? env.GENESIS_BASE_URL, fetch: f, userAgent: 'genesis-cli/0.2.4' }).iam.agents.enroll(key, body);
+        const result = await new Genesis({ baseUrl: g().baseUrl ?? env.GENESIS_BASE_URL, fetch: f, userAgent: 'genesis-cli/0.2.5' }).iam.agents.enroll(key, body);
         emit(result, () => JSON.stringify(result, null, 2));
     });
     // ---- auth ------------------------------------------------------------
@@ -691,6 +692,8 @@ export function buildProgram(deps = {}) {
     });
     // Last: extends the hives groups defined above (flights, logs, env values, domain reads).
     registerHivesCoverage(hives, { client: hivesClient, emit, readRequest: deps.readHivesRequest });
+    // After every hives command exists: prj_… help, and pr_… or omitted project ids resolved from the selected context.
+    registerHivesProjectDefault(hives, hivesClient);
     // ---- relays ----------------------------------------------------------
     const relays = program.command('relays').description('Relays: DNS zones and records');
     registerRelaysEnrollment(relays, client, emit);
@@ -810,7 +813,7 @@ export function buildProgram(deps = {}) {
         const url = `${base.href.replace(/\/+$/, '')}/v1/status`;
         let response;
         try {
-            response = await f(url, { method: 'GET', headers: { accept: 'application/json', 'user-agent': 'genesis-cli/0.2.4' }, signal: AbortSignal.timeout(15_000) });
+            response = await f(url, { method: 'GET', headers: { accept: 'application/json', 'user-agent': 'genesis-cli/0.2.5' }, signal: AbortSignal.timeout(15_000) });
         }
         catch (e) {
             throw new Error(`Gateway unreachable at ${safe(url)}: ${safe(e.message)}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onesi/genesis-cli",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/l1felabs/genesis-api.git",
@@ -33,7 +33,7 @@
   "dependencies": {
     "commander": "^14.0.0",
     "undici": "6.29.0",
-    "@onesi/genesis": "0.2.4"
+    "@onesi/genesis": "0.2.5"
   },
   "optionalDependencies": {
     "@napi-rs/keyring": "^1.2.0"