agent-orchestrator-mcp-server 0.8.9 → 0.8.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-orchestrator-mcp-server",
-  "version": "0.8.9",
+  "version": "0.8.10",
   "description": "Local implementation of agent-orchestrator MCP server",
   "main": "build/index.js",
   "type": "module",

package/shared/orchestrator-client/orchestrator-client.d.ts

@@ -3,7 +3,7 @@
  *
  * A client for interacting with the Agent Orchestrator REST API.
  */
-import type { Session, Log, SubagentTranscript, SessionsResponse, SearchSessionsResponse, SessionActionResponse, LogsResponse, SubagentTranscriptsResponse, CreateSessionRequest, UpdateSessionRequest, CreateLogRequest, UpdateLogRequest, CreateSubagentTranscriptRequest, UpdateSubagentTranscriptRequest, SessionStatus, LogLevel, SubagentStatus, MCPServerInfo, AgentRootInfo, ConfigsResponse, SendPushNotificationResponse, EnqueuedMessage, EnqueuedMessagesResponse, EnqueuedMessageInterruptResponse, EnqueuedMessageStatus, Category, CategoriesResponse, CreateCategoryRequest, UpdateCategoryRequest, SetSessionCategoryResponse, Trigger, TriggerType, TriggerStatus, TriggersResponse, TriggerResponse, TriggerChannelsResponse, CreateTriggerRequest, UpdateTriggerRequest, Notification, NotificationsResponse, NotificationBadgeResponse, NotificationMarkAllReadResponse, NotificationDismissAllReadResponse, HealthReport, HealthActionResponse, CliStatusResponse, CliActionResponse, ForkSessionResponse, RefreshSessionResponse, RefreshAllSessionsResponse, BulkArchiveResponse, TranscriptResponse, TranscriptArchiveStatusResponse, ElicitationActionType, ElicitationResponse } from '../types.js';
+import type { Session, Log, SubagentTranscript, SessionsResponse, SearchSessionsResponse, SessionActionResponse, LogsResponse, SubagentTranscriptsResponse, CreateSessionRequest, UpdateSessionRequest, CreateLogRequest, UpdateLogRequest, CreateSubagentTranscriptRequest, UpdateSubagentTranscriptRequest, SessionStatus, LogLevel, SubagentStatus, MCPServerInfo, AgentRootInfo, ConfigsResponse, SendPushNotificationResponse, EnqueuedMessage, EnqueuedMessagesResponse, EnqueuedMessageInterruptResponse, EnqueuedMessageStatus, Category, CategoriesResponse, CreateCategoryRequest, UpdateCategoryRequest, SetSessionCategoryResponse, Trigger, TriggerType, TriggerStatus, TriggersResponse, TriggerResponse, TriggerChannelsResponse, TriggerConditionAttributes, TriggerConditionType, CreateTriggerRequest, UpdateTriggerRequest, Notification, NotificationsResponse, NotificationBadgeResponse, NotificationMarkAllReadResponse, NotificationDismissAllReadResponse, HealthReport, HealthActionResponse, CliStatusResponse, CliActionResponse, ForkSessionResponse, RefreshSessionResponse, RefreshAllSessionsResponse, BulkArchiveResponse, TranscriptResponse, TranscriptArchiveStatusResponse, ElicitationActionType, ElicitationResponse } from '../types.js';
 /** Raw agent root shape as returned by the Rails API */
 export interface RawAgentRoot {
     name: string;
@@ -25,6 +25,14 @@ export interface RawAgentRoot {
  * as they are not needed by MCP clients.
  */
 export declare function mapAgentRoot(raw: RawAgentRoot): AgentRootInfo;
+/**
+ * Folds the ergonomic top-level `trigger_type` + `configuration` shape into the
+ * REST API's nested `trigger_conditions_attributes`. Mirrors the
+ * `trigger_type` → `condition_type` mapping that listTriggers uses for filtering.
+ * Returns undefined when there is no condition to build (no trigger_type), so
+ * callers can leave the field off the request entirely.
+ */
+export declare function conditionAttributesFromLegacy(trigger_type: TriggerConditionType | undefined, configuration: Record<string, unknown> | undefined): TriggerConditionAttributes[] | undefined;
 /**
  * Interface for the Agent Orchestrator API client.
  * Used for dependency injection and testing.
@@ -256,6 +264,13 @@ export declare class AgentOrchestratorClient implements IAgentOrchestratorClient
     getTrigger(id: number): Promise<TriggerResponse>;
     createTrigger(data: CreateTriggerRequest): Promise<Trigger>;
     updateTrigger(id: number, data: UpdateTriggerRequest): Promise<Trigger>;
+    /**
+     * Builds the trigger_conditions_attributes for an update expressed with the
+     * ergonomic top-level `trigger_type` + `configuration` shape. Fetches the
+     * trigger to reuse the matching existing condition's id (so the condition is
+     * updated in place rather than duplicated).
+     */
+    private resolveUpdatedTriggerConditions;
     deleteTrigger(id: number): Promise<void>;
     toggleTrigger(id: number): Promise<Trigger>;
     getTriggerChannels(): Promise<TriggerChannelsResponse>;

package/shared/orchestrator-client/orchestrator-client.integration-mock.js

@@ -3,6 +3,25 @@
  *
  * Used in integration tests to simulate API responses without hitting real endpoints.
  */
+import { conditionAttributesFromLegacy } from './orchestrator-client.js';
+/**
+ * Builds mock TriggerCondition rows from a create/update request, mirroring the
+ * real client: fold the ergonomic top-level trigger_type + configuration shape
+ * into nested condition attributes when the caller didn't supply them directly.
+ */
+function buildMockTriggerConditions(data) {
+    const conditionAttributes = data.trigger_conditions_attributes ??
+        conditionAttributesFromLegacy(data.trigger_type, data.configuration) ??
+        [];
+    return conditionAttributes.map((c, i) => ({
+        id: i + 1,
+        condition_type: c.condition_type,
+        configuration: c.configuration,
+        description: `${c.condition_type} condition`,
+        last_triggered_at: null,
+        last_polled_at: null,
+    }));
+}
 /**
  * Creates a mock Agent Orchestrator client for integration testing.
  */
@@ -751,14 +770,7 @@ export function createIntegrationMockOrchestratorClient(initialMockData) {
             return { trigger, recent_sessions: [] };
         },
         async createTrigger(data) {
-            const conditions = (data.trigger_conditions_attributes ?? []).map((c, i) => ({
-                id: i + 1,
-                condition_type: c.condition_type,
-                configuration: c.configuration,
-                description: `${c.condition_type} condition`,
-                last_triggered_at: null,
-                last_polled_at: null,
-            }));
+            const conditions = buildMockTriggerConditions(data);
             return {
                 id: 1,
                 name: data.name,
@@ -777,14 +789,7 @@ export function createIntegrationMockOrchestratorClient(initialMockData) {
             };
         },
         async updateTrigger(id, data) {
-            const conditions = (data.trigger_conditions_attributes ?? []).map((c, i) => ({
-                id: i + 1,
-                condition_type: c.condition_type,
-                configuration: c.configuration,
-                description: `${c.condition_type} condition`,
-                last_triggered_at: null,
-                last_polled_at: null,
-            }));
+            const conditions = buildMockTriggerConditions(data);
             return {
                 id,
                 name: data.name || 'Updated Trigger',

package/shared/orchestrator-client/orchestrator-client.js

@@ -22,6 +22,19 @@ export function mapAgentRoot(raw) {
         default_model: raw.default_model,
     };
 }
+/**
+ * Folds the ergonomic top-level `trigger_type` + `configuration` shape into the
+ * REST API's nested `trigger_conditions_attributes`. Mirrors the
+ * `trigger_type` → `condition_type` mapping that listTriggers uses for filtering.
+ * Returns undefined when there is no condition to build (no trigger_type), so
+ * callers can leave the field off the request entirely.
+ */
+export function conditionAttributesFromLegacy(trigger_type, configuration) {
+    if (trigger_type === undefined) {
+        return undefined;
+    }
+    return [{ condition_type: trigger_type, configuration: configuration ?? {} }];
+}
 /** Default timeout for API requests in milliseconds */
 const DEFAULT_TIMEOUT_MS = 30000;
 /**
@@ -387,13 +400,65 @@ export class AgentOrchestratorClient {
         return this.request('GET', `/triggers/${id}`);
     }
     async createTrigger(data) {
-        const response = await this.request('POST', '/triggers', data);
+        const { trigger_type, configuration, trigger_conditions_attributes, ...rest } = data;
+        const body = { ...rest };
+        // The Rails v1 /triggers endpoint permits neither a top-level `trigger_type`
+        // nor a top-level `configuration`; the condition must be nested as
+        // `trigger_conditions_attributes: [{ condition_type:, configuration: }]`.
+        // An explicitly-supplied nested array (e.g. from wake_me_up_* tools) wins;
+        // otherwise fold the ergonomic top-level shape into a single condition.
+        const conditions = trigger_conditions_attributes ?? conditionAttributesFromLegacy(trigger_type, configuration);
+        if (conditions !== undefined) {
+            body.trigger_conditions_attributes = conditions;
+        }
+        const response = await this.request('POST', '/triggers', body);
         return response.trigger;
     }
     async updateTrigger(id, data) {
-        const response = await this.request('PATCH', `/triggers/${id}`, data);
+        const { trigger_type, configuration, trigger_conditions_attributes, ...rest } = data;
+        const body = { ...rest };
+        if (trigger_conditions_attributes !== undefined) {
+            // Caller supplied the nested shape directly — forward verbatim.
+            body.trigger_conditions_attributes = trigger_conditions_attributes;
+        }
+        else if (trigger_type !== undefined || configuration !== undefined) {
+            // Ergonomic top-level shape. Resolve the existing condition's id so the
+            // condition is modified in place instead of a duplicate being appended
+            // (Rails uses accepts_nested_attributes_for). Metadata-only updates that
+            // omit both fields skip this entirely and never touch conditions.
+            body.trigger_conditions_attributes = await this.resolveUpdatedTriggerConditions(id, trigger_type, configuration);
+        }
+        const response = await this.request('PATCH', `/triggers/${id}`, body);
         return response.trigger;
     }
+    /**
+     * Builds the trigger_conditions_attributes for an update expressed with the
+     * ergonomic top-level `trigger_type` + `configuration` shape. Fetches the
+     * trigger to reuse the matching existing condition's id (so the condition is
+     * updated in place rather than duplicated).
+     */
+    async resolveUpdatedTriggerConditions(id, trigger_type, configuration) {
+        const { trigger } = await this.getTrigger(id);
+        const existing = trigger.conditions ?? [];
+        // Pick the condition to modify: the one matching the requested type, or the
+        // sole existing condition when no type was provided.
+        const target = trigger_type !== undefined
+            ? existing.find((c) => c.condition_type === trigger_type)
+            : existing.length === 1
+                ? existing[0]
+                : undefined;
+        const conditionType = trigger_type ?? target?.condition_type;
+        if (conditionType === undefined) {
+            throw new Error('Cannot update trigger configuration without a trigger_type when the trigger has zero or multiple conditions.');
+        }
+        return [
+            {
+                ...(target?.id !== undefined && { id: target.id }),
+                condition_type: conditionType,
+                configuration: configuration ?? target?.configuration ?? {},
+            },
+        ];
+    }
     async deleteTrigger(id) {
         await this.request('DELETE', `/triggers/${id}`);
     }

package/shared/tools/action-trigger.d.ts

@@ -19,24 +19,24 @@ export declare const ActionTriggerSchema: z.ZodObject<{
     goal?: string | undefined;
     mcp_servers?: string[] | undefined;
     trigger_type?: "slack" | "schedule" | undefined;
+    configuration?: Record<string, unknown> | undefined;
     name?: string | undefined;
-    id?: number | undefined;
     agent_root_name?: string | undefined;
     prompt_template?: string | undefined;
     reuse_session?: boolean | undefined;
-    configuration?: Record<string, unknown> | undefined;
+    id?: number | undefined;
 }, {
     action: "create" | "update" | "delete" | "toggle";
     status?: "enabled" | "disabled" | undefined;
     goal?: string | undefined;
     mcp_servers?: string[] | undefined;
     trigger_type?: "slack" | "schedule" | undefined;
+    configuration?: Record<string, unknown> | undefined;
     name?: string | undefined;
-    id?: number | undefined;
     agent_root_name?: string | undefined;
     prompt_template?: string | undefined;
     reuse_session?: boolean | undefined;
-    configuration?: Record<string, unknown> | undefined;
+    id?: number | undefined;
 }>;
 export declare function actionTriggerTool(_server: Server, clientFactory: () => IAgentOrchestratorClient): {
     name: string;

package/shared/tools/manage-categories.d.ts

@@ -11,16 +11,16 @@ export declare const ManageCategoriesSchema: z.ZodObject<{
     session_id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodNumber]>>;
 }, "strip", z.ZodTypeAny, {
     action: "list" | "create" | "update" | "delete" | "reorder" | "set_session_category";
-    description?: string | undefined;
     name?: string | undefined;
+    description?: string | undefined;
     session_id?: string | number | undefined;
     category_id?: number | null | undefined;
     is_frozen?: boolean | undefined;
     ids?: (number | "uncategorized")[] | undefined;
 }, {
     action: "list" | "create" | "update" | "delete" | "reorder" | "set_session_category";
-    description?: string | undefined;
     name?: string | undefined;
+    description?: string | undefined;
     session_id?: string | number | undefined;
     category_id?: number | null | undefined;
     is_frozen?: boolean | undefined;

package/shared/types.d.ts

@@ -298,6 +298,7 @@ export interface TriggerChannelsResponse {
     }>;
 }
 export interface TriggerConditionAttributes {
+    id?: number;
     condition_type: TriggerConditionType;
     configuration: Record<string, unknown>;
 }