omnara 1.0.28 → 1.0.29

package/dist/bin.js

@@ -16,10 +16,164 @@ import * as z4 from "zod";
 
 // ../sdk/src/generated/zod.gen.ts
 import * as z from "zod";
+var zAgentConfigDefinitionEventWebhook = z.object({
+  events: z.array(z.enum([
+    "agent_input",
+    "model_output",
+    "tool_result",
+    "context_checkpoint",
+    "tool_call_update"
+  ])).min(1),
+  signing_secret_id: z.string().min(1).optional(),
+  url: z.string().min(1)
+});
+var zAgentConfigDefinitionGitCredentials = z.object({
+  integration: z.string().regex(/^[a-zA-Z][a-zA-Z0-9-]{0,31}$/)
+});
+var zAgentConfigDefinitionInteractionHandler = z.record(z.string(), z.never());
+var zAgentConfigDefinitionInteractionHandlers = z.record(z.string(), zAgentConfigDefinitionInteractionHandler).nullable();
+var zAgentConfigDefinitionMcpAuth = z.object({
+  region: z.string().min(1).optional(),
+  secret_id: z.string().min(1).regex(/^sec_[a-z2-7]{26}$/),
+  service: z.string().min(1).optional(),
+  type: z.enum([
+    "bearer",
+    "oauth",
+    "sigv4"
+  ])
+});
+var zAgentConfigDefinitionSkills = z.array(z.string().regex(/^skl_[a-z2-7]{26}$/)).nullable();
+var zAgentConfigDefinitionSubagentInstruction = z.object({
+  append: z.string().optional()
+});
+var zAgentConfigDefinitionToolInputSchema = z.looseObject({
+  properties: z.record(z.string(), z.record(z.string(), z.unknown())).optional(),
+  required: z.array(z.string().min(1)).optional(),
+  type: z.literal("object")
+});
+var zAgentConfigDefinitionToolPermission = z.object({
+  mode: z.string().min(1).regex(/\S/),
+  parameters: z.record(z.string(), z.unknown()).optional()
+});
+var zAgentConfigDefinitionMcpTool = z.object({
+  deferred: z.boolean().nullish(),
+  enabled: z.boolean().nullish(),
+  permission: zAgentConfigDefinitionToolPermission.optional()
+});
+var zAgentConfigDefinitionMcpServer = z.object({
+  auth: zAgentConfigDefinitionMcpAuth.optional(),
+  default_enabled: z.boolean().nullish(),
+  deferred: z.boolean().optional(),
+  permission: zAgentConfigDefinitionToolPermission.optional(),
+  tools: z.record(z.string(), zAgentConfigDefinitionMcpTool).optional(),
+  url: z.string().min(1)
+});
+var zAgentConfigDefinitionMcpServers = z.record(z.string(), zAgentConfigDefinitionMcpServer).nullable();
+var zAgentConfigDefinitionTool = z.object({
+  deferred: z.boolean().optional(),
+  description: z.string().min(1).optional(),
+  enabled: z.boolean().nullish(),
+  input_schema: zAgentConfigDefinitionToolInputSchema.optional(),
+  permission: zAgentConfigDefinitionToolPermission.optional(),
+  type: z.enum(["built_in", "custom"]).optional()
+});
+var zAgentConfigDefinitionTools = z.record(z.string(), zAgentConfigDefinitionTool).nullable();
+var zEnvironmentVariableName = z.string().min(1).regex(/^[^=\x00]+$/);
+var zResourceNameReference = z.string().min(1).max(64).regex(/^\S(?:.*\S)?$/);
+var zAgentConfigDefinitionMachineSource = z.intersection(z.union([
+  z.record(z.string(), z.unknown()),
+  z.record(z.string(), z.unknown())
+]), z.object({
+  cwd: z.string().max(4096).optional(),
+  delete_after_idle_minutes: z.union([
+    z.literal(0),
+    z.int().gte(5).lte(2147483647)
+  ]).optional(),
+  description: z.string().max(4096).optional(),
+  env_overlay: z.record(z.string(), z.string().nullable()).nullish(),
+  initial_num_machines: z.int().gte(0).optional(),
+  machine_cpu: z.int().gte(1).lte(2147483647).optional(),
+  machine_memory_mb: z.int().gte(1).lte(2147483647).optional(),
+  machine_name: zResourceNameReference.optional(),
+  machine_pool_name: zResourceNameReference.optional(),
+  machine_provider_options_overlay: z.record(z.string(), z.unknown()).nullish(),
+  max_machines: z.int().gte(0).optional(),
+  secret_env_overlay: z.record(z.string(), z.string().regex(/^sec_[a-z2-7]{26}$/).nullable()).nullish()
+}));
+var zAgentConfigDefinitionMachineSources = z.array(zAgentConfigDefinitionMachineSource).nullable();
+var zAgentConfigDefinitionModel = z.object({
+  cache_retention: z.enum([
+    "none",
+    "short",
+    "long"
+  ]).optional(),
+  context_window_tokens: z.int().gte(1).optional(),
+  default_max_output_tokens: z.int().gte(1).optional(),
+  name: zResourceNameReference,
+  provider_config: zResourceNameReference,
+  reasoning: z.object({
+    effort: z.string().min(1).regex(/\S/)
+  }).optional()
+});
+var zAgentConfigDefinitionSubagentModel = z.object({
+  cache_retention: z.enum([
+    "none",
+    "short",
+    "long"
+  ]).optional(),
+  context_window_tokens: z.int().gte(1).optional(),
+  default_max_output_tokens: z.int().gte(1).optional(),
+  name: zResourceNameReference.optional(),
+  provider_config: zResourceNameReference.optional(),
+  reasoning: z.object({
+    effort: z.string().min(1).regex(/\S/)
+  }).optional()
+});
+var zAgentConfigDefinitionSubagent = z.object({
+  archive_after_idle_minutes: z.int().gte(1).lte(2147483647).optional(),
+  description: z.string().optional(),
+  instruction: zAgentConfigDefinitionSubagentInstruction.optional(),
+  max_instances: z.int().gte(1).lte(2147483647).optional(),
+  model: zAgentConfigDefinitionSubagentModel.optional(),
+  profile: zResourceNameReference.optional(),
+  type: z.enum(["profile", "self"])
+});
+var zAgentConfigDefinitionSubagents = z.record(z.string(), zAgentConfigDefinitionSubagent).nullable();
 var zResourceName = z.string().min(1).refine((value) => Array.from(value).length <= 64, { message: "Resource name cannot exceed 64 Unicode characters" }).transform((value) => value.normalize("NFC")).refine((value) => Array.from(value).length <= 64, { message: "Resource name cannot exceed 64 Unicode characters" }).refine((value) => !new RegExp("^\\p{White_Space}|\\p{White_Space}$", "u").test(value), { message: "Resource name must not start or end with whitespace" }).refine((value) => !/[\p{Cc}\p{Cf}\p{Cs}\p{Default_Ignorable_Code_Point}⠀]/u.test(value), { message: "Resource name contains an unsupported invisible, control, or format character" }).refine((value) => !value.includes("\uFFFD"), { message: "Resource name contains the Unicode replacement character" }).refine((value) => !Array.from(value).some((character) => character !== " " && new RegExp("\\p{White_Space}", "u").test(character)), { message: "Resource name may only use ordinary spaces" });
 var zAgentName = z.string().refine((value) => Array.from(value).length <= 64, { message: "Resource name cannot exceed 64 Unicode characters" }).transform((value) => value.normalize("NFC")).refine((value) => Array.from(value).length <= 64, { message: "Resource name cannot exceed 64 Unicode characters" }).refine((value) => !new RegExp("^\\p{White_Space}|\\p{White_Space}$", "u").test(value), { message: "Resource name must not start or end with whitespace" }).refine((value) => !/[\p{Cc}\p{Cf}\p{Cs}\p{Default_Ignorable_Code_Point}⠀]/u.test(value), { message: "Resource name contains an unsupported invisible, control, or format character" }).refine((value) => !value.includes("\uFFFD"), { message: "Resource name contains the Unicode replacement character" }).refine((value) => !Array.from(value).some((character) => character !== " " && new RegExp("\\p{White_Space}", "u").test(character)), { message: "Resource name may only use ordinary spaces" });
 var zSkillName = z.string().min(1).max(64).regex(/^[a-z0-9]+(?:-[a-z0-9]+)*$/);
 var zMemoryStoreName = z.string().min(1).max(64).regex(/^[a-z0-9]+(?:-[a-z0-9]+)*$/);
