omnara 1.0.41 → 1.0.42

package/dist/bin.js

@@ -3918,7 +3918,6 @@ var zCreateMachinePath = z.object({
   orgID: z.string().regex(/^org_[a-z2-7]{26}$/)
 });
 var zCreateMachineResponse = zMachine;
-var zConnectByoMachineBody = zConnectByoMachineRequest;
 var zConnectByoMachinePath = z.object({
   orgID: zOrganizationId
 });
@@ -9186,6 +9185,12 @@ var zConfigFile = z10.looseObject({
   org_id: zOrganizationId.optional(),
   project_id: zProjectId.optional()
 });
+function firstPresentSetting(...values) {
+  for (const value of values) {
+    if (value !== void 0 && value.trim() !== "") return value;
+  }
+  return void 0;
+}
 function configFilePath() {
   return join(homedir(), ".config", "omnara", "config.json");
 }
@@ -9483,7 +9488,7 @@ async function loginWithDevice(options) {
   report.success(loginMessage);
   report.info(`Token saved to ${store.path}`);
   if (validationWarning !== void 0) report.warn(validationWarning);
-  if (process.env.OMNARA_API_KEY !== void 0) {
+  if (firstPresentSetting(process.env.OMNARA_API_KEY) !== void 0) {
     report.warn("OMNARA_API_KEY is set and takes precedence over the saved token");
   }
   return { token, orgId, projectId, hasOrganizations };
@@ -9519,10 +9524,13 @@ var DEFAULT_API_URL = "https://api.omnara.com/v1";
 var DEFAULT_ISSUER_URL = "https://app.omnara.com";
 function resolveUrls(file, env) {
   return {
-    apiUrl: env.OMNARA_API_URL ?? file.api_url ?? DEFAULT_API_URL,
-    issuerUrl: env.OMNARA_ISSUER_URL ?? file.issuer_url ?? DEFAULT_ISSUER_URL
+    apiUrl: firstPresentSetting(env.OMNARA_API_URL, file.api_url) ?? DEFAULT_API_URL,
+    issuerUrl: firstPresentSetting(env.OMNARA_ISSUER_URL, file.issuer_url) ?? DEFAULT_ISSUER_URL
   };
 }
+function resolveSavedToken(env, fileToken) {
+  return firstPresentSetting(env.OMNARA_API_KEY, fileToken);
+}
 function migrateLegacyBaseUrl(file) {
   const { base_url: baseUrl, ...rest } = file;
   if (baseUrl === void 0) return void 0;
@@ -9553,7 +9561,7 @@ function loadConfig() {
   const { apiUrl, issuerUrl } = resolveUrls(file, process.env);
   let saved = { orgId: file.org_id, projectId: file.project_id };
   const resolveToken = createTokenResolver({
-    savedToken: process.env.OMNARA_API_KEY ?? file.token,
+    savedToken: resolveSavedToken(process.env, file.token),
     canPrompt: canPromptInteractively,
     login: async () => {
       const report = createLoginReporter(`Not logged in yet. Log in to ${issuerUrl}`);
@@ -9584,10 +9592,10 @@ function loadConfig() {
     fetch: globalThis.fetch,
     sleep: sleepSeconds,
     get defaultOrgId() {
-      return process.env.OMNARA_ORG_ID ?? saved.orgId;
+      return firstPresentSetting(process.env.OMNARA_ORG_ID, saved.orgId);
     },
     get defaultProjectId() {
-      return process.env.OMNARA_PROJECT_ID ?? saved.projectId;
+      return firstPresentSetting(process.env.OMNARA_PROJECT_ID, saved.projectId);
     },
     ensureLoggedIn: async () => {
       await resolveToken();
@@ -9595,7 +9603,7 @@ function loadConfig() {
   };
 }
 function describeValue(envName, fileValue, defaultValue) {
-  const envValue = process.env[envName];
+  const envValue = firstPresentSetting(process.env[envName]);
   if (envValue !== void 0) {
     const shadowed = fileValue !== void 0 ? ` (config has ${fileValue})` : "";
     return `${envValue}  [from ${envName}${shadowed}]`;
@@ -9999,7 +10007,9 @@ function collectFlagValues(specs, options) {
   return root;
 }
 function parseWithSchema(schema, value, label) {
-  const result = schema.safeParse(value);
+  const result = schema.safeParse(value, {
+    error: (issue) => issue.input === "" ? "value is empty" : void 0
+  });
   if (!result.success) {
     throw new CliInputError(`invalid ${label}:
 ${z13.prettifyError(result.error)}`);
@@ -10168,7 +10178,7 @@ function registerLoginCommand(program2, cli) {
         report.finish(
           `This account has no organization yet. Create one at ${new URL("/onboarding", cli.issuerUrl).toString()}, then run 'omnara config select'.`
         );
-      } else if ((process.env.OMNARA_ORG_ID ?? orgId) === void 0) {
+      } else if (firstPresentSetting(process.env.OMNARA_ORG_ID, orgId) === void 0) {
         report.finish("Run 'omnara config select' to choose a default organization and project.");
       } else {
         report.finish();
@@ -12656,7 +12666,11 @@ import { accessSync, constants, existsSync as existsSync2, readdirSync, readFile
 import { homedir as homedir2, release } from "node:os";
 import { basename, dirname as dirname2, isAbsolute, join as join2, resolve } from "node:path";
 import * as z24 from "zod";
-var zMachineSetupBody = zConnectByoMachineRequest;
+var zMachineSetupBody = zConnectByoMachineRequest.extend({
+  project_ids: zConnectByoMachineRequest.shape.project_ids.describe(
+    "project ID to grant the machine to, from omnara projects list"
+  )
+});
 async function connectMachine(context) {
   const { client: client2, path, body, report } = context;
   report.start("Creating machine with a daemon token");
@@ -13654,7 +13668,7 @@ var commandGroups = [
         fn: sdk_gen_exports.connectByoMachine,
         format: formatMachineSetup,
         path: zConnectByoMachinePath,
-        body: zConnectByoMachineBody
+        body: zMachineSetupBody
       }),
       flowOp({
         verb: "create-local",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omnara",
-  "version": "1.0.41",
+  "version": "1.0.42",
   "description": "Command-line interface for Omnara: launch and manage agents, organizations, integrations, and MCP servers",
   "keywords": [
     "ai-agents",