agent-orchestrator-mcp-server 0.7.14 → 0.7.16

package/package.json

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

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

@@ -611,18 +611,24 @@ export function createIntegrationMockOrchestratorClient(initialMockData) {
             const trigger = {
                 id,
                 name: 'Test Trigger',
-                trigger_type: 'schedule',
                 status: 'enabled',
                 agent_root_name: 'mcp-servers',
                 prompt_template: 'Test prompt',
                 stop_condition: null,
                 reuse_session: false,
                 mcp_servers: [],
-                configuration: {},
-                schedule_description: 'Every day',
+                conditions: [
+                    {
+                        id: id * 10,
+                        condition_type: 'schedule',
+                        configuration: { interval: 1, unit: 'days', time: '09:00', timezone: 'UTC' },
+                        description: 'Every day',
+                        last_triggered_at: null,
+                        last_polled_at: null,
+                    },
+                ],
                 last_session_id: null,
                 last_triggered_at: null,
-                last_polled_at: null,
                 sessions_created_count: 0,
                 created_at: new Date().toISOString(),
                 updated_at: new Date().toISOString(),
@@ -630,42 +636,52 @@ 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,
+            }));
             return {
                 id: 1,
                 name: data.name,
-                trigger_type: data.trigger_type || 'schedule',
                 status: data.status || 'enabled',
                 agent_root_name: data.agent_root_name,
                 prompt_template: data.prompt_template,
                 stop_condition: data.stop_condition || null,
                 reuse_session: data.reuse_session || false,
                 mcp_servers: data.mcp_servers || [],
-                configuration: data.configuration || {},
-                schedule_description: null,
+                conditions,
                 last_session_id: data.last_session_id ?? null,
                 last_triggered_at: null,
-                last_polled_at: null,
                 sessions_created_count: 0,
                 created_at: new Date().toISOString(),
                 updated_at: new Date().toISOString(),
             };
         },
         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,
