omnara 1.0.5 → 1.0.6

package/dist/bin.js

@@ -8,11 +8,6 @@ var __export = (target, all) => {
 // src/bin.ts
 import { Command } from "commander";
 
-// src/config.ts
-import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { dirname, join } from "node:path";
-
 // ../sdk/src/generated/sdk.gen.ts
 var sdk_gen_exports = {};
 __export(sdk_gen_exports, {
@@ -1248,7 +1243,7 @@ var zConfiguredModel = z.object({
   context_window_tokens: z.int(),
   max_output_tokens: z.int(),
   default_max_output_tokens: z.int().nullish(),
-  default_cache_retention: zModelCacheRetention,
+  default_cache_retention: zModelCacheRetention.optional(),
   supports_tools: z.boolean(),
   supports_reasoning: z.boolean(),
   default_reasoning_effort: z.string(),
@@ -6810,12 +6805,12 @@ async function pollDeviceAuthToken(options) {
   }
 }
 
-// src/config.ts
+// src/config-file.ts
+import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { dirname, join } from "node:path";
 import * as z5 from "zod";
 
-// src/interactive.ts
-import { isCancel, select } from "@clack/prompts";
-
 // src/output.ts
 import * as z4 from "zod";
 var zRenderValue = z4.json();
@@ -7003,54 +6998,7 @@ ${z4.prettifyError(error)}`);
   }
 }
 
-// src/interactive.ts
-function canPromptInteractively() {
-  return process.stdin.isTTY && process.stdout.isTTY;
-}
-async function selectFrom(message, choices) {
-  const [only] = choices;
-  if (choices.length === 1 && only !== void 0) {
-    console.log(`${message}: ${only.label} (only option)`);
-    return only.id;
-  }
-  const picked = await select({
-    message,
-    options: choices.map((choice) => ({ value: choice.id, label: choice.label, hint: choice.id }))
-  });
-  if (isCancel(picked)) throw new CliInputError("selection cancelled");
-  return picked;
-}
-async function promptOrgSelection(client2) {
-  const { data } = await sdk_gen_exports.getCurrentUser({ client: client2 });
-  if (data.orgs.length === 0) {
-    throw new CliInputError("this account has no organizations");
-  }
-  return selectFrom(
-    "Select an organization",
-    data.orgs.map((org) => ({ id: org.id, label: org.name }))
-  );
-}
-async function promptProjectSelection(client2, orgId) {
-  const projects = [];
-  let cursor;
-  do {
-    const { data } = await sdk_gen_exports.listVisibleProjects({
-      client: client2,
-      path: { orgID: orgId },
-      query: cursor === void 0 ? {} : { cursor }
-    });
-    projects.push(...data.data.map((project) => ({ id: project.id, label: project.name })));
-    cursor = data.next_cursor ?? void 0;
-  } while (cursor !== void 0);
-  if (projects.length === 0) {
-    throw new CliInputError(`no projects visible in organization ${orgId}`);
-  }
-  return selectFrom("Select a project", projects);
-}
-
-// src/config.ts
-var DEFAULT_API_URL = "https://api.omnara.com/v1";
-var DEFAULT_ISSUER_URL = "https://app.omnara.com";
+// src/config-file.ts
 var zConfigFile = z5.looseObject({
   api_url: z5.url().optional(),
   issuer_url: z5.url().optional(),
@@ -7113,6 +7061,234 @@ ${z5.prettifyError(result.error)}`);
   chmodSync(configFilePath(), 384);
   return result.data;
 }
+
+// src/device-login.ts
+import { hostname } from "node:os";
+import { intro, log, note, outro, spinner } from "@clack/prompts";
+import * as z6 from "zod";
+
+// src/browser.ts
+import { spawn } from "node:child_process";
+function browserCommand(url4) {
+  if (process.platform === "darwin") {
+    return { command: "open", args: [url4], windowsVerbatimArguments: false };
+  }
+  if (process.platform === "win32") {
+    return {
+      command: "cmd",
+      args: ["/c", "start", '""', `"${url4}"`],
+      windowsVerbatimArguments: true
+    };
+  }
+  return { command: "xdg-open", args: [url4], windowsVerbatimArguments: false };
+}
+function openInBrowser(url4, onError) {
+  const { command, args, windowsVerbatimArguments } = browserCommand(url4);
+  const child = spawn(command, args, { stdio: "ignore", detached: true, windowsVerbatimArguments });
+  child.once("error", () => {
+    onError("could not open a browser; use the URL above");
+  });
+  child.unref();
+}
+
+// src/interactive.ts
+import { isCancel, select } from "@clack/prompts";
+function canPromptInteractively() {
+  return process.stdin.isTTY && process.stdout.isTTY;
+}
+async function selectFrom(message, choices) {
+  const [only] = choices;
+  if (choices.length === 1 && only !== void 0) {
+    console.log(`${message}: ${only.label} (only option)`);
+    return only.id;
+  }
+  const picked = await select({
+    message,
+    options: choices.map((choice) => ({ value: choice.id, label: choice.label, hint: choice.id }))
+  });
+  if (isCancel(picked)) throw new CliInputError("selection cancelled");
+  return picked;
+}
+async function promptOrgSelection(client2) {
+  const { data } = await sdk_gen_exports.getCurrentUser({ client: client2 });
+  if (data.orgs.length === 0) {
+    throw new CliInputError("this account has no organizations");
+  }
+  return selectFrom(
+    "Select an organization",
+    data.orgs.map((org) => ({ id: org.id, label: org.name }))
+  );
+}
+async function promptProjectSelection(client2, orgId) {
+  const projects = [];
+  let cursor;
+  do {
+    const { data } = await sdk_gen_exports.listVisibleProjects({
+      client: client2,
+      path: { orgID: orgId },
+      query: cursor === void 0 ? {} : { cursor }
+    });
+    projects.push(...data.data.map((project) => ({ id: project.id, label: project.name })));
+    cursor = data.next_cursor ?? void 0;
+  } while (cursor !== void 0);
+  if (projects.length === 0) {
+    throw new CliInputError(`no projects visible in organization ${orgId}`);
+  }
+  return selectFrom("Select a project", projects);
+}
+
+// src/device-login.ts
+async function isProjectVisible(client2, orgId, projectId) {
+  let cursor;
+  do {
+    const { data } = await sdk_gen_exports.listVisibleProjects({
+      client: client2,
+      path: { orgID: orgId },
+      query: cursor === void 0 ? {} : { cursor }
+    });
+    if (data.data.some((project) => project.id === projectId)) return true;
+    cursor = data.next_cursor ?? void 0;
+  } while (cursor !== void 0);
+  return false;
+}
+function interactiveReporter(title) {
+  intro(title);
+  const spin = spinner();
+  return {
+    showCode(userCode, approvalUrl) {
+      note(`Code: ${userCode}
+${approvalUrl}`, "Confirm this code in your browser");
+    },
+    startWaiting() {
+      spin.start("Waiting for approval in your browser");
+    },
+    stopWaiting(approved) {
+      if (approved) {
+        spin.stop("Approved");
+      } else {
+        spin.error("Approval failed");
+      }
+    },
+    success(message) {
+      log.success(message);
+    },
+    info(message) {
+      log.info(message);
+    },
+    warn(message) {
+      log.warn(message);
+    },
+    finish(message) {
+      outro(message ?? "Done");
+    }
+  };
+}
+function plainReporter(title) {
+  console.log(title);
+  return {
+    showCode(userCode, approvalUrl) {
+      console.log(`Confirm this code in your browser: ${userCode}`);
+      console.log(`Approval page: ${approvalUrl}`);
+    },
+    startWaiting() {
+      console.log("Waiting for approval...");
+    },
+    stopWaiting(approved) {
+      if (approved) console.log("Approved.");
+    },
+    success(message) {
+      console.log(message);
+    },
+    info(message) {
+      console.log(message);
+    },
+    warn(message) {
+      console.error(`warning: ${message}`);
+    },
+    finish(message) {
+      if (message !== void 0) console.log(message);
+    }
+  };
+}
+function createLoginReporter(title) {
+  return canPromptInteractively() ? interactiveReporter(title) : plainReporter(title);
+}
+function loginTokenName(explicit, hostName) {
+  const candidate = explicit ?? cliLoginTokenName(hostName);
+  const result = zResourceName.safeParse(candidate);
+  if (result.success) return result.data;
+  if (explicit === void 0) return cliLoginTokenName();
+  throw new CliInputError(`invalid token name:
+${z6.prettifyError(result.error)}`);
+}
+async function loginWithDevice(options) {
+  const { report } = options;
+  updateConfigFile({});
+  const start = await startDeviceAuth({
+    issuerUrl: options.issuerUrl,
+    clientId: OMNARA_CLI_OAUTH_CLIENT_ID,
+    tokenName: loginTokenName(options.tokenName, hostname())
+  });
+  report.showCode(start.userCode, start.verificationUriComplete);
+  if (options.browser) {
+    openInBrowser(start.verificationUriComplete, (message) => {
+      report.warn(message);
+    });
+  }
+  report.startWaiting();
+  let token;
+  try {
+    token = await pollDeviceAuthToken({
+      tokenEndpoint: start.tokenEndpoint,
+      clientId: start.clientId,
+      deviceCode: start.deviceCode,
+      intervalSeconds: start.intervalSeconds
+    });
+  } catch (error) {
+    report.stopWaiting(false);
+    throw error;
+  }
+  report.stopWaiting(true);
+  const saved = updateConfigFile({
+    token,
+    api_url: options.apiUrl,
+    issuer_url: options.issuerUrl
+  });
+  const client2 = createOmnaraClient({ baseUrl: options.apiUrl, auth: bearerToken(token) });
+  let orgId = saved.org_id;
+  let projectId = saved.project_id;
+  let loginMessage = "Logged in";
+  let validationWarning;
+  try {
+    const { data: me } = await sdk_gen_exports.getCurrentUser({ client: client2 });
+    loginMessage = `Logged in as ${me.user.email || me.user.display_name}`;
+    if (orgId !== void 0 && !me.orgs.some((org) => org.id === orgId)) {
+      updateConfigFile({ org_id: void 0, project_id: void 0 });
+      orgId = void 0;
+      projectId = void 0;
+      report.warn(
+        "Cleared the saved default organization and project: this account cannot access them."
+      );
+    } else if (orgId !== void 0 && projectId !== void 0 && !await isProjectVisible(client2, orgId, projectId)) {
+      updateConfigFile({ project_id: void 0 });
+      projectId = void 0;
+      report.warn("Cleared the saved default project: this account cannot access it.");
+    }
+  } catch (error) {
+    validationWarning = `could not verify the account or saved organization and project defaults: ${error instanceof Error ? error.message : String(error)}`;
+  }
+  report.success(loginMessage);
+  report.info(`Token saved to ${configFilePath()}`);
+  if (validationWarning !== void 0) report.warn(validationWarning);
+  if (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 };
+}
+
+// src/config.ts
+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,
@@ -7124,23 +7300,58 @@ function migrateLegacyBaseUrl(file) {
   if (baseUrl === void 0) return void 0;
   return rest;
 }
+function createTokenResolver(options) {
+  let token = options.savedToken;
+  let pending;
+  return () => {
+    if (token !== void 0) return Promise.resolve(token);
+    if (!options.canPrompt()) {
+      return Promise.reject(
+        new CliInputError("not logged in: run 'omnara login' or set OMNARA_API_KEY")
+      );
+    }
+    pending ??= options.login().then((result) => {
+      token = result;
+      return result;
+    });
+    return pending;
+  };
+}
 function loadConfig() {
   const loaded = readConfigFile();
   const migrated = migrateLegacyBaseUrl(loaded);
   const file = migrated === void 0 ? loaded : updateConfigFile({ ...migrated, base_url: void 0 });
   const { apiUrl, issuerUrl } = resolveUrls(file, process.env);
-  const token = process.env.OMNARA_API_KEY ?? file.token;
+  let saved = { orgId: file.org_id, projectId: file.project_id };
+  const resolveToken = createTokenResolver({
+    savedToken: process.env.OMNARA_API_KEY ?? file.token,
+    canPrompt: canPromptInteractively,
+    login: async () => {
+      const report = createLoginReporter(`Not logged in yet. Log in to ${issuerUrl}`);
+      const login = await loginWithDevice({ apiUrl, issuerUrl, browser: true, report });
+      saved = { orgId: login.orgId, projectId: login.projectId };
+      report.finish("Continuing");
+      return login.token;
+    }
+  });
   const client2 = createOmnaraClient({
     baseUrl: apiUrl,
-    auth: token ? bearerToken(token) : void 0,
+    auth: bearerToken(resolveToken),
     headers: { "User-Agent": "omnara-cli" }
   });
   return {
     client: client2,
     apiUrl,
     issuerUrl,
-    defaultOrgId: process.env.OMNARA_ORG_ID ?? file.org_id,
-    defaultProjectId: process.env.OMNARA_PROJECT_ID ?? file.project_id
+    get defaultOrgId() {
+      return process.env.OMNARA_ORG_ID ?? saved.orgId;
+    },
+    get defaultProjectId() {
+      return process.env.OMNARA_PROJECT_ID ?? saved.projectId;
+    },
+    ensureLoggedIn: async () => {
+      await resolveToken();
+    }
   };
 }
 function describeValue(envName, fileValue, defaultValue) {
@@ -7185,6 +7396,7 @@ function registerConfigCommand(program2, cli) {
       if (!canPromptInteractively()) {
         throw new CliInputError("interactive selection needs a terminal");
       }
+      await cli.ensureLoggedIn();
       const orgId = await promptOrgSelection(cli.client);
       const projectId = await promptProjectSelection(cli.client, orgId);
       updateConfigFile({ org_id: orgId, project_id: projectId });
@@ -7195,10 +7407,10 @@ function registerConfigCommand(program2, cli) {
 
 // src/factory.ts
 import { InvalidArgumentError } from "commander";
-import * as z7 from "zod";
+import * as z8 from "zod";
 
 // src/flags.ts
-import * as z6 from "zod";
+import * as z7 from "zod";
 function kebabCase(name) {
   return name.replace(/([a-z0-9])([A-Z])/g, "$1-$2").replaceAll("_", "-").toLowerCase();
 }
@@ -7315,21 +7527,21 @@ function finalizeFlag(draft) {
   };
 }
 function deriveFlags(schema) {
-  const jsonSchema = z6.toJSONSchema(schema, { io: "input" });
+  const jsonSchema = z7.toJSONSchema(schema, { io: "input" });
   const drafts = /* @__PURE__ */ new Map();
   collectDrafts(drafts, jsonSchema, [], false);
   return [...drafts.values()].map(finalizeFlag);
 }
 
 // src/reporter.ts
-import { intro, log, note, outro, spinner } from "@clack/prompts";
-function interactiveReporter(title) {
-  intro(title);
-  const spin = spinner();
+import { intro as intro2, log as log2, note as note2, outro as outro2, spinner as spinner2 } from "@clack/prompts";
+function interactiveReporter2(title) {
+  intro2(title);
+  const spin = spinner2();
   let spinning = false;
   return {
     url(label, href) {
-      note(href, label);
+      note2(href, label);
     },
     start(message) {
       spin.start(message);
@@ -7346,17 +7558,17 @@ function interactiveReporter(title) {
       spinning = false;
     },
     warn(message) {
-      log.warn(message);
+      log2.warn(message);
     },
     info(message) {
-      log.info(message);
+      log2.info(message);
     },
     done() {
-      outro("Done");
+      outro2("Done");
     }
   };
 }
-function plainReporter() {
+function plainReporter2() {
   return {
     url(label, href) {
       console.log(`${label}: ${href}`);
@@ -7382,7 +7594,7 @@ function plainReporter() {
   };
 }
 function createFlowReporter(title) {
-  return canPromptInteractively() ? interactiveReporter(title) : plainReporter();
+  return canPromptInteractively() ? interactiveReporter2(title) : plainReporter2();
 }
 
 // src/factory.ts
@@ -7496,7 +7708,7 @@ function parseWithSchema(schema, value, label) {
   const result = schema.safeParse(value);
   if (!result.success) {
     throw new CliInputError(`invalid ${label}:
-${z7.prettifyError(result.error)}`);
+${z8.prettifyError(result.error)}`);
   }
   return result.data;
 }
@@ -7504,7 +7716,7 @@ async function callOperation(spec, input) {
   const result = await spec.fn(input);
   return result.data;
 }
-var zBodyObject = z7.looseObject({});
+var zBodyObject = z8.looseObject({});
 function deepMerge(base, patch) {
   const merged = { ...base };
   for (const [key, value] of Object.entries(patch)) {
@@ -7582,6 +7794,7 @@ function registerOperation(parent, config2, spec) {
   command.option("--json", "print the raw JSON response");
   command.action(async (...args) => {
     await runCliAction(async () => {
+      await config2.ensureLoggedIn();
       const options = command.opts();
       const input = { client: config2.client };
       if (spec.path) {
@@ -7621,6 +7834,7 @@ function registerFlow(parent, config2, spec) {
   for (const flag of bodyFlags) registerFlag(command, flag);
   command.action(async (...args) => {
     await runCliAction(async () => {
+      await config2.ensureLoggedIn();
       const options = command.opts();
       await spec.execute({
         client: config2.client,
@@ -7641,175 +7855,17 @@ function registerGroup(program2, config2, group) {
 }
 
 // src/login.ts
-import { hostname } from "node:os";
-import { intro as intro2, log as log2, note as note2, outro as outro2, spinner as spinner2 } from "@clack/prompts";
-import * as z8 from "zod";
-
-// src/browser.ts
-import { spawn } from "node:child_process";
-function browserCommand(url4) {
-  if (process.platform === "darwin") {
-    return { command: "open", args: [url4], windowsVerbatimArguments: false };
-  }
-  if (process.platform === "win32") {
-    return {
-      command: "cmd",
-      args: ["/c", "start", '""', `"${url4}"`],
-      windowsVerbatimArguments: true
-    };
-  }
-  return { command: "xdg-open", args: [url4], windowsVerbatimArguments: false };
-}
-function openInBrowser(url4, onError) {
-  const { command, args, windowsVerbatimArguments } = browserCommand(url4);
-  const child = spawn(command, args, { stdio: "ignore", detached: true, windowsVerbatimArguments });
-  child.once("error", () => {
-    onError("could not open a browser; use the URL above");
-  });
-  child.unref();
-}
-
-// src/login.ts
-async function isProjectVisible(client2, orgId, projectId) {
-  let cursor;
-  do {
-    const { data } = await sdk_gen_exports.listVisibleProjects({
-      client: client2,
-      path: { orgID: orgId },
-      query: cursor === void 0 ? {} : { cursor }
-    });
-    if (data.data.some((project) => project.id === projectId)) return true;
-    cursor = data.next_cursor ?? void 0;
-  } while (cursor !== void 0);
-  return false;
-}
-function interactiveReporter2(issuerUrl) {
-  intro2(`Log in to ${issuerUrl}`);
-  const spin = spinner2();
-  return {
-    showCode(userCode, approvalUrl) {
-      note2(`Code: ${userCode}
-${approvalUrl}`, "Confirm this code in your browser");
-    },
-    startWaiting() {
-      spin.start("Waiting for approval in your browser");
-    },
-    stopWaiting(approved) {
-      if (approved) {
-        spin.stop("Approved");
-      } else {
-        spin.error("Approval failed");
-      }
-    },
-    success(message) {
-      log2.success(message);
-    },
-    info(message) {
-      log2.info(message);
-    },
-    warn(message) {
-      log2.warn(message);
-    },
-    finish(message) {
-      outro2(message ?? "Done");
-    }
-  };
-}
-function plainReporter2() {
-  return {
-    showCode(userCode, approvalUrl) {
-      console.log(`Confirm this code in your browser: ${userCode}`);
-      console.log(`Approval page: ${approvalUrl}`);
-    },
-    startWaiting() {
-      console.log("Waiting for approval...");
-    },
-    stopWaiting(approved) {
-      if (approved) console.log("Approved.");
-    },
-    success(message) {
-      console.log(message);
-    },
-    info(message) {
-      console.log(message);
-    },
-    warn(message) {
-      console.error(`warning: ${message}`);
-    },
-    finish(message) {
-      if (message !== void 0) console.log(message);
-    }
-  };
-}
-function loginTokenName(explicit, hostName) {
-  const candidate = explicit ?? cliLoginTokenName(hostName);
-  const result = zResourceName.safeParse(candidate);
-  if (result.success) return result.data;
-  if (explicit === void 0) return cliLoginTokenName();
-  throw new CliInputError(`invalid token name:
-${z8.prettifyError(result.error)}`);
-}
 function registerLoginCommand(program2, cli) {
   program2.command("login").description("Log in via the browser and save an API token").option("--no-browser", "print the approval URL instead of opening a browser").option("--token-name <name>", "name for the created API token").action(async (options) => {
     await runCliAction(async () => {
-      updateConfigFile({});
-      const report = canPromptInteractively() ? interactiveReporter2(cli.issuerUrl) : plainReporter2();
-      const start = await startDeviceAuth({
+      const report = createLoginReporter(`Log in to ${cli.issuerUrl}`);
+      const { orgId } = await loginWithDevice({
+        apiUrl: cli.apiUrl,
         issuerUrl: cli.issuerUrl,
-        clientId: OMNARA_CLI_OAUTH_CLIENT_ID,
-        tokenName: loginTokenName(options.tokenName, hostname())
+        browser: options.browser,
+        tokenName: options.tokenName,
+        report
       });
-      report.showCode(start.userCode, start.verificationUriComplete);
-      if (options.browser) {
-        openInBrowser(start.verificationUriComplete, (message) => {
-          report.warn(message);
-        });
-      }
-      report.startWaiting();
-      let token;
-      try {
-        token = await pollDeviceAuthToken({
-          tokenEndpoint: start.tokenEndpoint,
-          clientId: start.clientId,
-          deviceCode: start.deviceCode,
-          intervalSeconds: start.intervalSeconds
-        });
-      } catch (error) {
-        report.stopWaiting(false);
-        throw error;
-      }
-      report.stopWaiting(true);
-      const saved = updateConfigFile({
-        token,
-        api_url: cli.apiUrl,
-        issuer_url: cli.issuerUrl
-      });
-      const client2 = createOmnaraClient({ baseUrl: cli.apiUrl, auth: bearerToken(token) });
-      let orgId = saved.org_id;
-      let loginMessage = "Logged in";
-      let validationWarning;
-      try {
-        const { data: me } = await sdk_gen_exports.getCurrentUser({ client: client2 });
-        loginMessage = `Logged in as ${me.user.email || me.user.display_name}`;
-        if (orgId !== void 0 && !me.orgs.some((org) => org.id === orgId)) {
-          updateConfigFile({ org_id: void 0, project_id: void 0 });
-          orgId = void 0;
-          report.warn(
-            "Cleared the saved default organization and project: this account cannot access them."
-          );
-        } else if (orgId !== void 0 && saved.project_id !== void 0 && !await isProjectVisible(client2, orgId, saved.project_id)) {
-          updateConfigFile({ project_id: void 0 });
-          report.warn("Cleared the saved default project: this account cannot access it.");
-        }
-      } catch (error) {
-        validationWarning = `could not verify the account or saved organization and project defaults: ${error instanceof Error ? error.message : String(error)}`;
-      }
-      report.success(loginMessage);
-      report.info(`Token saved to ${configFilePath()}`);
-      if (validationWarning !== void 0) report.warn(validationWarning);
-      if (process.env.OMNARA_API_KEY !== void 0) {
-        report.warn("OMNARA_API_KEY is set and takes precedence over the saved token");
-      }
       if ((process.env.OMNARA_ORG_ID ?? orgId) === void 0) {
         report.finish("Run 'omnara config select' to choose a default organization and project.");
       } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omnara",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "Command-line interface for Omnara: launch and manage agents, organizations, integrations, and MCP servers",
   "license": "Apache-2.0",
   "homepage": "https://omnara.com",