omnara 1.0.4 → 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, {
@@ -157,6 +152,7 @@ __export(sdk_gen_exports, {
   updateProjectMachinePoolGrant: () => updateProjectMachinePoolGrant,
   updateProjectModelGrant: () => updateProjectModelGrant,
   updateSecret: () => updateSecret,
+  updateSkill: () => updateSkill,
   uploadDaemonArtifact: () => uploadDaemonArtifact
 });
 
@@ -210,7 +206,7 @@ function createSseClient({
   sseMaxRetryAttempts,
   sseMaxRetryDelay,
   sseSleepFn,
-  url: url3,
+  url: url4,
   ...options
 }) {
   let lastEventId;
@@ -234,9 +230,9 @@ function createSseClient({
           headers,
           signal
         };
-        let request = new Request(url3, requestInit);
+        let request = new Request(url4, requestInit);
         if (onRequest) {
-          request = await onRequest(url3, requestInit);
+          request = await onRequest(url4, requestInit);
         }
         const _fetch = options.fetch ?? globalThis.fetch;
         const response = await _fetch(request);
@@ -453,7 +449,7 @@ var serializeObjectParam = ({
 // ../sdk/src/generated/core/utils.gen.ts
 var PATH_PARAM_RE = /\{[^{}]+\}/g;
 var defaultPathSerializer = ({ path, url: _url }) => {
-  let url3 = _url;
+  let url4 = _url;
   const matches = _url.match(PATH_PARAM_RE);
   if (matches) {
     for (const match of matches) {
@@ -476,11 +472,11 @@ var defaultPathSerializer = ({ path, url: _url }) => {
         continue;
       }
       if (Array.isArray(value)) {
-        url3 = url3.replace(match, serializeArrayParam({ explode, name, style, value }));
+        url4 = url4.replace(match, serializeArrayParam({ explode, name, style, value }));
         continue;
       }
       if (typeof value === "object") {
-        url3 = url3.replace(
+        url4 = url4.replace(
           match,
           serializeObjectParam({
             explode,
@@ -493,7 +489,7 @@ var defaultPathSerializer = ({ path, url: _url }) => {
         continue;
       }
       if (style === "matrix") {
-        url3 = url3.replace(
+        url4 = url4.replace(
           match,
           `;${serializePrimitiveParam({
             name,
@@ -505,10 +501,10 @@ var defaultPathSerializer = ({ path, url: _url }) => {
       const replaceValue = encodeURIComponent(
         style === "label" ? `.${value}` : value
       );
-      url3 = url3.replace(match, replaceValue);
+      url4 = url4.replace(match, replaceValue);
     }
   }
-  return url3;
+  return url4;
 };
 var getUrl = ({
   baseUrl,
@@ -518,18 +514,18 @@ var getUrl = ({
   url: _url
 }) => {
   const pathUrl = _url.startsWith("/") ? _url : `/${_url}`;
-  let url3 = (baseUrl ?? "") + pathUrl;
+  let url4 = (baseUrl ?? "") + pathUrl;
   if (path) {
-    url3 = defaultPathSerializer({ path, url: url3 });
+    url4 = defaultPathSerializer({ path, url: url4 });
   }
   let search = query ? querySerializer(query) : "";
   if (search.startsWith("?")) {
     search = search.substring(1);
   }
   if (search) {
-    url3 += `?${search}`;
+    url4 += `?${search}`;
   }
-  return url3;
+  return url4;
 };
 function getValidRequestBody(options) {
   const hasBody = options.body !== void 0;
@@ -805,8 +801,8 @@ var createClient = (config2 = {}) => {
       opts.headers.delete("Content-Type");
     }
     const resolvedOpts = opts;
-    const url3 = buildUrl(resolvedOpts);
-    return { opts: resolvedOpts, url: url3 };
+    const url4 = buildUrl(resolvedOpts);
+    return { opts: resolvedOpts, url: url4 };
   };
   const request = async (options) => {
     const throwOnError = options.throwOnError ?? _config.throwOnError;
@@ -814,13 +810,13 @@ var createClient = (config2 = {}) => {
     let request2;
     let response;
     try {
-      const { opts, url: url3 } = await beforeRequest(options);
+      const { opts, url: url4 } = await beforeRequest(options);
       const requestInit = {
         redirect: "follow",
         ...opts,
         body: getValidRequestBody(opts)
       };
-      request2 = new Request(url3, requestInit);
+      request2 = new Request(url4, requestInit);
       for (const fn of interceptors.request.fns) {
         if (fn) {
           request2 = await fn(request2, opts);
@@ -922,13 +918,13 @@ var createClient = (config2 = {}) => {
   };
   const makeMethodFn = (method) => (options) => request({ ...options, method });
   const makeSseFn = (method) => async (options) => {
-    const { opts, url: url3 } = await beforeRequest(options);
+    const { opts, url: url4 } = await beforeRequest(options);
     return createSseClient({
       ...opts,
       body: opts.body,
       method,
-      onRequest: async (url4, init) => {
-        let request2 = new Request(url4, init);
+      onRequest: async (url5, init) => {
+        let request2 = new Request(url5, init);
         for (const fn of interceptors.request.fns) {
           if (fn) {
             request2 = await fn(request2, opts);
@@ -937,7 +933,7 @@ var createClient = (config2 = {}) => {
         return request2;
       },
       serializedBody: getValidRequestBody(opts),
-      url: url3
+      url: url4
     });
   };
   const _buildUrl = (options) => buildUrl({ ..._config, ...options });
@@ -971,7 +967,7 @@ var createClient = (config2 = {}) => {
 };
 
 // ../sdk/src/generated/client.gen.ts
-var client = createClient(createConfig({ throwOnError: true }));
+var client = createClient(createConfig({ baseUrl: "https://api.omnara.com/v1", throwOnError: true }));
 
 // ../sdk/src/generated/zod.gen.ts
 import * as z from "zod";
@@ -1247,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(),
@@ -1336,6 +1332,21 @@ var zCreateSkillRequest = z.object({
   owner: zSkillOwnerInput,
   archive: z.string()
 });
+var zUpdateSkillRequest = z.intersection(z.union([
+  z.object({
+    archive: z.string()
+  }),
+  z.object({
+    skill_md: z.string()
+  })
+]), z.object({
+  archive: z.string().optional(),
+  skill_md: z.string().optional()
+}));
+var zSkillFile = z.object({
+  path: z.string(),
+  size: z.coerce.bigint().gte(BigInt(0)).max(BigInt("9223372036854775807"), { error: "Invalid value: Expected int64 to be <= 9223372036854775807" })
+});
 var zSkill = z.object({
   id: zSkillId,
   org_id: zOrganizationId,
@@ -1345,6 +1356,7 @@ var zSkill = z.object({
   revision: z.int().gte(1).max(2147483647, { error: "Invalid value: Expected int32 to be <= 2147483647" }),
   description: z.string(),
   skill_md: z.string().optional(),
+  files: z.array(zSkillFile).optional(),
   created_at: zTimestamp,
   updated_at: zTimestamp
 });
@@ -1831,6 +1843,15 @@ var zInlineMediaContentBlock = z.object({
     "text/markdown",
     "text/csv",
     "text/tab-separated-values",
+    "text/x-iif",
+    "application/msword",
+    "application/rtf",
+    "application/vnd.oasis.opendocument.text",
+    "application/vnd.apple.pages",
+    "application/vnd.apple.keynote",
+    "application/vnd.apple.iwork",
+    "application/vnd.ms-powerpoint",
+    "application/vnd.ms-excel",
     "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
     "application/vnd.openxmlformats-officedocument.presentationml.presentation",
     "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
@@ -3256,6 +3277,11 @@ var zGetSkillPath = z.object({
   skillID: z.string().regex(/^skl_[a-z2-7]{26}$/)
 });
 var zGetSkillResponse = zSkill;
+var zUpdateSkillPath = z.object({
+  orgID: z.string().regex(/^org_[a-z2-7]{26}$/),
+  skillID: z.string().regex(/^skl_[a-z2-7]{26}$/)
+});
+var zUpdateSkillResponse = zSkill;
 var zListSkillGrantsPath = z.object({
   orgID: z.string().regex(/^org_[a-z2-7]{26}$/),
   skillID: zSkillId
@@ -4099,7 +4125,7 @@ var listPersonalAccessTokens = (options) => (options?.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/personal-access-tokens",
+  url: "/personal-access-tokens",
   ...options
 });
 var createPersonalAccessToken = (options) => (options.client ?? client).post({
@@ -4109,7 +4135,7 @@ var createPersonalAccessToken = (options) => (options.client ?? client).post({
     name: "__Host-omnara_session",
     type: "apiKey"
   }, { name: "X-Omnara-Csrf", type: "apiKey" }],
-  url: "/api/v1/personal-access-tokens",
+  url: "/personal-access-tokens",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -4131,7 +4157,7 @@ var revokePersonalAccessToken = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/personal-access-tokens/{tokenID}/revoke",
+  url: "/personal-access-tokens/{tokenID}/revoke",
   ...options
 });
 var bootstrapDaemon = (options) => (options?.client ?? client).post({
@@ -4141,7 +4167,7 @@ var bootstrapDaemon = (options) => (options?.client ?? client).post({
     scheme: "bearer",
     type: "http"
   }],
-  url: "/api/v1/daemon/bootstrap",
+  url: "/daemon/bootstrap",
   ...options
 });
 var recordMachineFailure = (options) => (options.client ?? client).post({
@@ -4152,7 +4178,7 @@ var recordMachineFailure = (options) => (options.client ?? client).post({
     scheme: "bearer",
     type: "http"
   }],
-  url: "/api/v1/daemon/failures",
+  url: "/daemon/failures",
   ...options,
   headers: {
     "Content-Type": "text/plain",
@@ -4174,7 +4200,7 @@ var createOrganization = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs",
+  url: "/orgs",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -4196,7 +4222,7 @@ var deleteOrganization = (options) => (options.client ?? client).delete({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}",
+  url: "/orgs/{orgID}",
   ...options
 });
 var deleteCurrentUser = (options) => (options?.client ?? client).delete({
@@ -4214,7 +4240,7 @@ var deleteCurrentUser = (options) => (options?.client ?? client).delete({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/me",
+  url: "/me",
   ...options
 });
 var getCurrentUser = (options) => (options?.client ?? client).get({
@@ -4228,7 +4254,7 @@ var getCurrentUser = (options) => (options?.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/me",
+  url: "/me",
   ...options
 });
 var listPendingInvitations = (options) => (options?.client ?? client).get({
@@ -4242,7 +4268,7 @@ var listPendingInvitations = (options) => (options?.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/invitations",
+  url: "/invitations",
   ...options
 });
 var acceptInvitation = (options) => (options.client ?? client).post({
@@ -4260,7 +4286,7 @@ var acceptInvitation = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/invitations/{invitationID}/accept",
+  url: "/invitations/{invitationID}/accept",
   ...options
 });
 var declineInvitation = (options) => (options.client ?? client).post({
@@ -4278,7 +4304,7 @@ var declineInvitation = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/invitations/{invitationID}/decline",
+  url: "/invitations/{invitationID}/decline",
   ...options
 });
 var getOrgOverview = (options) => (options.client ?? client).get({
@@ -4292,7 +4318,7 @@ var getOrgOverview = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/overview",
+  url: "/orgs/{orgID}/overview",
   ...options
 });
 var listVisibleProjects = (options) => (options.client ?? client).get({
@@ -4306,7 +4332,7 @@ var listVisibleProjects = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/projects",
+  url: "/orgs/{orgID}/projects",
   ...options
 });
 var createProject = (options) => (options.client ?? client).post({
@@ -4324,7 +4350,7 @@ var createProject = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects",
+  url: "/orgs/{orgID}/projects",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -4346,7 +4372,7 @@ var deleteProject = (options) => (options.client ?? client).delete({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}",
+  url: "/orgs/{orgID}/projects/{projectID}",
   ...options
 });
 var listOrgMembers = (options) => (options.client ?? client).get({
@@ -4360,7 +4386,7 @@ var listOrgMembers = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/members",
+  url: "/orgs/{orgID}/members",
   ...options
 });
 var removeOrgMember = (options) => (options.client ?? client).delete({
@@ -4378,7 +4404,7 @@ var removeOrgMember = (options) => (options.client ?? client).delete({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/members/{userID}",
+  url: "/orgs/{orgID}/members/{userID}",
   ...options
 });
 var updateOrgMember = (options) => (options.client ?? client).patch({
@@ -4396,7 +4422,7 @@ var updateOrgMember = (options) => (options.client ?? client).patch({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/members/{userID}",
+  url: "/orgs/{orgID}/members/{userID}",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -4414,7 +4440,7 @@ var listMemberProjectAccess = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/members/{userID}/projects",
+  url: "/orgs/{orgID}/members/{userID}/projects",
   ...options
 });
 var removeMemberProjectAccess = (options) => (options.client ?? client).delete({
@@ -4432,7 +4458,7 @@ var removeMemberProjectAccess = (options) => (options.client ?? client).delete({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/members/{userID}/projects/{projectID}",
+  url: "/orgs/{orgID}/members/{userID}/projects/{projectID}",
   ...options
 });
 var setMemberProjectAccess = (options) => (options.client ?? client).put({
@@ -4450,7 +4476,7 @@ var setMemberProjectAccess = (options) => (options.client ?? client).put({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/members/{userID}/projects/{projectID}",
+  url: "/orgs/{orgID}/members/{userID}/projects/{projectID}",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -4468,7 +4494,7 @@ var listOrgApiKeys = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/api-keys",
+  url: "/orgs/{orgID}/api-keys",
   ...options
 });
 var createOrgApiKey = (options) => (options.client ?? client).post({
@@ -4478,7 +4504,7 @@ var createOrgApiKey = (options) => (options.client ?? client).post({
     name: "__Host-omnara_session",
     type: "apiKey"
   }, { name: "X-Omnara-Csrf", type: "apiKey" }],
-  url: "/api/v1/orgs/{orgID}/api-keys",
+  url: "/orgs/{orgID}/api-keys",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -4496,7 +4522,7 @@ var getOrgApiKey = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/api-keys/{keyID}",
+  url: "/orgs/{orgID}/api-keys/{keyID}",
   ...options
 });
 var updateOrgApiKey = (options) => (options.client ?? client).patch({
@@ -4506,7 +4532,7 @@ var updateOrgApiKey = (options) => (options.client ?? client).patch({
     name: "__Host-omnara_session",
     type: "apiKey"
   }, { name: "X-Omnara-Csrf", type: "apiKey" }],
-  url: "/api/v1/orgs/{orgID}/api-keys/{keyID}",
+  url: "/orgs/{orgID}/api-keys/{keyID}",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -4520,7 +4546,7 @@ var revokeOrgApiKey = (options) => (options.client ?? client).post({
     name: "__Host-omnara_session",
     type: "apiKey"
   }, { name: "X-Omnara-Csrf", type: "apiKey" }],
-  url: "/api/v1/orgs/{orgID}/api-keys/{keyID}/revoke",
+  url: "/orgs/{orgID}/api-keys/{keyID}/revoke",
   ...options
 });
 var listOrgApiKeyProjectAccess = (options) => (options.client ?? client).get({
@@ -4534,7 +4560,7 @@ var listOrgApiKeyProjectAccess = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/api-keys/{keyID}/projects",
+  url: "/orgs/{orgID}/api-keys/{keyID}/projects",
   ...options
 });
 var removeOrgApiKeyProjectRole = (options) => (options.client ?? client).delete({
@@ -4544,7 +4570,7 @@ var removeOrgApiKeyProjectRole = (options) => (options.client ?? client).delete(
     name: "__Host-omnara_session",
     type: "apiKey"
   }, { name: "X-Omnara-Csrf", type: "apiKey" }],
-  url: "/api/v1/orgs/{orgID}/api-keys/{keyID}/projects/{projectID}",
+  url: "/orgs/{orgID}/api-keys/{keyID}/projects/{projectID}",
   ...options
 });
 var setOrgApiKeyProjectRole = (options) => (options.client ?? client).put({
@@ -4554,7 +4580,7 @@ var setOrgApiKeyProjectRole = (options) => (options.client ?? client).put({
     name: "__Host-omnara_session",
     type: "apiKey"
   }, { name: "X-Omnara-Csrf", type: "apiKey" }],
-  url: "/api/v1/orgs/{orgID}/api-keys/{keyID}/projects/{projectID}",
+  url: "/orgs/{orgID}/api-keys/{keyID}/projects/{projectID}",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -4572,7 +4598,7 @@ var listOrgInvitations = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/invitations",
+  url: "/orgs/{orgID}/invitations",
   ...options
 });
 var createOrgInvitation = (options) => (options.client ?? client).post({
@@ -4590,7 +4616,7 @@ var createOrgInvitation = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/invitations",
+  url: "/orgs/{orgID}/invitations",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -4612,7 +4638,7 @@ var deleteOrgInvitation = (options) => (options.client ?? client).delete({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/invitations/{invitationID}",
+  url: "/orgs/{orgID}/invitations/{invitationID}",
   ...options
 });
 var listSkills = (options) => (options.client ?? client).get({
@@ -4626,7 +4652,7 @@ var listSkills = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/skills",
+  url: "/orgs/{orgID}/skills",
   ...options
 });
 var createSkill = (options) => (options.client ?? client).post({
@@ -4645,7 +4671,7 @@ var createSkill = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/skills",
+  url: "/orgs/{orgID}/skills",
   ...options,
   headers: {
     "Content-Type": null,
@@ -4667,7 +4693,7 @@ var deleteSkill = (options) => (options.client ?? client).delete({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/skills/{skillID}",
+  url: "/orgs/{orgID}/skills/{skillID}",
   ...options
 });
 var getSkill = (options) => (options.client ?? client).get({
@@ -4681,9 +4707,32 @@ var getSkill = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/skills/{skillID}",
+  url: "/orgs/{orgID}/skills/{skillID}",
   ...options
 });
+var updateSkill = (options) => (options.client ?? client).post({
+  ...formDataBodySerializer,
+  responseValidator: async (data) => await validateResponse(zUpdateSkillResponse, data),
+  security: [
+    {
+      key: "bearerAuth",
+      scheme: "bearer",
+      type: "http"
+    },
+    {
+      in: "cookie",
+      name: "__Host-omnara_session",
+      type: "apiKey"
+    },
+    { name: "X-Omnara-Csrf", type: "apiKey" }
+  ],
+  url: "/orgs/{orgID}/skills/{skillID}",
+  ...options,
+  headers: {
+    "Content-Type": null,
+    ...options.headers
+  }
+});
 var listSkillGrants = (options) => (options.client ?? client).get({
   responseValidator: async (data) => await validateResponse(zListSkillGrantsResponse2, data),
   security: [{
@@ -4695,7 +4744,7 @@ var listSkillGrants = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/skills/{skillID}/grants",
+  url: "/orgs/{orgID}/skills/{skillID}/grants",
   ...options
 });
 var createSkillGrant = (options) => (options.client ?? client).post({
@@ -4713,7 +4762,7 @@ var createSkillGrant = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/skills/{skillID}/grants",
+  url: "/orgs/{orgID}/skills/{skillID}/grants",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -4735,7 +4784,7 @@ var deleteSkillGrant = (options) => (options.client ?? client).delete({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/skills/{skillID}/grants/{grantID}",
+  url: "/orgs/{orgID}/skills/{skillID}/grants/{grantID}",
   ...options
 });
 var listProjectAvailableSkills = (options) => (options.client ?? client).get({
@@ -4749,7 +4798,7 @@ var listProjectAvailableSkills = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/skills",
+  url: "/orgs/{orgID}/projects/{projectID}/skills",
   ...options
 });
 var listSecrets = (options) => (options.client ?? client).get({
@@ -4763,7 +4812,7 @@ var listSecrets = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/secrets",
+  url: "/orgs/{orgID}/secrets",
   ...options
 });
 var createSecret = (options) => (options.client ?? client).post({
@@ -4781,7 +4830,7 @@ var createSecret = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/secrets",
+  url: "/orgs/{orgID}/secrets",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -4803,7 +4852,7 @@ var startSecretMcpoAuth = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/secrets/mcp-oauth",
+  url: "/orgs/{orgID}/secrets/mcp-oauth",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -4825,7 +4874,7 @@ var deleteSecret = (options) => (options.client ?? client).delete({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/secrets/{secretID}",
+  url: "/orgs/{orgID}/secrets/{secretID}",
   ...options
 });
 var getSecret = (options) => (options.client ?? client).get({
@@ -4839,7 +4888,7 @@ var getSecret = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/secrets/{secretID}",
+  url: "/orgs/{orgID}/secrets/{secretID}",
   ...options
 });
 var updateSecret = (options) => (options.client ?? client).patch({
@@ -4857,7 +4906,7 @@ var updateSecret = (options) => (options.client ?? client).patch({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/secrets/{secretID}",
+  url: "/orgs/{orgID}/secrets/{secretID}",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -4879,7 +4928,7 @@ var createSecretVersion = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/secrets/{secretID}/versions",
+  url: "/orgs/{orgID}/secrets/{secretID}/versions",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -4897,7 +4946,7 @@ var listSecretGrants = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/secrets/{secretID}/grants",
+  url: "/orgs/{orgID}/secrets/{secretID}/grants",
   ...options
 });
 var createSecretGrant = (options) => (options.client ?? client).post({
@@ -4915,7 +4964,7 @@ var createSecretGrant = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/secrets/{secretID}/grants",
+  url: "/orgs/{orgID}/secrets/{secretID}/grants",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -4937,7 +4986,7 @@ var deleteSecretGrant = (options) => (options.client ?? client).delete({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/secrets/{secretID}/grants/{grantID}",
+  url: "/orgs/{orgID}/secrets/{secretID}/grants/{grantID}",
   ...options
 });
 var listIntegrationInstalls = (options) => (options.client ?? client).get({
@@ -4951,7 +5000,7 @@ var listIntegrationInstalls = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/integration-installs",
+  url: "/orgs/{orgID}/projects/{projectID}/integration-installs",
   ...options
 });
 var deleteIntegrationInstall = (options) => (options.client ?? client).delete({
@@ -4969,7 +5018,7 @@ var deleteIntegrationInstall = (options) => (options.client ?? client).delete({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/integration-installs/{integrationInstallID}",
+  url: "/orgs/{orgID}/projects/{projectID}/integration-installs/{integrationInstallID}",
   ...options
 });
 var createAgentConfig = (options) => (options.client ?? client).post({
@@ -4987,7 +5036,7 @@ var createAgentConfig = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agent-configs",
+  url: "/orgs/{orgID}/projects/{projectID}/agent-configs",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -5005,7 +5054,7 @@ var getToolCatalog = (options) => (options?.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/tool-catalog",
+  url: "/tool-catalog",
   ...options
 });
 var listMcpServers = (options) => (options?.client ?? client).get({
@@ -5019,7 +5068,7 @@ var listMcpServers = (options) => (options?.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/mcp-servers",
+  url: "/mcp-servers",
   ...options
 });
 var listMcpServerTools = (options) => (options.client ?? client).post({
@@ -5037,7 +5086,7 @@ var listMcpServerTools = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/mcp-servers/tools",
+  url: "/orgs/{orgID}/projects/{projectID}/mcp-servers/tools",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -5055,7 +5104,7 @@ var getAgentConfig = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agent-configs/{agentConfigID}",
+  url: "/orgs/{orgID}/projects/{projectID}/agent-configs/{agentConfigID}",
   ...options
 });
 var listAgentProfiles = (options) => (options.client ?? client).get({
@@ -5069,7 +5118,7 @@ var listAgentProfiles = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agent-profiles",
+  url: "/orgs/{orgID}/projects/{projectID}/agent-profiles",
   ...options
 });
 var createAgentProfile = (options) => (options.client ?? client).post({
@@ -5087,7 +5136,7 @@ var createAgentProfile = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agent-profiles",
+  url: "/orgs/{orgID}/projects/{projectID}/agent-profiles",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -5109,7 +5158,7 @@ var deleteAgentProfile = (options) => (options.client ?? client).delete({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agent-profiles/{agentProfileID}",
+  url: "/orgs/{orgID}/projects/{projectID}/agent-profiles/{agentProfileID}",
   ...options
 });
 var getAgentProfile = (options) => (options.client ?? client).get({
@@ -5123,7 +5172,7 @@ var getAgentProfile = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agent-profiles/{agentProfileID}",
+  url: "/orgs/{orgID}/projects/{projectID}/agent-profiles/{agentProfileID}",
   ...options
 });
 var renameAgentProfile = (options) => (options.client ?? client).patch({
@@ -5141,7 +5190,7 @@ var renameAgentProfile = (options) => (options.client ?? client).patch({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agent-profiles/{agentProfileID}",
+  url: "/orgs/{orgID}/projects/{projectID}/agent-profiles/{agentProfileID}",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -5163,7 +5212,7 @@ var updateAgentProfile = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agent-profiles/{agentProfileID}/config",
+  url: "/orgs/{orgID}/projects/{projectID}/agent-profiles/{agentProfileID}/config",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -5185,7 +5234,7 @@ var createIntegrationOAuthSetup = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agent-profiles/{agentProfileID}/integration-oauth/setup",
+  url: "/orgs/{orgID}/projects/{projectID}/agent-profiles/{agentProfileID}/integration-oauth/setup",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -5207,7 +5256,7 @@ var createSlackSetup = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agent-profiles/{agentProfileID}/slack-setup",
+  url: "/orgs/{orgID}/projects/{projectID}/agent-profiles/{agentProfileID}/slack-setup",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -5225,7 +5274,7 @@ var listCronTriggers = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/cron-triggers",
+  url: "/orgs/{orgID}/projects/{projectID}/cron-triggers",
   ...options
 });
 var createCronTrigger = (options) => (options.client ?? client).post({
@@ -5243,7 +5292,7 @@ var createCronTrigger = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/cron-triggers",
+  url: "/orgs/{orgID}/projects/{projectID}/cron-triggers",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -5265,7 +5314,7 @@ var deleteCronTrigger = (options) => (options.client ?? client).delete({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/cron-triggers/{cronTriggerID}",
+  url: "/orgs/{orgID}/projects/{projectID}/cron-triggers/{cronTriggerID}",
   ...options
 });
 var getCronTrigger = (options) => (options.client ?? client).get({
@@ -5279,7 +5328,7 @@ var getCronTrigger = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/cron-triggers/{cronTriggerID}",
+  url: "/orgs/{orgID}/projects/{projectID}/cron-triggers/{cronTriggerID}",
   ...options
 });
 var updateCronTrigger = (options) => (options.client ?? client).patch({
@@ -5297,7 +5346,7 @@ var updateCronTrigger = (options) => (options.client ?? client).patch({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/cron-triggers/{cronTriggerID}",
+  url: "/orgs/{orgID}/projects/{projectID}/cron-triggers/{cronTriggerID}",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -5315,7 +5364,7 @@ var listAgents = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agents",
+  url: "/orgs/{orgID}/projects/{projectID}/agents",
   ...options
 });
 var createAgent = (options) => (options.client ?? client).post({
@@ -5333,7 +5382,7 @@ var createAgent = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agents",
+  url: "/orgs/{orgID}/projects/{projectID}/agents",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -5351,7 +5400,7 @@ var getAgent = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agents/{agentID}",
+  url: "/orgs/{orgID}/projects/{projectID}/agents/{agentID}",
   ...options
 });
 var archiveAgent = (options) => (options.client ?? client).post({
@@ -5369,7 +5418,7 @@ var archiveAgent = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agents/{agentID}/archive",
+  url: "/orgs/{orgID}/projects/{projectID}/agents/{agentID}/archive",
   ...options
 });
 var updateAgentConfig = (options) => (options.client ?? client).post({
@@ -5387,7 +5436,7 @@ var updateAgentConfig = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agents/{agentID}/config",
+  url: "/orgs/{orgID}/projects/{projectID}/agents/{agentID}/config",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -5409,7 +5458,7 @@ var createAgentInput = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agents/{agentID}/inputs",
+  url: "/orgs/{orgID}/projects/{projectID}/agents/{agentID}/inputs",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -5427,7 +5476,7 @@ var listToolCalls = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agents/{agentID}/tool-calls",
+  url: "/orgs/{orgID}/projects/{projectID}/agents/{agentID}/tool-calls",
   ...options
 });
 var submitToolCallResult = (options) => (options.client ?? client).post({
@@ -5445,7 +5494,7 @@ var submitToolCallResult = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agents/{agentID}/tool-calls/{toolCallID}/result",
+  url: "/orgs/{orgID}/projects/{projectID}/agents/{agentID}/tool-calls/{toolCallID}/result",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -5463,7 +5512,7 @@ var listTurns = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agents/{agentID}/turns",
+  url: "/orgs/{orgID}/projects/{projectID}/agents/{agentID}/turns",
   ...options
 });
 var listTurnEvents = (options) => (options.client ?? client).get({
@@ -5477,7 +5526,7 @@ var listTurnEvents = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agents/{agentID}/turns/{turnID}/events",
+  url: "/orgs/{orgID}/projects/{projectID}/agents/{agentID}/turns/{turnID}/events",
   ...options
 });
 var listEvents = (options) => (options.client ?? client).get({
@@ -5491,7 +5540,7 @@ var listEvents = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agents/{agentID}/events",
+  url: "/orgs/{orgID}/projects/{projectID}/agents/{agentID}/events",
   ...options
 });
 var streamEvents = (options) => (options.client ?? client).sse.get({
@@ -5505,7 +5554,7 @@ var streamEvents = (options) => (options.client ?? client).sse.get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agents/{agentID}/events/stream",
+  url: "/orgs/{orgID}/projects/{projectID}/agents/{agentID}/events/stream",
   ...options
 });
 var cancelAgent = (options) => (options.client ?? client).post({
@@ -5523,7 +5572,7 @@ var cancelAgent = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agents/{agentID}/cancel",
+  url: "/orgs/{orgID}/projects/{projectID}/agents/{agentID}/cancel",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -5541,7 +5590,7 @@ var listAgentInteractions = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agents/{agentID}/interactions",
+  url: "/orgs/{orgID}/projects/{projectID}/agents/{agentID}/interactions",
   ...options
 });
 var resolveAgentInteraction = (options) => (options.client ?? client).post({
@@ -5559,7 +5608,7 @@ var resolveAgentInteraction = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agents/{agentID}/interactions/{interactionID}/resolve",
+  url: "/orgs/{orgID}/projects/{projectID}/agents/{agentID}/interactions/{interactionID}/resolve",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -5577,7 +5626,7 @@ var listQueuedBacklogInputs = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agents/{agentID}/inputs/backlog",
+  url: "/orgs/{orgID}/projects/{projectID}/agents/{agentID}/inputs/backlog",
   ...options
 });
 var cancelQueuedBacklogInput = (options) => (options.client ?? client).post({
@@ -5595,7 +5644,7 @@ var cancelQueuedBacklogInput = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agents/{agentID}/inputs/{inputID}/cancel",
+  url: "/orgs/{orgID}/projects/{projectID}/agents/{agentID}/inputs/{inputID}/cancel",
   ...options
 });
 var moveQueuedBacklogInput = (options) => (options.client ?? client).post({
@@ -5613,7 +5662,7 @@ var moveQueuedBacklogInput = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agents/{agentID}/inputs/{inputID}/move",
+  url: "/orgs/{orgID}/projects/{projectID}/agents/{agentID}/inputs/{inputID}/move",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -5635,7 +5684,7 @@ var promoteQueuedInputToSteering = (options) => (options.client ?? client).post(
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agents/{agentID}/inputs/{inputID}/promote_to_steering",
+  url: "/orgs/{orgID}/projects/{projectID}/agents/{agentID}/inputs/{inputID}/promote_to_steering",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -5657,7 +5706,7 @@ var demoteSteeringInputToQueued = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agents/{agentID}/inputs/{inputID}/demote_to_queued",
+  url: "/orgs/{orgID}/projects/{projectID}/agents/{agentID}/inputs/{inputID}/demote_to_queued",
   ...options
 });
 var getArtifact = (options) => (options.client ?? client).get({
@@ -5671,7 +5720,7 @@ var getArtifact = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agents/{agentID}/artifacts/{artifactID}",
+  url: "/orgs/{orgID}/projects/{projectID}/agents/{agentID}/artifacts/{artifactID}",
   ...options
 });
 var getArtifactContent = (options) => (options.client ?? client).get({
@@ -5685,7 +5734,7 @@ var getArtifactContent = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/agents/{agentID}/artifacts/{artifactID}/content",
+  url: "/orgs/{orgID}/projects/{projectID}/agents/{agentID}/artifacts/{artifactID}/content",
   ...options
 });
 var listVisibleProjectMachines = (options) => (options.client ?? client).get({
@@ -5699,7 +5748,7 @@ var listVisibleProjectMachines = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/machines",
+  url: "/orgs/{orgID}/projects/{projectID}/machines",
   ...options
 });
 var listProjectMachineGrants = (options) => (options.client ?? client).get({
@@ -5713,7 +5762,7 @@ var listProjectMachineGrants = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/machine-grants",
+  url: "/orgs/{orgID}/projects/{projectID}/machine-grants",
   ...options
 });
 var createProjectMachineGrant = (options) => (options.client ?? client).post({
@@ -5731,7 +5780,7 @@ var createProjectMachineGrant = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/machine-grants",
+  url: "/orgs/{orgID}/projects/{projectID}/machine-grants",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -5753,7 +5802,7 @@ var deleteProjectMachineGrant = (options) => (options.client ?? client).delete({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/machine-grants/{grantID}",
+  url: "/orgs/{orgID}/projects/{projectID}/machine-grants/{grantID}",
   ...options
 });
 var listProjectAvailableSecrets = (options) => (options.client ?? client).get({
@@ -5767,7 +5816,7 @@ var listProjectAvailableSecrets = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/secrets",
+  url: "/orgs/{orgID}/projects/{projectID}/secrets",
   ...options
 });
 var getProjectAvailableSecret = (options) => (options.client ?? client).get({
@@ -5781,7 +5830,7 @@ var getProjectAvailableSecret = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/secrets/{secretID}",
+  url: "/orgs/{orgID}/projects/{projectID}/secrets/{secretID}",
   ...options
 });
 var listActors = (options) => (options.client ?? client).get({
@@ -5795,7 +5844,7 @@ var listActors = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/actors",
+  url: "/orgs/{orgID}/projects/{projectID}/actors",
   ...options
 });
 var putActor = (options) => (options.client ?? client).put({
@@ -5813,7 +5862,7 @@ var putActor = (options) => (options.client ?? client).put({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/actors",
+  url: "/orgs/{orgID}/projects/{projectID}/actors",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -5831,7 +5880,7 @@ var getActor = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/actors/{actorID}",
+  url: "/orgs/{orgID}/projects/{projectID}/actors/{actorID}",
   ...options
 });
 var listVisibleMachines = (options) => (options.client ?? client).get({
@@ -5845,7 +5894,7 @@ var listVisibleMachines = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/machines",
+  url: "/orgs/{orgID}/machines",
   ...options
 });
 var createMachine = (options) => (options.client ?? client).post({
@@ -5863,7 +5912,7 @@ var createMachine = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/machines",
+  url: "/orgs/{orgID}/machines",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -5885,7 +5934,7 @@ var connectByoMachine = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/machines/connect",
+  url: "/orgs/{orgID}/machines/connect",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -5907,7 +5956,7 @@ var deleteMachine = (options) => (options.client ?? client).delete({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/machines/{machineID}",
+  url: "/orgs/{orgID}/machines/{machineID}",
   ...options
 });
 var getMachine = (options) => (options.client ?? client).get({
@@ -5921,7 +5970,7 @@ var getMachine = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/machines/{machineID}",
+  url: "/orgs/{orgID}/machines/{machineID}",
   ...options
 });
 var updateMachine = (options) => (options.client ?? client).patch({
@@ -5939,7 +5988,7 @@ var updateMachine = (options) => (options.client ?? client).patch({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/machines/{machineID}",
+  url: "/orgs/{orgID}/machines/{machineID}",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -5957,7 +6006,7 @@ var listModelProviderConfigs = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/model-provider-configs",
+  url: "/orgs/{orgID}/model-provider-configs",
   ...options
 });
 var createModelProviderConfig = (options) => (options.client ?? client).post({
@@ -5975,7 +6024,7 @@ var createModelProviderConfig = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/model-provider-configs",
+  url: "/orgs/{orgID}/model-provider-configs",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -5997,7 +6046,7 @@ var deleteModelProviderConfig = (options) => (options.client ?? client).delete({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/model-provider-configs/{modelProviderConfigID}",
+  url: "/orgs/{orgID}/model-provider-configs/{modelProviderConfigID}",
   ...options
 });
 var getModelProviderConfig = (options) => (options.client ?? client).get({
@@ -6011,7 +6060,7 @@ var getModelProviderConfig = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/model-provider-configs/{modelProviderConfigID}",
+  url: "/orgs/{orgID}/model-provider-configs/{modelProviderConfigID}",
   ...options
 });
 var updateModelProviderConfig = (options) => (options.client ?? client).put({
@@ -6029,7 +6078,7 @@ var updateModelProviderConfig = (options) => (options.client ?? client).put({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/model-provider-configs/{modelProviderConfigID}",
+  url: "/orgs/{orgID}/model-provider-configs/{modelProviderConfigID}",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -6047,7 +6096,7 @@ var getModelCatalog = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/model-provider-configs/{modelProviderConfigID}/model-catalog",
+  url: "/orgs/{orgID}/model-provider-configs/{modelProviderConfigID}/model-catalog",
   ...options
 });
 var listConfiguredModels = (options) => (options.client ?? client).get({
@@ -6061,7 +6110,7 @@ var listConfiguredModels = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/model-provider-configs/{modelProviderConfigID}/models",
+  url: "/orgs/{orgID}/model-provider-configs/{modelProviderConfigID}/models",
   ...options
 });
 var createConfiguredModel = (options) => (options.client ?? client).post({
@@ -6079,7 +6128,7 @@ var createConfiguredModel = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/model-provider-configs/{modelProviderConfigID}/models",
+  url: "/orgs/{orgID}/model-provider-configs/{modelProviderConfigID}/models",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -6101,7 +6150,7 @@ var deleteConfiguredModel = (options) => (options.client ?? client).delete({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/model-provider-configs/{modelProviderConfigID}/models/{configuredModelID}",
+  url: "/orgs/{orgID}/model-provider-configs/{modelProviderConfigID}/models/{configuredModelID}",
   ...options
 });
 var updateConfiguredModel = (options) => (options.client ?? client).put({
@@ -6119,7 +6168,7 @@ var updateConfiguredModel = (options) => (options.client ?? client).put({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/model-provider-configs/{modelProviderConfigID}/models/{configuredModelID}",
+  url: "/orgs/{orgID}/model-provider-configs/{modelProviderConfigID}/models/{configuredModelID}",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -6137,7 +6186,7 @@ var listProjectModelGrants = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/model-grants",
+  url: "/orgs/{orgID}/projects/{projectID}/model-grants",
   ...options
 });
 var createProjectModelGrant = (options) => (options.client ?? client).post({
@@ -6155,7 +6204,7 @@ var createProjectModelGrant = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/model-grants",
+  url: "/orgs/{orgID}/projects/{projectID}/model-grants",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -6177,7 +6226,7 @@ var deleteProjectModelGrant = (options) => (options.client ?? client).delete({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/model-grants/{modelGrantID}",
+  url: "/orgs/{orgID}/projects/{projectID}/model-grants/{modelGrantID}",
   ...options
 });
 var updateProjectModelGrant = (options) => (options.client ?? client).patch({
@@ -6195,7 +6244,7 @@ var updateProjectModelGrant = (options) => (options.client ?? client).patch({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/model-grants/{modelGrantID}",
+  url: "/orgs/{orgID}/projects/{projectID}/model-grants/{modelGrantID}",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -6213,7 +6262,7 @@ var listMachinePools = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/machine-pools",
+  url: "/orgs/{orgID}/machine-pools",
   ...options
 });
 var createMachinePool = (options) => (options.client ?? client).post({
@@ -6231,7 +6280,7 @@ var createMachinePool = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/machine-pools",
+  url: "/orgs/{orgID}/machine-pools",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -6253,7 +6302,7 @@ var deleteMachinePool = (options) => (options.client ?? client).delete({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/machine-pools/{poolID}",
+  url: "/orgs/{orgID}/machine-pools/{poolID}",
   ...options
 });
 var getMachinePool = (options) => (options.client ?? client).get({
@@ -6267,7 +6316,7 @@ var getMachinePool = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/machine-pools/{poolID}",
+  url: "/orgs/{orgID}/machine-pools/{poolID}",
   ...options
 });
 var updateMachinePool = (options) => (options.client ?? client).put({
@@ -6285,7 +6334,7 @@ var updateMachinePool = (options) => (options.client ?? client).put({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/machine-pools/{poolID}",
+  url: "/orgs/{orgID}/machine-pools/{poolID}",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -6303,7 +6352,7 @@ var listProjectMachinePoolGrants = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/machine-pool-grants",
+  url: "/orgs/{orgID}/projects/{projectID}/machine-pool-grants",
   ...options
 });
 var createProjectMachinePoolGrant = (options) => (options.client ?? client).post({
@@ -6321,7 +6370,7 @@ var createProjectMachinePoolGrant = (options) => (options.client ?? client).post
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/machine-pool-grants",
+  url: "/orgs/{orgID}/projects/{projectID}/machine-pool-grants",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -6343,7 +6392,7 @@ var deleteProjectMachinePoolGrant = (options) => (options.client ?? client).dele
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/machine-pool-grants/{poolGrantID}",
+  url: "/orgs/{orgID}/projects/{projectID}/machine-pool-grants/{poolGrantID}",
   ...options
 });
 var getProjectMachinePoolGrant = (options) => (options.client ?? client).get({
@@ -6357,7 +6406,7 @@ var getProjectMachinePoolGrant = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/machine-pool-grants/{poolGrantID}",
+  url: "/orgs/{orgID}/projects/{projectID}/machine-pool-grants/{poolGrantID}",
   ...options
 });
 var updateProjectMachinePoolGrant = (options) => (options.client ?? client).patch({
@@ -6375,7 +6424,7 @@ var updateProjectMachinePoolGrant = (options) => (options.client ?? client).patc
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/projects/{projectID}/machine-pool-grants/{poolGrantID}",
+  url: "/orgs/{orgID}/projects/{projectID}/machine-pool-grants/{poolGrantID}",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -6393,7 +6442,7 @@ var listByoMachineDaemonTokens = (options) => (options.client ?? client).get({
     name: "__Host-omnara_session",
     type: "apiKey"
   }],
-  url: "/api/v1/orgs/{orgID}/machines/{machineID}/daemon-tokens",
+  url: "/orgs/{orgID}/machines/{machineID}/daemon-tokens",
   ...options
 });
 var createByoMachineDaemonToken = (options) => (options.client ?? client).post({
@@ -6411,7 +6460,7 @@ var createByoMachineDaemonToken = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/machines/{machineID}/daemon-tokens",
+  url: "/orgs/{orgID}/machines/{machineID}/daemon-tokens",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -6433,7 +6482,7 @@ var revokeMachineDaemonToken = (options) => (options.client ?? client).post({
     },
     { name: "X-Omnara-Csrf", type: "apiKey" }
   ],
-  url: "/api/v1/orgs/{orgID}/machines/{machineID}/daemon-tokens/{tokenID}/revoke",
+  url: "/orgs/{orgID}/machines/{machineID}/daemon-tokens/{tokenID}/revoke",
   ...options
 });
 var registerMachineDaemonRuntime = (options) => (options.client ?? client).post({
@@ -6443,7 +6492,7 @@ var registerMachineDaemonRuntime = (options) => (options.client ?? client).post(
     scheme: "bearer",
     type: "http"
   }],
-  url: "/api/v1/daemon/runtimes",
+  url: "/daemon/runtimes",
   ...options,
   headers: {
     "Content-Type": "application/json",
@@ -6456,7 +6505,7 @@ var socketMachineDaemonRuntime = (options) => (options.client ?? client).get({
     scheme: "bearer",
     type: "http"
   }],
-  url: "/api/v1/daemon/runtimes/{runtimeID}/socket",
+  url: "/daemon/runtimes/{runtimeID}/socket",
   ...options
 });
 var endMachineDaemonRuntime = (options) => (options.client ?? client).post({
@@ -6466,7 +6515,7 @@ var endMachineDaemonRuntime = (options) => (options.client ?? client).post({
     scheme: "bearer",
     type: "http"
   }],
-  url: "/api/v1/daemon/runtimes/{runtimeID}/end",
+  url: "/daemon/runtimes/{runtimeID}/end",
   ...options
 });
 var sleepMachineDaemonRuntime = (options) => (options.client ?? client).post({
@@ -6476,7 +6525,7 @@ var sleepMachineDaemonRuntime = (options) => (options.client ?? client).post({
     scheme: "bearer",
     type: "http"
   }],
-  url: "/api/v1/daemon/runtimes/{runtimeID}/sleep",
+  url: "/daemon/runtimes/{runtimeID}/sleep",
   ...options
 });
 var getDaemonSkillArchive = (options) => (options.client ?? client).get({
@@ -6486,7 +6535,7 @@ var getDaemonSkillArchive = (options) => (options.client ?? client).get({
     scheme: "bearer",
     type: "http"
   }],
-  url: "/api/v1/daemon/skills/{skillID}/archive",
+  url: "/daemon/skills/{skillID}/archive",
   ...options
 });
 var uploadDaemonArtifact = (options) => (options.client ?? client).post({
@@ -6497,7 +6546,7 @@ var uploadDaemonArtifact = (options) => (options.client ?? client).post({
     scheme: "bearer",
     type: "http"
   }],
-  url: "/api/v1/daemon/tool-calls/{toolCallID}/artifact",
+  url: "/daemon/tool-calls/{toolCallID}/artifact",
   ...options,
   headers: {
     "Content-Type": "application/octet-stream",
@@ -6511,7 +6560,7 @@ var downloadDaemonArtifact = (options) => (options.client ?? client).get({
     scheme: "bearer",
     type: "http"
   }],
-  url: "/api/v1/daemon/tool-calls/{toolCallID}/artifacts/{artifactID}/content",
+  url: "/daemon/tool-calls/{toolCallID}/artifacts/{artifactID}/content",
   ...options
 });
 
@@ -6564,7 +6613,9 @@ var ApiError = class _ApiError extends Error {
       data = void 0;
     }
     if (data && typeof data === "object") {
-      if ("error" in data && typeof data.error === "string") {
+      if ("error_description" in data && typeof data.error_description === "string") {
+        message = data.error_description;
+      } else if ("error" in data && typeof data.error === "string") {
         message = data.error;
       }
       if ("code" in data && typeof data.code === "string") {
@@ -6609,7 +6660,7 @@ function createOmnaraClient(options = {}) {
     })
   );
   client2.setConfig({
-    baseUrl: options.baseUrl ?? "",
+    baseUrl: options.baseUrl ?? client.getConfig().baseUrl,
     credentials: options.credentials,
     headers: options.headers
   });
@@ -6630,6 +6681,15 @@ function createOmnaraClient(options = {}) {
 
 // ../sdk/src/device.ts
 import * as z3 from "zod";
+var OMNARA_CLI_OAUTH_CLIENT_ID = "omnara-cli";
+var OAUTH_DEVICE_GRANT_TYPE = "urn:ietf:params:oauth:grant-type:device_code";
+var zAuthorizationServerMetadata = z3.object({
+  issuer: z3.url(),
+  device_authorization_endpoint: z3.url(),
+  token_endpoint: z3.url(),
+  grant_types_supported: z3.array(z3.string()),
+  token_endpoint_auth_methods_supported: z3.array(z3.string())
+});
 var zDeviceAuthStartResponse = z3.object({
   device_code: z3.string().min(1),
   user_code: z3.string().min(1),
@@ -6638,11 +6698,9 @@ var zDeviceAuthStartResponse = z3.object({
   expires_in: z3.number().int().positive(),
   interval: z3.number().int().positive()
 });
-var zDeviceAuthWaitingResponse = z3.object({
-  interval: z3.number().int().positive()
-});
-var zDeviceAuthFailureResponse = z3.object({
-  error: z3.enum(["access_denied", "expired_token"])
+var zDeviceAuthErrorResponse = z3.object({
+  error: z3.string().min(1),
+  error_description: z3.string().optional()
 });
 var zDeviceAuthApprovedResponse = z3.object({
   access_token: z3.string().min(1),
@@ -6660,29 +6718,55 @@ var DeviceAuthError = class extends Error {
     this.code = code;
   }
 };
-async function postDeviceAuthJSON(fetchImpl, baseUrl, path, body) {
-  return fetchImpl(`${baseUrl.replace(/\/+$/, "")}${path}`, {
+async function postOAuthForm(fetchImpl, endpoint, body) {
+  return fetchImpl(endpoint, {
     method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify(body)
+    headers: {
+      Accept: "application/json",
+      "Content-Type": "application/x-www-form-urlencoded"
+    },
+    body: new URLSearchParams(body).toString()
   });
 }
+function normalizeIssuer(raw) {
+  const issuer = new URL(raw);
+  if (issuer.username !== "" || issuer.password !== "" || issuer.pathname !== "/" || issuer.search !== "" || issuer.hash !== "") {
+    throw new Error("authorization server issuer must be an origin");
+  }
+  return issuer.origin;
+}
 async function startDeviceAuth(options) {
-  const response = await postDeviceAuthJSON(
-    options.fetch ?? fetch,
-    options.baseUrl,
-    "/api/auth/device/code",
-    { client_name: options.clientName, token_name: options.tokenName }
-  );
+  const fetchImpl = options.fetch ?? fetch;
+  const expectedIssuer = normalizeIssuer(options.issuerUrl);
+  const metadataUrl = new URL("/.well-known/oauth-authorization-server", `${expectedIssuer}/`);
+  const metadataResponse = await fetchImpl(metadataUrl, { headers: { Accept: "application/json" } });
+  if (!metadataResponse.ok) throw await ApiError.fromResponse(metadataResponse);
+  const metadata = zAuthorizationServerMetadata.parse(await metadataResponse.json());
+  if (normalizeIssuer(metadata.issuer) !== expectedIssuer) {
+    throw new Error(
+      `authorization server issuer mismatch: expected ${expectedIssuer}, received ${metadata.issuer}`
+    );
+  }
+  if (!metadata.grant_types_supported.includes(OAUTH_DEVICE_GRANT_TYPE)) {
+    throw new Error("authorization server does not support the OAuth device grant");
+  }
+  if (!metadata.token_endpoint_auth_methods_supported.includes("none")) {
+    throw new Error("authorization server does not support public OAuth clients");
+  }
+  const body = { client_id: options.clientId };
+  if (options.tokenName !== void 0) body.token_name = options.tokenName;
+  const response = await postOAuthForm(fetchImpl, metadata.device_authorization_endpoint, body);
   if (!response.ok) throw await ApiError.fromResponse(response);
   const data = zDeviceAuthStartResponse.parse(await response.json());
   return {
     deviceCode: data.device_code,
     userCode: data.user_code,
-    verificationUri: new URL(data.verification_uri, options.baseUrl).toString(),
-    verificationUriComplete: new URL(data.verification_uri_complete, options.baseUrl).toString(),
+    verificationUri: new URL(data.verification_uri, metadata.issuer).toString(),
+    verificationUriComplete: new URL(data.verification_uri_complete, metadata.issuer).toString(),
     expiresInSeconds: data.expires_in,
-    intervalSeconds: data.interval
+    intervalSeconds: data.interval,
+    tokenEndpoint: metadata.token_endpoint,
+    clientId: options.clientId
   };
 }
 function defaultSleep(seconds) {
@@ -6694,37 +6778,39 @@ async function pollDeviceAuthToken(options) {
   let interval = options.intervalSeconds;
   while (true) {
     await sleep2(interval);
-    const response = await postDeviceAuthJSON(
-      fetchImpl,
-      options.baseUrl,
-      "/api/auth/device/token",
-      {
-        device_code: options.deviceCode
-      }
-    );
+    const response = await postOAuthForm(fetchImpl, options.tokenEndpoint, {
+      grant_type: OAUTH_DEVICE_GRANT_TYPE,
+      device_code: options.deviceCode,
+      client_id: options.clientId
+    });
     if (response.status === 200) {
       return zDeviceAuthApprovedResponse.parse(await response.json()).access_token;
     }
-    if (response.status === 202) {
-      interval = zDeviceAuthWaitingResponse.parse(await response.json()).interval;
-      continue;
-    }
     if (response.status === 400) {
-      const failure = zDeviceAuthFailureResponse.safeParse(
+      const failure = zDeviceAuthErrorResponse.safeParse(
         await response.clone().json().catch(() => void 0)
       );
-      if (failure.success) throw new DeviceAuthError(failure.data.error);
+      if (failure.success) {
+        if (failure.data.error === "authorization_pending") continue;
+        if (failure.data.error === "slow_down") {
+          interval += 5;
+          continue;
+        }
+        if (failure.data.error === "access_denied" || failure.data.error === "expired_token") {
+          throw new DeviceAuthError(failure.data.error);
+        }
+      }
     }
     throw await ApiError.fromResponse(response);
   }
 }
 
-// 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();
@@ -6912,54 +6998,10 @@ ${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_BASE_URL = "https://app.omnara.com";
+// src/config-file.ts
 var zConfigFile = z5.looseObject({
+  api_url: z5.url().optional(),
+  issuer_url: z5.url().optional(),
   base_url: z5.url().optional(),
   token: z5.string().min(1).optional(),
   org_id: zOrganizationId.optional(),
@@ -7019,20 +7061,297 @@ ${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,
+    issuerUrl: env.OMNARA_ISSUER_URL ?? file.issuer_url ?? DEFAULT_ISSUER_URL
+  };
+}
+function migrateLegacyBaseUrl(file) {
+  const { base_url: baseUrl, ...rest } = 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 file = readConfigFile();
-  const baseUrl = process.env.OMNARA_BASE_URL ?? file.base_url ?? DEFAULT_BASE_URL;
-  const token = process.env.OMNARA_API_KEY ?? file.token;
+  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);
+  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,
-    auth: token ? bearerToken(token) : void 0,
+    baseUrl: apiUrl,
+    auth: bearerToken(resolveToken),
     headers: { "User-Agent": "omnara-cli" }
   });
   return {
     client: client2,
-    baseUrl,
-    defaultOrgId: process.env.OMNARA_ORG_ID ?? file.org_id,
-    defaultProjectId: process.env.OMNARA_PROJECT_ID ?? file.project_id
+    apiUrl,
+    issuerUrl,
+    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) {
@@ -7050,17 +7369,23 @@ function printConfig() {
   console.log(`config file  ${configFilePath()}`);
   console.log(`org_id       ${describeValue("OMNARA_ORG_ID", file.org_id)}`);
   console.log(`project_id   ${describeValue("OMNARA_PROJECT_ID", file.project_id)}`);
-  console.log(`base_url     ${describeValue("OMNARA_BASE_URL", file.base_url, DEFAULT_BASE_URL)}`);
+  const { apiUrl, issuerUrl } = resolveUrls(file, {});
+  console.log(`api_url      ${describeValue("OMNARA_API_URL", file.api_url, apiUrl)}`);
+  console.log(`issuer_url   ${describeValue("OMNARA_ISSUER_URL", file.issuer_url, issuerUrl)}`);
 }
 function registerConfigCommand(program2, cli) {
-  const config2 = program2.command("config").description("Show or set the default organization and project").option("--org <org-id>", "save this organization ID as the default").option("--project <project-id>", "save this project ID as the default").option("--base-url <url>", "save this API base URL as the default").action(async (options) => {
+  const config2 = program2.command("config").description("Show or set the default organization and project").option("--org <org-id>", "save this organization ID as the default").option("--project <project-id>", "save this project ID as the default").option("--api-url <url>", "save this API root URL (used for requests) as the default").option(
+    "--issuer-url <url>",
+    "save this web app origin (used for login and browser links) as the default"
+  ).action(async (options) => {
     await runCliAction(() => {
-      if (options.org !== void 0 || options.project !== void 0 || options.baseUrl !== void 0) {
+      if (options.org !== void 0 || options.project !== void 0 || options.apiUrl !== void 0 || options.issuerUrl !== void 0) {
         const clearStaleProject = options.org !== void 0 && options.project === void 0;
         updateConfigFile({
           ...options.org !== void 0 ? { org_id: options.org } : {},
           ...clearStaleProject ? { project_id: void 0 } : options.project !== void 0 ? { project_id: options.project } : {},
-          ...options.baseUrl !== void 0 ? { base_url: options.baseUrl } : {}
+          ...options.apiUrl !== void 0 ? { api_url: options.apiUrl } : {},
+          ...options.issuerUrl !== void 0 ? { issuer_url: options.issuerUrl } : {}
         });
       }
       printConfig();
@@ -7071,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 });
@@ -7081,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();
 }
@@ -7201,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);
@@ -7232,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}`);
@@ -7268,7 +7594,7 @@ function plainReporter() {
   };
 }
 function createFlowReporter(title) {
-  return canPromptInteractively() ? interactiveReporter(title) : plainReporter();
+  return canPromptInteractively() ? interactiveReporter2(title) : plainReporter2();
 }
 
 // src/factory.ts
@@ -7282,7 +7608,7 @@ function flowOp(spec) {
     type: "flow",
     execute: (input) => run({
       client: input.client,
-      baseUrl: input.baseUrl,
+      apiUrl: input.apiUrl,
       path: parseWithSchema(spec.path, input.path, "arguments"),
       body: parseWithSchema(spec.body, input.body, "flags"),
       report: createFlowReporter(spec.summary)
@@ -7382,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;
 }
@@ -7390,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)) {
@@ -7468,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) {
@@ -7492,7 +7819,9 @@ function registerOperation(parent, config2, spec) {
         renderResult(data, true);
         return;
       }
-      const formatted = spec.format(data, { baseUrl: config2.baseUrl });
+      const formatted = spec.format(data, {
+        apiUrl: config2.apiUrl
+      });
       renderResult(formatted.value, false, { columns: formatted.columns });
     });
   });
@@ -7505,10 +7834,11 @@ 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,
-        baseUrl: config2.baseUrl,
+        apiUrl: config2.apiUrl,
         path: await resolvePathValues(plan, args, options, config2),
         body: collectFlagValues(bodyFlags, options)
       });
@@ -7525,170 +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(url3) {
-  if (process.platform === "darwin") {
-    return { command: "open", args: [url3], windowsVerbatimArguments: false };
-  }
-  if (process.platform === "win32") {
-    return {
-      command: "cmd",
-      args: ["/c", "start", '""', `"${url3}"`],
-      windowsVerbatimArguments: true
-    };
-  }
-  return { command: "xdg-open", args: [url3], windowsVerbatimArguments: false };
-}
-function openInBrowser(url3, onError) {
-  const { command, args, windowsVerbatimArguments } = browserCommand(url3);
-  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(baseUrl) {
-  intro2(`Log in to ${baseUrl}`);
-  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 () => {
-      readConfigFileForUpdate();
-      const report = canPromptInteractively() ? interactiveReporter2(cli.baseUrl) : plainReporter2();
-      const start = await startDeviceAuth({
-        baseUrl: cli.baseUrl,
-        clientName: "Omnara CLI",
-        tokenName: loginTokenName(options.tokenName, hostname())
+      const report = createLoginReporter(`Log in to ${cli.issuerUrl}`);
+      const { orgId } = await loginWithDevice({
+        apiUrl: cli.apiUrl,
+        issuerUrl: cli.issuerUrl,
+        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({
-          baseUrl: cli.baseUrl,
-          deviceCode: start.deviceCode,
-          intervalSeconds: start.intervalSeconds
-        });
-      } catch (error) {
-        report.stopWaiting(false);
-        throw error;
-      }
-      report.stopWaiting(true);
-      const saved = updateConfigFile({ token, base_url: cli.baseUrl });
-      const client2 = createOmnaraClient({ baseUrl: cli.baseUrl, 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 {
@@ -7831,13 +8008,16 @@ async function connectMachine(context) {
 function shellQuote(value) {
   return `'${value.replaceAll("'", `'\\''`)}'`;
 }
-function installCommand(baseUrl) {
-  return `curl -fsSL ${shellQuote(`${baseUrl}/install/omnarad.sh`)} | sh`;
+function installScriptUrl(apiUrl) {
+  return new URL("/install/omnarad.sh", apiUrl).toString();
+}
+function installCommand(apiUrl) {
+  return `curl -fsSL ${shellQuote(installScriptUrl(apiUrl))} | sh`;
 }
-var formatMachineSetup = (response, { baseUrl }) => ({
+var formatMachineSetup = (response, { apiUrl }) => ({
   value: {
     ...response,
-    install_command: installCommand(baseUrl),
+    install_command: installCommand(apiUrl),
     install_note: "Run install_command on the target machine and paste the token when prompted."
   }
 });
@@ -7941,9 +8121,9 @@ function ensureDaemonHomeWritable(home) {
 var DaemonExitError = class extends Error {
 };
 async function runMachineCreateLocal(context) {
-  const { report, baseUrl } = context;
+  const { report, apiUrl } = context;
   ensureSupportedPlatform(process.platform, process.arch);
-  ensureDaemonApiUrl(baseUrl);
+  ensureDaemonApiUrl(apiUrl);
   const home = daemonHome();
   const existing = describeExistingInstallation(home);
   if (existing !== void 0) {
@@ -7961,7 +8141,7 @@ async function runMachineCreateLocal(context) {
   report.info(`Machine ID: ${machine.id}`);
   report.start("Installing omnarad on this machine");
   try {
-    await runInstaller(report, baseUrl, token, machine.id, home);
+    await runInstaller(report, apiUrl, token, machine.id, home);
   } catch (error) {
     if (error instanceof DaemonExitError) {
       report.fail("omnarad exited after it was installed");
@@ -7978,7 +8158,7 @@ async function runMachineCreateLocal(context) {
 ${token}`);
     report.url(
       "Finish setup by running this, then paste the machine token when prompted",
-      installCommand(baseUrl)
+      installCommand(apiUrl)
     );
     throw error;
   }
@@ -8035,11 +8215,11 @@ function readDaemonLockPid(home) {
     return void 0;
   }
 }
-function installerScript(baseUrl) {
+function installerScript(apiUrl) {
   return [
     "installer=$(mktemp)",
     `trap 'rm -f "$installer"' EXIT`,
-    `curl -qfsSL --connect-timeout 10 -m 60 --max-redirs 5 --max-filesize 1048576 --proto '=http,https' --proto-redir '=https' -o "$installer" ${shellQuote(`${baseUrl}/install/omnarad.sh`)}`,
+    `curl -qfsSL --connect-timeout 10 -m 60 --max-redirs 5 --max-filesize 1048576 --proto '=http,https' --proto-redir '=https' -o "$installer" ${shellQuote(installScriptUrl(apiUrl))}`,
     'sh "$installer"'
   ].join(" && ");
 }
@@ -8048,11 +8228,11 @@ function installerFailure(code, signal, log3) {
   return new Error(`omnarad installer failed (${reason})${log3 === "" ? "" : `
 ${log3}`}`);
 }
-function runInstaller(report, baseUrl, token, machineId, home) {
+function runInstaller(report, apiUrl, token, machineId, home) {
   return new Promise((resolve3, reject) => {
-    const child = spawn2("/bin/sh", ["-c", installerScript(baseUrl)], {
+    const child = spawn2("/bin/sh", ["-c", installerScript(apiUrl)], {
       stdio: ["ignore", "pipe", "pipe"],
-      env: { ...process.env, OMNARA_API_URL: baseUrl, OMNARA_MACHINE_TOKEN: token }
+      env: { ...process.env, OMNARA_API_URL: apiUrl, OMNARA_MACHINE_TOKEN: token }
     });
     const relay = (signal) => {
       child.kill(signal);
@@ -8174,10 +8354,10 @@ async function authorizeMcpOAuthSecret(options) {
   });
 }
 var zBrowserFlag = z11.boolean().default(true).describe("open the authorization URL in a browser");
-function openAuthorizationUrl(report, title, url3, browser) {
-  report.url(title, url3);
+function openAuthorizationUrl(report, title, url4, browser) {
+  report.url(title, url4);
   if (browser) {
-    openInBrowser(url3, (message) => {
+    openInBrowser(url4, (message) => {
       report.warn(message);
     });
   }
@@ -8192,8 +8372,8 @@ async function runMcpOAuth(context) {
       client: client2,
       orgId: path.orgID,
       request,
-      onAuthorization(url3) {
-        openAuthorizationUrl(report, "Authorize this MCP server in your browser", url3, browser);
+      onAuthorization(url4) {
+        openAuthorizationUrl(report, "Authorize this MCP server in your browser", url4, browser);
         report.start("Waiting for the secret to be created");
       }
     });
@@ -8219,8 +8399,8 @@ var zMcpAddBody = zMcpoAuthStartRequest.omit({ owner: true, name: true }).extend
 function targetLabel(target) {
   return target === "agent" ? "agent" : "agent profile";
 }
-function serverEntry(url3, secretId) {
-  return { url: url3, auth: { type: "oauth", secret_id: secretId } };
+function serverEntry(url4, secretId) {
+  return { url: url4, auth: { type: "oauth", secret_id: secretId } };
 }
 var zJsonRecord = z12.record(z12.string(), z12.json());
 function prepareJsonConfig(config2, serverName, mcpUrl) {
@@ -8352,8 +8532,8 @@ async function runMcpAdd(context, target, targetId) {
       client: client2,
       orgId: scope.orgId,
       request,
-      onAuthorization(url3) {
-        openAuthorizationUrl(report, "Authorize this MCP server in your browser", url3, browser);
+      onAuthorization(url4) {
+        openAuthorizationUrl(report, "Authorize this MCP server in your browser", url4, browser);
         report.start("Waiting for the MCP OAuth secret to be created");
       }
     });