+            }));
             return {
                 id,
                 name: data.name || 'Updated Trigger',
-                trigger_type: data.trigger_type || 'schedule',
                 status: data.status || 'enabled',
                 agent_root_name: data.agent_root_name || 'mcp-servers',
                 prompt_template: data.prompt_template || 'Test prompt',
                 stop_condition: data.stop_condition || null,
                 reuse_session: data.reuse_session || false,
                 mcp_servers: data.mcp_servers || [],
-                configuration: data.configuration || {},
-                schedule_description: null,
+                conditions,
                 last_session_id: null,
                 last_triggered_at: null,
-                last_polled_at: null,
                 sessions_created_count: 0,
                 created_at: new Date().toISOString(),
                 updated_at: new Date().toISOString(),
@@ -678,18 +694,15 @@ export function createIntegrationMockOrchestratorClient(initialMockData) {
             return {
                 id,
                 name: 'Toggled Trigger',
-                trigger_type: 'schedule',
                 status: 'disabled',
                 agent_root_name: 'mcp-servers',
                 prompt_template: 'Test prompt',
                 stop_condition: null,
                 reuse_session: false,
                 mcp_servers: [],
-                configuration: {},
-                schedule_description: null,
+                conditions: [],
                 last_session_id: null,
                 last_triggered_at: null,
-                last_polled_at: null,
                 sessions_created_count: 0,
                 created_at: new Date().toISOString(),
                 updated_at: new Date().toISOString(),

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

@@ -222,7 +222,7 @@ export class AgentOrchestratorClient {
         return this.request('POST', `/sessions/${id}/restart`);
     }
     async changeMcpServers(id, mcp_servers) {
-        const response = await this.request('PATCH', `/sessions/${id}`, {
+        const response = await this.request('PATCH', `/sessions/${id}/mcp_servers`, {
             mcp_servers,
         });
         return response.session;
@@ -356,7 +356,11 @@ export class AgentOrchestratorClient {
     }
     // Triggers
     async listTriggers(options) {
-        return this.request('GET', '/triggers', undefined, options);
+        const { trigger_type, ...rest } = options ?? {};
+        return this.request('GET', '/triggers', undefined, {
+            ...rest,
+            ...(trigger_type !== undefined && { condition_type: trigger_type }),
+        });
     }
     async getTrigger(id) {
         return this.request('GET', `/triggers/${id}`);

package/shared/tools/action-session.js

@@ -328,6 +328,30 @@ export function actionSessionTool(_server, clientFactory) {
                     }
                     case 'change_mcp_servers': {
                         const session = await client.changeMcpServers(session_id, mcp_servers);
+                        const requested = [...mcp_servers].sort();
+                        const actual = [...(session.mcp_servers ?? [])].sort();
+                        const diverged = requested.length !== actual.length || requested.some((name, i) => name !== actual[i]);
+                        if (diverged) {
+                            const formatList = (list) => (list.length > 0 ? list.join(', ') : '(none)');
+                            return {
+                                content: [
+                                    {
+                                        type: 'text',
+                                        text: [
+                                            `## MCP Servers Update FAILED — server list unchanged`,
+                                            '',
+                                            `The API accepted the request but the session's MCP servers do not match what was requested. This usually indicates the request hit a backend endpoint that silently dropped the parameter.`,
+                                            '',
+                                            `- **Session ID:** ${session.id}`,
+                                            `- **Title:** ${session.title}`,
+                                            `- **Requested:** ${formatList(mcp_servers)}`,
+                                            `- **Actual:** ${formatList(session.mcp_servers ?? [])}`,
+                                        ].join('\n'),
+                                    },
+                                ],
+                                isError: true,
+                            };
+                        }
                         const lines = [
                             `## MCP Servers Updated`,
                             '',

package/shared/tools/action-trigger.js

@@ -108,12 +108,14 @@ export function actionTriggerTool(_server, clientFactory) {
                             mcp_servers: validated.mcp_servers,
                             configuration: validated.configuration,
                         });
+                        const conditionTypes = (trigger.conditions ?? []).map((c) => c.condition_type);
+                        const typeSummary = conditionTypes.length > 0 ? Array.from(new Set(conditionTypes)).join(', ') : '(none)';
                         result = [
                             '## Trigger Created',
                             '',
                             `- **ID:** ${trigger.id}`,
                             `- **Name:** ${trigger.name}`,
-                            `- **Type:** ${trigger.trigger_type}`,
+                            `- **Conditions:** ${typeSummary}`,
                             `- **Status:** ${trigger.status}`,
                             `- **Agent Root:** ${trigger.agent_root_name}`,
                         ].join('\n');

package/shared/tools/search-triggers.d.ts

@@ -3,7 +3,7 @@ import { z } from 'zod';
 import type { IAgentOrchestratorClient } from '../orchestrator-client/orchestrator-client.js';
 export declare const SearchTriggersSchema: z.ZodObject<{
     id: z.ZodOptional<z.ZodNumber>;
-    trigger_type: z.ZodOptional<z.ZodEnum<["slack", "schedule"]>>;
+    trigger_type: z.ZodOptional<z.ZodEnum<["slack", "schedule", "ao_event"]>>;
     status: z.ZodOptional<z.ZodEnum<["enabled", "disabled"]>>;
     include_channels: z.ZodOptional<z.ZodBoolean>;
     page: z.ZodOptional<z.ZodNumber>;
@@ -12,14 +12,14 @@ export declare const SearchTriggersSchema: z.ZodObject<{
     per_page?: number | undefined;
     status?: "enabled" | "disabled" | undefined;
     page?: number | undefined;
-    trigger_type?: "slack" | "schedule" | undefined;
+    trigger_type?: "slack" | "schedule" | "ao_event" | undefined;
     id?: number | undefined;
     include_channels?: boolean | undefined;
 }, {
     per_page?: number | undefined;
     status?: "enabled" | "disabled" | undefined;
     page?: number | undefined;
-    trigger_type?: "slack" | "schedule" | undefined;
+    trigger_type?: "slack" | "schedule" | "ao_event" | undefined;
     id?: number | undefined;
     include_channels?: boolean | undefined;
 }>;
@@ -35,7 +35,7 @@ export declare function searchTriggersTool(_server: Server, clientFactory: () =>
             };
             trigger_type: {
                 type: string;
-                enum: string[];
+                enum: readonly ["slack", "schedule", "ao_event"];
                 description: string;
             };
             status: {

package/shared/tools/search-triggers.js

@@ -1,7 +1,8 @@
 import { z } from 'zod';
+const TRIGGER_TYPE_VALUES = ['slack', 'schedule', 'ao_event'];
 export const SearchTriggersSchema = z.object({
     id: z.number().optional(),
-    trigger_type: z.enum(['slack', 'schedule']).optional(),
+    trigger_type: z.enum(TRIGGER_TYPE_VALUES).optional(),
     status: z.enum(['enabled', 'disabled']).optional(),
     include_channels: z.boolean().optional(),
     page: z.number().min(1).optional(),
@@ -14,10 +15,31 @@ const TOOL_DESCRIPTION = `Search and list automation triggers.
 - **List**: List triggers with optional filters (trigger_type, status, pagination)
 - **Include channels**: Set include_channels=true to also list available Slack channels (useful when creating Slack triggers)
 
+**Filterable trigger types:**
+- **slack**: Triggers fired by Slack messages
+- **schedule**: Recurring or one-time scheduled triggers
+- **ao_event**: Triggers fired by internal AO state transitions (e.g., a session entering needs_input or failed). These back the \`wake_me_up_when_session_changes_state\` tool.
+
+A trigger may have multiple conditions (OR semantics) — filtering by trigger_type returns triggers that have at least one condition of that type.
+
 **Use cases:**
-- View configured automations (scheduled tasks, Slack integrations)
+- View configured automations (scheduled tasks, Slack integrations, ao_event waiters)
 - Check trigger status and execution history
 - Discover available Slack channels for new triggers`;
+// Returns a deduped, ordered list of condition types present on a trigger.
+function summarizeConditionTypes(conditions) {
+    if (!conditions || conditions.length === 0)
+        return '(none)';
+    const seen = new Set();
+    const ordered = [];
+    for (const c of conditions) {
+        if (!seen.has(c.condition_type)) {
+            seen.add(c.condition_type);
+            ordered.push(c.condition_type);
+        }
+    }
+    return ordered.join(', ');
+}
 export function searchTriggersTool(_server, clientFactory) {
     return {
         name: 'search_triggers',
@@ -31,8 +53,8 @@ export function searchTriggersTool(_server, clientFactory) {
                 },
                 trigger_type: {
                     type: 'string',
-                    enum: ['slack', 'schedule'],
-                    description: 'Filter by trigger type.',
+                    enum: TRIGGER_TYPE_VALUES,
+                    description: "Filter to triggers having at least one condition of this type. Maps to the API's `condition_type` query parameter.",
                 },
                 status: {
                     type: 'string',
@@ -64,22 +86,30 @@ export function searchTriggersTool(_server, clientFactory) {
                         `## Trigger: ${t.name}`,
                         '',
                         `- **ID:** ${t.id}`,
-                        `- **Type:** ${t.trigger_type}`,
+                        `- **Conditions:** ${summarizeConditionTypes(t.conditions)}`,
                         `- **Status:** ${t.status}`,
                         `- **Agent Root:** ${t.agent_root_name}`,
                         `- **Reuse Session:** ${t.reuse_session ? 'Yes' : 'No'}`,
-                        `- **MCP Servers:** ${t.mcp_servers.length > 0 ? t.mcp_servers.join(', ') : '(none)'}`,
+                        `- **MCP Servers:** ${t.mcp_servers && t.mcp_servers.length > 0 ? t.mcp_servers.join(', ') : '(none)'}`,
                     ];
                     if (t.stop_condition)
                         lines.push(`- **Stop Condition:** ${t.stop_condition}`);
-                    if (t.schedule_description)
-                        lines.push(`- **Schedule:** ${t.schedule_description}`);
                     lines.push(`- **Sessions Created:** ${t.sessions_created_count}`);
                     if (t.last_triggered_at)
                         lines.push(`- **Last Triggered:** ${t.last_triggered_at}`);
                     lines.push('', '### Prompt Template', '```', t.prompt_template, '```');
-                    if (t.configuration && Object.keys(t.configuration).length > 0) {
-                        lines.push('', '### Configuration', '```json', JSON.stringify(t.configuration, null, 2), '```');
+                    if (t.conditions && t.conditions.length > 0) {
+                        lines.push('', '### Conditions');
+                        t.conditions.forEach((c) => {
+                            lines.push(`- **${c.condition_type}** — ${c.description}`);
+                            if (c.configuration && Object.keys(c.configuration).length > 0) {
+                                lines.push('  ```json');
+                                JSON.stringify(c.configuration, null, 2)
+                                    .split('\n')
+                                    .forEach((line) => lines.push(`  ${line}`));
+                                lines.push('  ```');
+                            }
+                        });
                     }
                     if (response.recent_sessions && response.recent_sessions.length > 0) {
                         lines.push('', '### Recent Sessions');
@@ -104,9 +134,12 @@ export function searchTriggersTool(_server, clientFactory) {
                     lines.push(`## Triggers (${response.pagination.total_count} total, page ${response.pagination.page} of ${response.pagination.total_pages})`, '');
                     response.triggers.forEach((t) => {
                         lines.push(`### ${t.name} (ID: ${t.id})`);
-                        lines.push(`- **Type:** ${t.trigger_type} | **Status:** ${t.status} | **Sessions:** ${t.sessions_created_count}`);
-                        if (t.schedule_description)
-                            lines.push(`- **Schedule:** ${t.schedule_description}`);
+                        lines.push(`- **Conditions:** ${summarizeConditionTypes(t.conditions)} | **Status:** ${t.status} | **Sessions:** ${t.sessions_created_count}`);
+                        if (t.conditions && t.conditions.length > 0) {
+                            t.conditions.forEach((c) => {
+                                lines.push(`  - ${c.description}`);
+                            });
+                        }
                         lines.push('');
                     });
                 }

package/shared/types.d.ts

@@ -215,23 +215,31 @@ export interface EnqueuedMessageInterruptResponse {
     session: Session;
     message: string;
 }
-export type TriggerType = 'slack' | 'schedule';
+export type TriggerConditionType = 'slack' | 'schedule' | 'ao_event';
+export type TriggerType = TriggerConditionType;
 export type TriggerStatus = 'enabled' | 'disabled';
+export interface TriggerCondition {
+    id: number;
+    condition_type: TriggerConditionType;
+    configuration: Record<string, unknown>;
+    description: string;
+    last_triggered_at: string | null;
+    last_polled_at: string | null;
+}
 export interface Trigger {
     id: number;
     name: string;
-    trigger_type: TriggerType;
     status: TriggerStatus;
     agent_root_name: string;
     prompt_template: string;
     stop_condition: string | null;
     reuse_session: boolean;
+    enqueue_messages?: boolean;
+    resuscitate_archived?: boolean;
     mcp_servers: string[];
-    configuration: Record<string, unknown>;
-    schedule_description: string | null;
+    conditions: TriggerCondition[];
     last_session_id: number | null;
     last_triggered_at: string | null;
-    last_polled_at: string | null;
     sessions_created_count: number;
     created_at: string;
     updated_at: string;
@@ -253,31 +261,32 @@ export interface TriggerChannelsResponse {
     }>;
 }
 export interface TriggerConditionAttributes {
-    condition_type: 'slack' | 'schedule' | 'ao_event';
+    condition_type: TriggerConditionType;
     configuration: Record<string, unknown>;
 }
 export interface CreateTriggerRequest {
     name: string;
-    trigger_type?: TriggerType;
     agent_root_name: string;
     prompt_template: string;
     status?: TriggerStatus;
     stop_condition?: string;
     reuse_session?: boolean;
     mcp_servers?: string[];
-    configuration?: Record<string, unknown>;
     last_session_id?: number;
     trigger_conditions_attributes?: TriggerConditionAttributes[];
+    trigger_type?: TriggerConditionType;
+    configuration?: Record<string, unknown>;
 }
 export interface UpdateTriggerRequest {
     name?: string;
-    trigger_type?: TriggerType;
     agent_root_name?: string;
     prompt_template?: string;
     status?: TriggerStatus;
     stop_condition?: string;
     reuse_session?: boolean;
     mcp_servers?: string[];
+    trigger_conditions_attributes?: TriggerConditionAttributes[];
+    trigger_type?: TriggerConditionType;
     configuration?: Record<string, unknown>;
 }
 export interface Notification {