omnara 1.0.12 → 1.0.14

package/dist/bin.js

@@ -67,10 +67,6 @@ var zError = z.object({
     "authentication_unavailable"
   ])
 });
-var zWarning = z.object({
-  message: z.string(),
-  code: z.enum(["missing_recommended_machine_tools"])
-});
 var zClientErrorCode = z.enum([
   "invalid_request",
   "validation_failed",
@@ -146,11 +142,18 @@ var zModelCacheRetention = z.enum([
   "short",
   "long"
 ]);
+var zDiscoveredModelPricing = z.object({
+  input_usd_per_million: z.string().regex(/^(0|[1-9][0-9]*)(\.[0-9]+)?$/),
+  cache_read_input_usd_per_million: z.string().regex(/^(0|[1-9][0-9]*)(\.[0-9]+)?$/).optional(),
+  cache_write_input_usd_per_million: z.string().regex(/^(0|[1-9][0-9]*)(\.[0-9]+)?$/).optional(),
+  output_usd_per_million: z.string().regex(/^(0|[1-9][0-9]*)(\.[0-9]+)?$/)
+});
 var zDiscoveredProviderModel = z.object({
   slug: z.string(),
   display_name: z.string().optional(),
   context_window_tokens: z.int().gte(2).lte(2147483647).optional(),
-  max_output_tokens: z.int().gte(1).lte(2147483647).optional()
+  max_output_tokens: z.int().gte(1).lte(2147483647).optional(),
+  pricing: zDiscoveredModelPricing.optional()
 });
 var zModelCatalog = z.object({
   status: z.enum(["ok", "failed"]),
@@ -345,6 +348,7 @@ var zConfiguredModelSummary = z.object({
   model_provider_config_id: zModelProviderConfigId,
   name: zResourceName,
   provider_config: zResourceName,
+  provider_model_slug: z.string(),
   created_at: zTimestamp,
   updated_at: zTimestamp
 });
@@ -515,6 +519,10 @@ var zSlackSetup = z.object({
   actions_url: z.url(),
   expires_at: zTimestamp
 });
+var zResolveAgentConfigToolsRequest = z.object({
+  source: z.string().min(1),
+  source_format: z.enum(["yaml", "json"])
+});
 var zCreateAgentConfigRequest = z.object({
   source: z.string().min(1),
   source_format: z.enum(["yaml", "json"])
@@ -528,6 +536,14 @@ var zToolPermissionSelection = z.object({
   mode: z.string(),
   parameters: z.record(z.string(), z.unknown())
 });
+var zResolvedAgentConfigTool = z.object({
+  name: z.string(),
+  enabled: z.boolean(),
+  permission: zToolPermissionSelection
+});
+var zResolvedAgentConfigTools = z.object({
+  tools: z.array(zResolvedAgentConfigTool)
+});
 var zToolPermissionMode = z.object({
   name: z.string(),
   label: z.string(),
@@ -541,6 +557,7 @@ var zToolPermissionProfile = z.object({
 var zToolCatalogEntry = z.object({
   name: z.string(),
   description: z.string(),
+  implicit: z.boolean().optional(),
   default_permission: zToolPermissionSelection,
   permission_modes: z.array(zToolPermissionMode)
 });
@@ -674,7 +691,6 @@ var zAgentConfig = z.object({
   effective_definition_hash: z.string(),
   model: zAgentConfigModel,
   instruction_hash: z.string().optional(),
-  warnings: z.array(zWarning).min(1).optional(),
   created_at: zTimestamp
 });
 var zCreateAgentProfileRequest = z.object({
@@ -767,6 +783,15 @@ var zCreateAgentRequest = z.object({
   name: zAgentName.optional(),
   message: z.string().optional()
 });
+var zAgentActivity = z.object({
+  state: z.enum([
+    "running",
+    "idle",
+    "waiting_on_interaction",
+    "archived"
+  ]),
+  last_activity_at: zTimestamp
+});
 var zAgentModel = z.object({
   provider_config: zResourceName,
   name: zResourceName
@@ -788,6 +813,9 @@ var zAgent = z.object({
   integration_target: zIntegrationTarget.optional(),
   current_config_id: zAgentConfigId.optional(),
   model: zAgentModel.optional(),
+  parent_agent_id: zAgentId.optional(),
+  subagent_key: z.string().optional(),
+  activity: zAgentActivity.optional(),
   created_at: zTimestamp,
   updated_at: zTimestamp,
   archived_at: zTimestamp.optional()
@@ -859,7 +887,6 @@ var zAgentMachineBinding = z.object({
   project_id: zProjectId,
   agent_id: zAgentId,
   machine_id: zMachineId,
-  machine_ref: z.string(),
   binding_kind: zAgentMachineBindingKind,
   state: zAgentMachineBindingState,
   description: z.string(),
@@ -874,6 +901,7 @@ var zMachineFailureReport = z.object({
     "startup_script",
     "daemon_install",
     "daemon_update",
+    "daemon_runtime",
     "daemon_uninstall",
     "daemon_uninstalled"
   ]),
@@ -1023,6 +1051,7 @@ var zToolCallOutcome = z.enum([
 ]);
 var zToolCall = z.object({
   id: zToolCallId,
+  agent_id: zAgentId,
   turn_id: zAgentTurnId,
   provider_call_id: z.string(),
   name: z.string(),
@@ -1035,6 +1064,7 @@ var zToolCall = z.object({
 });
 var zToolCallUpdate = z.object({
   tool_call_id: zToolCallId,
+  agent_id: zAgentId.optional(),
   state: zToolCallState
 });
 var zListToolCallsResponse = z.object({
@@ -1303,6 +1333,8 @@ var zAgentInteraction = z.object({
   agent_id: zAgentId,
   tool_call_id: zToolCallId,
   tool_name: z.string().optional(),
+  agent_name: zAgentName.optional(),
+  subagent_key: z.string().optional(),
   interaction_kind: zAgentInteractionKind,
   state: zAgentInteractionState,
   request: zInteractionForm,
@@ -2075,6 +2107,40 @@ var zOrgOverviewResponse = z.object({
   recent_agents: z.array(zAgent),
   recent_agent_profiles: z.array(zAgentProfile)
 });
+var zUsageTokenTotals = z.object({
+  input_tokens_total: z.coerce.bigint().gte(BigInt(0)).max(BigInt("9223372036854775807"), { error: "Invalid value: Expected int64 to be <= 9223372036854775807" }),
+  uncached_input_tokens: z.coerce.bigint().gte(BigInt(0)).max(BigInt("9223372036854775807"), { error: "Invalid value: Expected int64 to be <= 9223372036854775807" }),
+  cache_read_input_tokens: z.coerce.bigint().gte(BigInt(0)).max(BigInt("9223372036854775807"), { error: "Invalid value: Expected int64 to be <= 9223372036854775807" }),
+  cache_write_input_tokens: z.coerce.bigint().gte(BigInt(0)).max(BigInt("9223372036854775807"), { error: "Invalid value: Expected int64 to be <= 9223372036854775807" }),
+  output_tokens_total: z.coerce.bigint().gte(BigInt(0)).max(BigInt("9223372036854775807"), { error: "Invalid value: Expected int64 to be <= 9223372036854775807" }),
+  reasoning_output_tokens: z.coerce.bigint().gte(BigInt(0)).max(BigInt("9223372036854775807"), { error: "Invalid value: Expected int64 to be <= 9223372036854775807" })
+});
+var zUsageCostTotals = z.object({
+  provider_reported_usd: z.string().regex(/^(0|[1-9][0-9]*)(\.[0-9]+)?$/),
+  model_calls_with_reported_cost: z.coerce.bigint().gte(BigInt(0)).max(BigInt("9223372036854775807"), { error: "Invalid value: Expected int64 to be <= 9223372036854775807" })
+});
+var zUsageTotals = z.object({
+  model_calls: z.coerce.bigint().gte(BigInt(0)).max(BigInt("9223372036854775807"), { error: "Invalid value: Expected int64 to be <= 9223372036854775807" }),
+  tokens: zUsageTokenTotals,
+  cost: zUsageCostTotals
+});
+var zUsageModel = z.object({
+  configured_model_id: zConfiguredModelId,
+  name: zResourceName,
+  provider_model_slug: z.string(),
+  model_provider_config_id: zModelProviderConfigId,
+  model_provider_config_name: zResourceName
+});
+var zModelUsageTotals = z.object({
+  model: zUsageModel,
+  model_calls: z.coerce.bigint().gte(BigInt(0)).max(BigInt("9223372036854775807"), { error: "Invalid value: Expected int64 to be <= 9223372036854775807" }),
+  tokens: zUsageTokenTotals,
+  cost: zUsageCostTotals
+});
+var zUsageReport = z.object({
+  totals: zUsageTotals,
+  by_model: z.array(zModelUsageTotals)
+});
 var zCurrentUserIdentity = z.object({
   id: zUserId,
   email: z.string(),
@@ -2123,6 +2189,10 @@ var zProjectMembershipGrant = z.object({
 var zListProjectMembershipGrantsResponse = z.object({
   data: z.array(zProjectMembershipGrant)
 });
+var zUsageSince = z.iso.datetime({ offset: true });
+var zUsageUntil = z.iso.datetime({ offset: true });
+var zUsageIncludeProjectIds = z.array(zProjectId).min(1).max(100);
+var zUsageExcludeProjectIds = z.array(zProjectId).min(1).max(100);
 var zIdempotencyKey = z.string().min(1).max(255);
 var zPageLimit = z.int().gte(1).lte(100).default(50);
 var zPageCursor = z.string().max(1024);
@@ -2158,6 +2228,7 @@ var zRecordMachineFailureQuery = z.object({
     "startup_script",
     "daemon_install",
     "daemon_update",
+    "daemon_runtime",
     "daemon_uninstall",
     "daemon_uninstalled"
   ]),
@@ -2196,6 +2267,16 @@ var zGetOrgOverviewPath = z.object({
   orgID: zOrganizationId
 });
 var zGetOrgOverviewResponse = zOrgOverviewResponse;
+var zGetOrgUsagePath = z.object({
+  orgID: zOrganizationId
+});
+var zGetOrgUsageQuery = z.object({
+  since: z.iso.datetime({ offset: true }).optional(),
+  until: z.iso.datetime({ offset: true }).optional(),
+  include_project_ids: z.array(zProjectId).min(1).max(100).optional(),
+  exclude_project_ids: z.array(zProjectId).min(1).max(100).optional()
+});
+var zGetOrgUsageResponse = zUsageReport;
 var zListVisibleProjectsPath = z.object({
   orgID: z.string().regex(/^org_[a-z2-7]{26}$/)
 });
@@ -2217,6 +2298,15 @@ var zDeleteProjectPath = z.object({
   projectID: z.string().regex(/^proj_[a-z2-7]{26}$/)
 });
 var zDeleteProjectResponse = z.void();
+var zGetProjectUsagePath = z.object({
+  orgID: zOrganizationId,
+  projectID: zProjectId
+});
+var zGetProjectUsageQuery = z.object({
+  since: z.iso.datetime({ offset: true }).optional(),
+  until: z.iso.datetime({ offset: true }).optional()
+});
+var zGetProjectUsageResponse = zUsageReport;
 var zListOrgMembersPath = z.object({
   orgID: z.string().regex(/^org_[a-z2-7]{26}$/)
 });
@@ -2483,6 +2573,11 @@ var zDeleteIntegrationInstallPath = z.object({
   integrationInstallID: z.string().regex(/^iin_[a-z2-7]{26}$/)
 });
 var zDeleteIntegrationInstallResponse = z.void();
+var zResolveAgentConfigToolsPath = z.object({
+  orgID: zOrganizationId,
+  projectID: zProjectId
+});
+var zResolveAgentConfigToolsResponse = zResolvedAgentConfigTools;
 var zCreateAgentConfigPath = z.object({
   orgID: z.string().regex(/^org_[a-z2-7]{26}$/),
   projectID: z.string().regex(/^proj_[a-z2-7]{26}$/)
@@ -2545,6 +2640,17 @@ var zRenameAgentProfilePath = z.object({
   agentProfileID: z.string().regex(/^aprf_[a-z2-7]{26}$/)
 });
 var zRenameAgentProfileResponse = zAgentProfile;
+var zGetAgentProfileUsagePath = z.object({
+  orgID: zOrganizationId,
+  projectID: zProjectId,
+  agentProfileID: zAgentProfileId
+});
+var zGetAgentProfileUsageQuery = z.object({
+  since: z.iso.datetime({ offset: true }).optional(),
+  until: z.iso.datetime({ offset: true }).optional(),
+  include_subagents: z.boolean().optional()
+});
+var zGetAgentProfileUsageResponse = zUsageReport;
 var zUpdateAgentProfileHeaders = z.object({
   "Idempotency-Key": z.string().min(1).max(255).optional()
 });
@@ -2614,6 +2720,9 @@ var zListAgentsPath = z.object({
 var zListAgentsQuery = z.object({
   name: z.string().min(1).max(200).optional(),
   agent_profile_id: zAgentProfileId.optional(),
+  parent_agent_id: zAgentId.optional(),
+  include_subagents: z.boolean().optional(),
+  include_archived: z.boolean().optional(),
   sort: zResourceListSort.optional(),
   limit: z.int().gte(1).lte(100).optional().default(50),
   cursor: z.string().max(1024).optional()
@@ -2636,6 +2745,17 @@ var zGetAgentPath = z.object({
   agentID: z.string().regex(/^agt_[a-z2-7]{26}$/)
 });
 var zGetAgentResponse2 = zGetAgentResponse;
+var zGetAgentUsagePath = z.object({
+  orgID: zOrganizationId,
+  projectID: zProjectId,
+  agentID: zAgentId
+});
+var zGetAgentUsageQuery = z.object({
+  since: z.iso.datetime({ offset: true }).optional(),
+  until: z.iso.datetime({ offset: true }).optional(),
+  include_subagents: z.boolean().optional()
+});
+var zGetAgentUsageResponse = zUsageReport;
 var zArchiveAgentPath = z.object({
   orgID: z.string().regex(/^org_[a-z2-7]{26}$/),
   projectID: z.string().regex(/^proj_[a-z2-7]{26}$/),
@@ -2669,6 +2789,7 @@ var zListToolCallsPath = z.object({
 var zListToolCallsQuery = z.object({
   state: zToolCallState.optional(),
   type: zToolCallType.optional(),
+  include_subagents: z.boolean().optional(),
   limit: z.int().gte(1).lte(100).optional().default(50),
   cursor: z.string().max(1024).optional()
 });
@@ -2739,6 +2860,7 @@ var zListAgentInteractionsPath = z.object({
 });
 var zListAgentInteractionsQuery = z.object({
   state: zAgentInteractionState.optional(),
+  include_subagents: z.boolean().optional(),
   limit: z.int().gte(1).lte(100).optional().default(50),
   cursor: z.string().max(1024).optional()
 });
@@ -4588,6 +4710,8 @@ __export(sdk_gen_exports, {
   getAgent: () => getAgent,
   getAgentConfig: () => getAgentConfig,
   getAgentProfile: () => getAgentProfile,
+  getAgentProfileUsage: () => getAgentProfileUsage,
+  getAgentUsage: () => getAgentUsage,
   getArtifact: () => getArtifact,
   getArtifactContent: () => getArtifactContent,
   getCronTrigger: () => getCronTrigger,
@@ -4599,8 +4723,10 @@ __export(sdk_gen_exports, {
   getModelProviderConfig: () => getModelProviderConfig,
   getOrgApiKey: () => getOrgApiKey,
   getOrgOverview: () => getOrgOverview,
+  getOrgUsage: () => getOrgUsage,
   getProjectAvailableSecret: () => getProjectAvailableSecret,
   getProjectMachinePoolGrant: () => getProjectMachinePoolGrant,
+  getProjectUsage: () => getProjectUsage,
   getSecret: () => getSecret,
   getSkill: () => getSkill,
   getToolCatalog: () => getToolCatalog,
@@ -4650,6 +4776,7 @@ __export(sdk_gen_exports, {
   removeOrgApiKeyProjectRole: () => removeOrgApiKeyProjectRole,
   removeOrgMember: () => removeOrgMember,
   renameAgentProfile: () => renameAgentProfile,
+  resolveAgentConfigTools: () => resolveAgentConfigTools,
   resolveAgentInteraction: () => resolveAgentInteraction,
   revokeMachineDaemonToken: () => revokeMachineDaemonToken,
   revokeOrgApiKey: () => revokeOrgApiKey,
@@ -4897,6 +5024,20 @@ var getOrgOverview = (options) => (options.client ?? client).get({
   url: "/orgs/{orgID}/overview",
   ...options
 });
+var getOrgUsage = (options) => (options.client ?? client).get({
+  responseValidator: relaxedResponseValidator(zGetOrgUsageResponse),
+  security: [{
+    key: "bearerAuth",
+    scheme: "bearer",
+    type: "http"
+  }, {
+    in: "cookie",
+    name: "__Host-omnara_session",
+    type: "apiKey"
+  }],
+  url: "/orgs/{orgID}/usage",
+  ...options
+});
 var listVisibleProjects = (options) => (options.client ?? client).get({
   responseValidator: relaxedResponseValidator(zListVisibleProjectsResponse),
   security: [{
@@ -4951,6 +5092,20 @@ var deleteProject = (options) => (options.client ?? client).delete({
   url: "/orgs/{orgID}/projects/{projectID}",
   ...options
 });
+var getProjectUsage = (options) => (options.client ?? client).get({
+  responseValidator: relaxedResponseValidator(zGetProjectUsageResponse),
+  security: [{
+    key: "bearerAuth",
+    scheme: "bearer",
+    type: "http"
+  }, {
+    in: "cookie",
+    name: "__Host-omnara_session",
+    type: "apiKey"
+  }],
+  url: "/orgs/{orgID}/projects/{projectID}/usage",
+  ...options
+});
 var listOrgMembers = (options) => (options.client ?? client).get({
   responseValidator: relaxedResponseValidator(zListOrgMembersResponse2),
   security: [{
@@ -5597,6 +5752,28 @@ var deleteIntegrationInstall = (options) => (options.client ?? client).delete({
   url: "/orgs/{orgID}/projects/{projectID}/integration-installs/{integrationInstallID}",
   ...options
 });
+var resolveAgentConfigTools = (options) => (options.client ?? client).post({
+  responseValidator: relaxedResponseValidator(zResolveAgentConfigToolsResponse),
+  security: [
+    {
+      key: "bearerAuth",
+      scheme: "bearer",
+      type: "http"
+    },
+    {
+      in: "cookie",
+      name: "__Host-omnara_session",
+      type: "apiKey"
+    },
+    { name: "X-Omnara-Csrf", type: "apiKey" }
+  ],
+  url: "/orgs/{orgID}/projects/{projectID}/agent-configs/tools",
+  ...options,
+  headers: {
+    "Content-Type": "application/json",
+    ...options.headers
+  }
+});
 var createAgentConfig = (options) => (options.client ?? client).post({
   responseValidator: relaxedResponseValidator(zCreateAgentConfigResponse),
   security: [
@@ -5773,6 +5950,20 @@ var renameAgentProfile = (options) => (options.client ?? client).patch({
     ...options.headers
   }
 });
+var getAgentProfileUsage = (options) => (options.client ?? client).get({
+  responseValidator: relaxedResponseValidator(zGetAgentProfileUsageResponse),
+  security: [{
+    key: "bearerAuth",
+    scheme: "bearer",
+    type: "http"
+  }, {
+    in: "cookie",
+    name: "__Host-omnara_session",
+    type: "apiKey"
+  }],
+  url: "/orgs/{orgID}/projects/{projectID}/agent-profiles/{agentProfileID}/usage",
+  ...options
+});
 var updateAgentProfile = (options) => (options.client ?? client).post({
   responseValidator: relaxedResponseValidator(zUpdateAgentProfileResponse),
   security: [
@@ -5979,6 +6170,20 @@ var getAgent = (options) => (options.client ?? client).get({
   url: "/orgs/{orgID}/projects/{projectID}/agents/{agentID}",
   ...options
 });
+var getAgentUsage = (options) => (options.client ?? client).get({
+  responseValidator: relaxedResponseValidator(zGetAgentUsageResponse),
+  security: [{
+    key: "bearerAuth",
+    scheme: "bearer",
+    type: "http"
+  }, {
+    in: "cookie",
+    name: "__Host-omnara_session",
+    type: "apiKey"
+  }],
+  url: "/orgs/{orgID}/projects/{projectID}/agents/{agentID}/usage",
+  ...options
+});
 var archiveAgent = (options) => (options.client ?? client).post({
   responseValidator: relaxedResponseValidator(zArchiveAgentResponse),
   security: [
@@ -7232,9 +7437,6 @@ function truncate(value, width) {
   if (end > 0 && lastUnit >= 55296 && lastUnit <= 56319) end -= 1;
   return `${value.slice(0, end)}\u2026`;
 }
-function abbreviate(text, max) {
-  return truncate(text.replaceAll(/\s+/g, " ").trim(), max);
-}
 function printTable(rows, indent, explicitColumns) {
   if (rows.length === 0) {
     console.log(indented(indent, dim("(no results)")));
@@ -8481,6 +8683,9 @@ function parseStreamData(data) {
 function sequenceNumber(value) {
   return value ?? 0;
 }
+function eventsAfterSequence(events, sequence) {
+  return events.filter((event) => sequenceNumber(event.sequence) > sequence);
+}
 function eventMetadata(event) {
   return {
     eventId: event.id,
@@ -9098,21 +9303,19 @@ function useAgentInputBacklog(path) {
 
 // ../react/src/domains/agent-interactions.ts
 import { useMutation as useMutation2, useQuery as useQuery2, useQueryClient as useQueryClient2 } from "@tanstack/react-query";
-var openInteractionsQuery = { state: "open", limit: 100 };
-var activeAgentRefetchIntervalMs = 1e3;
+var openInteractionsQuery = { state: "open", limit: 100, include_subagents: true };
 function openAgentInteractionsQueryKey(client2, path) {
   return listAgentInteractionsQueryKey({ path, query: openInteractionsQuery, client: client2 });
 }
-function useAgentInteractions(orgID, projectID, agentID, agentActive) {
+function useAgentInteractions(orgID, projectID, agentID) {
   const client2 = useOmnaraClient();
-  return useQuery2({
-    ...listAgentInteractionsOptions({
+  return useQuery2(
+    listAgentInteractionsOptions({
       path: { orgID, projectID, agentID },
       query: openInteractionsQuery,
       client: client2
-    }),
-    refetchInterval: agentActive ? activeAgentRefetchIntervalMs : false
-  });
+    })
+  );
 }
 function useResolveAgentInteraction(orgID, projectID, agentID) {
   const client2 = useOmnaraClient();
@@ -9121,11 +9324,12 @@ function useResolveAgentInteraction(orgID, projectID, agentID) {
   return useMutation2({
     mutationFn: async ({
       interactionID,
-      body
+      body,
+      targetAgentID = agentID
     }) => {
       const { data } = await sdk_gen_exports.resolveAgentInteraction({
         client: client2,
-        path: { orgID, projectID, agentID, interactionID },
+        path: { orgID, projectID, agentID: targetAgentID, interactionID },
         body
       });
       return data;
@@ -9148,6 +9352,15 @@ function useResolveAgentInteraction(orgID, projectID, agentID) {
   });
 }
 
+// ../react/src/domains/usage.ts
+import { keepPreviousData, useQuery as useQuery3 } from "@tanstack/react-query";
+function agentUsageQueryPredicate(orgID, projectID) {
+  return (query) => {
+    const key = generatedQueryKey(query);
+    return key?._id === "getAgentUsage" && key.path?.orgID === orgID && key.path.projectID === projectID;
+  };
+}
+
 // ../react/src/domains/agent-chat.ts
 var emptyBacklogInputs = [];
 var AgentChatSession = class {
@@ -9172,6 +9385,7 @@ var AgentChatSession = class {
     localInputs: [],
     backlogInputs: [],
     error: void 0,
+    streamError: void 0,
     hasOlderEvents: false
   };
   constructor({
@@ -9328,6 +9542,7 @@ var AgentChatSession = class {
       localInputs,
       backlogInputs: [],
       error: this.error,
+      streamError: this.errorSource === "stream" ? this.error : void 0,
       hasOlderEvents: false
     };
     for (const listener of this.listeners) listener();
@@ -9337,10 +9552,7 @@ var AgentChatSession = class {
     if (this.cursor == null || sequence <= this.cursor) return;
     this.cursor = sequence;
     this.events = [...this.events, event];
-    if (this.errorSource === "stream") {
-      this.error = void 0;
-      this.errorSource = void 0;
-    }
+    this.clearStreamError();
     const inputIdempotencyKey = event.event_kind === "agent_input" ? event.input_idempotency_key : void 0;
     let localInputEcho = inputIdempotencyKey != null && inputIdempotencyKey === this.lastFailedSend?.id;
     if (localInputEcho) {
@@ -9375,20 +9587,23 @@ var AgentChatSession = class {
     }
     if (isTerminalEvent(event)) {
       this.deltas = this.deltas.filter((delta) => delta.turn_id !== event.turn_id);
-    }
-    if (hasToolCalls(event) || event.event_kind === "tool_result" || isControlEvent(event)) {
       void this.queryClient.invalidateQueries({
-        queryKey: openAgentInteractionsQueryKey(this.client, this.scope)
+        predicate: agentUsageQueryPredicate(this.scope.orgID, this.scope.projectID)
       });
     }
+    if (hasToolCalls(event) || event.event_kind === "tool_result" || isControlEvent(event)) {
+      this.invalidateInteractions();
+    }
     this.notify();
   }
+  invalidateInteractions() {
+    void this.queryClient.invalidateQueries({
+      queryKey: openAgentInteractionsQueryKey(this.client, this.scope)
+    });
+  }
   handleDelta(delta) {
     if (this.completedCalls.has(delta.model_call_context_id)) return;
-    if (this.errorSource === "stream") {
-      this.error = void 0;
-      this.errorSource = void 0;
-    }
+    this.clearStreamError();
     if (delta.event.kind === "error") {
       this.completedCalls.add(delta.model_call_context_id);
       this.deltas = this.deltas.filter(
@@ -9411,16 +9626,22 @@ var AgentChatSession = class {
       this.notify();
       return;
     }
-    if (state.reconnected) {
-      void this.queryClient.invalidateQueries({
-        queryKey: openAgentInteractionsQueryKey(this.client, this.scope)
-      });
-    }
+    if (state.reconnected) this.invalidateInteractions();
   }
   disconnect = () => {
     this.runController?.abort();
     this.runController = null;
   };
+  reconnect = () => {
+    if (this.clearStreamError()) this.notify();
+    this.connect();
+  };
+  clearStreamError() {
+    if (this.errorSource !== "stream") return false;
+    this.error = void 0;
+    this.errorSource = void 0;
+    return true;
+  }
   connect() {
     if (this.cursor == null || this.listeners.length === 0 || this.runController != null) return;
     this.runController = new AbortController();
@@ -9443,6 +9664,7 @@ var AgentChatSession = class {
         const parsed = parseStreamData(data);
         if (parsed.kind === "delta") this.handleDelta(parsed.delta);
         else if (parsed.kind === "event") this.handleEvent(parsed.event);
+        else this.invalidateInteractions();
       }
     } catch (error) {
       if (signal.aborted) return;
@@ -9490,21 +9712,28 @@ function useAgentChat(scope, options) {
   const data = useMemo(
     () => ({
       ...sessionData,
-      events: [...history.data?.events ?? [], ...sessionData.events],
+      events: [
+        ...history.data?.events ?? [],
+        ...eventsAfterSequence(sessionData.events, newestLoadedSequence)
+      ],
       backlogInputs: authoritativeBacklogInputs,
       hasOlderEvents
     }),
-    [authoritativeBacklogInputs, history.data, hasOlderEvents, sessionData]
+    [authoritativeBacklogInputs, history.data, hasOlderEvents, newestLoadedSequence, sessionData]
   );
   const projected = useMemo(() => projectAgentChat(data), [data]);
   const inputPlacement = projected.isWorking || projected.backlogInputs.length > 0 || sessionData.localInputs.length > 0 ? "backlog" : "conversation";
   return {
+    events: data.events,
     messages: projected.messages,
     status: projected.status,
     isWorking: projected.isWorking,
     error: data.error,
+    streamError: data.streamError,
     historyStatus: history.status,
     historyError: history.error,
+    retryHistory: () => void history.refetch(),
+    reconnect: session.reconnect,
     hasOlderMessages: history.hasNextPage,
     isLoadingOlderMessages: history.isFetchingNextPage,
     loadOlderMessages: () => void history.fetchNextPage(),
@@ -9531,11 +9760,50 @@ function useAgentChat(scope, options) {
   };
 }
 
+// ../react/src/domains/agent-config-tools.ts
+import { useQuery as useQuery4 } from "@tanstack/react-query";
+
+// ../react/src/domains/agent-event-preview.ts
+function truncate2(value, width) {
+  if (value.length <= width) return value;
+  let end = Math.max(0, width - 1);
+  const lastUnit = value.charCodeAt(end - 1);
+  if (end > 0 && lastUnit >= 55296 && lastUnit <= 56319) end -= 1;
+  return `${value.slice(0, end)}\u2026`;
+}
+function abbreviate(text, max) {
+  return truncate2(text.replaceAll(/\s+/g, " ").trim(), max);
+}
+function blockText(block) {
+  switch (block.type) {
+    case "text":
+      return block.text ?? "";
+    case "tool_call":
+      return `[tool_call ${block.name ?? ""}]`;
+    case "structured_data":
+      return JSON.stringify(block.value);
+    default:
+      return `[${block.type}]`;
+  }
+}
+var agentEventPreviewWidth = 80;
+function agentEventPreview(event, width = agentEventPreviewWidth) {
+  switch (event.event_kind) {
+    case "agent_input":
+    case "model_output":
+      return abbreviate(event.content_blocks.map(blockText).join(" "), width);
+    case "tool_result":
+      return abbreviate(`${event.outcome}: ${event.content_blocks.map(blockText).join(" ")}`, width);
+    case "context_checkpoint":
+      return abbreviate(`context summarized: ${event.summary}`, width);
+  }
+}
+
 // ../react/src/domains/agent-profiles.ts
 import {
   useInfiniteQuery as useInfiniteQuery2,
   useMutation as useMutation4,
-  useQuery as useQuery3,
+  useQuery as useQuery5,
   useQueryClient as useQueryClient4,
   useSuspenseQuery as useSuspenseQuery2
 } from "@tanstack/react-query";
@@ -9549,9 +9817,10 @@ import { useMutation as useMutation3 } from "@tanstack/react-query";
 
 // ../react/src/domains/agents.ts
 import {
+  keepPreviousData as keepPreviousData2,
   useInfiniteQuery as useInfiniteQuery3,
   useMutation as useMutation5,
-  useQuery as useQuery4,
+  useQuery as useQuery6,
   useQueryClient as useQueryClient5,
   useSuspenseQuery as useSuspenseQuery3
 } from "@tanstack/react-query";
@@ -9563,20 +9832,20 @@ import { useInfiniteQuery as useInfiniteQuery4, useMutation as useMutation6, use
 import { useInfiniteQuery as useInfiniteQuery5, useMutation as useMutation7, useQueryClient as useQueryClient7 } from "@tanstack/react-query";
 
 // ../react/src/domains/invitations.ts
-import { useMutation as useMutation8, useQuery as useQuery5, useQueryClient as useQueryClient8, useSuspenseQuery as useSuspenseQuery4 } from "@tanstack/react-query";
+import { useMutation as useMutation8, useQuery as useQuery7, useQueryClient as useQueryClient8, useSuspenseQuery as useSuspenseQuery4 } from "@tanstack/react-query";
 
 // ../react/src/domains/machine-pools.ts
-import { useInfiniteQuery as useInfiniteQuery6, useMutation as useMutation9, useQuery as useQuery6, useQueryClient as useQueryClient9 } from "@tanstack/react-query";
+import { useInfiniteQuery as useInfiniteQuery6, useMutation as useMutation9, useQuery as useQuery8, useQueryClient as useQueryClient9 } from "@tanstack/react-query";
 
 // ../react/src/domains/machines.ts
-import { useInfiniteQuery as useInfiniteQuery7, useMutation as useMutation10, useQuery as useQuery7, useQueryClient as useQueryClient10 } from "@tanstack/react-query";
+import { useInfiniteQuery as useInfiniteQuery7, useMutation as useMutation10, useQuery as useQuery9, useQueryClient as useQueryClient10 } from "@tanstack/react-query";
 
 // ../react/src/domains/mcp-registry.ts
-import { useInfiniteQuery as useInfiniteQuery8, useQuery as useQuery8, useQueryClient as useQueryClient11 } from "@tanstack/react-query";
+import { useInfiniteQuery as useInfiniteQuery8, useQuery as useQuery10, useQueryClient as useQueryClient11 } from "@tanstack/react-query";
 var serverInfoStaleTime = 5 * 60 * 1e3;
 
 // ../react/src/domains/mcp-server-tools.ts
-import { useQuery as useQuery9 } from "@tanstack/react-query";
+import { useQuery as useQuery11 } from "@tanstack/react-query";
 var mcpServerToolsStaleTime = 60 * 1e3;
 
 // ../react/src/domains/me.ts
@@ -9586,18 +9855,21 @@ import { useSuspenseQuery as useSuspenseQuery5 } from "@tanstack/react-query";
 import {
   useInfiniteQuery as useInfiniteQuery9,
   useMutation as useMutation11,
-  useQuery as useQuery10,
+  useQueries,
+  useQuery as useQuery12,
   useQueryClient as useQueryClient12
 } from "@tanstack/react-query";
+import { useEffect as useEffect2 } from "react";
+var modelCatalogPricingStaleTime = 5 * 60 * 1e3;
 
 // ../react/src/domains/org-api-keys.ts
-import { useInfiniteQuery as useInfiniteQuery10, useMutation as useMutation12, useQuery as useQuery11, useQueryClient as useQueryClient13 } from "@tanstack/react-query";
+import { useInfiniteQuery as useInfiniteQuery10, useMutation as useMutation12, useQuery as useQuery13, useQueryClient as useQueryClient13 } from "@tanstack/react-query";
 
 // ../react/src/domains/org-members.ts
-import { useMutation as useMutation13, useQuery as useQuery12, useQueryClient as useQueryClient14 } from "@tanstack/react-query";
+import { useMutation as useMutation13, useQuery as useQuery14, useQueryClient as useQueryClient14 } from "@tanstack/react-query";
 
 // ../react/src/domains/orgs.ts
-import { useInfiniteQuery as useInfiniteQuery11, useMutation as useMutation14, useQuery as useQuery13, useQueryClient as useQueryClient15 } from "@tanstack/react-query";
+import { useInfiniteQuery as useInfiniteQuery11, useMutation as useMutation14, useQuery as useQuery15, useQueryClient as useQueryClient15 } from "@tanstack/react-query";
 
 // ../react/src/domains/personal-access-tokens.ts
 import { useInfiniteQuery as useInfiniteQuery12, useMutation as useMutation15, useQueryClient as useQueryClient16 } from "@tanstack/react-query";
@@ -9617,7 +9889,7 @@ import {
 import {
   useInfiniteQuery as useInfiniteQuery15,
   useMutation as useMutation17,
-  useQuery as useQuery14,
+  useQuery as useQuery16,
   useQueryClient as useQueryClient19
 } from "@tanstack/react-query";
 
@@ -9625,12 +9897,12 @@ import {
 import {
   useInfiniteQuery as useInfiniteQuery16,
   useMutation as useMutation18,
-  useQuery as useQuery15,
+  useQuery as useQuery17,
   useQueryClient as useQueryClient20
 } from "@tanstack/react-query";
 
 // ../react/src/domains/tool-catalog.ts
-import { useQuery as useQuery16 } from "@tanstack/react-query";
+import { useQuery as useQuery18 } from "@tanstack/react-query";
 
 // src/chat.tsx
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
@@ -9638,45 +9910,18 @@ import { render } from "ink";
 
 // src/chat-ui.tsx
 import { Box as Box2, Static, Text as Text2, useApp } from "ink";
-import { useEffect as useEffect2, useMemo as useMemo2, useReducer, useState as useState2 } from "react";
+import { useEffect as useEffect3, useMemo as useMemo2, useReducer, useState as useState2 } from "react";
 import * as z15 from "zod";
 
 // src/agent-rendering.ts
 import * as z14 from "zod";
-function blockText(block) {
-  switch (block.type) {
-    case "text":
-      return block.text ?? "";
-    case "tool_call":
-      return `[tool_call ${block.name ?? ""}]`;
-    case "structured_data":
-      return JSON.stringify(block.value);
-    default:
-      return `[${block.type}]`;
-  }
-}
-var previewWidth = 80;
-function eventPreview(event) {
-  switch (event.event_kind) {
-    case "agent_input":
-    case "model_output":
-      return abbreviate(event.content_blocks.map(blockText).join(" "), previewWidth);
-    case "tool_result":
-      return abbreviate(
-        `${event.outcome}: ${event.content_blocks.map(blockText).join(" ")}`,
-        previewWidth
-      );
-    case "context_checkpoint":
-      return abbreviate(`context summarized: ${event.summary}`, previewWidth);
-  }
-}
 var formatAgentEventList = (response) => {
   const page = {
     data: response.data.map((event) => ({
       sequence: event.sequence,
       event_kind: event.event_kind,
       turn_sequence: event.turn_sequence,
-      preview: eventPreview(event),
+      preview: agentEventPreview(event),
       created_at: event.created_at
     })),
     has_more: response.has_more,
@@ -9808,6 +10053,12 @@ function InteractionPrompt({
       " ",
       form.title
     ] }),
+    interaction.agent_name != null && /* @__PURE__ */ jsxs(Text, { children: [
+      "  ",
+      /* @__PURE__ */ jsx2(Text, { dimColor: true, children: "from subagent" }),
+      " ",
+      interaction.agent_name
+    ] }),
     (form.context ?? []).map((item) => /* @__PURE__ */ jsxs(Text, { children: [
       "  ",
       /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
@@ -10015,7 +10266,7 @@ function transitionWorkTimer(snapshot, phase) {
 }
 function useWorkTimer(phase) {
   const [snapshot, transition] = useReducer(transitionWorkTimer, { accumulatedMs: 0 });
-  useEffect2(() => {
+  useEffect3(() => {
     transition(phase);
   }, [phase]);
   return snapshot;
@@ -10029,7 +10280,7 @@ function StatusLine({
     now: void 0
   });
   const active = activity != null;
-  useEffect2(() => {
+  useEffect3(() => {
     if (!active) return;
     const interval = setInterval(() => {
       setTick((previous) => ({
@@ -10140,12 +10391,7 @@ function Transcript({ items, live }) {
 }
 function Chat({ scope }) {
   const chat = useAgentChat(scope, { source: "cli" });
-  const interactions = useAgentInteractions(
-    scope.orgID,
-    scope.projectID,
-    scope.agentID,
-    chat.isWorking
-  );
+  const interactions = useAgentInteractions(scope.orgID, scope.projectID, scope.agentID);
   const resolveInteraction = useResolveAgentInteraction(scope.orgID, scope.projectID, scope.agentID);
   const { exit } = useApp();
   const [draft, setDraft] = useState2("");
@@ -10186,7 +10432,11 @@ function Chat({ scope }) {
       {
         interaction,
         onAnswer: (answers) => {
-          void resolveInteraction.mutateAsync({ interactionID: interaction.id, body: { answers } }).catch(() => void 0);
+          void resolveInteraction.mutateAsync({
+            interactionID: interaction.id,
+            body: { answers },
+            targetAgentID: interaction.agent_id
+          }).catch(() => void 0);
         }
       },
       interaction.id
@@ -11089,8 +11339,12 @@ var commandGroups = [
         verb: "list",
         summary: "List agents in a project",
         fn: sdk_gen_exports.listAgents,
-        format: (response) => formatTable(["id", "name", "state", "model", "created_at"])({
-          data: response.data.map((agent) => ({ ...agent, model: agent.model?.name })),
+        format: (response) => formatTable(["id", "name", "state", "model", "parent_agent_id", "created_at"])({
+          data: response.data.map((agent) => ({
+            ...agent,
+            model: agent.model?.name,
+            parent_agent_id: agent.parent_agent_id ?? ""
+          })),
           next_cursor: response.next_cursor
         }),
         path: zListAgentsPath,

package/package.json

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