+var zAgentConfigDefinitionMemoryStore = z.object({
+  name: zMemoryStoreName,
+  access: z.enum(["read", "read_write"])
+});
+var zAgentConfigDefinitionMemoryStores = z.array(zAgentConfigDefinitionMemoryStore).nullable();
+var zAgentConfigDefinition = z.object({
+  event_webhook: zAgentConfigDefinitionEventWebhook.optional(),
+  git_credentials: zAgentConfigDefinitionGitCredentials.optional(),
+  instruction: z.string().min(1).regex(/\S/),
+  interaction_handlers: zAgentConfigDefinitionInteractionHandlers.optional(),
+  machine_sources: zAgentConfigDefinitionMachineSources.optional(),
+  max_depth: z.int().gte(1).lte(8).optional(),
+  max_subagents: z.int().gte(1).lte(2147483647).optional(),
+  mcp: zAgentConfigDefinitionMcpServers.optional(),
+  memory_stores: zAgentConfigDefinitionMemoryStores.optional(),
+  model: zAgentConfigDefinitionModel,
+  skills: zAgentConfigDefinitionSkills.optional(),
+  subagents: zAgentConfigDefinitionSubagents.optional(),
+  tools: zAgentConfigDefinitionTools.optional(),
+  version: z.enum(["v1"]).optional()
+});
+var zAgentConfigToolsDefinition = z.looseObject({
+  git_credentials: zAgentConfigDefinitionGitCredentials.optional(),
+  interaction_handlers: zAgentConfigDefinitionInteractionHandlers.optional(),
+  machine_sources: zAgentConfigDefinitionMachineSources.optional(),
+  mcp: zAgentConfigDefinitionMcpServers.optional(),
+  memory_stores: zAgentConfigDefinitionMemoryStores.optional(),
+  skills: zAgentConfigDefinitionSkills.optional(),
+  subagents: zAgentConfigDefinitionSubagents.optional(),
+  tools: zAgentConfigDefinitionTools.optional()
+});
 var zResourceListSort = z.enum([
   "name",
   "-name",
@@ -555,15 +709,22 @@ var zCreateSlackSetupRequest = z.object({
   return_to: z.string().optional()
 });
 var zResolveAgentConfigToolsRequest = z.object({
-  source: z.string().min(1),
+  source: z.union([
+    z.string().min(1),
+    zAgentConfigToolsDefinition
+  ]),
   source_format: z.enum(["yaml", "json"])
 });
+var zAgentConfigSourceInput = z.union([
+  z.string().min(1),
+  zAgentConfigDefinition
+]);
 var zCreateAgentConfigRequest = z.object({
-  source: z.string().min(1),
+  source: zAgentConfigSourceInput,
   source_format: z.enum(["yaml", "json"])
 });
 var zUpdateAgentConfigRequest = z.object({
-  source: z.string().min(1),
+  source: zAgentConfigSourceInput,
   source_format: z.enum(["yaml", "json"]),
   expected_current_config_id: zAgentConfigId.optional()
 });
@@ -829,6 +990,9 @@ var zAgentConfigSummary = z.object({
   instruction_hash: z.string().optional(),
   created_at: zTimestamp
 });
+var zAgentConfigGeneratedSource = z.object({
+  source: z.string()
+});
 var zCreateAgentProfileRequest = z.object({
   name: zResourceName,
   config: zAgentConfigId
@@ -1681,6 +1845,17 @@ var zArtifact = z.object({
   size_bytes: z.coerce.bigint().min(BigInt("-9223372036854775808"), { error: "Invalid value: Expected int64 to be >= -9223372036854775808" }).max(BigInt("9223372036854775807"), { error: "Invalid value: Expected int64 to be <= 9223372036854775807" }).optional(),
   created_at: zTimestamp
 });
+var zCheckMachinePoolConnectionRequest = z.object({
+  provider: z.string().min(1),
+  provider_auth_secret_id: zSecretId,
+  provider_config: z.record(z.string(), z.unknown()).optional(),
+  default_machine_provider_options: z.record(z.string(), z.unknown()).optional()
+});
+var zMachinePoolConnectionCheckError = z.object({
+  error: z.string(),
+  code: z.enum(["unprocessable", "upstream_unavailable"]),
+  details: z.string().optional()
+});
 var zCreateMachinePoolRequestBase = z.object({
   name: zResourceName,
   description: z.string().optional(),
@@ -1707,11 +1882,11 @@ var zCreateMachinePoolRequestBase = z.object({
 var zCreateMachinePoolRequest = zCreateMachinePoolRequestBase.and(z.union([
   z.object({
     provider: z.enum([
-      "unikraft",
-      "modal",
+      "arker",
       "freestyle",
+      "modal",
       "tenki",
-      "arker"
+      "unikraft"
     ]),
     default_machine_cpu: z.int().min(-2147483648, { error: "Invalid value: Expected int32 to be >= -2147483648" }).max(2147483647, { error: "Invalid value: Expected int32 to be <= 2147483647" }),
     default_machine_memory_mb: z.int().min(-2147483648, { error: "Invalid value: Expected int32 to be >= -2147483648" }).max(2147483647, { error: "Invalid value: Expected int32 to be <= 2147483647" }),
@@ -1722,9 +1897,9 @@ var zCreateMachinePoolRequest = zCreateMachinePoolRequestBase.and(z.union([
   }),
   z.object({
     provider: z.enum([
-      "daytona",
       "boxd",
-      "createos"
+      "createos",
+      "daytona"
     ]),
     max_total_cpu: z.int().min(-2147483648, { error: "Invalid value: Expected int32 to be >= -2147483648" }).max(2147483647, { error: "Invalid value: Expected int32 to be <= 2147483647" }),
     max_total_memory_mb: z.int().min(-2147483648, { error: "Invalid value: Expected int32 to be >= -2147483648" }).max(2147483647, { error: "Invalid value: Expected int32 to be <= 2147483647" }),
@@ -2423,24 +2598,6 @@ var zIntegrationRuntimeFailure = z.object({
   message: z.string(),
   retry_at: zTimestamp
 });
-var zConfigAgentToolInputSchema = z.object({
-  properties: z.record(z.string(), z.record(z.string(), z.unknown())).optional(),
-  required: z.array(z.string().min(1)).optional(),
-  type: z.literal("object")
-});
-var zConfigIntegrationCapabilitySource = z.record(z.string(), z.never());
-var zConfigToolPermissionSelection = z.object({
-  mode: z.string().min(1).regex(/\S/),
-  parameters: z.record(z.string(), z.unknown()).optional()
-});
-var zConfigToolSource = z.object({
-  deferred: z.boolean().optional(),
-  description: z.string().min(1).optional(),
-  enabled: z.boolean().nullish(),
-  input_schema: zConfigAgentToolInputSchema.optional(),
-  permission: zConfigToolPermissionSelection.optional(),
-  type: z.enum(["built_in", "custom"]).optional()
-});
 var zIntegrationName = z.string().regex(/^[a-zA-Z][a-zA-Z0-9-]{0,31}$/);
 var zCompiledGitCredentials = z.object({
   integration: zIntegrationName,
@@ -2593,16 +2750,27 @@ var zIntegrationSubscriptionAttachment = z.object({
   integration_id: zIntegrationId,
   conversation: zIntegrationConversation
 });
-var zCreateAgentRequest = z.object({
+var zCreateAgentRequest = z.intersection(z.union([
+  z.object({
+    profile: zAgentProfileId
+  }),
+  z.object({
+    config: zAgentConfigId
+  }),
+  z.object({
+    config_source: zCreateAgentConfigRequest
+  })
+]), z.object({
   profile: zAgentProfileId.optional(),
-  config: zAgentConfigId,
+  config: zAgentConfigId.optional(),
+  config_source: zCreateAgentConfigRequest.optional(),
   name: zAgentName.optional(),
   message: z.string().optional(),
-  tools: z.record(z.string(), zConfigToolSource).optional(),
+  tools: z.record(z.string(), zAgentConfigDefinitionTool).optional(),
   subscriptions: z.array(zIntegrationSubscriptionAttachment).max(100).optional(),
-  interaction_handlers: z.record(z.string(), zConfigIntegrationCapabilitySource).optional(),
+  interaction_handlers: z.record(z.string(), zAgentConfigDefinitionInteractionHandler).optional(),
   initial_input: zAgentLaunchInitialInput.optional()
-});
+}));
 var zCreateIntegrationSubscriptionRequest = z.object({
   agent_id: zAgentId,
   conversation: zIntegrationConversation
@@ -3187,6 +3355,15 @@ var zGetAgentConfigPath = z.object({
   agentConfigID: z.string().regex(/^acfg_[a-z2-7]{26}$/)
 });
 var zGetAgentConfigResponse = zAgentConfig;
+var zGetAgentConfigGeneratedSourcePath = z.object({
+  orgID: z.string().regex(/^org_[a-z2-7]{26}$/),
+  projectID: z.string().regex(/^proj_[a-z2-7]{26}$/),
+  agentConfigID: z.string().regex(/^acfg_[a-z2-7]{26}$/)
+});
+var zGetAgentConfigGeneratedSourceQuery = z.object({
+  source_format: z.enum(["yaml", "json"]).optional().default("yaml")
+});
+var zGetAgentConfigGeneratedSourceResponse = zAgentConfigGeneratedSource;
 var zListAgentProfilesPath = z.object({
   orgID: z.string().regex(/^org_[a-z2-7]{26}$/),
   projectID: z.string().regex(/^proj_[a-z2-7]{26}$/)
@@ -3762,6 +3939,10 @@ var zCreateMachinePoolPath = z.object({
   orgID: z.string().regex(/^org_[a-z2-7]{26}$/)
 });
 var zCreateMachinePoolResponse = zMachinePool;
+var zCheckMachinePoolConnectionPath = z.object({
+  orgID: z.string().regex(/^org_[a-z2-7]{26}$/)
+});
+var zCheckMachinePoolConnectionResponse = z.void();
 var zDeleteMachinePoolPath = z.object({
   orgID: z.string().regex(/^org_[a-z2-7]{26}$/),
   poolID: z.string().regex(/^mpo_[a-z2-7]{26}$/)
@@ -5375,6 +5556,7 @@ __export(sdk_gen_exports, {
   bootstrapDaemon: () => bootstrapDaemon,
   cancelAgent: () => cancelAgent,
   cancelQueuedBacklogInput: () => cancelQueuedBacklogInput,
+  checkMachinePoolConnection: () => checkMachinePoolConnection,
   configureIntegration: () => configureIntegration,
   connectByoMachine: () => connectByoMachine,
   createAgent: () => createAgent,
@@ -5436,6 +5618,7 @@ __export(sdk_gen_exports, {
   getActor: () => getActor,
   getAgent: () => getAgent,
   getAgentConfig: () => getAgentConfig,
+  getAgentConfigGeneratedSource: () => getAgentConfigGeneratedSource,
   getAgentProfile: () => getAgentProfile,
   getAgentProfileUsage: () => getAgentProfileUsage,
   getAgentUsage: () => getAgentUsage,
@@ -6786,6 +6969,20 @@ var getAgentConfig = (options) => (options.client ?? client).get({
   url: "/orgs/{orgID}/projects/{projectID}/agent-configs/{agentConfigID}",
   ...options
 });
+var getAgentConfigGeneratedSource = (options) => (options.client ?? client).get({
+  responseValidator: relaxedResponseValidator(zGetAgentConfigGeneratedSourceResponse),
+  security: [{
+    key: "bearerAuth",
+    scheme: "bearer",
+    type: "http"
+  }, {
+    in: "cookie",
+    name: "__Host-omnara_session",
+    type: "apiKey"
+  }],
+  url: "/orgs/{orgID}/projects/{projectID}/agent-configs/{agentConfigID}/generated-source",
+  ...options
+});
 var listAgentProfiles = (options) => (options.client ?? client).get({
   responseValidator: relaxedResponseValidator(zListAgentProfilesResponse2),
   security: [{
@@ -8022,6 +8219,28 @@ var createMachinePool = (options) => (options.client ?? client).post({
     ...options.headers
   }
 });
+var checkMachinePoolConnection = (options) => (options.client ?? client).post({
+  responseValidator: relaxedResponseValidator(zCheckMachinePoolConnectionResponse),
+  security: [
+    {
+      key: "bearerAuth",
+      scheme: "bearer",
+      type: "http"
+    },
+    {
+      in: "cookie",
+      name: "__Host-omnara_session",
+      type: "apiKey"
+    },
+    { name: "X-Omnara-Csrf", type: "apiKey" }
+  ],
+  url: "/orgs/{orgID}/machine-pools/check-connection",
+  ...options,
+  headers: {
+    "Content-Type": "application/json",
+    ...options.headers
+  }
+});
 var deleteMachinePool = (options) => (options.client ?? client).delete({
   responseValidator: relaxedResponseValidator(zDeleteMachinePoolResponse),
   security: [
@@ -11846,13 +12065,24 @@ function fileFormat(filePath) {
   if (lower.endsWith(".yaml") || lower.endsWith(".yml")) return "yaml";
   throw new CliInputError(`config file must end in .yaml, .yml, or .json: ${filePath}`);
 }
-function inlineFormat(source) {
-  try {
-    JSON.parse(source);
-    return "json";
-  } catch {
-    return "yaml";
+var zDefinitionText = zJsonText.pipe(
+  z20.custom(
+    (value) => z20.record(z20.string(), z20.unknown()).safeParse(value).success,
+    "expected a JSON object"
+  )
+);
+function jsonSource(text, label) {
+  const parsed = zDefinitionText.safeParse(text);
+  if (!parsed.success) {
+    throw new CliInputError(
+      `${label} is not a valid JSON agent config: ${parsed.error.issues[0]?.message}`
+    );
   }
+  return { source: text, source_format: "json" };
+}
+function inlineSource(source) {
+  if (!zJsonText.safeParse(source).success) return { source, source_format: "yaml" };
+  return jsonSource(source, "inline config source");
 }
 function renderConfigSource(attachment) {
   requireExactlyOne([attachment.file, attachment.source], SOURCE_HINT);
@@ -11864,11 +12094,10 @@ function renderConfigSource(attachment) {
     } catch {
       throw new CliInputError(`could not read config file: ${attachment.file}`);
     }
-    return { source, source_format: format };
-  }
-  if (attachment.source !== void 0) {
-    return { source: attachment.source, source_format: inlineFormat(attachment.source) };
+    if (format === "yaml") return { source, source_format: "yaml" };
+    return jsonSource(source, `config file ${attachment.file}`);
   }
+  if (attachment.source !== void 0) return inlineSource(attachment.source);
   throw new CliInputError(SOURCE_HINT);
 }
 async function resolveConfigId(client2, path, attachment) {
@@ -11881,6 +12110,18 @@ async function resolveConfigId(client2, path, attachment) {
   });
   return data.id;
 }
+var LAUNCH_HINT = "pass --profile or one of --config, --file, or --source";
+var LAUNCH_CONFIG_HINT = "pass at most one of --config, --file, or --source";
+function renderLaunchConfig(profile, attachment) {
+  const provided = [attachment.config, attachment.file, attachment.source].filter(
+    (value) => value !== void 0
+  );
+  if (provided.length > 1) throw new CliInputError(LAUNCH_CONFIG_HINT);
+  if (attachment.config !== void 0) return { profile, config: attachment.config };
+  if (provided.length === 1) return { profile, config_source: renderConfigSource(attachment) };
+  if (profile === void 0) throw new CliInputError(LAUNCH_HINT);
+  return { profile };
+}
 async function currentProfileConfigId(client2, path) {
   const { data } = await sdk_gen_exports.getAgentProfile({ client: client2, path });
   return data.current_config_id;
@@ -12536,32 +12777,34 @@ function serverEntry(url4, secretId) {
   return { url: url4, auth: { type: "oauth", secret_id: secretId } };
 }
 var zJsonRecord = z25.record(z25.string(), z25.json());
-function prepareJsonConfig(config2, serverName, mcpUrl) {
-  const json8 = zJsonText.safeParse(config2.source ?? "");
-  if (!json8.success) throw new CliInputError("the current agent config contains invalid JSON");
-  const parsed = zJsonRecord.safeParse(json8.data);
-  if (!parsed.success) throw new CliInputError("the current agent config must be an object");
-  const mcp = zJsonRecord.optional().safeParse(parsed.data.mcp);
-  if (!mcp.success) {
+var zDefinitionText2 = zJsonText.pipe(
+  z25.custom((value) => zJsonRecord.safeParse(value).success)
+);
+function prepareJsonConfig(configId, source, serverName, mcpUrl) {
+  const parsed = zDefinitionText2.safeParse(source);
+  if (!parsed.success) throw new CliInputError("the current agent config is not a JSON object");
+  const definition = parsed.data;
+  if (!zJsonRecord.nullish().safeParse(definition.mcp).success) {
     throw new CliInputError("the current agent config has an invalid mcp section");
   }
-  if (mcp.data !== void 0 && Object.hasOwn(mcp.data, serverName)) {
+  if (definition.mcp != null && Object.hasOwn(definition.mcp, serverName)) {
     throw new CliInputError(`MCP server ${serverName} already exists in the current config`);
   }
   return {
-    currentConfigId: config2.id,
+    currentConfigId: configId,
     render(secretId) {
-      const updated = {
-        ...parsed.data,
-        mcp: { ...mcp.data, [serverName]: serverEntry(mcpUrl, secretId) }
+      return {
+        source: {
+          ...definition,
+          mcp: { ...definition.mcp, [serverName]: serverEntry(mcpUrl, secretId) }
+        },
+        source_format: "json"
       };
-      return { source: `${JSON.stringify(updated, null, 2)}
-`, sourceFormat: "json" };
     }
   };
 }
-function prepareYamlConfig(config2, serverName, mcpUrl) {
-  const doc = parseDocument(config2.source ?? "");
+function prepareYamlConfig(configId, source, serverName, mcpUrl) {
+  const doc = parseDocument(source);
   if (doc.errors.length > 0) {
     throw new CliInputError("the current agent config contains invalid YAML");
   }
@@ -12577,14 +12820,14 @@ function prepareYamlConfig(config2, serverName, mcpUrl) {
     throw new CliInputError(`MCP server ${serverName} already exists in the current config`);
   }
   return {
-    currentConfigId: config2.id,
+    currentConfigId: configId,
     render(secretId) {
       if (isMap(mcp)) {
         doc.setIn(["mcp", serverName], serverEntry(mcpUrl, secretId));
       } else {
         doc.set("mcp", { [serverName]: serverEntry(mcpUrl, secretId) });
       }
-      return { source: doc.toString(), sourceFormat: "yaml" };
+      return { source: doc.toString(), source_format: "yaml" };
     }
   };
 }
@@ -12592,7 +12835,7 @@ function prepareConfig(config2, serverName, mcpUrl) {
   if (config2.source === void 0 || config2.source_format === void 0) {
     throw new CliInputError("the current agent config source is unavailable");
   }
-  return config2.source_format === "json" ? prepareJsonConfig(config2, serverName, mcpUrl) : prepareYamlConfig(config2, serverName, mcpUrl);
+  return config2.source_format === "json" ? prepareJsonConfig(config2.id, config2.source, serverName, mcpUrl) : prepareYamlConfig(config2.id, config2.source, serverName, mcpUrl);
 }
 async function loadConfig2(client2, scope, target, targetId) {
   const path = { orgID: scope.orgId, projectID: scope.projectId };
@@ -12609,6 +12852,14 @@ async function loadConfig2(client2, scope, target, targetId) {
   if (configId === void 0) throw new CliInputError("the agent has no current config");
   return (await sdk_gen_exports.getAgentConfig({ client: client2, path: { ...path, agentConfigID: configId } })).data;
 }
+async function withEditableSource(client2, scope, config2) {
+  if (config2.source !== void 0) return config2;
+  const { data } = await sdk_gen_exports.getAgentConfigGeneratedSource({
+    client: client2,
+    path: { orgID: scope.orgId, projectID: scope.projectId, agentConfigID: config2.id }
+  });
+  return { ...config2, source: data.source, source_format: "yaml" };
+}
 async function applyConfig(client2, scope, target, targetId, prepared, secret, report) {
   const rendered = prepared.render(secret.id);
   const path = { orgID: scope.orgId, projectID: scope.projectId };
@@ -12616,18 +12867,14 @@ async function applyConfig(client2, scope, target, targetId, prepared, secret, r
     const { data } = await sdk_gen_exports.updateAgentConfig({
       client: client2,
       path: { ...path, agentID: targetId },
-      body: {
-        source: rendered.source,
-        source_format: rendered.sourceFormat,
-        expected_current_config_id: prepared.currentConfigId
-      }
+      body: { ...rendered, expected_current_config_id: prepared.currentConfigId }
     });
     return data.agent_config.id;
   }
   const { data: config2 } = await sdk_gen_exports.createAgentConfig({
     client: client2,
     path,
-    body: { source: rendered.source, source_format: rendered.sourceFormat }
+    body: rendered
   });
   try {
     await sdk_gen_exports.updateAgentProfile({
@@ -12653,7 +12900,11 @@ async function runMcpAdd(context, target, targetId) {
     owner: { kind: "project", project_id: scope.projectId },
     name: secret_name ?? `${server_name}-mcp`
   };
-  const currentConfig = await loadConfig2(client2, scope, target, targetId);
+  const currentConfig = await withEditableSource(
+    client2,
+    scope,
+    await loadConfig2(client2, scope, target, targetId)
+  );
   const prepared = prepareConfig(currentConfig, server_name, request.mcp_url);
   let secret;
   try {
@@ -12826,15 +13077,14 @@ var commandGroups = [
         format: formatRecord(),
         path: zCreateAgentPath,
         body: zConfigAttachment.extend({
-          profile: zAgentProfileId.optional(),
+          profile: zAgentProfileId.optional().describe("agent profile ID; runs its current config unless a config is given"),
           name: zAgentName.optional(),
           message: z28.string().optional()
         }),
-        transformBody: async ({ profile, name, message, ...attachment }, { client: client2, path }) => ({
-          profile,
+        transformBody: ({ profile, name, message, ...attachment }) => ({
           name,
           message,
-          config: await resolveConfigId(client2, path, attachment)
+          ...renderLaunchConfig(profile, attachment)
         })
       }),
       op({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omnara",
-  "version": "1.0.28",
+  "version": "1.0.29",
   "description": "Command-line interface for Omnara: launch and manage agents, organizations, integrations, and MCP servers",
   "license": "Apache-2.0",
   "homepage": "https://omnara.com",
@@ -36,8 +36,8 @@
     "tsx": "^4.19.0",
     "typescript": "^5.6.0",
     "vitest": "4.1.9",
-    "@omnara/react": "0.0.0",
-    "@omnara/sdk": "0.0.0"
+    "@omnara/sdk": "0.0.0",
+    "@omnara/react": "0.0.0"
   },
   "scripts": {
     "build": "esbuild src/bin.ts --bundle --platform=node --format=esm --target=node22 --outfile=dist/bin.js --banner:js='#!/usr/bin/env node' --external:@clack/prompts --external:@tanstack/react-query --external:commander --external:ink --external:react --external:tar --external:yaml --external:zod",